Attachment 173052 Details for Bug 211306 – Add norm support

[patch] Add norm support

patch-libzmq4.diff (text/plain), 6.75 KB, created by Eric Camachat on 2016-07-27 17:06:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Eric Camachat

Created: 2016-07-27 17:06:24 UTC

Size: 6.75 KB

patch

obsolete

>Index: net/libzmq4/Makefile
>===================================================================
>--- net/libzmq4/Makefile	(revision 419133)
>+++ net/libzmq4/Makefile	(working copy)
>@@ -1,10 +1,10 @@
> # $FreeBSD$
> 
> PORTNAME=	libzmq4
>-PORTVERSION=	4.1.4
>-PORTREVISION=	2
>+PORTVERSION=	4.1.5
>+PORTREVISION=	0
> CATEGORIES=	net
>-MASTER_SITES=	http://download.zeromq.org/
>+MASTER_SITES=	https://github.com/zeromq/zeromq4-1/releases/download/v${DISTVERSION}/
> DISTNAME=	zeromq-${DISTVERSION}
> 
> MAINTAINER=	koobs@FreeBSD.org
>@@ -19,11 +19,13 @@
> USE_LDCONFIG=	yes
> GNU_CONFIGURE=	yes
> 
>-OPTIONS_DEFINE=		CURVE DEBUG PGM
>-OPTIONS_DEFAULT=	CURVE PGM
>+OPTIONS_DEFINE=		CURVE DEBUG PGM NORM MANPAGES
>+OPTIONS_DEFAULT=	CURVE PGM NORM MANPAGES
>+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_CONFIGURE_WITH=	libsodium
> CURVE_LIB_DEPENDS=	libsodium.so:security/libsodium
>@@ -34,6 +36,13 @@
> PGM_CONFIGURE_WITH=	pgm
> PGM_LIB_DEPENDS=	libpgm.so:net/openpgm
> 
>+NORM_CONFIGURE_WITH=	norm=${PREFIX}
>+NORM_LIB_DEPENDS=	libnorm.so:net/norm
>+
>+MANPAGES_BUILD_DEPENDS=	xmlto:textproc/xmlto \
>+			asciidoc:textproc/asciidoc
>+MANPAGES_CONFIGURE_WITH=	documentation
>+
> CONFIGURE_ARGS+=	--with-pkgconfigdir=${PREFIX}/libdata/pkgconfig
> 
> CFLAGS+=	-Wno-long-long
>Index: net/libzmq4/distinfo
>===================================================================
>--- net/libzmq4/distinfo	(revision 419133)
>+++ net/libzmq4/distinfo	(working copy)
>@@ -1,2 +1,3 @@
>-SHA256 (zeromq-4.1.4.tar.gz) = e99f44fde25c2e4cb84ce440f87ca7d3fe3271c2b8cfbc67d55e4de25e6fe378
>-SIZE (zeromq-4.1.4.tar.gz) = 1400012
>+TIMESTAMP = 1469230974
>+SHA256 (zeromq-4.1.5.tar.gz) = 04aac57f081ffa3a2ee5ed04887be9e205df3a7ddade0027460b8042432bdbcf
>+SIZE (zeromq-4.1.5.tar.gz) = 794853
>Index: net/libzmq4/files/patch-configure
>===================================================================
>--- net/libzmq4/files/patch-configure	(nonexistent)
>+++ net/libzmq4/files/patch-configure	(working copy)
>@@ -0,0 +1,14 @@
>+--- configure.orig	2016-07-27 09:59:28.324238000 -0700
>++++ configure	2016-07-27 09:59:53.211984000 -0700
>+@@ -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
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: net/libzmq4/pkg-plist
>===================================================================
>--- net/libzmq4/pkg-plist	(revision 419133)
>+++ net/libzmq4/pkg-plist	(working copy)
>@@ -4,57 +4,57 @@
> lib/libzmq.a
> lib/libzmq.so
> lib/libzmq.so.5
>-lib/libzmq.so.5.0.0
>+lib/libzmq.so.5.0.1
> libdata/pkgconfig/libzmq.pc
>-man/man7/zmq.7.gz
>-man/man3/zmq_bind.3.gz
>-man/man3/zmq_close.3.gz
>-man/man3/zmq_connect.3.gz
>-man/man3/zmq_ctx_get.3.gz
>-man/man3/zmq_ctx_new.3.gz
>-man/man3/zmq_ctx_set.3.gz
>-man/man3/zmq_ctx_shutdown.3.gz
>-man/man3/zmq_ctx_term.3.gz
>-man/man7/zmq_curve.7.gz
>-man/man3/zmq_curve_keypair.3.gz
>-man/man3/zmq_disconnect.3.gz
>-man/man3/zmq_errno.3.gz
>-man/man3/zmq_getsockopt.3.gz
>-man/man3/zmq_has.3.gz
>-man/man7/zmq_inproc.7.gz
>-man/man7/zmq_ipc.7.gz
>-man/man3/zmq_msg_close.3.gz
>-man/man3/zmq_msg_copy.3.gz
>-man/man3/zmq_msg_data.3.gz
>-man/man3/zmq_msg_get.3.gz
>-man/man3/zmq_msg_gets.3.gz
>-man/man3/zmq_msg_init.3.gz
>-man/man3/zmq_msg_init_data.3.gz
>-man/man3/zmq_msg_init_size.3.gz
>-man/man3/zmq_msg_more.3.gz
>-man/man3/zmq_msg_move.3.gz
>-man/man3/zmq_msg_recv.3.gz
>-man/man3/zmq_msg_send.3.gz
>-man/man3/zmq_msg_set.3.gz
>-man/man3/zmq_msg_size.3.gz
>-man/man7/zmq_null.7.gz
>-man/man7/zmq_pgm.7.gz
>-man/man7/zmq_plain.7.gz
>-man/man3/zmq_poll.3.gz
>-man/man3/zmq_proxy.3.gz
>-man/man3/zmq_proxy_steerable.3.gz
>-man/man3/zmq_recv.3.gz
>-man/man3/zmq_recvmsg.3.gz
>-man/man3/zmq_send.3.gz
>-man/man3/zmq_send_const.3.gz
>-man/man3/zmq_sendmsg.3.gz
>-man/man3/zmq_setsockopt.3.gz
>-man/man3/zmq_socket.3.gz
>-man/man3/zmq_socket_monitor.3.gz
>-man/man3/zmq_strerror.3.gz
>-man/man7/zmq_tcp.7.gz
>-man/man7/zmq_tipc.7.gz
>-man/man3/zmq_unbind.3.gz
>-man/man3/zmq_version.3.gz
>-man/man3/zmq_z85_decode.3.gz
>-man/man3/zmq_z85_encode.3.gz
>+%%MANPAGES%%man/man7/zmq.7.gz
>+%%MANPAGES%%man/man3/zmq_bind.3.gz
>+%%MANPAGES%%man/man3/zmq_close.3.gz
>+%%MANPAGES%%man/man3/zmq_connect.3.gz
>+%%MANPAGES%%man/man3/zmq_ctx_get.3.gz
>+%%MANPAGES%%man/man3/zmq_ctx_new.3.gz
>+%%MANPAGES%%man/man3/zmq_ctx_set.3.gz
>+%%MANPAGES%%man/man3/zmq_ctx_shutdown.3.gz
>+%%MANPAGES%%man/man3/zmq_ctx_term.3.gz
>+%%MANPAGES%%man/man7/zmq_curve.7.gz
>+%%MANPAGES%%man/man3/zmq_curve_keypair.3.gz
>+%%MANPAGES%%man/man3/zmq_disconnect.3.gz
>+%%MANPAGES%%man/man3/zmq_errno.3.gz
>+%%MANPAGES%%man/man3/zmq_getsockopt.3.gz
>+%%MANPAGES%%man/man3/zmq_has.3.gz
>+%%MANPAGES%%man/man7/zmq_inproc.7.gz
>+%%MANPAGES%%man/man7/zmq_ipc.7.gz
>+%%MANPAGES%%man/man3/zmq_msg_close.3.gz
>+%%MANPAGES%%man/man3/zmq_msg_copy.3.gz
>+%%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_more.3.gz
>+%%MANPAGES%%man/man3/zmq_msg_move.3.gz
>+%%MANPAGES%%man/man3/zmq_msg_recv.3.gz
>+%%MANPAGES%%man/man3/zmq_msg_send.3.gz
>+%%MANPAGES%%man/man3/zmq_msg_set.3.gz
>+%%MANPAGES%%man/man3/zmq_msg_size.3.gz
>+%%MANPAGES%%man/man7/zmq_null.7.gz
>+%%MANPAGES%%man/man7/zmq_pgm.7.gz
>+%%MANPAGES%%man/man7/zmq_plain.7.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_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_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_strerror.3.gz
>+%%MANPAGES%%man/man7/zmq_tcp.7.gz
>+%%MANPAGES%%man/man7/zmq_tipc.7.gz
>+%%MANPAGES%%man/man3/zmq_unbind.3.gz
>+%%MANPAGES%%man/man3/zmq_version.3.gz
>+%%MANPAGES%%man/man3/zmq_z85_decode.3.gz
>+%%MANPAGES%%man/man3/zmq_z85_encode.3.gz

Flags:

eric: maintainer-approval?

Actions: View | Diff

Attachments on bug 211306: 172850 | 173052