weechat: returned old patches

[coypu <coypu%sdf.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	coypu <coypu%sdf.org@localhost>
Pushed By:	coypu
Date:		Sun Dec 6 15:40:39 2015 +0000
Changeset:	a80b821d52bc90e6be77b157e376dcda7b9b2d17

Modified Files:
	weechat/PLIST
	weechat/distinfo
Added Files:
	weechat/patches/patch-ab
	weechat/patches/patch-po_CMakeLists.txt
	weechat/patches/patch-src_gui_curses_CMakeLists_txt
	weechat/patches/patch-src_gui_curses_gui-curses-term_c
	weechat/patches/patch-src_plugins_charset_charset.c

Log Message:
weechat: returned old patches

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=a80b821d52bc90e6be77b157e376dcda7b9b2d17

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 weechat/PLIST                                      |  1 -
 weechat/distinfo                                   |  6 +++-
 weechat/patches/patch-ab                           | 15 ++++++++
 weechat/patches/patch-po_CMakeLists.txt            | 15 ++++++++
 .../patches/patch-src_gui_curses_CMakeLists_txt    | 36 +++++++++++++++++++
 .../patches/patch-src_gui_curses_gui-curses-term_c | 41 ++++++++++++++++++++++
 .../patches/patch-src_plugins_charset_charset.c    | 14 ++++++++
 7 files changed, 126 insertions(+), 2 deletions(-)

diffs:
diff --git a/weechat/PLIST b/weechat/PLIST
index 231ef2b..d14eb6f 100644
--- a/weechat/PLIST
+++ b/weechat/PLIST
@@ -1,6 +1,5 @@
 @comment $NetBSD$
 bin/weechat
-bin/weechat-curses
 include/weechat/weechat-plugin.h
 lib/pkgconfig/weechat.pc
 lib/weechat/plugins/alias.so
diff --git a/weechat/distinfo b/weechat/distinfo
index 6b4836e..3cc2f12 100644
--- a/weechat/distinfo
+++ b/weechat/distinfo
@@ -4,4 +4,8 @@ SHA1 (weechat-1.3.tar.bz2) = 3d6cac3a92b194819197ee7ed435a0c2e62a7c66
 RMD160 (weechat-1.3.tar.bz2) = 2484204e67eea53328a37c7d588cb76f76dfd0ec
 SHA512 (weechat-1.3.tar.bz2) = 82159f1c630bf389e7a3b8baf29b67c50711e1a767040440c71bfd7d3cd0c3005b7423e6dd53c2437512cc68953f540039971a4e6f6d7a4cdb4a4e74e4c3985b
 Size (weechat-1.3.tar.bz2) = 2402422 bytes
-SHA1 (patch-src_gui_curses_gui-curses-term.c) = 0b45b76ecde33089cd90feae29818c1e6cad6007
+SHA1 (patch-ab) = 2a4583e0f5b0336e8c42ad9eb5a65bbec4730207
+SHA1 (patch-po_CMakeLists.txt) = 9b97a4a4da4175e31ea53352fd0b95e1c985ba1e
+SHA1 (patch-src_gui_curses_CMakeLists_txt) = 28a1b3b9920cc130d0454a18b111d37b8090038b
+SHA1 (patch-src_gui_curses_gui-curses-term_c) = 900af9a94e74f229b32031bfeced1b85ea3a0ccf
+SHA1 (patch-src_plugins_charset_charset.c) = f0b6e5268908caab5efa8048c8a55b0083ec0ca4
diff --git a/weechat/patches/patch-ab b/weechat/patches/patch-ab
new file mode 100644
index 0000000..9eb74e5
--- /dev/null
+++ b/weechat/patches/patch-ab
@@ -0,0 +1,15 @@
+$NetBSD: patch-ab,v 1.8 2015/08/01 19:10:15 tonio Exp $
+
+Prefer ncursesw/curses.h over ncursesw/ncurses.h.
+
+--- src/gui/curses/gui-curses.h.orig	2012-01-08 09:13:53.000000000 +0000
++++ src/gui/curses/gui-curses.h
+@@ -23,6 +23,8 @@
+ #include <time.h>
+ 
+ #ifdef HAVE_NCURSESW_CURSES_H
++#include <ncursesw/curses.h>
++#elif HAVE_NCURSESW_NCURSES_H
+ #include <ncursesw/ncurses.h>
+ #elif HAVE_NCURSES_H
+ #include <ncurses.h>
diff --git a/weechat/patches/patch-po_CMakeLists.txt b/weechat/patches/patch-po_CMakeLists.txt
new file mode 100644
index 0000000..60ce408
--- /dev/null
+++ b/weechat/patches/patch-po_CMakeLists.txt
@@ -0,0 +1,15 @@
+$NetBSD: patch-po_CMakeLists.txt,v 1.4 2015/08/01 19:10:15 tonio Exp $
+
+Drop package-name and package-version args to xgettext.
+
+--- po/CMakeLists.txt.orig	2014-08-15 08:09:01.000000000 +0000
++++ po/CMakeLists.txt
+@@ -56,7 +56,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 --from-code=UTF-8 --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 --from-code=UTF-8 --directory=${CMAKE_SOURCE_DIR} --msgid-bugs-address=${BUGS_ADDRESS} --copyright-holder='NAME' ${SRC_FILES}
+     DEPENDS ${POT_DEPENDS}
+     COMMENT "Generating ${POT_FILE}"
+     )
diff --git a/weechat/patches/patch-src_gui_curses_CMakeLists_txt b/weechat/patches/patch-src_gui_curses_CMakeLists_txt
new file mode 100644
index 0000000..faf6672
--- /dev/null
+++ b/weechat/patches/patch-src_gui_curses_CMakeLists_txt
@@ -0,0 +1,36 @@
+$NetBSD: patch-src_gui_curses_CMakeLists_txt,v 1.5 2015/08/01 19:10:15 tonio Exp $
+
+Test for ncursesw
+
+--- src/gui/curses/CMakeLists.txt.orig	2015-05-10 07:24:50.000000000 +0000
++++ src/gui/curses/CMakeLists.txt
+@@ -37,9 +37,11 @@ set(EXECUTABLE weechat)
+ 
+ find_package(Ncurses)
+ if(NCURSES_FOUND)
++  check_include_files(ncursesw/term.h HAVE_NCURSES_TERM_H)
++  check_include_files(ncursesw/curses.h HAVE_NCURSESW_CURSES_H)
+   check_include_files(ncursesw/ncurses.h NCURSESW_HEADERS)
+   if(NCURSESW_HEADERS)
+-    add_definitions(-DHAVE_NCURSESW_CURSES_H)
++    add_definitions(-DHAVE_NCURSESW_NCURSES_H)
+   else()
+     check_include_files(ncurses.h NCURSES_HEADERS)
+     if(NCURSES_HEADERS)
+@@ -59,6 +61,10 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "SunOS"
+   list(APPEND EXTRA_LIBS "socket" "nsl")
+ endif()
+ 
++if(${CMAKE_SYSTEM_NAME} STREQUAL "NetBSD")
++  list(APPEND EXTRA_LIBS "curses")
++endif()
++
+ list(APPEND EXTRA_LIBS "pthread")
+ 
+ if(ICONV_LIBRARY)
+@@ -103,4 +109,4 @@ list(APPEND CMAKE_INSTALL_MANIFEST_FILES
+ 
+ # Install executable and symbolic link
+ install(TARGETS ${EXECUTABLE} RUNTIME DESTINATION bin)
+-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${EXECUTABLE}-curses${CMAKE_EXECUTABLE_SUFFIX} DESTINATION bin)
++
diff --git a/weechat/patches/patch-src_gui_curses_gui-curses-term_c b/weechat/patches/patch-src_gui_curses_gui-curses-term_c
new file mode 100644
index 0000000..d75faba
--- /dev/null
+++ b/weechat/patches/patch-src_gui_curses_gui-curses-term_c
@@ -0,0 +1,41 @@
+$NetBSD: patch-src_gui_curses_gui-curses-term_c,v 1.5 2015/08/01 19:10:15 tonio Exp $
+
+Include <ncurses/term.h>, not <ncursesw/term.h>.
+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	2015-05-10 07:24:50.000000000 +0000
++++ src/gui/curses/gui-curses-term.c
+@@ -23,15 +23,15 @@
+ #include "config.h"
+ #endif
+ 
+-#ifdef HAVE_NCURSESW_CURSES_H
+-#ifdef __sun
++#ifdef HAVE_NCURSES_TERM_H
+ #include <ncurses/term.h>
+ #else
+-#include <ncursesw/term.h>
+-#endif /* __sun */
+-#else
++#ifdef __NetBSD__
++/* workaround for build failure on early 6.99.* and prerelease 6.0 */
++#include <sys/cdefs.h>
++#endif
+ #include <term.h>
+-#endif /* HAVE_NCURSESW_CURSES_H */
++#endif /* HAVE_NCURSESW_TERM_H */
+ 
+ 
+ /*
+@@ -45,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 */
diff --git a/weechat/patches/patch-src_plugins_charset_charset.c b/weechat/patches/patch-src_plugins_charset_charset.c
new file mode 100644
index 0000000..fd331ee
--- /dev/null
+++ b/weechat/patches/patch-src_plugins_charset_charset.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_plugins_charset_charset.c,v 1.1 2013/12/12 20:17:56 jperkin Exp $
+
+Need strings.h for strcasecmp()
+
+--- src/plugins/charset/charset.c.orig	2013-05-20 08:06:14.000000000 +0000
++++ src/plugins/charset/charset.c
+@@ -25,6 +25,7 @@
+ #define __USE_GNU
+ #endif
+ #include <string.h>
++#include <strings.h>
+ #include <iconv.h>
+ 
+ #include "../weechat-plugin.h"