<pre style='margin:0'>
David B. Evans (dbevans) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/84ded3db35034c5d03c1da3274f687accdc55c9d">https://github.com/macports/macports-ports/commit/84ded3db35034c5d03c1da3274f687accdc55c9d</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 84ded3db35034c5d03c1da3274f687accdc55c9d
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Tue Nov 21 15:02:54 2017 -0800
<span style='display:block; white-space:pre;color:#404040;'> gearmand: update to version 1.1.17, dependencies, configuration
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * enable ssl support using openssl
</span><span style='display:block; white-space:pre;color:#404040;'> * disable optional dependencies to avoid opportunistic configuration
</span><span style='display:block; white-space:pre;color:#404040;'> * fix destroot
</span><span style='display:block; white-space:pre;color:#404040;'> * other minor cleanups
</span>---
sysutils/gearmand/Portfile | 25 ++++++++++--------
.../gearmand/files/patch-libgearman-client.cc.diff | 30 ----------------------
2 files changed, 15 insertions(+), 40 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/gearmand/Portfile b/sysutils/gearmand/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 896e4d4..5a17661 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/gearmand/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/gearmand/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,12 +1,11 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# configure: error: unable to determine endian
</span> PortGroup muniversal 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup gearman gearmand 1.1.14
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup gearman gearmand 1.1.17
</span> categories sysutils net devel
maintainers nomaintainer
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,25 +24,31 @@ long_description \
</span> homepage http://gearman.org/
github.tarball_from releases
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 38b27b1e81bc9fa5ef18c1e41db8f15b6ca8eb6f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 6e01b72cdf386149f689cccd934e79c55851549845f0128683a726ffb3200cd0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 fc80aa1079d01edc2a8893624e45f3925af5eb88 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 f9fa59d60c0ad03b449942c6fe24abe09456056852fae89a05052fa25c113c0f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build port:pkgconfig
</span>
depends_lib port:boost \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libevent
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:curl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libevent \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/libssl.dylib:openssl
</span>
patchfiles-append patch-libgearman-byteorder.cc.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-libgearman-client.cc.diff
</span>
if {${configure.cxx_stdlib} eq "libstdc++"} {
patchfiles-append patch-libgearman-1.0-gearman.h.diff
}
configure.args --disable-silent-rules \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-hiredis \
</span> --disable-libdrizzle \
--disable-libpq \
--disable-libmemcached \
--disable-libtokyocabinet \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-wolfssl \
</span> --enable-jobserver=${build.jobs} \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-ssl \
</span> --without-mysql \
--without-sqlite3
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -58,7 +63,7 @@ post-destroot {
</span> COPYING \
ChangeLog \
HACKING \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- README \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NEWS \
</span> THANKS \
${destroot}${docdir}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -77,8 +82,6 @@ variant sqlite description {Build with sqlite3 support} {
</span> depends_lib-append port:sqlite3
configure.args-delete --without-sqlite3
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default_variants +sqlite
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> variant drizzle description {Build with libdrizzle support} {
depends_lib-append port:libdrizzle
configure.args-replace --disable-libdrizzle --enable-libdrizzle
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -99,6 +102,8 @@ variant tokyocabinet description {Build with tokyocabinet support} {
</span> configure.args-replace --disable-libtokyocabinet --enable-libtokyocabinet
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+default_variants +sqlite
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> startupitem.create yes
startupitem.executable ${prefix}/sbin/gearmand \
--verbose=WARNING \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/gearmand/files/patch-libgearman-client.cc.diff b/sysutils/gearmand/files/patch-libgearman-client.cc.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index ced7506..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/gearmand/files/patch-libgearman-client.cc.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,30 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://bugs.launchpad.net/gearmand/+bug/1318151
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- libgearman/client.cc.orig 2014-02-11 18:05:28.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libgearman/client.cc 2014-07-10 13:42:13.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -599,7 +599,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Client* client= client_shell->impl();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (gearman_connection_create(client->universal, host, port) == false)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (gearman_connection_create(client->universal, host, port) == NULL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- assert(client->error_code() != GEARMAN_SUCCESS);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return client->error_code();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -614,7 +614,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gearman_return_t Client::add_server(const char *host, const char* service_)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (gearman_connection_create(universal, host, service_) == false)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (gearman_connection_create(universal, host, service_) == NULL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- assert(error_code() != GEARMAN_SUCCESS);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return error_code();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -946,7 +946,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *denominator= do_task->impl()->denominator;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (is_known == false and is_running == false)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (! is_known and ! is_running)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (do_task->impl()->options.is_running)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span></pre><pre style='margin:0'>
</pre>