net/libzmq4: Update to 4.1.2, Fixes CVE-2014-9721

- Update to 4.1.2
- Update pkg-plist
- USES: pkg-config is now a global dependency
- OPTIONS: with-sytem-pgm is now with-pgm, update helpers
- OPTIONS: with-libsodium no longer takes args, update helpers
- Override pkgconfigdir via configure, deprecate USES: pathfix

- Bump PORTREVISION for dependent ports for shared library version
  change

While I'm here:

- Whitespace align Makefile

Based on:

PR:		200502
Reported by:	Sevan Janiyan <venture37 geeklan co uk>
Submitted by:	Jason Unovitch <jason.unovitch gmail com>
MFH:		2015Q2
Security:	10a6d0aa-0b1c-11e5-bb90-002590263bf5
Security:	CVE-2014-9721

7 files changed, 27 insertions, 25 deletions

diff --git a/net/czmq/Makefile b/net/czmq/Makefile
index 8cd54df69282..bdb71ffe74ad 100644
--- a/net/czmq/Makefile
+++ b/net/czmq/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	czmq
 PORTVERSION=	2.2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	http://download.zeromq.org/
 
diff --git a/net/libzmq4/Makefile b/net/libzmq4/Makefile
index c4aa60ed9639..ed7a64a9e0d2 100644
--- a/net/libzmq4/Makefile
+++ b/net/libzmq4/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	libzmq4
-PORTVERSION=	4.0.5
-PORTREVISION=	1
+PORTVERSION=	4.1.2
 CATEGORIES=	net
 MASTER_SITES=	http://download.zeromq.org/
 DISTNAME=	zeromq-${DISTVERSION}
@@ -15,23 +14,25 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 CONFLICTS=	zmq-[0-9]* libzmq[^4]-[0-9]*
 
-USES=		libtool pathfix
+USES=		libtool pkgconfig
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 
-OPTIONS_DEFINE=	CURVE DEBUG PGM
+OPTIONS_DEFINE=		CURVE DEBUG PGM
 OPTIONS_DEFAULT=	CURVE PGM
 
 CURVE_DESC=	CURVE security mechanism via libsodium
 PGM_DESC=	Reliable multicast transport using PGM via OpenPGM
 
-CURVE_CONFIGURE_ON=	--with-libsodium=${LOCALBASE}
+CURVE_CONFIGURE_WITH=	libsodium
 CURVE_LIB_DEPENDS=	libsodium.so:${PORTSDIR}/security/libsodium
 
-DEBUG_CONFIGURE_ON=	--enable-debug
-PGM_CONFIGURE_ON=	--with-system-pgm
+DEBUG_CONFIGURE_ENABLE=	debug
+
+PGM_CONFIGURE_WITH=	pgm
 PGM_LIB_DEPENDS=	libpgm.so:${PORTSDIR}/net/openpgm
-PGM_USES=		pkgconfig
+
+CONFIGURE_ARGS+=	--with-pkgconfigdir=${PREFIX}/libdata/pkgconfig
 
 CFLAGS+=	-Wno-long-long
 MAKE_ENV=	V=1
diff --git a/net/libzmq4/distinfo b/net/libzmq4/distinfo
index 3373e9c390e2..b5025c84c85a 100644
--- a/net/libzmq4/distinfo
+++ b/net/libzmq4/distinfo
@@ -1,2 +1,2 @@
-SHA256 (zeromq-4.0.5.tar.gz) = 3bc93c5f67370341428364ce007d448f4bb58a0eaabd0a60697d8086bc43342b
-SIZE (zeromq-4.0.5.tar.gz) = 2153667
+SHA256 (zeromq-4.1.2.tar.gz) = f9162ead6d68521e5154d871bac304f88857308bb02366b81bb588497a345927
+SIZE (zeromq-4.1.2.tar.gz) = 1367275
diff --git a/net/libzmq4/pkg-plist b/net/libzmq4/pkg-plist
index ffb7a01360d9..529d08fb6c8c 100644
--- a/net/libzmq4/pkg-plist
+++ b/net/libzmq4/pkg-plist
@@ -3,27 +3,31 @@ include/zmq.h
 include/zmq_utils.h
 lib/libzmq.a
 lib/libzmq.so
-lib/libzmq.so.4
-lib/libzmq.so.4.0.0
+lib/libzmq.so.5
+lib/libzmq.so.5.0.0
 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_destroy.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_init.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
@@ -34,8 +38,9 @@ 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/man3/zmq_poll.3.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
@@ -47,14 +52,9 @@ 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/man3/zmq_term.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
-man/man7/zmq.7.gz
-man/man7/zmq_epgm.7.gz
-man/man7/zmq_inproc.7.gz
-man/man7/zmq_ipc.7.gz
-man/man7/zmq_pgm.7.gz
-man/man7/zmq_tcp.7.gz
diff --git a/net/ntopng/Makefile b/net/ntopng/Makefile
index e336bb149a4c..ef55aa0f2101 100644
--- a/net/ntopng/Makefile
+++ b/net/ntopng/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	ntopng
 PORTVERSION=	1.2.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net
 MASTER_SITES=	SF/ntop/${PORTNAME}
 
diff --git a/net/pecl-zmq/Makefile b/net/pecl-zmq/Makefile
index 368d16015971..6e1b67471200 100644
--- a/net/pecl-zmq/Makefile
+++ b/net/pecl-zmq/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	zmq
 PORTVERSION=	1.1.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net pear
 MASTER_SITES=	http://pecl.php.net/get/
 PKGNAMEPREFIX=	pecl-
diff --git a/net/py-pyzmq/Makefile b/net/py-pyzmq/Makefile
index 6f0273a5ca44..db22a3b86a0a 100644
--- a/net/py-pyzmq/Makefile
+++ b/net/py-pyzmq/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	pyzmq
 PORTVERSION=	14.6.0
+PORTREVISION=	1
 CATEGORIES=	net devel
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}