- add DragonFly support (positive lists for broken platforms would

simplify this...)
- disable propolice on DragonFly
- use void (*)(int) as type of sa_handler as by SUS
- correctly annotate info usage, bump revision for this

7 files changed, 81 insertions, 8 deletions

diff --git a/net/socket++/Makefile b/net/socket++/Makefile
index 312f2ed3642..266219e1a8a 100644
--- a/net/socket++/Makefile
+++ b/net/socket++/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2006/02/05 23:10:31 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2006/05/12 07:44:26 joerg Exp $
 #
 
 DISTNAME=		socket++-1.12.10
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		net
 MASTER_SITES=		http://www.linuxhacker.at/linux/downloads/src/
 
@@ -10,6 +10,8 @@ MAINTAINER=		mchittur@cs.nmsu.edu
 HOMEPAGE=		http://www.linuxhacker.at/socketxx/
 COMMENT=		C++ class library for UNIX Sockets with exception handling
 
+INFO_FILES=		# PLIST
+USE_LANGUAGES=		c c++
 USE_LIBTOOL=		YES
 USE_TOOLS+=		automake14
 AUTOCONF_REQD=          2.50
diff --git a/net/socket++/distinfo b/net/socket++/distinfo
index 0e2d095ebd5..58bf13c715c 100644
--- a/net/socket++/distinfo
+++ b/net/socket++/distinfo
@@ -1,9 +1,12 @@
-$NetBSD: distinfo,v 1.2 2005/03/27 21:05:08 wiz Exp $
+$NetBSD: distinfo,v 1.3 2006/05/12 07:44:26 joerg Exp $
 
 SHA1 (socket++-1.12.10.tar.gz) = a59a6d30803a686b65f17f3dae1a67ec601fa5e9
 RMD160 (socket++-1.12.10.tar.gz) = d8c2d4d58d36f7f1e46542a670b494982cf1849d
 Size (socket++-1.12.10.tar.gz) = 62741 bytes
-SHA1 (patch-aa) = e8f2e2d4b77edeb82402df1ca6a4492ce7c4be92
+SHA1 (patch-aa) = ce6c86c04b1f27abe8f895bb0f657997442c2fc8
 SHA1 (patch-ab) = 2fa03c7ee83dca495db14887e3c179388f71c71a
 SHA1 (patch-ac) = a7e48aa5795fd4d78bc2d133e72c51417172b6f9
 SHA1 (patch-ad) = 7f0ffbf79592b340a45f2c7868b7a6904a63c9f3
+SHA1 (patch-ae) = df00fd55c4af18ec1aaed4a1a16432146e026aff
+SHA1 (patch-af) = 5e298f495802fb7fb64785b083b1c8b51015749d
+SHA1 (patch-ag) = 403b04500cb267d70f4bb6254a1b479f181eda32
diff --git a/net/socket++/hacks.mk b/net/socket++/hacks.mk
new file mode 100644
index 00000000000..7e71cfe6454
--- /dev/null
+++ b/net/socket++/hacks.mk
@@ -0,0 +1,18 @@
+# $NetBSD: hacks.mk,v 1.1 2006/05/12 07:44:26 joerg Exp $
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "DragonFly" && ${PKGSRC_COMPILER} == "gcc"
+#
+# Workaround an ICE in the stack-smashing protection in GCC 3.4.x.
+#
+.if !defined(HAS_PROPOLICE)
+HAS_PROPOLICE!=	( ${CC} -v 2>&1 | ${GREP} 'propolice' ) 2>/dev/null || echo no
+MAKEVARS+=	HAS_PROPOLICE
+.endif
+
+.if ${HAS_PROPOLICE} != "no"
+CFLAGS+=	-fno-stack-protector
+CXXFLAGS+=	-fno-stack-protector
+.endif
+.endif
diff --git a/net/socket++/patches/patch-aa b/net/socket++/patches/patch-aa
index c7ed572d74e..b1d4968cb4a 100644
--- a/net/socket++/patches/patch-aa
+++ b/net/socket++/patches/patch-aa
@@ -1,14 +1,16 @@
-$NetBSD: patch-aa,v 1.1.1.1 2005/03/27 17:45:38 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2006/05/12 07:44:26 joerg Exp $
 
---- socket++/local.h.orig	2003-03-14 19:02:40.000000000 +0100
+--- socket++/local.h.orig	2003-03-14 18:02:40.000000000 +0000
 +++ socket++/local.h
-@@ -90,7 +90,9 @@ extern "C" unsigned long inet_addr (cons
+@@ -90,8 +90,10 @@ extern "C" unsigned long inet_addr (cons
  extern "C" char* inet_ntoa (in_addr ina);
  
  #if !defined (__linux__)
 +#if !defined (__NetBSD__)
    extern "C" int gethostname (char* hostname, int len);
+-#if !(defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__APPLE__))
 +#endif
- #if !(defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__APPLE__))
++#if !(defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__APPLE__) || defined(__DragonFly__))
    extern char* SYS_SIGLIST [];
  #endif
+ #endif
diff --git a/net/socket++/patches/patch-ae b/net/socket++/patches/patch-ae
new file mode 100644
index 00000000000..18d83834a41
--- /dev/null
+++ b/net/socket++/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1 2006/05/12 07:44:26 joerg Exp $
+
+--- socket++/sockstream.h.orig	2006-05-12 07:22:35.000000000 +0000
++++ socket++/sockstream.h
+@@ -153,7 +153,7 @@ public:
+     msg_peek	        = MSG_PEEK,
+     msg_dontroute	= MSG_DONTROUTE,
+ 
+-#if !(defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__APPLE__))
++#if !(defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__APPLE__) || defined(__DragonFly__))
+     msg_maxiovlen	= MSG_MAXIOVLEN
+ #endif
+   };
diff --git a/net/socket++/patches/patch-af b/net/socket++/patches/patch-af
new file mode 100644
index 00000000000..dd867102c3d
--- /dev/null
+++ b/net/socket++/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1 2006/05/12 07:44:26 joerg Exp $
+
+--- socket++/sockstream.cpp.orig	2006-05-12 07:23:32.000000000 +0000
++++ socket++/sockstream.cpp
+@@ -245,7 +245,7 @@ bool sockerr::benign () const
+   case EWOULDBLOCK:

+ // On FreeBSD (and probably on Linux too) 
+ // EAGAIN has the same value as EWOULDBLOCK
+-#if !defined(__linux__) && !(defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__APPLE__)) // LN
++#if !defined(__linux__) && !(defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__APPLE__) || defined(__DragonFly__)) // LN
+   case EAGAIN:
+ #endif
+     return true;
diff --git a/net/socket++/patches/patch-ag b/net/socket++/patches/patch-ag
new file mode 100644
index 00000000000..96829f1caae
--- /dev/null
+++ b/net/socket++/patches/patch-ag
@@ -0,0 +1,22 @@
+$NetBSD: patch-ag,v 1.1 2006/05/12 07:44:26 joerg Exp $
+
+--- socket++/sig.cpp.orig	2006-05-12 07:32:01.000000000 +0000
++++ socket++/sig.cpp
+@@ -21,7 +21,7 @@ typedef sig::phndlist phndlist;
+ siginit siginit::init;
+ sig& sig::nal = *siginit::init.s;
+ 
+-typedef void (*sighnd_type) (...);
++typedef void (*sighnd_type) (int);
+ 
+ extern "C" {
+   static void sighandler (int signo) {
+@@ -153,7 +153,7 @@ void sig::sysresume (int signo, bool set
+     sa.sa_flags = 0;
+   }
+ 
+-#if !(defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__sun__) || defined(__linux__) || defined(__APPLE))
++#if !(defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__sun__) || defined(__linux__) || defined(__APPLE) || defined(__DragonFly__))
+ // Early SunOS versions may have SA_INTERRUPT. I can't confirm.
+   if (set == false)
+     sa.sa_flags |= SA_INTERRUPT;