<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/96effd5dd254acb85cf250f37f8833e2dd894e71">https://github.com/macports/macports-ports/commit/96effd5dd254acb85cf250f37f8833e2dd894e71</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 96effd5 libmemcached: Update to 1.0.18
</span>96effd5 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 96effd5dd254acb85cf250f37f8833e2dd894e71
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Fri Dec 8 13:23:25 2017 -0600
<span style='display:block; white-space:pre;color:#404040;'> libmemcached: Update to 1.0.18
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Add patches to fix build failures observed on Sierra. Remove older
</span><span style='display:block; white-space:pre;color:#404040;'> patch that appears no longer to be needed.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Remove pod2man dependency; doesn't appear to be used anymore. The
</span><span style='display:block; white-space:pre;color:#404040;'> configure script still checks for perl, but the build system doesn't
</span><span style='display:block; white-space:pre;color:#404040;'> appear to use it.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Add umem build dependency; its umem.h header is included if present.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Explicitly disable gearmand and MySQL autodetection.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Remove dtrace variant; it does not compile because the build system
</span><span style='display:block; white-space:pre;color:#404040;'> supplies dtrace with arguments it does not understand.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Remove libc++ workaround that's no longer needed.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Comment out Tiger and Leopard fixes that may no longer be needed, or
</span><span style='display:block; white-space:pre;color:#404040;'> if still needed should maybe be fixed another way.
</span>---
devel/libmemcached/Portfile | 75 +++++++++++--------------
devel/libmemcached/files/htonll.patch | 14 +++++
devel/libmemcached/files/memflush.patch | 22 ++++++++
devel/libmemcached/files/patch-Makefile.in.diff | 11 ----
4 files changed, 70 insertions(+), 52 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libmemcached/Portfile b/devel/libmemcached/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9936083..6d20e54 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libmemcached/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libmemcached/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +1,15 @@
</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:#ffe0e0;'>-PortGroup conflicts_build 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# configure: error: unable to determine endian
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup muniversal 1.0
</span>
name libmemcached
if {[file exists ${prefix}/bin/MemParse]} {
conflicts-append xercesc3
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.0.10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.0.18
</span> set branch [join [lrange [split ${version} .] 0 1] .]
revision 0
categories devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,52 +26,43 @@ long_description libmemcached is a C and C++ client library for memcached. \
</span> homepage http://libmemcached.org/
master_sites http://launchpad.net/${name}/${branch}/${version}/+download/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 483402a449762ce68633582696d32c1e2ef0aea5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 0bbb5e310b3d175dfbde99a463ba4474aa22b4ad88ffea2afe76c868d6e1290b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-Makefile.in.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 647ea760191755da4832f1a4c78847a330e5b515 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 e22c0bb032fde08f53de9ffbc5a128233041d9f33b5de022c0978a2149885f82 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1039649
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build bin:pod2man:perl5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:cyrus-sasl2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Uses umem.h if present.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:umem
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:memcached
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:cyrus-sasl2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:memcached
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Although "./configure --help" says umem support is off by default, and although we
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# specify "--disable-umem", configure nevertheless looks for and finds umem if installed,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# and then fails to build.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts_build umem
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append htonll.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append memflush.patch
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --disable-silent-rules \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-umem \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-dtrace \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-hsieh_hash
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args --disable-dtrace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-hsieh_hash \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-jobserver \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-silent-rules \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-memcached=${prefix}/bin/memcached \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-gearmand \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-mysql
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant dtrace description {enable dtrace probes } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --enable-dtrace
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant hsieh description {Include support for hsieh hashing} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-hsieh_hash --enable-hsieh_hash
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant hsieh description {include support for hsieh hashing } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --enable-hsieh_hash
</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;'>-platform darwin 8 {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append no_memslap.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.compiler macports-gcc-4.6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- universal_variant no
</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;'>-platform darwin 9 {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.compiler macports-gcc-4.6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- universal_variant no
</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;'>-platform darwin {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} >= 13} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s:tr1/::" ${worksrcpath}/libmemcached-1.0/memcached.h
</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;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# platform darwin 8 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# patchfiles-append no_memslap.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# configure.compiler macports-gcc-4.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# universal_variant no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# platform darwin 9 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# configure.compiler macports-gcc-4.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# universal_variant no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# }
</span>
livecheck.type regex
livecheck.url https://launchpad.net/libmemcached/+download
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libmemcached/files/htonll.patch b/devel/libmemcached/files/htonll.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..70008fc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libmemcached/files/htonll.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+libmemcached/byteorder.cc:66:10: error: use of undeclared identifier 'ntohll'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+libmemcached/byteorder.cc:75:10: error: use of undeclared identifier 'htonll'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libmemcached/byteorder.cc.orig 2014-02-09 05:52:42.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libmemcached/byteorder.cc 2017-12-08 11:49:13.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -35,6 +35,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <sys/types.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <netinet/in.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <inttypes.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "mem_config.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "libmemcached/byteorder.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libmemcached/files/memflush.patch b/devel/libmemcached/files/memflush.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..6868422
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libmemcached/files/memflush.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,22 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+clients/memflush.cc:42:19: error: comparison between pointer and integer ('char *' and 'int')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+clients/memflush.cc:51:21: error: comparison between pointer and integer ('char *' and 'int')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- clients/memflush.cc.orig 2014-02-09 05:52:42.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ clients/memflush.cc 2017-12-08 11:56:34.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -39,7 +39,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ options_parse(argc, argv);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (opt_servers == false)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (opt_servers == NULL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char *temp;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -48,7 +48,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ opt_servers= strdup(temp);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (opt_servers == false)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (opt_servers == NULL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ std::cerr << "No Servers provided" << std::endl;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ exit(EXIT_FAILURE);
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libmemcached/files/patch-Makefile.in.diff b/devel/libmemcached/files/patch-Makefile.in.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 66670e7..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libmemcached/files/patch-Makefile.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile.in.orig 2012-08-08 15:01:42.000000000 +0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile.in 2012-08-08 15:02:13.000000000 +0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -868,7 +868,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @BUILD_MEMASLAP_TRUE@@BUILD_WIN32_WRAPPERS_FALSE@@HAVE_LIBEVENT_TRUE@am__EXEEXT_1 = clients/memaslap$(EXEEXT)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @HAVE_LIBEVENT_TRUE@am__EXEEXT_2 = example/memcached_light$(EXEEXT)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @HAVE_LIBEVENT_TRUE@am__EXEEXT_3 = memcached/memcached$(EXEEXT)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+PROGRAMS = $(bin_PROGRAMS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- am_clients_memaslap_OBJECTS = clients/memaslap.$(OBJEXT) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- clients/ms_conn.$(OBJEXT) clients/ms_setting.$(OBJEXT) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- clients/ms_sigsegv.$(OBJEXT) clients/ms_stats.$(OBJEXT) \
</span></pre><pre style='margin:0'>
</pre>