6 files changed, 26 insertions, 30 deletions
diff --git a/net/zeromq/Makefile b/net/zeromq/Makefile
index c49ba93f4f6..f20a9264ece 100644
--- a/net/zeromq/Makefile
+++ b/net/zeromq/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.12 2013/09/30 12:54:11 obache Exp $
+# $NetBSD: Makefile,v 1.13 2014/03/01 08:38:12 obache Exp $
 
-DISTNAME=	zeromq-3.2.4
+DISTNAME=	zeromq-4.0.3
 CATEGORIES=	net devel
 MASTER_SITES=	http://download.zeromq.org/
 
diff --git a/net/zeromq/PLIST b/net/zeromq/PLIST
index e3701654974..5d03032486c 100644
--- a/net/zeromq/PLIST
+++ b/net/zeromq/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.3 2013/07/19 08:16:36 adam Exp $
+@comment $NetBSD: PLIST,v 1.4 2014/03/01 08:38:12 obache Exp $
+bin/curve_keygen
 include/zmq.h
 include/zmq_utils.h
 lib/libzmq.la
@@ -10,6 +11,8 @@ man/man3/zmq_ctx_destroy.3
 man/man3/zmq_ctx_get.3
 man/man3/zmq_ctx_new.3
 man/man3/zmq_ctx_set.3
+man/man3/zmq_ctx_term.3
+man/man3/zmq_curve_keypair.3
 man/man3/zmq_disconnect.3
 man/man3/zmq_errno.3
 man/man3/zmq_getsockopt.3
@@ -32,6 +35,7 @@ man/man3/zmq_proxy.3
 man/man3/zmq_recv.3
 man/man3/zmq_recvmsg.3
 man/man3/zmq_send.3
+man/man3/zmq_send_const.3
 man/man3/zmq_sendmsg.3
 man/man3/zmq_setsockopt.3
 man/man3/zmq_socket.3
@@ -40,9 +44,14 @@ man/man3/zmq_strerror.3
 man/man3/zmq_term.3
 man/man3/zmq_unbind.3
 man/man3/zmq_version.3
+man/man3/zmq_z85_decode.3
+man/man3/zmq_z85_encode.3
 man/man7/zmq.7
+man/man7/zmq_curve.7
 man/man7/zmq_epgm.7
 man/man7/zmq_inproc.7
 man/man7/zmq_ipc.7
+man/man7/zmq_null.7
 man/man7/zmq_pgm.7
+man/man7/zmq_plain.7
 man/man7/zmq_tcp.7
diff --git a/net/zeromq/distinfo b/net/zeromq/distinfo
index e1b83ac4ef5..ac095a6e907 100644
--- a/net/zeromq/distinfo
+++ b/net/zeromq/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.12 2013/10/04 18:36:54 joerg Exp $
+$NetBSD: distinfo,v 1.13 2014/03/01 08:38:12 obache Exp $
 
-SHA1 (zeromq-3.2.4.tar.gz) = 08303259f08edd1faeac2e256f5be3899377135e
-RMD160 (zeromq-3.2.4.tar.gz) = 9f62881bc5d910cc1d1eb91df6be0ad3ca09d541
-Size (zeromq-3.2.4.tar.gz) = 2083123 bytes
-SHA1 (patch-configure) = 884409304fa361e1590ce673fb92146581ea1663
-SHA1 (patch-src_platform.hpp.in) = d248fabbd2194e27f667d55f676744a2d7076c19
-SHA1 (patch-tests_test__connect__delay.cpp) = 6c3bb997d8f0aaf277f1f81ce96d38c682c7bbf9
+SHA1 (zeromq-4.0.3.tar.gz) = a363ddfff75f73976f656b3ba48f32544b214075
+RMD160 (zeromq-4.0.3.tar.gz) = 183228d912c88618ed8392f0f82bec5ac6af4b1b
+Size (zeromq-4.0.3.tar.gz) = 2169301 bytes
+SHA1 (patch-configure) = 1dc8623eb06a167b3559ae950a9dbf1e19a29b6d
+SHA1 (patch-src_platform.hpp.in) = 767370bd997310cddeb7ee1f759bec1a638974e0
diff --git a/net/zeromq/patches/patch-configure b/net/zeromq/patches/patch-configure
index 75a77d7c904..1288a92b22c 100644
--- a/net/zeromq/patches/patch-configure
+++ b/net/zeromq/patches/patch-configure
@@ -1,12 +1,12 @@
-$NetBSD: patch-configure,v 1.3 2013/09/30 12:54:11 obache Exp $
+$NetBSD: patch-configure,v 1.4 2014/03/01 08:38:12 obache Exp $
 
 * DragonFly support
 
---- configure.orig	2013-05-02 09:13:30.000000000 +0000
+--- configure.orig	2013-11-24 18:02:49.000000000 +0000
 +++ configure
-@@ -17064,6 +17064,14 @@ $as_echo "#define ZMQ_FORCE_MUTEXES 1" >
- 
-         fi
+@@ -17123,6 +17123,14 @@ $as_echo "#define ZMQ_FORCE_MUTEXES 1" >
+         LDFLAGS="-lssp $LDFLAGS"
+         CPPFLAGS="$CPPFLAGS -Wno-long-long"
          ;;
 +    *dragonfly*)
 +        # Define on DragonFly to enable all library features
diff --git a/net/zeromq/patches/patch-src_platform.hpp.in b/net/zeromq/patches/patch-src_platform.hpp.in
index e30c0e59f8b..c3ed037b8cc 100644
--- a/net/zeromq/patches/patch-src_platform.hpp.in
+++ b/net/zeromq/patches/patch-src_platform.hpp.in
@@ -1,10 +1,10 @@
-$NetBSD: patch-src_platform.hpp.in,v 1.3 2013/09/30 12:54:11 obache Exp $
+$NetBSD: patch-src_platform.hpp.in,v 1.4 2014/03/01 08:38:12 obache Exp $
 
 * DragonFly support
 
---- src/platform.hpp.in.orig	2013-05-02 09:13:31.000000000 +0000
+--- src/platform.hpp.in.orig	2013-11-24 18:02:50.000000000 +0000
 +++ src/platform.hpp.in
-@@ -178,9 +178,12 @@
+@@ -184,9 +184,12 @@
  /* Have eventfd extension. */
  #undef ZMQ_HAVE_EVENTFD
  
diff --git a/net/zeromq/patches/patch-tests_test__connect__delay.cpp b/net/zeromq/patches/patch-tests_test__connect__delay.cpp
deleted file mode 100644
index ec2ef6a72a7..00000000000
--- a/net/zeromq/patches/patch-tests_test__connect__delay.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-tests_test__connect__delay.cpp,v 1.3 2013/10/04 18:36:54 joerg Exp $
-
---- tests/test_connect_delay.cpp.orig	2013-10-02 11:20:19.000000000 +0000
-+++ tests/test_connect_delay.cpp
-@@ -23,6 +23,7 @@
- #include <string.h>
- #include <unistd.h>
- #include <string>
-+#include <time.h>
- 
- #undef NDEBUG
- #include <assert.h>