I did an attempt to update zeromq to 4.0.4.
It builds fine, it is passing the tests, but I can't make it pick upp
libsodium. Any advice or anyone who is interested to pick this one up?

Some notes on the diff below:
* removed SHARED_ONLY since bin/curve_keygen is now included
* bumped major on SHARED_LIBS, configure.ac says new ABI-version
* patches/patch-configure was removed but I don't know how to make cvs
diff show that
* removed crypto and ssl from WANTLIB, port-lib-depends-check told me to

/Markus


Index: Makefile
===================================================================
RCS file: /cvs/ports/net/zeromq/Makefile,v
retrieving revision 1.11
diff -u -p -u -r1.11 Makefile
--- Makefile 22 Jun 2013 07:45:14 -0000 1.11
+++ Makefile 11 May 2014 19:00:40 -0000
@@ -2,10 +2,9 @@

 COMMENT = open source message queue optimised for performance

-DISTNAME = zeromq-3.2.3
+DISTNAME = zeromq-4.0.4

-SHARED_ONLY = Yes
-SHARED_LIBS += zmq                  2.0      # 3.0
+SHARED_LIBS += zmq                  3.0      # 4.0

 CATEGORIES = net
 HOMEPAGE = http://zeromq.org/
@@ -13,7 +12,7 @@ HOMEPAGE = http://zeromq.org/
 # LGPLv3
 PERMIT_PACKAGE_CDROM = Yes

-WANTLIB= pthread stdc++ ssl crypto m
+WANTLIB= c m pthread stdc++

 MASTER_SITES = http://download.zeromq.org/

@@ -22,10 +21,6 @@ USE_GROFF = Yes

 CONFIGURE_STYLE = gnu
 CONFIGURE_ARGS = ${CONFIGURE_SHARED}
-
-# test_connect_delay.cpp:260:2: error: no newline at end of file
-post-extract:
- echo "" >> ${WRKSRC}/tests/test_connect_delay.cpp

 # Note: use ulimit -n 1024 for regress tests

Index: distinfo
===================================================================
RCS file: /cvs/ports/net/zeromq/distinfo,v
retrieving revision 1.7
diff -u -p -u -r1.7 distinfo
--- distinfo 22 Jun 2013 07:45:14 -0000 1.7
+++ distinfo 11 May 2014 19:00:40 -0000
@@ -1,2 +1,2 @@
-SHA256 (zeromq-3.2.3.tar.gz) = 4TTBqvgp3Xe8qdwPoZm6MQlaWBvQ092l/FlSO59AEjg=
-SIZE (zeromq-3.2.3.tar.gz) = 2072758
+SHA256 (zeromq-4.0.4.tar.gz) = HvcdRulPM+J91aFmHtYmzTm+TS1pZ3kqJ1BA40RX05k=
+SIZE (zeromq-4.0.4.tar.gz) = 2149732
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/net/zeromq/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -u -r1.3 PLIST
--- pkg/PLIST 8 Mar 2013 10:33:28 -0000 1.3
+++ pkg/PLIST 11 May 2014 19:00:40 -0000
@@ -1,4 +1,5 @@
 @comment $OpenBSD: PLIST,v 1.3 2013/03/08 10:33:28 jasper Exp $
+@bin bin/curve_keygen
 include/zmq.h
 include/zmq_utils.h
 lib/libzmq.a
@@ -13,6 +14,8 @@ lib/pkgconfig/libzmq.pc
 @man man/man3/zmq_ctx_get.3
 @man man/man3/zmq_ctx_new.3
 @man man/man3/zmq_ctx_set.3
+@man man/man3/zmq_ctx_term.3
+@man man/man3/zmq_curve_keypair.3
 @man man/man3/zmq_disconnect.3
 @man man/man3/zmq_errno.3
 @man man/man3/zmq_getsockopt.3
@@ -35,6 +38,7 @@ lib/pkgconfig/libzmq.pc
 @man man/man3/zmq_recv.3
 @man man/man3/zmq_recvmsg.3
 @man man/man3/zmq_send.3
+@man man/man3/zmq_send_const.3
 @man man/man3/zmq_sendmsg.3
 @man man/man3/zmq_setsockopt.3
 @man man/man3/zmq_socket.3
@@ -43,9 +47,14 @@ lib/pkgconfig/libzmq.pc
 @man man/man3/zmq_term.3
 @man man/man3/zmq_unbind.3
 @man man/man3/zmq_version.3
+@man man/man3/zmq_z85_decode.3
+@man man/man3/zmq_z85_encode.3
 @man man/man7/zmq.7
+@man man/man7/zmq_curve.7
 @man man/man7/zmq_epgm.7
 @man man/man7/zmq_inproc.7
 @man man/man7/zmq_ipc.7
+@man man/man7/zmq_null.7
 @man man/man7/zmq_pgm.7
+@man man/man7/zmq_plain.7
 @man man/man7/zmq_tcp.7

Reply via email to