Revision: 149416 https://trac.macports.org/changeset/149416 Author: michaelld@macports.org Date: 2016-06-18 10:29:21 -0700 (Sat, 18 Jun 2016) Log Message: ----------- zmq*: + update Portfile to use github PortGroup; + add devel at commit e8116b1f (20160617); + remove now-unnecessary patch. Modified Paths: -------------- trunk/dports/devel/zmq/Portfile Removed Paths: ------------- trunk/dports/devel/zmq/files/yosemite-libtool.patch Modified: trunk/dports/devel/zmq/Portfile =================================================================== --- trunk/dports/devel/zmq/Portfile 2016-06-18 17:21:37 UTC (rev 149415) +++ trunk/dports/devel/zmq/Portfile 2016-06-18 17:29:21 UTC (rev 149416) @@ -2,12 +2,9 @@ # $Id$ PortSystem 1.0 +PortGroup github 1.0 name zmq -version 4.1.5 -set major [lindex [split ${version} '.'] 0] -set minor [lindex [split ${version} '.'] 1] -revision 0 categories devel sysutils net platforms darwin license LGPL-3+ @@ -17,77 +14,77 @@ description 0MQ (ZeroMQ) lightweight messaging kernel long_description \ - The 0MQ lightweight messaging kernel is a library which extends the \ + The ${description} is a library which extends the \ standard socket interfaces with features traditionally provided by \ specialised messaging middleware products. 0MQ sockets provide an \ abstraction of asynchronous message queues, multiple messaging patterns, \ message filtering (subscriptions), seamless access to multiple transport \ protocols and more. -homepage http://www.zeromq.org/ -master_sites http://download.zeromq.org/ \ - https://github.com/zeromq/zeromq${major}-${minor}/releases/download/v${version}/ +if {${name} eq ${subport}} { + github.setup zeromq zeromq4-1 4.1.5 v + checksums \ + rmd160 952683a27697b8ccc9fca3d0766a2b6c76a837ae \ + sha256 226e7d31d3ef2df6b5da86c3ec6f97a379aac1200a8ebb2ce82d481d40cb64bc -distname zeromq-${version} + conflicts zmq-devel zmq22 zmq3 -checksums rmd160 32154414256dabda477cc7e298097819f6c4c6ac \ - sha256 04aac57f081ffa3a2ee5ed04887be9e205df3a7ddade0027460b8042432bdbcf + depends_lib-append port:libsodium -conflicts zmq-devel zmq22 zmq3 + # special livecheck, because zmq keeps different repos for new + # versions; check the homepage instead + homepage http://www.zeromq.org/ + livecheck.type regex + livecheck.url ${homepage}intro:get-the-software + livecheck.regex Current Stable Release (\[0-9.\]+) +} + # Legacy subport (no longer supported) subport zmq3 { - version 3.2.5 - revision 0 + github.setup zeromq zeromq3-x 3.2.5 v - distname zeromq-${version} + checksums rmd160 959e1403e4c8e36603711c9cf3bb5ff5cd5727aa \ + sha256 3ba8fbdee4845e26f25f3d1d43492bc182077338f4e857fa50a06e1b21bade7f - checksums rmd160 8f4633aff59b3cd8c2c8074ba92a6a9570e98fd4 \ - sha256 09653e56a466683edb2f87ee025c4de55b8740df69481b9d7da98748f0c92124 - conflicts zmq zmq-devel zmq22 } # Legacy subport (as a dependency for py5-zeromq) subport zmq22 { - version 2.2.0 + github.setup zeromq zeromq2-x 2.2.0 v revision 1 + checksums rmd160 5bf0cfe29e26348dc4c201764d099a8117c43735 \ + sha256 e021b62c6be211b5a1ac4b9e038068e0a8caaf81c22ee050183b25e991825e05 - distname zeromq-${version} - - checksums rmd160 63c6ca84c292a72ffb0e18f1a97a6fa744a6be7c \ - sha256 43904aeb9ea6844f72ca02e4e53bf1d481a1a0264e64979da761464e88604637 - conflicts zmq zmq-devel zmq3 - - patchfiles-append yosemite-libtool.patch } -# Transition from zmq-devel to zmq (since 14 Aug 2015) subport zmq-devel { - replaced_by zmq + github.setup zeromq zeromq4-1 e8116b1f1ce90bb98d327833548b364c24b80365 + checksums rmd160 734b6170015be9c69e39bc2d0228395f683096c6 \ + sha256 09382b2a5e3d786f2fbe925cc982bb5914770ae663cc7b7efbd9d128f7ed4533 - PortGroup obsolete 1.0 + depends_lib-append port:libsodium conflicts zmq zmq22 zmq3 } -if {${subport} eq ${name}} { - depends_lib-append port:libsodium -} +# override github information -distname zeromq-${version} -worksrcdir zeromq-[strsed ${version} {g/[^0-9.].*$//}] +homepage http://www.zeromq.org/ +# common directory for storing downloaded tarballs + +dist_subdir zmq + +# use autoconf + +use_autoconf yes +autoconf.cmd ./autogen.sh + # macports libtool allows linking against libc++, # the libtool in the distribution does not + depends_build port:libtool port:pkgconfig build.args LIBTOOL=${prefix}/bin/glibtool - -if {${subport} eq ${name}} { - livecheck.type regex - livecheck.url ${homepage}area:download - livecheck.regex zeromq-(\[0-9.\]+)${extract.suffix} -} else { - livecheck.type none -} Deleted: trunk/dports/devel/zmq/files/yosemite-libtool.patch =================================================================== --- trunk/dports/devel/zmq/files/yosemite-libtool.patch 2016-06-18 17:21:37 UTC (rev 149415) +++ trunk/dports/devel/zmq/files/yosemite-libtool.patch 2016-06-18 17:29:21 UTC (rev 149416) @@ -1,15 +0,0 @@ -Don't accidentally create flat-namespace dylibs on Yosemite (#44596). - -Index: configure -=================================================================== ---- configure.orig -+++ configure -@@ -10879,7 +10879,7 @@ $as_echo "$lt_cv_ld_force_load" >&6; } - case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in - 10.0,*86*-darwin8*|10.0,*-darwin[91]*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; -- 10.[012]*) -+ 10.[012][,.]*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; - 10.*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;