svn commit: r335089 - in head: . devel devel/zmq-devel net net/libzmq3

[Kubilay Kocak]

Author: koobs
Date: Thu Nov 28 11:57:02 2013
New Revision: 335089
URL: http://svnweb.freebsd.org/changeset/ports/335089

Log:
  devel/zmq-devel: Move to net/libzmq3, add DEBUG and PGM options
  
  - Copy devel/zmq-devel to net/libzmq3
  - Delete devel/zmq-devel
  - Remove from devel/Makefile
  - Add a MOVED entry for zmq-devel
  - Add libzmq3 to net/Makefile
  - Switch primary category
  
  - Add DEBUG and PGM (Multicast) options
  - Remove PKGNAMESUFFIX
  - Update COMMENT to align with libzqm4
  - Update pkg-descr to align with libzmq4
  - Add LICENSE
  - Update CONFLICTS
  - Tweak the regression-test target to build before running
  
  Reviewed by:	kwm, wg

Added:
  head/net/libzmq3/
     - copied from r335008, head/devel/zmq-devel/
Deleted:
  head/devel/zmq-devel/
Modified:
  head/MOVED
  head/devel/Makefile
  head/net/Makefile
  head/net/libzmq3/Makefile
  head/net/libzmq3/pkg-descr

Modified: head/MOVED
==============================================================================
--- head/MOVED	Thu Nov 28 11:41:56 2013	(r335088)
+++ head/MOVED	Thu Nov 28 11:57:02 2013	(r335089)
@@ -5268,3 +5268,4 @@ audio/mpc|audio/musicpc|2013-11-19|Renam
 deskutils/q4wine|emulators/q4wine|2013-11-26|Move to better category
 devel/p5-MooseX-ChainedAccessors||2013-11-27|Has expired: Marked as depreciated upstream
 devel/py-distribute|devel/py-setuptools|2013-11-27|Replaced with setuptools
+devel/zmq-devel|net/libzmq3|2013-11-28|Rename according to upstream and move to more suitable category

Modified: head/devel/Makefile
==============================================================================
--- head/devel/Makefile	Thu Nov 28 11:41:56 2013	(r335088)
+++ head/devel/Makefile	Thu Nov 28 11:57:02 2013	(r335089)
@@ -4531,7 +4531,6 @@
     SUBDIR += z80asm
     SUBDIR += z80ex
     SUBDIR += zmq
-    SUBDIR += zmq-devel
     SUBDIR += zookeeper
     SUBDIR += zpu-binutils
     SUBDIR += zpu-gcc

Modified: head/net/Makefile
==============================================================================
--- head/net/Makefile	Thu Nov 28 11:41:56 2013	(r335088)
+++ head/net/Makefile	Thu Nov 28 11:57:02 2013	(r335089)
@@ -348,6 +348,7 @@
     SUBDIR += libunp
     SUBDIR += libutp
     SUBDIR += libvncserver
+    SUBDIR += libzmq3
     SUBDIR += libzmq4
     SUBDIR += liferea
     SUBDIR += linc

Modified: head/net/libzmq3/Makefile
==============================================================================
--- head/devel/zmq-devel/Makefile	Wed Nov 27 11:56:53 2013	(r335008)
+++ head/net/libzmq3/Makefile	Thu Nov 28 11:57:02 2013	(r335089)
@@ -1,24 +1,38 @@
 # $FreeBSD$
 
-PORTNAME=	zmq
+PORTNAME=	libzmq3
 PORTVERSION=	3.2.4
-CATEGORIES=	devel net
+CATEGORIES=	net
 MASTER_SITES=	http://download.zeromq.org/
-PKGNAMESUFFIX=	-devel
 DISTNAME=	zeromq-${DISTVERSION}
 
 MAINTAINER=	koobs at FreeBSD.org
-COMMENT=	Lightweight messaging kernel
+COMMENT=	ZeroMQ core library (Version 3)
+
+LICENSE=	LGPL3
 
 USES=		pathfix
 USE_LDCONFIG=	yes
 
+OPTIONS_DEFINE=	DEBUG PGM
+PGM_DESC=	Reliable multicast transport using PGM via OpenPGM
+
+DEBUG_CONFIGURE_ON=	--enable-debug
+PGM_CONFIGURE_ON=	--with-system-pgm
+PGM_LIB_DEPENDS=	libpgm.so:${PORTSDIR}/net/openpgm
+PGM_USES=		pkgconfig
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MDEBUG}
+WITH_DEBUG=	yes
+.endif
+
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--disable-silent-rules
 
-CONFLICTS=	zmq-[0-9]*
+CONFLICTS=	zmq-[0-9]* libzmq[^3]-[0-9]*
 
-regression-test:
+regression-test: build
 	cd ${WRKSRC} && ${MAKE}	check
 
 .include <bsd.port.mk>

Modified: head/net/libzmq3/pkg-descr
==============================================================================
--- head/devel/zmq-devel/pkg-descr	Wed Nov 27 11:56:53 2013	(r335008)
+++ head/net/libzmq3/pkg-descr	Thu Nov 28 11:57:02 2013	(r335089)
@@ -1,3 +1,8 @@
-An open source message queue optimised for performance.
+ZeroMQ - Distributed Computing Made Simple
+
+ * The socket library that acts as a concurrency framework.
+ * Carries messages across inproc, IPC, TCP, and multicast.
+ * Connect N-to-N via fanout, pubsub, pipeline, request-reply.
+ * Asynch I/O for scalable multicore message-passing apps.
 
 WWW: http://www.zeromq.org/