[111617] trunk/dports/devel

[stromnov at macports.org]

Revision: 111617
          https://trac.macports.org/changeset/111617
Author:   stromnov at macports.org
Date:     2013-09-27 06:53:00 -0700 (Fri, 27 Sep 2013)
Log Message:
-----------
zmq-devel: new port (based on zmq)

Modified Paths:
--------------
    trunk/dports/devel/zmq-devel/Portfile

Added Paths:
-----------
    trunk/dports/devel/zmq-devel/
    trunk/dports/devel/zmq-devel/files/patch-tools-curve_keygen.c.diff

Removed Paths:
-------------
    trunk/dports/devel/zmq-devel/files/patch-tests-test_disconnect_inproc.cpp.diff

Modified: trunk/dports/devel/zmq-devel/Portfile
===================================================================
--- trunk/dports/devel/zmq/Portfile	2013-09-24 09:02:02 UTC (rev 111517)
+++ trunk/dports/devel/zmq-devel/Portfile	2013-09-27 13:53:00 UTC (rev 111617)
@@ -3,13 +3,15 @@
 
 PortSystem          1.0
 
-name                zmq
-version             3.2.3
+name                zmq-devel
+version             4.0.0-rc1
+revision            0
 categories          devel net
-license             LGPL-3+
 platforms           darwin
-maintainers         inconsistent.nl:merijn
+license             LGPL-3+
 
+maintainers         stromnov openmaintainer
+
 description         ØMQ (ZeroMQ) lightweight messaging kernel
 
 long_description    The ØMQ lightweight messaging kernel is a library which \
@@ -26,21 +28,16 @@
 distname            zeromq-${version}
 worksrcdir          zeromq-[strsed ${version} {g/[^0-9.].*$//}]
 
-checksums           rmd160  b31bccf91f639b67dad56ef1265db73467780515 \
-                    sha256  e134c1aaf829dd77bca9dc0fa199ba31095a581bd0d3dda5fc59523b9f401238
+checksums           rmd160  2cd184ec2facdd785bd2166910bca36b375ab820 \
+                    sha256  e5c3b6054150f832fee986f98e1c2ccdcf329a2c785e09a3a882e155e840d258
 
-conflicts           zmq20 zmq22
+conflicts           zmq zmq20 zmq22
 
 universal_variant   yes
 
-# macports libtool allows linking against libc++, the libtool in the distribution does not
-depends_build       port:libtool
-build.args          LIBTOOL=${prefix}/bin/glibtool
+patchfiles-append   patch-tools-curve_keygen.c.diff
 
-# Work-around from upstream, delete debug prints in tests
-if {${os.platform} == "darwin" && ${os.major} < 11} {
-    patchfiles          patch-tests-test_disconnect_inproc.cpp.diff
-}
+depends_lib-append  port:libsodium
 
 variant pgm description {build with PGM extension} {
     configure.args-append   --with-pgm
@@ -48,4 +45,4 @@
 
 livecheck.type      regex
 livecheck.url       ${homepage}area:download
-livecheck.regex     zeromq-(\[0-9.\]+)${extract.suffix}
+livecheck.regex     {zeromq-([0-9.]+(?:-rc[0-9])?)\.[tz]}

Deleted: trunk/dports/devel/zmq-devel/files/patch-tests-test_disconnect_inproc.cpp.diff
===================================================================
--- trunk/dports/devel/zmq/files/patch-tests-test_disconnect_inproc.cpp.diff	2013-09-24 09:02:02 UTC (rev 111517)
+++ trunk/dports/devel/zmq-devel/files/patch-tests-test_disconnect_inproc.cpp.diff	2013-09-27 13:53:00 UTC (rev 111617)
@@ -1,30 +0,0 @@
---- tests/test_disconnect_inproc.cpp.orig	2013-05-21 04:01:14.000000000 +0200
-+++ tests/test_disconnect_inproc.cpp	2013-05-21 04:02:24.000000000 +0200
-@@ -40,16 +40,13 @@
-                 zmq_msg_t msg;
-                 zmq_msg_init (&msg);
-                 zmq_msg_recv (&msg, pubSocket, 0);
--                int msgSize = zmq_msg_size(&msg);
-                 char* buffer = (char*)zmq_msg_data(&msg);
- 
-                 if (buffer[0] == 0) {
-                     assert(isSubscribed);
--                    printf("unsubscribing from '%s'\n", strndup(buffer + 1, msgSize - 1));
-                     isSubscribed = false;
-                 } else {
-                     assert(!isSubscribed);
--                    printf("subscribing on '%s'\n", strndup(buffer + 1, msgSize - 1));
-                     isSubscribed = true;
-                 }
- 
-@@ -66,10 +63,6 @@
-                 zmq_msg_t msg;
-                 zmq_msg_init (&msg);
-                 zmq_msg_recv (&msg, subSocket, 0);
--                int msgSize = zmq_msg_size(&msg);
--                char* buffer = (char*)zmq_msg_data(&msg);
--        
--                printf("received on subscriber '%s'\n", strndup(buffer, msgSize));
-         
-                 zmq_getsockopt (subSocket, ZMQ_RCVMORE, &more, &more_size);
-                 zmq_msg_close (&msg);

Added: trunk/dports/devel/zmq-devel/files/patch-tools-curve_keygen.c.diff
===================================================================
--- trunk/dports/devel/zmq-devel/files/patch-tools-curve_keygen.c.diff	                        (rev 0)
+++ trunk/dports/devel/zmq-devel/files/patch-tools-curve_keygen.c.diff	2013-09-27 13:53:00 UTC (rev 111617)
@@ -0,0 +1,12 @@
+--- tools/curve_keygen.c.orig	2013-09-20 11:29:29.000000000 +0400
++++ tools/curve_keygen.c	2013-09-27 17:02:18.000000000 +0400
+@@ -24,6 +24,9 @@
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+ 
++#include <assert.h>
++#include "../src/platform.hpp"
++
+ #include <zmq_utils.h>
+ #ifdef HAVE_LIBSODIUM
+ #   include <sodium.h>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130927/d04d8c8a/attachment.html>