Avoid potential clash with host defined ERR and add needed libs for SunOS

5 files changed, 36 insertions, 5 deletions

diff --git a/news/pan/Makefile b/news/pan/Makefile
index 0b40c32fcdb..2428651dcfe 100644
--- a/news/pan/Makefile
+++ b/news/pan/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.86 2015/04/25 14:23:48 tnn Exp $
+# $NetBSD: Makefile,v 1.87 2015/08/25 08:29:10 richard Exp $
 
 DISTNAME=		pan-0.139
 PKGREVISION=		16
@@ -12,6 +12,7 @@ COMMENT=		Newsreader for GTK2
 LICENSE=		gnu-gpl-v2
 
 USE_TOOLS+=		gmake intltool msgfmt pkg-config
+USE_TOOLS+=		msgmerge xgettext
 USE_LANGUAGES=		c c++
 USE_PKGLOCALEDIR=	YES
 GNU_CONFIGURE=		YES
@@ -21,6 +22,8 @@ GNU_CONFIGURE=		YES
 LIBS+=			-lcompat
 .endif
 
+LIBS.SunOS+=	-lsocket -liconv
+
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mail/gmime24/buildlink3.mk"
diff --git a/news/pan/distinfo b/news/pan/distinfo
index fa65b1c0a07..0563969a947 100644
--- a/news/pan/distinfo
+++ b/news/pan/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.28 2014/04/16 22:39:46 wiz Exp $
+$NetBSD: distinfo,v 1.29 2015/08/25 08:29:10 richard Exp $
 
 SHA1 (pan-0.139.tar.bz2) = 01ea0361a6d81489888e6abb075fd552999c3c60
 RMD160 (pan-0.139.tar.bz2) = e0e2963b2d11b362201639ca755ad9ae43581c2f
 Size (pan-0.139.tar.bz2) = 1523907 bytes
-SHA1 (patch-pan_usenet-utils_mime-utils.cc) = fb3703e8e5ddd24b337b583e3f4348358a0098f5
+SHA1 (patch-pan_general_text-match.cc) = eaf15f3323f693d094892d3283437ad5ac3c9682
+SHA1 (patch-pan_general_text-match.h) = 6ac5a68a8b1cb472df517a8df53eee5a79e4c73c
+SHA1 (patch-pan_usenet-utils_mime-utils.cc) = 3c397b896d93c64e2d0a09ab26663c9fbd106ed8
diff --git a/news/pan/patches/patch-pan_general_text-match.cc b/news/pan/patches/patch-pan_general_text-match.cc
new file mode 100644
index 00000000000..16d68864c1a
--- /dev/null
+++ b/news/pan/patches/patch-pan_general_text-match.cc
@@ -0,0 +1,13 @@
+$NetBSD: patch-pan_general_text-match.cc,v 1.1 2015/08/25 08:29:10 richard Exp $
+Avoid clash with host defined ERR (on SunOS)
+--- pan/general/text-match.cc.orig	2012-06-29 22:24:54.000000000 +0000
++++ pan/general/text-match.cc
+@@ -209,7 +209,7 @@ TextMatch :: my_regexec (const StringVie
+       if (_pcre_info->set (_impl_text, state.case_sensitive))
+          _pcre_state = COMPILED;
+       else
+-         _pcre_state = ERR;
++         _pcre_state = PCRE_ERR;
+    }
+ 
+    return _pcre_state != COMPILED
diff --git a/news/pan/patches/patch-pan_general_text-match.h b/news/pan/patches/patch-pan_general_text-match.h
new file mode 100644
index 00000000000..bcec4281be7
--- /dev/null
+++ b/news/pan/patches/patch-pan_general_text-match.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-pan_general_text-match.h,v 1.1 2015/08/25 08:29:10 richard Exp $
+Avoid clash with host defined ERR (on SunOS)
+--- pan/general/text-match.h.orig	2012-06-29 22:24:54.000000000 +0000
++++ pan/general/text-match.h
+@@ -108,7 +108,7 @@ private:
+       class PcreInfo;
+       mutable PcreInfo * _pcre_info;
+ 
+-      enum PcreState { NEED_COMPILE, COMPILED, ERR };
++      enum PcreState { NEED_COMPILE, COMPILED, PCRE_ERR };
+       mutable PcreState _pcre_state;
+ 
+ public:
diff --git a/news/pan/patches/patch-pan_usenet-utils_mime-utils.cc b/news/pan/patches/patch-pan_usenet-utils_mime-utils.cc
index b6a17f7fb28..5c804b8a8d6 100644
--- a/news/pan/patches/patch-pan_usenet-utils_mime-utils.cc
+++ b/news/pan/patches/patch-pan_usenet-utils_mime-utils.cc
@@ -1,4 +1,4 @@
-$NetBSD: patch-pan_usenet-utils_mime-utils.cc,v 1.2 2012/07/13 08:16:00 marino Exp $
+$NetBSD: patch-pan_usenet-utils_mime-utils.cc,v 1.3 2015/08/25 08:29:10 richard Exp $
 
 Fix build with NetBSD's iconv().
 
@@ -8,7 +8,7 @@ Fix build with NetBSD's iconv().
        outbuf = out + converted;
        outleft = outlen - converted;
  
-+#if defined(__NetBSD__)
++#if defined(__NetBSD__) || defined (__sun)
 +      converted = iconv (cd, (const char **) &inbuf, &inleft, &outbuf, &outleft);
 +#else
        converted = iconv (cd, (char **) &inbuf, &inleft, &outbuf, &outleft);