Make chat/weechat detect and use correctly. Index: chat/weechat/distinfo =================================================================== RCS file: /cvsroot/pkgsrc/chat/weechat/distinfo,v retrieving revision 1.23 diff -p -u -r1.23 distinfo --- chat/weechat/distinfo 24 Nov 2012 11:16:06 -0000 1.23 +++ chat/weechat/distinfo 23 Apr 2013 13:29:14 -0000 @@ -6,5 +6,7 @@ Size (weechat-0.3.9.2.tar.bz2) = 2721004 SHA1 (patch-aa) = 86a3cfd780fb52d8dea92d5f9d72bb3ac2df91bf SHA1 (patch-ab) = d0fac0994602dfa0afde9fe14487f44f8cce25d6 SHA1 (patch-ac) = e9fa664f040bd6549ddd8e860ec4568931bcab6b -SHA1 (patch-src_gui_curses_gui-curses-term_c) = 85d59b3bc4dc3bac8b972d19a20a35afbcd599c8 +SHA1 (patch-configure) = e7d8c886fd55f633ffd4a3419a445c031b561d2b +SHA1 (patch-configure.in) = 9d341fe4d046333a5e5aafe48c2edf8f26448a8d +SHA1 (patch-src_gui_curses_gui-curses-term_c) = db7a4223e728d9f30491eada9d1c41881ea2e066 SHA1 (patch-src_plugins_script_script_repo_h) = 041b5e284a3b4cd6998c7e93e3f24f8ccb04980a Index: chat/weechat/patches/patch-configure =================================================================== RCS file: chat/weechat/patches/patch-configure diff -N chat/weechat/patches/patch-configure --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ chat/weechat/patches/patch-configure 23 Apr 2013 13:29:14 -0000 @@ -0,0 +1,15 @@ +$NetBSD$ + +Check for . + +--- configure.orig 2013-01-19 17:37:48.000000000 +0000 ++++ configure +@@ -17137,7 +17137,7 @@ $as_echo "$as_me: WARNING: + else + NCURSES_LFLAGS="-lncursesw" + fi +- for ac_header in ncurses.h ncursesw/curses.h ++ for ac_header in ncurses.h ncurses/term.h ncursesw/curses.h + do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` + ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" Index: chat/weechat/patches/patch-configure.in =================================================================== RCS file: chat/weechat/patches/patch-configure.in diff -N chat/weechat/patches/patch-configure.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ chat/weechat/patches/patch-configure.in 23 Apr 2013 13:29:14 -0000 @@ -0,0 +1,15 @@ +$NetBSD$ + +Check for . + +--- configure.in.orig 2012-11-18 09:50:21.000000000 +0000 ++++ configure.in +@@ -200,7 +200,7 @@ if test "x$enable_ncurses" = "xyes" ; th + else + NCURSES_LFLAGS="-lncursesw" + fi +- AC_CHECK_HEADERS([ncurses.h ncursesw/curses.h]) ++ AC_CHECK_HEADERS([ncurses.h ncurses/term.h ncursesw/curses.h]) + AC_SUBST(NCURSES_LFLAGS) + else + not_asked="$not_asked ncurses" Index: chat/weechat/patches/patch-src_gui_curses_gui-curses-term_c =================================================================== RCS file: /cvsroot/pkgsrc/chat/weechat/patches/patch-src_gui_curses_gui-curses-term_c,v retrieving revision 1.1 diff -p -u -r1.1 patch-src_gui_curses_gui-curses-term_c --- chat/weechat/patches/patch-src_gui_curses_gui-curses-term_c 29 May 2012 00:32:27 -0000 1.1 +++ chat/weechat/patches/patch-src_gui_curses_gui-curses-term_c 23 Apr 2013 13:29:14 -0000 @@ -1,13 +1,21 @@ -$NetBSD: patch-src_gui_curses_gui-curses-term_c,v 1.1 2012/05/29 00:32:27 dholland Exp $ +$NetBSD$ + +Include , not . +Check for HAVE_NCURSES_TERM_H, not for HAVE_NCURSES_CURSES_H. Workaround for build failure on early NetBSD 6.99.* and prerelease 6.0 (PR 46492) ---- src/gui/curses/gui-curses-term.c~ 2012-01-08 10:28:06.000000000 +0000 +--- src/gui/curses/gui-curses-term.c.orig 2012-03-10 07:56:43.000000000 +0000 +++ src/gui/curses/gui-curses-term.c -@@ -28,6 +28,10 @@ - #ifdef HAVE_NCURSESW_CURSES_H - #include +@@ -25,9 +25,13 @@ + #include "config.h" + #endif + +-#ifdef HAVE_NCURSESW_CURSES_H +-#include ++#ifdef HAVE_NCURSES_TERM_H ++#include #else +#ifdef __NetBSD__ +/* workaround for build failure on early 6.99.* and prerelease 6.0 */