Index: net/libzmq4/Makefile =================================================================== --- net/libzmq4/Makefile (revision 442784) +++ net/libzmq4/Makefile (working copy) @@ -1,9 +1,9 @@ # $FreeBSD$ PORTNAME= libzmq4 -PORTVERSION= 4.1.5 +PORTVERSION= 4.2.2 CATEGORIES= net -MASTER_SITES= https://github.com/zeromq/zeromq4-1/releases/download/v${DISTVERSION}/ +MASTER_SITES= https://github.com/zeromq/libzmq/releases/download/v${DISTVERSION}/ DISTNAME= zeromq-${DISTVERSION} MAINTAINER= koobs@FreeBSD.org @@ -14,24 +14,27 @@ CONFLICTS= zmq-[0-9]* libzmq[^4]-[0-9]* -USES= libtool pkgconfig +USES= gmake libtool pkgconfig USE_LDCONFIG= yes GNU_CONFIGURE= yes -OPTIONS_DEFINE= CURVE DEBUG NORM MANPAGES PGM -OPTIONS_DEFAULT= CURVE MANPAGES NORM PGM +OPTIONS_DEFINE= DEBUG GSSAPI MANPAGES NORM PGM +OPTIONS_RADIO= CURVE +OPTIONS_RADIO_CURVE= SODIUM TWEETNACL +OPTIONS_DEFAULT= MANPAGES NORM PGM TWEETNACL OPTIONS_SUB= yes -CURVE_DESC= CURVE security mechanism via libsodium +TWEETNACL_DESC= Using tweetnacl for CURVE security +SODIUM_DESC= Using libsodium for CURVE security PGM_DESC= Reliable multicast transport using PGM via OpenPGM NORM_DESC= Reliable multicast transport using NORM via NRL -CURVE_CONFIGURE_WITH= libsodium -CURVE_LIB_DEPENDS= libsodium.so:security/libsodium - DEBUG_CONFIGURE_ENABLE= debug DEBUG_VARS= WITH_DEBUG=yes +GSSAPI_CONFIGURE_ON= --with-libgssapi_krb5="${GSSAPIBASEDIR}" +GSSAPI_CONFIGURE_OFF= --without-libgssapi_krb5 + PGM_CONFIGURE_WITH= pgm PGM_LIB_DEPENDS= libpgm.so:net/openpgm @@ -42,6 +45,17 @@ NORM_CONFIGURE_WITH= norm=${PREFIX} NORM_LIB_DEPENDS= libnorm.so:net/norm +SODIUM_CONFIGURE_WITH= libsodium +SODIUM_LIB_DEPENDS= libsodium.so:security/libsodium + +.include + +.if ${PORT_OPTIONS:MGSSAPI} +USES+= gssapi:mit +CFLAGS+= -I"${GSSAPIBASEDIR}/include" +LDFLAGS+= -L"${GSSAPIBASEDIR}/lib" +.endif + CONFIGURE_ARGS+= --with-pkgconfigdir=${PREFIX}/libdata/pkgconfig CFLAGS+= -Wno-long-long Index: net/libzmq4/distinfo =================================================================== --- net/libzmq4/distinfo (revision 442784) +++ net/libzmq4/distinfo (working copy) @@ -1,3 +1,3 @@ -TIMESTAMP = 1470914531 -SHA256 (zeromq-4.1.5.tar.gz) = 04aac57f081ffa3a2ee5ed04887be9e205df3a7ddade0027460b8042432bdbcf -SIZE (zeromq-4.1.5.tar.gz) = 794853 +TIMESTAMP = 1496769977 +SHA256 (zeromq-4.2.2.tar.gz) = 5b23f4ca9ef545d5bd3af55d305765e3ee06b986263b31967435d285a3e6df6b +SIZE (zeromq-4.2.2.tar.gz) = 1236437 Index: net/libzmq4/files/patch-configure =================================================================== --- net/libzmq4/files/patch-configure (revision 442784) +++ net/libzmq4/files/patch-configure (nonexistent) @@ -1,20 +0,0 @@ -# https://github.com/zeromq/libzmq/pull/2066 -# From 07d00b3aaa2a194c18628ae247dbfd46b9c306ae Mon Sep 17 00:00:00 2001 -# From: Eric Camachat -# Date: Wed, 27 Jul 2016 11:09:19 -0700 -# Subject: [PATCH] Fix build with NORM enabled on FreeBSD. - ---- configure.orig 2016-08-11 11:27:28 UTC -+++ configure -@@ -19801,9 +19801,9 @@ $as_echo "#define ZMQ_HAVE_NORM 1" >>con - if test "x$wwith_norm_ext" != "xyes"; then - norm_path="${with_norm_ext}" - LIBZMQ_EXTRA_CXXFLAGS="-I${norm_path}/include ${LIBZMQ_EXTRA_CXXFLAGS}" -- LIBZMQ_EXTRA_LDFLAGS="-I${norm_path}/include ${LIBZMQ_EXTRA_LDFLAGS}" -+ LIBZMQ_EXTRA_LDFLAGS="-L${norm_path}/lib ${LIBZMQ_EXTRA_LDFLAGS}" - fi -- LIBS="-lnorm $LIBS" -+ LIBS="-L${norm_path}/lib -lnorm $LIBS" - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } Property changes on: net/libzmq4/files/patch-configure ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: net/libzmq4/pkg-plist =================================================================== --- net/libzmq4/pkg-plist (revision 442784) +++ net/libzmq4/pkg-plist (working copy) @@ -4,8 +4,14 @@ lib/libzmq.a lib/libzmq.so lib/libzmq.so.5 -lib/libzmq.so.5.0.1 +lib/libzmq.so.5.1.2 libdata/pkgconfig/libzmq.pc +%%MANPAGES%%man/man3/zmq_atomic_counter_dec.3.gz +%%MANPAGES%%man/man3/zmq_atomic_counter_destroy.3.gz +%%MANPAGES%%man/man3/zmq_atomic_counter_inc.3.gz +%%MANPAGES%%man/man3/zmq_atomic_counter_new.3.gz +%%MANPAGES%%man/man3/zmq_atomic_counter_set.3.gz +%%MANPAGES%%man/man3/zmq_atomic_counter_value.3.gz %%MANPAGES%%man/man3/zmq_bind.3.gz %%MANPAGES%%man/man3/zmq_close.3.gz %%MANPAGES%%man/man3/zmq_connect.3.gz @@ -15,6 +21,7 @@ %%MANPAGES%%man/man3/zmq_ctx_shutdown.3.gz %%MANPAGES%%man/man3/zmq_ctx_term.3.gz %%MANPAGES%%man/man3/zmq_curve_keypair.3.gz +%%MANPAGES%%man/man3/zmq_curve_public.3.gz %%MANPAGES%%man/man3/zmq_disconnect.3.gz %%MANPAGES%%man/man3/zmq_errno.3.gz %%MANPAGES%%man/man3/zmq_getsockopt.3.gz @@ -24,26 +31,28 @@ %%MANPAGES%%man/man3/zmq_msg_data.3.gz %%MANPAGES%%man/man3/zmq_msg_get.3.gz %%MANPAGES%%man/man3/zmq_msg_gets.3.gz +%%MANPAGES%%man/man3/zmq_msg_init.3.gz %%MANPAGES%%man/man3/zmq_msg_init_data.3.gz %%MANPAGES%%man/man3/zmq_msg_init_size.3.gz -%%MANPAGES%%man/man3/zmq_msg_init.3.gz %%MANPAGES%%man/man3/zmq_msg_more.3.gz %%MANPAGES%%man/man3/zmq_msg_move.3.gz %%MANPAGES%%man/man3/zmq_msg_recv.3.gz +%%MANPAGES%%man/man3/zmq_msg_routing_id.3.gz %%MANPAGES%%man/man3/zmq_msg_send.3.gz %%MANPAGES%%man/man3/zmq_msg_set.3.gz +%%MANPAGES%%man/man3/zmq_msg_set_routing_id.3.gz %%MANPAGES%%man/man3/zmq_msg_size.3.gz %%MANPAGES%%man/man3/zmq_poll.3.gz +%%MANPAGES%%man/man3/zmq_proxy.3.gz %%MANPAGES%%man/man3/zmq_proxy_steerable.3.gz -%%MANPAGES%%man/man3/zmq_proxy.3.gz %%MANPAGES%%man/man3/zmq_recv.3.gz %%MANPAGES%%man/man3/zmq_recvmsg.3.gz +%%MANPAGES%%man/man3/zmq_send.3.gz %%MANPAGES%%man/man3/zmq_send_const.3.gz -%%MANPAGES%%man/man3/zmq_send.3.gz %%MANPAGES%%man/man3/zmq_sendmsg.3.gz %%MANPAGES%%man/man3/zmq_setsockopt.3.gz +%%MANPAGES%%man/man3/zmq_socket.3.gz %%MANPAGES%%man/man3/zmq_socket_monitor.3.gz -%%MANPAGES%%man/man3/zmq_socket.3.gz %%MANPAGES%%man/man3/zmq_strerror.3.gz %%MANPAGES%%man/man3/zmq_unbind.3.gz %%MANPAGES%%man/man3/zmq_version.3.gz @@ -57,4 +66,6 @@ %%MANPAGES%%man/man7/zmq_plain.7.gz %%MANPAGES%%man/man7/zmq_tcp.7.gz %%MANPAGES%%man/man7/zmq_tipc.7.gz +%%MANPAGES%%man/man7/zmq_udp.7.gz +%%MANPAGES%%man/man7/zmq_vmci.7.gz %%MANPAGES%%man/man7/zmq.7.gz