svn commit: r448376 - in head/net/libzmq4: . files
Kubilay Kocak
koobs at FreeBSD.org
Sun Aug 20 11:58:40 UTC 2017
Author: koobs
Date: Sun Aug 20 11:58:39 2017
New Revision: 448376
URL: https://svnweb.freebsd.org/changeset/ports/448376
Log:
net/libzmq4: Update to 4.2.2
- Update PORTVERSION and distinfo checksum (4.2.2) [1]
- Use DISTVERSIONPREFIX -> tweak MASTER_SITES
- Split CURVE option (now a group) into TWEETNACL and SODIUM options [1]
- Group NORM and PGM options into a MULTICAST group
- Simplify & tweak options descriptions accordingly
- Update MANPAGES configure argument (*-documentation is deprecated)
- Remove patch that was upstreamed [1]
- Move curve_keygen from pkg-plist to conditional PLIST_FILES
PR: 214367
Submitted by: Eric Camachat <eric camachat org> [1]
Deleted:
head/net/libzmq4/files/
Modified:
head/net/libzmq4/Makefile
head/net/libzmq4/distinfo
head/net/libzmq4/pkg-plist
Modified: head/net/libzmq4/Makefile
==============================================================================
--- head/net/libzmq4/Makefile Sun Aug 20 11:57:52 2017 (r448375)
+++ head/net/libzmq4/Makefile Sun Aug 20 11:58:39 2017 (r448376)
@@ -1,9 +1,10 @@
# $FreeBSD$
PORTNAME= libzmq4
-PORTVERSION= 4.1.5
+PORTVERSION= 4.2.2
+DISTVERSIONPREFIX= v
CATEGORIES= net
-MASTER_SITES= https://github.com/zeromq/zeromq4-1/releases/download/v${DISTVERSION}/
+MASTER_SITES= https://github.com/zeromq/libzmq/releases/download/${DISTVERSIONFULL}/
DISTNAME= zeromq-${DISTVERSION}
MAINTAINER= koobs at FreeBSD.org
@@ -14,21 +15,25 @@ LICENSE_FILE= ${WRKSRC}/COPYING
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 MANPAGES
+OPTIONS_RADIO= CURVE
+OPTIONS_RADIO_CURVE= SODIUM TWEETNACL
+OPTIONS_GROUP= MULTICAST
+OPTIONS_GROUP_MULTICAST= NORM PGM
+OPTIONS_DEFAULT= MANPAGES NORM PGM TWEETNACL
OPTIONS_SUB= yes
-CURVE_DESC= CURVE security mechanism via libsodium
-PGM_DESC= Reliable multicast transport using PGM via OpenPGM
-NORM_DESC= Reliable multicast transport using NORM via NRL
+CURVE_DESC= CURVE security backend
+MULTICAST_DESC= Reliable Multicast Transports
+TWEETNACL_DESC= Use tweetnacl
+SODIUM_DESC= Use libsodium
+PGM_DESC= Enable PGM transport via OpenPGM
+NORM_DESC= Enable NORM via NRL
-CURVE_CONFIGURE_WITH= libsodium
-CURVE_LIB_DEPENDS= libsodium.so:security/libsodium
-
DEBUG_CONFIGURE_ENABLE= debug
DEBUG_VARS= WITH_DEBUG=yes
@@ -37,11 +42,17 @@ PGM_LIB_DEPENDS= libpgm.so:net/openpgm
MANPAGES_BUILD_DEPENDS= xmlto:textproc/xmlto \
asciidoc:textproc/asciidoc
-MANPAGES_CONFIGURE_WITH= documentation
+MANPAGES_CONFIGURE_WITH= docs
NORM_CONFIGURE_WITH= norm=${PREFIX}
NORM_LIB_DEPENDS= libnorm.so:net/norm
+SODIUM_CONFIGURE_WITH= libsodium
+SODIUM_LIB_DEPENDS= libsodium.so:security/libsodium
+SODIUM_PLIST_FILES= bin/curve_keygen
+
+TWEETNACL_PLIST_FILES= bin/curve_keygen
+
CONFIGURE_ARGS+= --with-pkgconfigdir=${PREFIX}/libdata/pkgconfig
CFLAGS+= -Wno-long-long
@@ -50,5 +61,11 @@ MAKE_ENV= V=1
INSTALL_TARGET= install-strip
TEST_TARGET= check
+
+.include <bsd.port.options.mk>
+
+.if !${PORT_OPTIONS:MSODIUM} && !${PORT_OPTIONS:MTWEETNACL}
+CONFIGURE_ARGS+= --disable-curve
+.endif
.include <bsd.port.mk>
Modified: head/net/libzmq4/distinfo
==============================================================================
--- head/net/libzmq4/distinfo Sun Aug 20 11:57:52 2017 (r448375)
+++ head/net/libzmq4/distinfo Sun Aug 20 11:58:39 2017 (r448376)
@@ -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
Modified: head/net/libzmq4/pkg-plist
==============================================================================
--- head/net/libzmq4/pkg-plist Sun Aug 20 11:57:52 2017 (r448375)
+++ head/net/libzmq4/pkg-plist Sun Aug 20 11:58:39 2017 (r448376)
@@ -1,11 +1,16 @@
-bin/curve_keygen
include/zmq_utils.h
include/zmq.h
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 +20,7 @@ libdata/pkgconfig/libzmq.pc
%%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 +30,28 @@ libdata/pkgconfig/libzmq.pc
%%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_steerable.3.gz
%%MANPAGES%%man/man3/zmq_proxy.3.gz
+%%MANPAGES%%man/man3/zmq_proxy_steerable.3.gz
%%MANPAGES%%man/man3/zmq_recv.3.gz
%%MANPAGES%%man/man3/zmq_recvmsg.3.gz
-%%MANPAGES%%man/man3/zmq_send_const.3.gz
%%MANPAGES%%man/man3/zmq_send.3.gz
+%%MANPAGES%%man/man3/zmq_send_const.3.gz
%%MANPAGES%%man/man3/zmq_sendmsg.3.gz
%%MANPAGES%%man/man3/zmq_setsockopt.3.gz
-%%MANPAGES%%man/man3/zmq_socket_monitor.3.gz
%%MANPAGES%%man/man3/zmq_socket.3.gz
+%%MANPAGES%%man/man3/zmq_socket_monitor.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 +65,6 @@ libdata/pkgconfig/libzmq.pc
%%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
More information about the svn-ports-head
mailing list