Re: [UPDATE]: zeromq to 4.0.4

2014-05-15 Thread Markus Bergkvist 
2014-05-14 10:31 GMT+02:00 Stuart Henderson :
> On 2014/05/13 23:42, Markus Bergkvist wrote:
>> I'm on
>> $ dmesg | head -n 2
>> OpenBSD 5.5-current (GENERIC.MP) #105: Sun May  4 18:35:59 MDT 2014
>> dera...@amd64.openbsd.org:/usr/src/sys/arch/amd64/compile/GENERIC.MP
>>
>> The complete port is attached.
>
> Weird: on macppc, running "test_immediate" from "make test" hangs,
> burning cpu (though not making system calls). Running it outside
> the test framework i.e. "cd tests; ./test_immediate" it returns
> successfully.
>

Thanks for testing.
I've tested it on amd64 and i386, both with libsodium-0.5.0 and both
passing the tests.

> I'm not sure whether this is important or not...

I'm don't think I can be of any help with this.

Re: [UPDATE]: zeromq to 4.0.4

2014-05-14 Thread Stuart Henderson 
On 2014/05/14 10:44, Giovanni Bechis wrote:
> On 05/14/14 10:31, Stuart Henderson wrote:
> > On 2014/05/13 23:42, Markus Bergkvist wrote:
> >> I'm on
> >> $ dmesg | head -n 2
> >> OpenBSD 5.5-current (GENERIC.MP) #105: Sun May  4 18:35:59 MDT 2014
> >> dera...@amd64.openbsd.org:/usr/src/sys/arch/amd64/compile/GENERIC.MP
> >>
> >> The complete port is attached.
> > 
> > Weird: on macppc, running "test_immediate" from "make test" hangs,
> > burning cpu (though not making system calls). Running it outside
> > the test framework i.e. "cd tests; ./test_immediate" it returns
> > successfully.
> > 
> > I'm not sure whether this is important or not...
> > 
> same problem with 3.2.3 version or is it new ?
>  Cheers
>   Giovanni

Good question, but this test does not exist in 3.2.3.

I did see a similar-looking hang in test_connect_delay with 3.2.3
(works from shell, fails from make) but that one went away when I raised
maxfiles-cur; the test_immediate problem does not - and in any event
it isn't using many FDs.

sthentest_immediate 17511 text /usr/obj/ports  4808017 -rwxr-xr-x   r
18243
sthentest_immediate 17511   wd /usr/obj/ports  4807087 drwxr-xr-x   r 
4096
sthentest_immediate 175110 /   78701 crw--w  rwttyp2
sthentest_immediate 175111 pipe 0x0 state: 
sthentest_immediate 175112 pipe 0x0 state: 
sthentest_immediate 175113 /   78701 crw--w  rwttyp2
sthentest_immediate 175114 pipe 0x0 state: 
sthentest_immediate 175115* unix stream 0x0
sthentest_immediate 175116* unix stream 0x0
sthentest_immediate 175117* unix stream 0x0
sthentest_immediate 175118* unix stream 0x0
sthentest_immediate 175119 kqueue 0x0 0 state: 
sthentest_immediate 17511   10* unix stream 0x0
sthentest_immediate 17511   11* unix stream 0x0
sthentest_immediate 17511   12 kqueue 0x0 1 state:

Re: [UPDATE]: zeromq to 4.0.4

2014-05-14 Thread Giovanni Bechis 
On 05/14/14 10:31, Stuart Henderson wrote:
> On 2014/05/13 23:42, Markus Bergkvist wrote:
>> I'm on
>> $ dmesg | head -n 2
>> OpenBSD 5.5-current (GENERIC.MP) #105: Sun May  4 18:35:59 MDT 2014
>> dera...@amd64.openbsd.org:/usr/src/sys/arch/amd64/compile/GENERIC.MP
>>
>> The complete port is attached.
> 
> Weird: on macppc, running "test_immediate" from "make test" hangs,
> burning cpu (though not making system calls). Running it outside
> the test framework i.e. "cd tests; ./test_immediate" it returns
> successfully.
> 
> I'm not sure whether this is important or not...
> 
same problem with 3.2.3 version or is it new ?
 Cheers
  Giovanni

Re: [UPDATE]: zeromq to 4.0.4

2014-05-14 Thread Stuart Henderson 
On 2014/05/13 23:42, Markus Bergkvist wrote:
> I'm on
> $ dmesg | head -n 2
> OpenBSD 5.5-current (GENERIC.MP) #105: Sun May  4 18:35:59 MDT 2014
> dera...@amd64.openbsd.org:/usr/src/sys/arch/amd64/compile/GENERIC.MP
> 
> The complete port is attached.

Weird: on macppc, running "test_immediate" from "make test" hangs,
burning cpu (though not making system calls). Running it outside
the test framework i.e. "cd tests; ./test_immediate" it returns
successfully.

I'm not sure whether this is important or not...

Re: [UPDATE]: zeromq to 4.0.4

2014-05-13 Thread Giovanni Bechis 
On 05/13/14 11:03, Giovanni Bechis wrote:
[...]
> Still does not build for me on
> OpenBSD 5.5-current (GENERIC.MP) #85: Sun Apr 27 09:24:33 MDT 2014
> t...@amd64.openbsd.org:/usr/src/sys/arch/amd64/compile/GENERIC.MP
> 
> Build log attached
>
I had WARNINGS=Yes in mk.conf, now it builds fine.
 Cheers
  Giovanni

Re: [UPDATE]: zeromq to 4.0.4

2014-05-13 Thread Markus Bergkvist 
I'm on
$ dmesg | head -n 2
OpenBSD 5.5-current (GENERIC.MP) #105: Sun May  4 18:35:59 MDT 2014
dera...@amd64.openbsd.org:/usr/src/sys/arch/amd64/compile/GENERIC.MP

The complete port is attached.


2014-05-13 11:03 GMT+02:00 Giovanni Bechis :
> On 05/12/14 23:18, Markus Bergkvist wrote:
>> Thanks for the advice.
>> With this diff it picks up libsodium to libzmq but not to curve_keygen.
>> All regression tests pass, including the ones related to libsodium.
>>
>> 2014-05-12 18:40 GMT+02:00 Giovanni Bechis :
>>> On 05/12/14 18:03, viq wrote:
>>>> On Sun, May 11, 2014 at 9:19 PM, Markus Bergkvist
>>>>  wrote:
>>>>> 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?
>>>>
>>>> No advice, but this issue could possibly affect also sysutils/salt.
>>>> Which currently is broken anyway due to problems with
>>>> security/py-M2Crypto, but that's a different story.
>>>>
>>> With this diff it picks up libsodium but than it fails immediately while 
>>> building "libzmq_la-address.lo".
>>> Maybe more patches are needed.
>>>  Cheers
>>>   Giovanni
> Still does not build for me on
> OpenBSD 5.5-current (GENERIC.MP) #85: Sun Apr 27 09:24:33 MDT 2014
> t...@amd64.openbsd.org:/usr/src/sys/arch/amd64/compile/GENERIC.MP
>
> Build log attached
>  Cheers
>   Giovanni


zeromq-4.0.4.tar.gz
Description: GNU Zip compressed data

Re: [UPDATE]: zeromq to 4.0.4

2014-05-13 Thread Giovanni Bechis 
On 05/12/14 23:18, Markus Bergkvist wrote:
> Thanks for the advice.
> With this diff it picks up libsodium to libzmq but not to curve_keygen.
> All regression tests pass, including the ones related to libsodium.
> 
> 2014-05-12 18:40 GMT+02:00 Giovanni Bechis :
>> On 05/12/14 18:03, viq wrote:
>>> On Sun, May 11, 2014 at 9:19 PM, Markus Bergkvist
>>>  wrote:
>>>> 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?
>>>
>>> No advice, but this issue could possibly affect also sysutils/salt.
>>> Which currently is broken anyway due to problems with
>>> security/py-M2Crypto, but that's a different story.
>>>
>> With this diff it picks up libsodium but than it fails immediately while 
>> building "libzmq_la-address.lo".
>> Maybe more patches are needed.
>>  Cheers
>>   Giovanni
Still does not build for me on
OpenBSD 5.5-current (GENERIC.MP) #85: Sun Apr 27 09:24:33 MDT 2014
t...@amd64.openbsd.org:/usr/src/sys/arch/amd64/compile/GENERIC.MP

Build log attached
 Cheers
  Giovanni
+++ Tue May 13 11:00:16 CEST 2014
===>  Checking files for zeromq-4.0.4
`/home/cvs/ports/distfiles/zeromq-4.0.4.tar.gz' is up to date.
>> (SHA256) zeromq-4.0.4.tar.gz: OK
===>  Extracting for zeromq-4.0.4
===>  Patching for zeromq-4.0.4
===>  Configuring for zeromq-4.0.4
Using /usr/obj/ports/zeromq-4.0.4/config.site (generated)
configure: loading site script /usr/obj/ports/zeromq-4.0.4/config.site
checking for a BSD-compatible install... /usr/bin/install -c -o root -g bin
checking whether build environment is sane... yes
checking for a thread-safe mkdir -p... mkdir -p
checking for gawk... (cached) awk
checking whether gmake sets $(MAKE)... yes
checking how to create a ustar tar archive... (cached) /usr/bin/tar
checking whether gmake supports nested variables... yes
checking for gcc... cc
checking whether the C compiler works... yes
checking for C compiler default output file name... a.out
checking for suffix of executables... 
checking whether we are cross compiling... no
checking for suffix of object files... (cached) o
checking whether we are using the GNU C compiler... (cached) yes
checking whether cc accepts -g... (cached) yes
checking for cc option to accept ISO C89... none needed
checking for style of include used by gmake... GNU
checking dependency style of cc... gcc3
checking for cc option to accept ISO C99... -std=gnu99
checking whether we are using the GNU C++ compiler... (cached) yes
checking whether c++ accepts -g... (cached) yes
checking dependency style of c++... gcc3
checking whether cc -std=gnu99 and cc understand -c and -o together... yes
checking for a sed that does not truncate output... (cached) /usr/bin/sed
checking for gawk... (cached) awk
checking for xmlto... no
checking for asciidoc... no
checking build system type... x86_64-unknown-openbsd5.5
checking host system type... x86_64-unknown-openbsd5.5
checking how to print strings... print -r
checking for a sed that does not truncate output... (cached) /usr/bin/sed
checking for grep that handles long lines and -e... (cached) /usr/bin/grep
checking for egrep... (cached) /usr/bin/egrep
checking for fgrep... (cached) /usr/bin/fgrep
checking for ld used by cc -std=gnu99... /usr/bin/ld
checking if the linker (/usr/bin/ld) is GNU ld... yes
checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B
checking the name lister (/usr/bin/nm -B) interface... BSD nm
checking whether ln -s works... yes
checking the maximum length of command line arguments... (cached) 131072
checking whether the shell understands some XSI constructs... yes
checking whether the shell understands "+="... no
checking how to convert x86_64-unknown-openbsd5.5 file names to x86_64-unknown-openbsd5.5 format... func_convert_file_noop
checking how to convert x86_64-unknown-openbsd5.5 file names to toolchain format... func_convert_file_noop
checking for /usr/bin/ld option to reload object files... -r
checking for objdump... objdump
checking how to recognize dependent libraries... match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$
checking for dlltool... dlltool
checking how to associate runtime and link libraries... print -r --
checking for ar... (cached) ar
checking for archiver @FILE support... no
checking for strip... (cached) strip
checking for ranlib... (cached) ranlib
checking command to parse /usr/bin/nm -B output from cc -std=gnu99 object... ok
checking for sysroot... no
checking for mt... mt
checking if mt is a manifest tool... no
checking how to run the C preprocessor... cc -std=gnu99 -E
checking for ANSI C header files... (cached) yes
checking for sys/types.h... (cached) yes
checking for sys/stat.h... (cached) yes
checking fo

Re: [UPDATE]: zeromq to 4.0.4

2014-05-12 Thread Markus Bergkvist 
2014-05-12 23:18 GMT+02:00 Markus Bergkvist :
> With this diff it picks up libsodium to libzmq but not to curve_keygen.

Yes it does. curve-keygen works fine. My mistake.

Re: [UPDATE]: zeromq to 4.0.4

2014-05-12 Thread Markus Bergkvist 
Thanks for the advice.
With this diff it picks up libsodium to libzmq but not to curve_keygen.
All regression tests pass, including the ones related to libsodium.

2014-05-12 18:40 GMT+02:00 Giovanni Bechis :
> On 05/12/14 18:03, viq wrote:
>> On Sun, May 11, 2014 at 9:19 PM, Markus Bergkvist
>>  wrote:
>>> 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?
>>
>> No advice, but this issue could possibly affect also sysutils/salt.
>> Which currently is broken anyway due to problems with
>> security/py-M2Crypto, but that's a different story.
>>
> With this diff it picks up libsodium but than it fails immediately while 
> building "libzmq_la-address.lo".
> Maybe more patches are needed.
>  Cheers
>   Giovanni
? typescript
Index: Makefile
===
RCS file: /cvs/ports/net/zeromq/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- Makefile22 Jun 2013 07:45:14 -  1.11
+++ Makefile12 May 2014 21:11:54 -
@@ -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,9 @@ HOMEPAGE =http://zeromq.org/
 # LGPLv3
 PERMIT_PACKAGE_CDROM = Yes
 
-WANTLIB=   pthread stdc++ ssl crypto m
+WANTLIB =  c crypto m pthread sodium ssl stdc++
+
+LIB_DEPENDS =  security/libsodium
 
 MASTER_SITES = http://download.zeromq.org/
 
@@ -21,11 +22,8 @@ USE_GMAKE =  Yes
 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
+CONFIGURE_ARGS =   ${CONFIGURE_SHARED} \
+   --with-libsodium=${LOCALBASE}
 
 # 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 -r1.7 distinfo
--- distinfo22 Jun 2013 07:45:14 -  1.7
+++ distinfo12 May 2014 21:11:54 -
@@ -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 -r1.3 PLIST
--- pkg/PLIST   8 Mar 2013 10:33:28 -   1.3
+++ pkg/PLIST   12 May 2014 21:11:54 -
@@ -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

Re: [UPDATE]: zeromq to 4.0.4

2014-05-12 Thread Giovanni Bechis 
On 05/12/14 18:03, viq wrote:
> On Sun, May 11, 2014 at 9:19 PM, Markus Bergkvist
>  wrote:
>> 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?
> 
> No advice, but this issue could possibly affect also sysutils/salt.
> Which currently is broken anyway due to problems with
> security/py-M2Crypto, but that's a different story.
> 
With this diff it picks up libsodium but than it fails immediately while 
building "libzmq_la-address.lo".
Maybe more patches are needed.
 Cheers
  Giovanni
Index: Makefile
===
RCS file: /cvs/ports/net/zeromq/Makefile,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 Makefile
--- Makefile	22 Jun 2013 07:45:14 -	1.11
+++ Makefile	12 May 2014 16:15:40 -
@@ -2,10 +2,10 @@
 
 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/
@@ -15,17 +15,16 @@ PERMIT_PACKAGE_CDROM =	Yes
 
 WANTLIB=		pthread stdc++ ssl crypto m
 
+LIB_DEPENDS=		security/libsodium
+
 MASTER_SITES =		http://download.zeromq.org/
 
 USE_GMAKE =		Yes
 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
+CONFIGURE_ARGS =	${CONFIGURE_SHARED} \
+			--with-libsodium=${LOCALBASE}
 
 # 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 -p -r1.7 distinfo
--- distinfo	22 Jun 2013 07:45:14 -	1.7
+++ distinfo	12 May 2014 16:15:40 -
@@ -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 -p -r1.3 PLIST
--- pkg/PLIST	8 Mar 2013 10:33:28 -	1.3
+++ pkg/PLIST	12 May 2014 16:15:40 -
@@ -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

Re: [UPDATE]: zeromq to 4.0.4

2014-05-12 Thread viq 
On Sun, May 11, 2014 at 9:19 PM, Markus Bergkvist
 wrote:
> 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?

No advice, but this issue could possibly affect also sysutils/salt.
Which currently is broken anyway due to problems with
security/py-M2Crypto, but that's a different story.

-- 
viq

[UPDATE]: zeromq to 4.0.4

2014-05-11 Thread Markus Bergkvist 
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 - 1.11
+++ Makefile 11 May 2014 19:00:40 -
@@ -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 - 1.7
+++ distinfo 11 May 2014 19:00:40 -
@@ -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 - 1.3
+++ pkg/PLIST 11 May 2014 19:00:40 -
@@ -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