[124066] trunk/dports/sysutils/gearmand

[ryandesign at macports.org]

Revision: 124066
          https://trac.macports.org/changeset/124066
Author:   ryandesign at macports.org
Date:     2014-08-17 20:29:47 -0700 (Sun, 17 Aug 2014)
Log Message:
-----------
gearmand: update to 1.1.12

Modified Paths:
--------------
    trunk/dports/sysutils/gearmand/Portfile

Added Paths:
-----------
    trunk/dports/sysutils/gearmand/files/patch-libgearman-client.cc.diff

Modified: trunk/dports/sysutils/gearmand/Portfile
===================================================================
--- trunk/dports/sysutils/gearmand/Portfile	2014-08-18 03:27:51 UTC (rev 124065)
+++ trunk/dports/sysutils/gearmand/Portfile	2014-08-18 03:29:47 UTC (rev 124066)
@@ -7,7 +7,7 @@
 PortGroup           muniversal 1.0
 
 name                gearmand
-version             1.1.11
+version             1.1.12
 set branch          1.2
 categories          sysutils net devel
 platforms           darwin
@@ -30,13 +30,14 @@
 homepage            http://gearman.org/
 master_sites        https://launchpad.net/gearmand/${branch}/${version}/+download/
 
-checksums           rmd160  f2832ba771d726e90446f56f20565a2588a5b178 \
-                    sha256  a175cbdeabe8102796418a516532adad58abd5e355365c78b6a234e544655825
+checksums           rmd160  a5be8f7d7f4ec3897f70b55c3f6acebe47af66fa \
+                    sha256  973d7a3523141a84c7b757c6f243febbc89a3631e919b532c056c814d8738acb
 
 depends_lib         port:boost \
                     port:libevent
 
 patchfiles-append   patch-libgearman-byteorder.cc.diff
+patchfiles-append   patch-libgearman-client.cc.diff
 
 configure.args      --disable-silent-rules \
                     --disable-libdrizzle \
@@ -70,11 +71,6 @@
 }
 
 platform darwin {
-    if {${os.major} >= 13} {
-        post-patch {
-            reinplace "s:tr1/::" ${worksrcpath}/libgearman-1.0/gearman.h
-        }
-    }
     if {${os.major} >= 14} {
         configure.cxxflags-append -DHAVE_HTONLL
     }

Added: trunk/dports/sysutils/gearmand/files/patch-libgearman-client.cc.diff
===================================================================
--- trunk/dports/sysutils/gearmand/files/patch-libgearman-client.cc.diff	                        (rev 0)
+++ trunk/dports/sysutils/gearmand/files/patch-libgearman-client.cc.diff	2014-08-18 03:29:47 UTC (rev 124066)
@@ -0,0 +1,30 @@
+https://bugs.launchpad.net/gearmand/+bug/1318151
+--- libgearman/client.cc.orig	2014-02-11 18:05:28.000000000 -0600
++++ libgearman/client.cc	2014-07-10 13:42:13.000000000 -0500
+@@ -599,7 +599,7 @@
+   {
+     Client* client= client_shell->impl();
+ 
+-    if (gearman_connection_create(client->universal, host, port) == false)
++    if (gearman_connection_create(client->universal, host, port) == NULL)
+     {
+       assert(client->error_code() != GEARMAN_SUCCESS);
+       return client->error_code();
+@@ -614,7 +614,7 @@
+ 
+ gearman_return_t Client::add_server(const char *host, const char* service_)
+ {
+-  if (gearman_connection_create(universal, host, service_) == false)
++  if (gearman_connection_create(universal, host, service_) == NULL)
+   {
+     assert(error_code() != GEARMAN_SUCCESS);
+     return error_code();
+@@ -946,7 +946,7 @@
+       *denominator= do_task->impl()->denominator;
+     }
+ 
+-    if (is_known == false and is_running == false)
++    if (! is_known and ! is_running)
+     {
+       if (do_task->impl()->options.is_running) 
+       {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140817/b211ec82/attachment.html>