Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 11 Aug 2016 12:15:20 +0000 (UTC)
From:      Kubilay Kocak <koobs@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r420065 - in head/net/libzmq4: . files
Message-ID:  <201608111215.u7BCFKdm081687@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: koobs
Date: Thu Aug 11 12:15:20 2016
New Revision: 420065
URL: https://svnweb.freebsd.org/changeset/ports/420065

Log:
  net/libzmq4: Update to 4.1.5, Add MANPAGES option
  
  - Update PORTVERSION and distinfo checksum (4.1.5)
  - Update pkg-plist accordingly (library minor version bump)
  - Update MASTER_SITES (upstream moved to GitHub releases)
  - Add MANPAGES option and dependencies (xmlto/asciidoc (sorry!) as they
    now need to be built. Add OPTIONS_SUB and update pkg-plist accordingly
  - Re-patch configure after minor updates since 4.1.4
  - Sort pkg-plist
  
  PR:		211306 (part two of two)
  Submitted by:	Eric Camachat <eric camachat org>

Modified:
  head/net/libzmq4/Makefile
  head/net/libzmq4/distinfo
  head/net/libzmq4/files/patch-configure
  head/net/libzmq4/pkg-plist

Modified: head/net/libzmq4/Makefile
==============================================================================
--- head/net/libzmq4/Makefile	Thu Aug 11 12:12:02 2016	(r420064)
+++ head/net/libzmq4/Makefile	Thu Aug 11 12:15:20 2016	(r420065)
@@ -1,10 +1,9 @@
 # $FreeBSD$
 
 PORTNAME=	libzmq4
-PORTVERSION=	4.1.4
-PORTREVISION=	3
+PORTVERSION=	4.1.5
 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,8 +18,9 @@ USES=		libtool pkgconfig
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 
-OPTIONS_DEFINE=		CURVE DEBUG NORM PGM
-OPTIONS_DEFAULT=	CURVE PGM
+OPTIONS_DEFINE=		CURVE DEBUG NORM MANPAGES PGM
+OPTIONS_DEFAULT=	CURVE MANPAGES NORM PGM
+OPTIONS_SUB=		yes
 
 CURVE_DESC=	CURVE security mechanism via libsodium
 PGM_DESC=	Reliable multicast transport using PGM via OpenPGM
@@ -35,6 +35,10 @@ DEBUG_VARS=		WITH_DEBUG=yes
 PGM_CONFIGURE_WITH=	pgm
 PGM_LIB_DEPENDS=	libpgm.so:net/openpgm
 
+MANPAGES_BUILD_DEPENDS=		xmlto:textproc/xmlto \
+				asciidoc:textproc/asciidoc
+MANPAGES_CONFIGURE_WITH=	documentation
+
 NORM_CONFIGURE_WITH=	norm=${PREFIX}
 NORM_LIB_DEPENDS=	libnorm.so:net/norm
 

Modified: head/net/libzmq4/distinfo
==============================================================================
--- head/net/libzmq4/distinfo	Thu Aug 11 12:12:02 2016	(r420064)
+++ head/net/libzmq4/distinfo	Thu Aug 11 12:15:20 2016	(r420065)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1469795631
-SHA256 (zeromq-4.1.4.tar.gz) = e99f44fde25c2e4cb84ce440f87ca7d3fe3271c2b8cfbc67d55e4de25e6fe378
-SIZE (zeromq-4.1.4.tar.gz) = 1400012
+TIMESTAMP = 1470914531
+SHA256 (zeromq-4.1.5.tar.gz) = 04aac57f081ffa3a2ee5ed04887be9e205df3a7ddade0027460b8042432bdbcf
+SIZE (zeromq-4.1.5.tar.gz) = 794853

Modified: head/net/libzmq4/files/patch-configure
==============================================================================
--- head/net/libzmq4/files/patch-configure	Thu Aug 11 12:12:02 2016	(r420064)
+++ head/net/libzmq4/files/patch-configure	Thu Aug 11 12:15:20 2016	(r420065)
@@ -4,18 +4,17 @@
 # Date: Wed, 27 Jul 2016 11:09:19 -0700
 # Subject: [PATCH] Fix build with NORM enabled on FreeBSD.
 
---- configure.orig	2016-07-29 12:36:40 UTC
+--- configure.orig	2016-08-11 11:27:28 UTC
 +++ configure
-@@ -19823,10 +19823,10 @@ $as_echo "#define ZMQ_HAVE_NORM 1" >>con
+@@ -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="-I${norm_path}/lib ${LIBZMQ_EXTRA_LDFLAGS}"
++        LIBZMQ_EXTRA_LDFLAGS="-L${norm_path}/lib ${LIBZMQ_EXTRA_LDFLAGS}"
      fi
- 
 -    LIBS="-lnorm $LIBS"
 +    LIBS="-L${norm_path}/lib -lnorm $LIBS"
- fi
- 
- # Set -Wall, -Werror and -pedantic
+ else
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }

Modified: head/net/libzmq4/pkg-plist
==============================================================================
--- head/net/libzmq4/pkg-plist	Thu Aug 11 12:12:02 2016	(r420064)
+++ head/net/libzmq4/pkg-plist	Thu Aug 11 12:15:20 2016	(r420065)
@@ -1,60 +1,60 @@
 bin/curve_keygen
-include/zmq.h
 include/zmq_utils.h
+include/zmq.h
 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/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/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/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_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_send.3.gz
+%%MANPAGES%%man/man3/zmq_msg_set.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_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_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_strerror.3.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
+%%MANPAGES%%man/man7/zmq_curve.7.gz
+%%MANPAGES%%man/man7/zmq_inproc.7.gz
+%%MANPAGES%%man/man7/zmq_ipc.7.gz
+%%MANPAGES%%man/man7/zmq_null.7.gz
+%%MANPAGES%%man/man7/zmq_pgm.7.gz
+%%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.7.gz



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201608111215.u7BCFKdm081687>