Link with curses on NetBSD. Don't try to overwrite terminfo internals

that are const. Drop --package-name.

4 files changed, 42 insertions, 8 deletions

diff --git a/chat/weechat/distinfo b/chat/weechat/distinfo
index df93aca3804..1ef90337ae4 100644
--- a/chat/weechat/distinfo
+++ b/chat/weechat/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.25 2013/06/09 21:19:02 tonio Exp $
+$NetBSD: distinfo,v 1.26 2013/08/30 16:56:56 joerg Exp $
 
 SHA1 (weechat-0.4.1.tar.bz2) = a5185d6b8a2b330713ea354f06601a205270e3a2
 RMD160 (weechat-0.4.1.tar.bz2) = 07cf6554b0238a2dd41da94483d62573789fe97b
 Size (weechat-0.4.1.tar.bz2) = 1772500 bytes
 SHA1 (patch-ab) = d0fac0994602dfa0afde9fe14487f44f8cce25d6
-SHA1 (patch-src_gui_curses_CMakeLists_txt) = 7233fd400c38e0ae65c1664f38a3534734141630
-SHA1 (patch-src_gui_curses_gui-curses-term_c) = db7a4223e728d9f30491eada9d1c41881ea2e066
+SHA1 (patch-po_CMakeLists.txt) = 518c8c1347fc2bcdd15dfd83e48af7f08b7527be
+SHA1 (patch-src_gui_curses_CMakeLists_txt) = 06f18d1efd21e9aeab6931e8d2018885e709c745
+SHA1 (patch-src_gui_curses_gui-curses-term_c) = ba9e6a8bbb17356fbd9421aba4f3225bb7d6b9da
diff --git a/chat/weechat/patches/patch-po_CMakeLists.txt b/chat/weechat/patches/patch-po_CMakeLists.txt
new file mode 100644
index 00000000000..ba059784ec3
--- /dev/null
+++ b/chat/weechat/patches/patch-po_CMakeLists.txt
@@ -0,0 +1,13 @@
+$NetBSD: patch-po_CMakeLists.txt,v 1.1 2013/08/30 16:56:56 joerg Exp $
+
+--- po/CMakeLists.txt.orig	2013-08-30 13:48:27.000000000 +0000
++++ po/CMakeLists.txt
+@@ -55,7 +55,7 @@ IF(XGETTEXT_EXECUTABLE AND MSGMERGE_EXEC
+   ADD_CUSTOM_COMMAND(
+     OUTPUT ${POT_FILE_PATH}
+     COMMAND ${XGETTEXT_EXECUTABLE}
+-    ARGS -o ${POT_FILE_PATH} --add-comments='TRANSLATORS:' --keyword='_' --keyword='weechat_gettext' --keyword='N_' --keyword='NG_:1,2' --keyword='weechat_ngettext:1,2' --no-location --directory=${CMAKE_SOURCE_DIR} --package-name='WeeChat' --package-version=${VERSION} --msgid-bugs-address=${BUGS_ADDRESS} --copyright-holder='NAME' ${SRC_FILES}
++    ARGS -o ${POT_FILE_PATH} --add-comments='TRANSLATORS:' --keyword='_' --keyword='weechat_gettext' --keyword='N_' --keyword='NG_:1,2' --keyword='weechat_ngettext:1,2' --no-location --directory=${CMAKE_SOURCE_DIR} --msgid-bugs-address=${BUGS_ADDRESS} --copyright-holder='NAME' ${SRC_FILES}
+     DEPENDS ${POT_DEPENDS}
+     COMMENT "Generating ${POT_FILE}"
+     )
diff --git a/chat/weechat/patches/patch-src_gui_curses_CMakeLists_txt b/chat/weechat/patches/patch-src_gui_curses_CMakeLists_txt
index 79ce18aa432..897849e57a8 100644
--- a/chat/weechat/patches/patch-src_gui_curses_CMakeLists_txt
+++ b/chat/weechat/patches/patch-src_gui_curses_CMakeLists_txt
@@ -1,8 +1,8 @@
-$NetBSD: patch-src_gui_curses_CMakeLists_txt,v 1.1 2013/06/09 21:19:02 tonio Exp $
+$NetBSD: patch-src_gui_curses_CMakeLists_txt,v 1.2 2013/08/30 16:56:56 joerg Exp $
 
 Test for ncursesw
 
---- src/gui/curses/CMakeLists.txt.orig	2013-06-09 20:57:43.000000000 +0000
+--- src/gui/curses/CMakeLists.txt.orig	2013-05-20 08:06:14.000000000 +0000
 +++ src/gui/curses/CMakeLists.txt
 @@ -34,9 +34,11 @@ SET(EXECUTABLE weechat-curses)
  
@@ -17,3 +17,14 @@ Test for ncursesw
    ELSE(NCURSESW_HEADERS)
      CHECK_INCLUDE_FILES(ncurses.h NCURSES_HEADERS)
      IF(NCURSES_HEADERS)
+@@ -57,6 +59,10 @@ IF(${CMAKE_SYSTEM_NAME} STREQUAL "OpenBS
+   LIST(APPEND EXTRA_LIBS "pthread")
+ ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD")
+ 
++IF(${CMAKE_SYSTEM_NAME} STREQUAL "NetBSD")
++  LIST(APPEND EXTRA_LIBS "curses")
++ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "NetBSD")
++
+ IF(ICONV_LIBRARY)
+   LIST(APPEND EXTRA_LIBS ${ICONV_LIBRARY})
+ ENDIF(ICONV_LIBRARY)
diff --git a/chat/weechat/patches/patch-src_gui_curses_gui-curses-term_c b/chat/weechat/patches/patch-src_gui_curses_gui-curses-term_c
index 8fb251a81db..ce88f282cc7 100644
--- a/chat/weechat/patches/patch-src_gui_curses_gui-curses-term_c
+++ b/chat/weechat/patches/patch-src_gui_curses_gui-curses-term_c
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_gui_curses_gui-curses-term_c,v 1.2 2013/05/11 18:31:11 riastradh Exp $
+$NetBSD: patch-src_gui_curses_gui-curses-term_c,v 1.3 2013/08/30 16:56:56 joerg Exp $
 
 Include <ncurses/term.h>, not <ncursesw/term.h>.
 Check for HAVE_NCURSES_TERM_H, not for HAVE_NCURSES_CURSES_H.
@@ -6,9 +6,9 @@ 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.orig	2012-03-10 07:56:43.000000000 +0000
+--- src/gui/curses/gui-curses-term.c.orig	2013-05-20 08:06:14.000000000 +0000
 +++ src/gui/curses/gui-curses-term.c
-@@ -25,9 +25,13 @@
+@@ -23,9 +23,13 @@
  #include "config.h"
  #endif
  
@@ -24,3 +24,12 @@ Workaround for build failure on early NetBSD 6.99.* and prerelease 6.0
  #include <term.h>
  #endif
  
+@@ -41,7 +45,7 @@
+ void
+ gui_term_set_eat_newline_glitch (int value)
+ {
+-#ifdef HAVE_EAT_NEWLINE_GLITCH
++#if defined(HAVE_EAT_NEWLINE_GLITCH) && !defined(__NetBSD__)
+     eat_newline_glitch = value;
+ #else
+     /* make C compiler happy */