[106263] trunk/dports/devel/zmq

[cal at macports.org]

Revision: 106263
          https://trac.macports.org/changeset/106263
Author:   cal at macports.org
Date:     2013-05-20 16:02:10 -0700 (Mon, 20 May 2013)
Log Message:
-----------
zmq: Fix a problem where strndup was missing on < lion, closes #39122, maintainer

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

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

Modified: trunk/dports/devel/zmq/Portfile
===================================================================
--- trunk/dports/devel/zmq/Portfile	2013-05-20 20:55:10 UTC (rev 106262)
+++ trunk/dports/devel/zmq/Portfile	2013-05-20 23:02:10 UTC (rev 106263)
@@ -37,6 +37,11 @@
 depends_build       port:libtool
 build.args          LIBTOOL=${prefix}/bin/glibtool
 
+# Work-around from upstream, delete debug prints in tests
+if {[vercmp ${os.version} 10.9.0] < 0} {
+    patchfiles          patch-tests-test_disconnect_inproc.cpp.diff
+}
+
 variant pgm description {build with PGM extension} {
     configure.args-append   --with-pgm
 }

Added: trunk/dports/devel/zmq/files/patch-tests-test_disconnect_inproc.cpp.diff
===================================================================
--- trunk/dports/devel/zmq/files/patch-tests-test_disconnect_inproc.cpp.diff	                        (rev 0)
+++ trunk/dports/devel/zmq/files/patch-tests-test_disconnect_inproc.cpp.diff	2013-05-20 23:02:10 UTC (rev 106263)
@@ -0,0 +1,31 @@
+--- tests/test_disconnect_inproc.cpp	2013-05-02 03:18:44.000000000 -0600
++++ tests/test_disconnect_inproc.cpp	2013-05-18 10:45:13.000000000 -0600
+@@ -40,16 +40,14 @@
+                 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,11 +64,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);
+         
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130520/57f1f93b/attachment.html>