Date: Wed, 4 Dec 2013 14:08:04 +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: r335619 - in head: . devel devel/cocaine-core devel/jzmq devel/zmq net net/libzmq2 net/p5-ZeroMQ textproc/groonga textproc/rubygem-zmq www/blastbeat www/mongrel2 Message-ID: <201312041408.rB4E84Gq042238@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: koobs Date: Wed Dec 4 14:08:03 2013 New Revision: 335619 URL: http://svnweb.freebsd.org/changeset/ports/335619 Log: devel/zmq: Move to net/libzmq2 & update to align with other ZeroMQ ports All other core ZeroMQ library ports have been moved to the net/ category along with the czmq client library. This change completes the set, enabling greater flexibility and choice for maintainers of ZeroMQ-based software in the ports tree. - Move devel/zmq to net/libzmq2 - Update devel/ and net/ category Makefiles - Add MOVED entry - Update LIB_DEPENDS in dependent ports net/libzmq2: - Switch primary category to net - Enable STAGE support - Add DEBUG option - Update COMMENT to match libzmq[34] - Update pkg-descr to match libzmq[34] - Update CONFLICTS - Add LICENSE - Sort USE_* section - Remove MAN macros and move entries to pkg-plist - Add regression-test target for QA Reviewed by: makc Approved by: Gea-Suan Lin <gslin@gslin.org> (maintainer, via email) Added: head/net/libzmq2/ - copied from r335618, head/devel/zmq/ Deleted: head/devel/zmq/ Modified: head/MOVED head/devel/Makefile head/devel/cocaine-core/Makefile head/devel/jzmq/Makefile head/net/Makefile head/net/libzmq2/Makefile head/net/libzmq2/pkg-descr (contents, props changed) head/net/libzmq2/pkg-plist (contents, props changed) head/net/p5-ZeroMQ/Makefile head/textproc/groonga/Makefile (contents, props changed) head/textproc/rubygem-zmq/Makefile head/www/blastbeat/Makefile head/www/mongrel2/Makefile Modified: head/MOVED ============================================================================== --- head/MOVED Wed Dec 4 12:15:53 2013 (r335618) +++ head/MOVED Wed Dec 4 14:08:03 2013 (r335619) @@ -5288,3 +5288,4 @@ editors/gphpedit||2013-12-01|Has expired irc/inspircd12|irc/inspircd|2013-12-01|Has expired: No upstream support; known vulnerable. Please use irc/inspircd graphics/py-clutter||2013-12-01|Has expired: Broken for more than 6 month graphics/py-clutter-gtk||2013-12-01|Has expired: depends on expired graphics/py-clutter +devel/zmq|net/zmq|2013-12-05|Rename according to upstream and move to more suitable category Modified: head/devel/Makefile ============================================================================== --- head/devel/Makefile Wed Dec 4 12:15:53 2013 (r335618) +++ head/devel/Makefile Wed Dec 4 14:08:03 2013 (r335619) @@ -4540,7 +4540,6 @@ SUBDIR += z80-asm SUBDIR += z80asm SUBDIR += z80ex - SUBDIR += zmq SUBDIR += zookeeper SUBDIR += zpu-binutils SUBDIR += zpu-gcc Modified: head/devel/cocaine-core/Makefile ============================================================================== --- head/devel/cocaine-core/Makefile Wed Dec 4 12:15:53 2013 (r335618) +++ head/devel/cocaine-core/Makefile Wed Dec 4 14:08:03 2013 (r335619) @@ -3,7 +3,7 @@ PORTNAME= cocaine-core PORTVERSION= 0.10 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel MASTER_SITES= GH GHC @@ -17,7 +17,7 @@ LIB_DEPENDS= boost_iostreams:${PORTSDIR} ltdl:${PORTSDIR}/devel/libltdl \ msgpack:${PORTSDIR}/devel/msgpack \ uuid:${PORTSDIR}/misc/e2fsprogs-libuuid \ - zmq:${PORTSDIR}/devel/zmq + zmq:${PORTSDIR}/net/libzmq2 USES= cmake USE_GCC= yes Modified: head/devel/jzmq/Makefile ============================================================================== --- head/devel/jzmq/Makefile Wed Dec 4 12:15:53 2013 (r335618) +++ head/devel/jzmq/Makefile Wed Dec 4 14:08:03 2013 (r335619) @@ -2,6 +2,7 @@ PORTNAME= jzmq PORTVERSION= 2011.04.26 +PORTREVISION= 1 CATEGORIES= devel java MASTER_SITES= LOCAL/olgeni DISTNAME= zeromq-${PORTNAME}-${PORTVERSION} @@ -9,7 +10,7 @@ DISTNAME= zeromq-${PORTNAME}-${PORTVERSI MAINTAINER= olgeni@FreeBSD.org COMMENT= Java bindings for ZeroMQ -LIB_DEPENDS= zmq.1:${PORTSDIR}/devel/zmq +LIB_DEPENDS= zmq.1:${PORTSDIR}/net/libzmq2 USES= pkgconfig USE_AUTOTOOLS= autoconf:env libtool automake:env Modified: head/net/Makefile ============================================================================== --- head/net/Makefile Wed Dec 4 12:15:53 2013 (r335618) +++ head/net/Makefile Wed Dec 4 14:08:03 2013 (r335619) @@ -349,6 +349,7 @@ SUBDIR += libunp SUBDIR += libutp SUBDIR += libvncserver + SUBDIR += libzmq2 SUBDIR += libzmq3 SUBDIR += libzmq4 SUBDIR += liferea Modified: head/net/libzmq2/Makefile ============================================================================== --- head/devel/zmq/Makefile Wed Dec 4 12:15:53 2013 (r335618) +++ head/net/libzmq2/Makefile Wed Dec 4 14:08:03 2013 (r335619) @@ -3,52 +3,35 @@ PORTNAME= zmq PORTVERSION= 2.2.0 -CATEGORIES= devel net +PORTREVISION= 1 +CATEGORIES= net MASTER_SITES= http://download.zeromq.org/ DISTNAME= zeromq-${DISTVERSION} MAINTAINER= gslin@gslin.org -COMMENT= Open source message queue optimised for performance +COMMENT= ZeroMQ core library (Version 2) -GNU_CONFIGURE= yes -USES= pathfix +LICENSE= LGPL3 + +USES= pathfix USE_LDCONFIG= yes +GNU_CONFIGURE= yes -CONFLICTS= zmq-devel-[0-9]* +CONFLICTS= libzmq[^2]-[0-9]* -MAN3= zmq_bind.3 \ - zmq_close.3 \ - zmq_connect.3 \ - zmq_device.3 \ - zmq_errno.3 \ - zmq_getsockopt.3 \ - zmq_init.3 \ - zmq_msg_close.3 \ - zmq_msg_copy.3 \ - zmq_msg_data.3 \ - zmq_msg_init.3 \ - zmq_msg_init_data.3 \ - zmq_msg_init_size.3 \ - zmq_msg_move.3 \ - zmq_msg_size.3 \ - zmq_poll.3 \ - zmq_recv.3 \ - zmq_send.3 \ - zmq_setsockopt.3 \ - zmq_socket.3 \ - zmq_strerror.3 \ - zmq_term.3 \ - zmq_version.3 -MAN7= zmq.7 \ - zmq_cpp.7 \ - zmq_epgm.7 \ - zmq_inproc.7 \ - zmq_ipc.7 \ - zmq_pgm.7 \ - zmq_tcp.7 +OPTIONS_DEFINE= DEBUG +DEBUG_CONFIGURE_ON= --enable-debug + +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MDEBUG} +WITH_DEBUG= yes +.endif -NO_STAGE= yes post-patch: ${REINPLACE_CMD} -e '9s|$$| -pthread|' ${WRKSRC}/src/libzmq.pc.in +regression-test: build + cd ${WRKSRC} && ${MAKE} check + .include <bsd.port.mk> Modified: head/net/libzmq2/pkg-descr ============================================================================== --- head/devel/zmq/pkg-descr Wed Dec 4 12:15:53 2013 (r335618) +++ head/net/libzmq2/pkg-descr Wed Dec 4 14:08:03 2013 (r335619) @@ -1,3 +1,8 @@ -An open source message queue optimised for performance. +ZeroMQ - Distributed Computing Made Simple -WWW: http://www.zeromq.org/ + * 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/ Modified: head/net/libzmq2/pkg-plist ============================================================================== --- head/devel/zmq/pkg-plist Wed Dec 4 12:15:53 2013 (r335618) +++ head/net/libzmq2/pkg-plist Wed Dec 4 14:08:03 2013 (r335619) @@ -1,4 +1,3 @@ -@comment $FreeBSD$ lib/libzmq.so.1 lib/libzmq.la lib/libzmq.a @@ -7,3 +6,33 @@ libdata/pkgconfig/libzmq.pc include/zmq.hpp include/zmq_utils.h include/zmq.h +man/man3/zmq_bind.3.gz +man/man3/zmq_close.3.gz +man/man3/zmq_connect.3.gz +man/man3/zmq_device.3.gz +man/man3/zmq_errno.3.gz +man/man3/zmq_getsockopt.3.gz +man/man3/zmq_init.3.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_init.3.gz +man/man3/zmq_msg_init_data.3.gz +man/man3/zmq_msg_init_size.3.gz +man/man3/zmq_msg_move.3.gz +man/man3/zmq_msg_size.3.gz +man/man3/zmq_poll.3.gz +man/man3/zmq_recv.3.gz +man/man3/zmq_send.3.gz +man/man3/zmq_setsockopt.3.gz +man/man3/zmq_socket.3.gz +man/man3/zmq_strerror.3.gz +man/man3/zmq_term.3.gz +man/man3/zmq_version.3.gz +man/man7/zmq.7.gz +man/man7/zmq_cpp.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 Modified: head/net/p5-ZeroMQ/Makefile ============================================================================== --- head/net/p5-ZeroMQ/Makefile Wed Dec 4 12:15:53 2013 (r335618) +++ head/net/p5-ZeroMQ/Makefile Wed Dec 4 14:08:03 2013 (r335619) @@ -2,7 +2,7 @@ PORTNAME= ZeroMQ PORTVERSION= 0.21 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net perl5 MASTER_SITES= CPAN MASTER_SITE_SUBDIR= CPAN:DMAKI @@ -16,7 +16,7 @@ LICENSE_COMB= dual RUN_DEPENDS= p5-Task-Weaken>=0:${PORTSDIR}/devel/p5-Task-Weaken BUILD_DEPENDS= p5-Task-Weaken>=0:${PORTSDIR}/devel/p5-Task-Weaken -LIB_DEPENDS= zmq.1:${PORTSDIR}/devel/zmq \ +LIB_DEPENDS= zmq.1:${PORTSDIR}/net/libzmq2 \ uuid:${PORTSDIR}/misc/e2fsprogs-libuuid TEST_DEPENDS= p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal \ Modified: head/textproc/groonga/Makefile ============================================================================== --- head/textproc/groonga/Makefile Wed Dec 4 12:15:53 2013 (r335618) +++ head/textproc/groonga/Makefile Wed Dec 4 14:08:03 2013 (r335619) @@ -2,6 +2,7 @@ PORTNAME= groonga PORTVERSION= 3.0.0 +PORTREVISION= 1 CATEGORIES= textproc MASTER_SITES= http://packages.groonga.org/source/groonga/ @@ -56,7 +57,7 @@ CONFIGURE_ARGS+= --with-libevent=${LOCAL --enable-zeromq LIB_DEPENDS+= event-1.4:${PORTSDIR}/devel/libevent \ msgpack:${PORTSDIR}/devel/msgpack \ - zmq:${PORTSDIR}/devel/zmq + zmq:${PORTSDIR}/net/libzmq2 PLIST_SUB+= SUGGEST="" .else CONFIGURE_ARGS+= --without-libevent \ Modified: head/textproc/rubygem-zmq/Makefile ============================================================================== --- head/textproc/rubygem-zmq/Makefile Wed Dec 4 12:15:53 2013 (r335618) +++ head/textproc/rubygem-zmq/Makefile Wed Dec 4 14:08:03 2013 (r335619) @@ -2,13 +2,14 @@ PORTNAME= zmq PORTVERSION= 2.1.4 +PORTREVISION= 1 CATEGORIES= textproc rubygems MASTER_SITES= RG MAINTAINER= ruby@FreeBSD.org COMMENT= Ruby ZeroMQ gem -LIB_DEPENDS= zmq:${PORTSDIR}/devel/zmq +LIB_DEPENDS= zmq:${PORTSDIR}/net/libzmq2 USE_RUBY= yes USE_RUBYGEMS= yes Modified: head/www/blastbeat/Makefile ============================================================================== --- head/www/blastbeat/Makefile Wed Dec 4 12:15:53 2013 (r335618) +++ head/www/blastbeat/Makefile Wed Dec 4 14:08:03 2013 (r335619) @@ -3,7 +3,7 @@ PORTNAME= blastbeat PORTVERSION= 20121205 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www MASTER_SITES= GH GHC @@ -17,7 +17,7 @@ LICENSE_PERMS= auto-accept LIB_DEPENDS= ev:${PORTSDIR}/devel/libev \ uuid:${PORTSDIR}/misc/e2fsprogs-libuuid \ - zmq:${PORTSDIR}/devel/zmq + zmq:${PORTSDIR}/net/libzmq2 USE_GMAKE= yes USE_GITHUB= yes Modified: head/www/mongrel2/Makefile ============================================================================== --- head/www/mongrel2/Makefile Wed Dec 4 12:15:53 2013 (r335618) +++ head/www/mongrel2/Makefile Wed Dec 4 14:08:03 2013 (r335619) @@ -3,13 +3,14 @@ PORTNAME= mongrel2 PORTVERSION= 1.7.5 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://mongrel2.org/static/downloads/ MAINTAINER= vg@FreeBSD.org COMMENT= Is an application, language, and network arch -LIB_DEPENDS= zmq.1:${PORTSDIR}/devel/zmq \ +LIB_DEPENDS= zmq.1:${PORTSDIR}/net/libzmq2 \ sqlite3.8:${PORTSDIR}/databases/sqlite3 USE_GMAKE= yes
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312041408.rB4E84Gq042238>