net/zeromq: Add DragonFly support

With one exception, DragonFly can piggyback on FreeBSD.

4 files changed, 55 insertions, 1 deletions

diff --git a/net/zeromq/distinfo b/net/zeromq/distinfo
index 94732a1a835..3d36a9dde61 100644
--- a/net/zeromq/distinfo
+++ b/net/zeromq/distinfo
@@ -1,5 +1,8 @@
-$NetBSD: distinfo,v 1.5 2012/01/26 05:40:30 obache Exp $
+$NetBSD: distinfo,v 1.6 2012/05/20 21:07:25 marino Exp $
 
 SHA1 (zeromq-2.1.11.tar.gz) = e8691266559a8031ade6c4fe53f54738c7757447
 RMD160 (zeromq-2.1.11.tar.gz) = 017379490ec76ccab6aac2ccaee8b6fa2adb5d4e
 Size (zeromq-2.1.11.tar.gz) = 1891038 bytes
+SHA1 (patch-configure) = 8e184b534e8fbb97e4007af08f6d305d00899081
+SHA1 (patch-src_platform.hpp.in) = d1063de1699f2cda9f1421417062083b8fc4a0a2
+SHA1 (patch-src_tcp_socket.cpp) = ecc7c0b8b70dfc436a6422d230faa7bb4fef70ee
diff --git a/net/zeromq/patches/patch-configure b/net/zeromq/patches/patch-configure
new file mode 100644
index 00000000000..010150ff98f
--- /dev/null
+++ b/net/zeromq/patches/patch-configure
@@ -0,0 +1,19 @@
+$NetBSD: patch-configure,v 1.1 2012/05/20 21:07:25 marino Exp $
+
+--- configure.orig	2011-12-18 23:22:41.000000000 +0000
++++ configure
+@@ -17110,6 +17110,14 @@ $as_echo "#define ZMQ_FORCE_MUTEXES 1" >
+ 
+         fi
+         ;;
++    *dragonfly*)
++        # Define on DragonFly to enable all library features
++        CPPFLAGS="-D__BSD_VISIBLE $CPPFLAGS"
++
++$as_echo "#define ZMQ_HAVE_FREEBSD 1" >>confdefs.h
++$as_echo "#define ZMQ_DRAGONFLY 1" >>confdefs.h
++
++        ;;
+     *freebsd*)
+         # Define on FreeBSD to enable all library features
+         CPPFLAGS="-D__BSD_VISIBLE $CPPFLAGS"
diff --git a/net/zeromq/patches/patch-src_platform.hpp.in b/net/zeromq/patches/patch-src_platform.hpp.in
new file mode 100644
index 00000000000..1d02200e480
--- /dev/null
+++ b/net/zeromq/patches/patch-src_platform.hpp.in
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_platform.hpp.in,v 1.1 2012/05/20 21:07:25 marino Exp $
+
+--- src/platform.hpp.in.orig	2012-05-20 20:57:44.478200000 +0000
++++ src/platform.hpp.in
+@@ -178,9 +178,12 @@
+ /* Have Cygwin */
+ #undef ZMQ_HAVE_CYGWIN
+ 
+-/* Have FreeBSD OS */
++/* Have FreeBSD OS -or- DragonFly OS */
+ #undef ZMQ_HAVE_FREEBSD
+ 
++/* Have DragonFly OS */
++#undef ZMQ_DRAGONFLY
++
+ /* Have HPUX OS */
+ #undef ZMQ_HAVE_HPUX
+ 
diff --git a/net/zeromq/patches/patch-src_tcp_socket.cpp b/net/zeromq/patches/patch-src_tcp_socket.cpp
new file mode 100644
index 00000000000..0ff21444034
--- /dev/null
+++ b/net/zeromq/patches/patch-src_tcp_socket.cpp
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_tcp_socket.cpp,v 1.1 2012/05/20 21:07:25 marino Exp $
+
+--- src/tcp_socket.cpp.orig	2011-11-30 20:00:24.000000000 +0000
++++ src/tcp_socket.cpp
+@@ -162,7 +162,8 @@ int zmq::tcp_socket_t::open (fd_t fd_, u
+         errno_assert (rc == 0);
+     }
+ 
+-#if defined ZMQ_HAVE_OSX || defined ZMQ_HAVE_FREEBSD
++#if defined(ZMQ_HAVE_OSX) || \
++   (defined(ZMQ_HAVE_FREEBSD) && !defined(ZMQ_DRAGONFLY))
+     int set = 1;
+     int rc = setsockopt (s, SOL_SOCKET, SO_NOSIGPIPE, &set, sizeof (int));
+     errno_assert (rc == 0);