Various patches to fix build on SunOS.

7 files changed, 85 insertions, 3 deletions

diff --git a/chat/weechat/Makefile b/chat/weechat/Makefile
index 55565719de4..f7062d85266 100644
--- a/chat/weechat/Makefile
+++ b/chat/weechat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2013/07/04 21:27:56 adam Exp $
+# $NetBSD: Makefile,v 1.43 2013/12/12 20:17:56 jperkin Exp $
 
 DISTNAME=	weechat-0.4.1
 PKGREVISION=	1
@@ -15,14 +15,18 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		msgfmt pkg-config
+USE_LANGUAGES=		c99
 USE_LIBTOOL=		yes
 USE_CMAKE=		yes
-LIBS.SunOS+=		-lnsl
+
+CFLAGS.SunOS+=		-D_XOPEN_SOURCE=600 -D__EXTENSIONS__
+LDFLAGS.SunOS+=		-lsocket -lnsl -lintl
 
 CMAKE_ARGS+=		-DENABLE_ASPELL:BOOL=OFF
 CMAKE_ARGS+=		-DENABLE_GUILE:BOOL=OFF
 CMAKE_ARGS+=		-DENABLE_TCL:BOOL=OFF
 CMAKE_ARGS+=		-DMANDIR:STRING=${PKGMANDIR}
+CMAKE_ARGS+=		-DLOCALEDIR:STRING=${PKGLOCALEDIR}/locale
 
 .include "options.mk"
 
diff --git a/chat/weechat/distinfo b/chat/weechat/distinfo
index 1ef90337ae4..8a4b4a2a3f0 100644
--- a/chat/weechat/distinfo
+++ b/chat/weechat/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.26 2013/08/30 16:56:56 joerg Exp $
+$NetBSD: distinfo,v 1.27 2013/12/12 20:17:56 jperkin Exp $
 
 SHA1 (weechat-0.4.1.tar.bz2) = a5185d6b8a2b330713ea354f06601a205270e3a2
 RMD160 (weechat-0.4.1.tar.bz2) = 07cf6554b0238a2dd41da94483d62573789fe97b
@@ -7,3 +7,8 @@ SHA1 (patch-ab) = d0fac0994602dfa0afde9fe14487f44f8cce25d6
 SHA1 (patch-po_CMakeLists.txt) = 518c8c1347fc2bcdd15dfd83e48af7f08b7527be
 SHA1 (patch-src_gui_curses_CMakeLists_txt) = 06f18d1efd21e9aeab6931e8d2018885e709c745
 SHA1 (patch-src_gui_curses_gui-curses-term_c) = ba9e6a8bbb17356fbd9421aba4f3225bb7d6b9da
+SHA1 (patch-src_plugins_charset_charset.c) = f0b6e5268908caab5efa8048c8a55b0083ec0ca4
+SHA1 (patch-src_plugins_irc_irc-protocol.c) = 263a0cf3e77618d67bc521af1469585d21f2d3cf
+SHA1 (patch-src_plugins_logger_logger.c) = 36d465728191f61d0a7d76b888f437b056817922
+SHA1 (patch-src_plugins_script_script-repo.c) = c9eed9b991fa24c5fc41ae5596cb0b2cf3edbe62
+SHA1 (patch-src_plugins_xfer_xfer-dcc.c) = 242fe1d690bb5a6485e57e61df7969010e91c9f8
diff --git a/chat/weechat/patches/patch-src_plugins_charset_charset.c b/chat/weechat/patches/patch-src_plugins_charset_charset.c
new file mode 100644
index 00000000000..fd331ee7d75
--- /dev/null
+++ b/chat/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"
diff --git a/chat/weechat/patches/patch-src_plugins_irc_irc-protocol.c b/chat/weechat/patches/patch-src_plugins_irc_irc-protocol.c
new file mode 100644
index 00000000000..8d9d45624f2
--- /dev/null
+++ b/chat/weechat/patches/patch-src_plugins_irc_irc-protocol.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_plugins_irc_irc-protocol.c,v 1.1 2013/12/12 20:17:56 jperkin Exp $
+
+Don't define _XOPEN_SOURCE past 600 on SunOS.
+
+--- src/plugins/irc/irc-protocol.c.orig	2013-05-20 08:06:14.000000000 +0000
++++ src/plugins/irc/irc-protocol.c
+@@ -21,7 +21,7 @@
+  */
+ 
+ /* this define is needed for strptime() (not on OpenBSD) */
+-#if !defined(__OpenBSD__)
++#if !defined(__OpenBSD__) && !defined(__sun)
+ #define _XOPEN_SOURCE 700
+ #endif
+ 
diff --git a/chat/weechat/patches/patch-src_plugins_logger_logger.c b/chat/weechat/patches/patch-src_plugins_logger_logger.c
new file mode 100644
index 00000000000..ecf1a074be2
--- /dev/null
+++ b/chat/weechat/patches/patch-src_plugins_logger_logger.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_plugins_logger_logger.c,v 1.1 2013/12/12 20:17:56 jperkin Exp $
+
+Don't define _XOPEN_SOURCE past 600 on SunOS.
+
+--- src/plugins/logger/logger.c.orig	2013-05-20 08:06:14.000000000 +0000
++++ src/plugins/logger/logger.c
+@@ -20,7 +20,7 @@
+  */
+ 
+ /* this define is needed for strptime() (not on OpenBSD) */
+-#if !defined(__OpenBSD__)
++#if !defined(__OpenBSD__) && !defined(__sun)
+ #define _XOPEN_SOURCE 700
+ #endif
+ 
diff --git a/chat/weechat/patches/patch-src_plugins_script_script-repo.c b/chat/weechat/patches/patch-src_plugins_script_script-repo.c
new file mode 100644
index 00000000000..14edb2e55eb
--- /dev/null
+++ b/chat/weechat/patches/patch-src_plugins_script_script-repo.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_plugins_script_script-repo.c,v 1.1 2013/12/12 20:17:56 jperkin Exp $
+
+Don't define _XOPEN_SOURCE past 600 on SunOS.
+
+--- src/plugins/script/script-repo.c.orig	2013-05-20 08:06:14.000000000 +0000
++++ src/plugins/script/script-repo.c
+@@ -23,7 +23,7 @@
+  * this define is needed for strptime()
+  * but is not used for OpenBSD, it causes bug with gcrypt (see bug #37373)
+  */
+-#if !defined(__OpenBSD__)
++#if !defined(__OpenBSD__) && !defined(__sun)
+ #define _XOPEN_SOURCE 700
+ #endif
+ 
diff --git a/chat/weechat/patches/patch-src_plugins_xfer_xfer-dcc.c b/chat/weechat/patches/patch-src_plugins_xfer_xfer-dcc.c
new file mode 100644
index 00000000000..8d2dc04026f
--- /dev/null
+++ b/chat/weechat/patches/patch-src_plugins_xfer_xfer-dcc.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_plugins_xfer_xfer-dcc.c,v 1.1 2013/12/12 20:17:56 jperkin Exp $
+
+Need string.h
+
+--- src/plugins/xfer/xfer-dcc.c.orig	2013-05-20 08:06:14.000000000 +0000
++++ src/plugins/xfer/xfer-dcc.c
+@@ -20,6 +20,7 @@
+  */
+ 
+ #include <stdlib.h>
++#include <string.h>
+ #include <unistd.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>