- 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

4 files changed, 54 insertions, 4 deletions

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;