Date: Thu, 11 Dec 2014 05:26:39 +0000 (UTC) From: Kubilay Kocak <koobs@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374511 - in head: databases/libmemcached databases/libmemcached/files databases/p5-Cache-Memcached-libmemcached databases/pecl-memcached databases/pgpool-II-33 databases/py-pylibmc dat... Message-ID: <201412110526.sBB5QdiN072713@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: koobs Date: Thu Dec 11 05:26:39 2014 New Revision: 374511 URL: https://svnweb.freebsd.org/changeset/ports/374511 QAT: https://qat.redports.org/buildarchive/r374511/ Log: databases/libmemcached: Update to 1.0.18 and much more - Update to 1.0.18 and pkg-plist accordingly - Add LICENSE (BSD3CLAUSE) and LICENSE_FILE - Add TEST_DEPENDS and regression-test target - Perl is not required, remove USE_PERL and from USES - Split LDFLAGS from CONFIGURE_ENV, they're already set there - Add libmemcachedprotocol to CONFIGURE_ARGS (Now default: off) - Add OPTIONS for hash functions, debug and dtrace - pkg-descr: Update WWW: URL - Add patches for: * alloca.h include not found on FreeBSD * cinttypes include location * clang compatibility - Strip shared libraries manually since upstream install-strip target is fail Changes: https://launchpad.net/libmemcached/+announcements [1] https://bugs.launchpad.net/libmemcached/+bug/1245562 [2] https://bugs.launchpad.net/libmemcached/+bug/1400560 Approved by: Mikhail Tsatsenko <m.tsatsenko@gmail.com> (maintainer, via email) Added: head/databases/libmemcached/files/patch-bug1245562 (contents, props changed) head/databases/libmemcached/files/patch-bug1400560 (contents, props changed) head/databases/libmemcached/files/patch-libmemcached_assert.hpp (contents, props changed) head/databases/libmemcached/files/patch-libtest_lite.h (contents, props changed) Modified: head/databases/libmemcached/Makefile head/databases/libmemcached/distinfo head/databases/libmemcached/pkg-descr head/databases/libmemcached/pkg-plist head/databases/p5-Cache-Memcached-libmemcached/Makefile head/databases/pecl-memcached/Makefile head/databases/pgpool-II-33/Makefile head/databases/py-pylibmc/Makefile head/databases/rubygem-memcache/Makefile head/devel/gearmand-devel/Makefile head/devel/gearmand/Makefile head/devel/pecl-memoize/Makefile head/devel/php-memoize/Makefile head/ftp/proftpd/Makefile head/mail/opendkim/Makefile head/net-mgmt/collectd/Makefile head/net-mgmt/collectd5/Makefile head/net-mgmt/nagios-check_memcached_paranoid/Makefile head/net/yaz/Makefile head/security/razorback-dispatcher/Makefile head/www/mod_memcache_block/Makefile Modified: head/databases/libmemcached/Makefile ============================================================================== --- head/databases/libmemcached/Makefile Thu Dec 11 05:23:34 2014 (r374510) +++ head/databases/libmemcached/Makefile Thu Dec 11 05:26:39 2014 (r374511) @@ -1,31 +1,60 @@ # $FreeBSD$ PORTNAME= libmemcached -PORTVERSION= 1.0.7 -PORTREVISION= 4 +PORTVERSION= 1.0.18 CATEGORIES= databases MASTER_SITES= http://launchpad.net/${PORTNAME}/1.0/${PORTVERSION}/+download/ MAINTAINER= m.tsatsenko@gmail.com COMMENT= C and C++ client library to the memcached server +LICENSE= BSD3CLAUSE +LICENSE_FILE= ${WRKSRC}/COPYING + LIB_DEPENDS?= libevent.so:${PORTSDIR}/devel/libevent2 +TEST_DEPENDS= memcached:${PORTSDIR}/databases/memcached -USES= execinfo gmake pathfix pkgconfig perl5 libtool -USE_PERL5= build +USES= autoreconf execinfo gmake pathfix pkgconfig libtool USE_LDCONFIG= yes + GNU_CONFIGURE= yes -CONFIGURE_ARGS= --without-memcached -CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib -lexecinfo" +CONFIGURE_ARGS= --without-memcached \ + --enable-libmemcachedprotocol + +LDFLAGS+= -L${LOCALBASE}/lib -lexecinfo CXXFLAGS+= -D__STDC_CONSTANT_MACROS -OPTIONS_DEFINE= SASL +OPTIONS_DEFINE= DEBUG DTRACE MEMASLAP SASL +OPTIONS_DEFAULT= MEMASLAP SASL MURMUR FNV64 +OPTIONS_GROUP= HASH +OPTIONS_GROUP_HASH= FNV64 HSIEH MURMUR + +DTRACE_DESC= Enable DTrace support +MEMASLAP_DESC= Load generation and benchmark tool +FNV64_DESC= Enable fnv64 hashing +HSIEH_DESC= Enable hsieh hashing +MURMUR_DESC= Enable murmur hashing + +DEBUG_CONFIGURE_ENABLE= debug +DTRACE_CONFIGURE_ENABLE= dtrace +MEMASLAP_CONFIGURE_ENABLE= memaslap +FNV64_CONFIGURE_ENABLE= fnv64_hash +HSIEH_CONFIGURE_ENABLE= hsieh_hash +MURMUR_CONFIGURE_ENABLE= murmur_hash +SASL_CONFIGURE_ENABLE= sasl SASL_LIB_DEPENDS= libsasl2.so:${PORTSDIR}/security/cyrus-sasl2 +PATHFIX_MAKEFILEIN= include.am + post-patch: - @${REINPLACE_CMD} -e 's|^pkgconfigdir.*|pkgconfigdir = $${PREFIX}/libdata/pkgconfig|' \ - -e '/^LDFLAGS *=/ s/$$/ $${LTLIBSASL2}/' \ - ${WRKSRC}/Makefile.in ${WRKSRC}/support/include.am + @${REINPLACE_CMD} -e '/^LDFLAGS *=/ s/$$/ $${LTLIBSASL2}/' \ + ${WRKSRC}/Makefile.in + +post-install: + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so.* + +regression-test: build + @cd ${WRKSRC} && ${GMAKE} check .include <bsd.port.mk> Modified: head/databases/libmemcached/distinfo ============================================================================== --- head/databases/libmemcached/distinfo Thu Dec 11 05:23:34 2014 (r374510) +++ head/databases/libmemcached/distinfo Thu Dec 11 05:26:39 2014 (r374511) @@ -1,2 +1,2 @@ -SHA256 (libmemcached-1.0.7.tar.gz) = 3efa86c9733eaad55d7119cb16769424e2aa6c22b3392e8f973946fce6678d81 -SIZE (libmemcached-1.0.7.tar.gz) = 1077060 +SHA256 (libmemcached-1.0.18.tar.gz) = e22c0bb032fde08f53de9ffbc5a128233041d9f33b5de022c0978a2149885f82 +SIZE (libmemcached-1.0.18.tar.gz) = 1039649 Added: head/databases/libmemcached/files/patch-bug1245562 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/libmemcached/files/patch-bug1245562 Thu Dec 11 05:26:39 2014 (r374511) @@ -0,0 +1,38 @@ +diff --git a/clients/memflush.cc b/clients/memflush.cc +index 8bd0dbf..cdba743 100644 +--- clients/memflush.cc ++++ clients/memflush.cc +@@ -39,7 +39,7 @@ int main(int argc, char *argv[]) + { + options_parse(argc, argv); + +- if (opt_servers == false) ++ if (opt_servers == NULL) + { + char *temp; + +@@ -48,7 +48,7 @@ int main(int argc, char *argv[]) + opt_servers= strdup(temp); + } + +- if (opt_servers == false) ++ if (opt_servers == NULL) + { + std::cerr << "No Servers provided" << std::endl; + exit(EXIT_FAILURE); +diff --git a/libmemcached-1.0/memcached.h b/libmemcached-1.0/memcached.h +index bc16e73..dcee395 100644 +--- libmemcached-1.0/memcached.h ++++ libmemcached-1.0/memcached.h +@@ -43,7 +43,11 @@ + #endif + + #ifdef __cplusplus ++#ifdef _LIBCPP_VERSION + # include <cinttypes> ++#else ++# include <tr1/cinttypes> ++#endif + # include <cstddef> + # include <cstdlib> + #else Added: head/databases/libmemcached/files/patch-bug1400560 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/libmemcached/files/patch-bug1400560 Thu Dec 11 05:26:39 2014 (r374511) @@ -0,0 +1,29 @@ +Fixed a bug that caused configure to disobey the enable/disable debug flag. The debug flag will default to disabled if not specified. +diff -ru libmemcached-1.0.18-orig/m4/ax_debug.m4 libmemcached-1.0.18/m4/ax_debug.m4 +--- m4/ax_debug.m4 2014-11-05 14:43:53.720284916 -0600 ++++ m4/ax_debug.m4 2014-11-19 14:23:19.512482198 -0600 +@@ -49,16 +49,18 @@ + [AC_PREREQ([2.63])dnl + AC_ARG_ENABLE([debug], + [AS_HELP_STRING([--enable-debug], +- [Add debug code/turns off optimizations (yes|no) @<:@default=no@:>@])], +- [ax_enable_debug=yes ++ [Add debug code/turns off optimizations (yes|no) @<:@default=no@:>@])]) ++ AS_IF([test "x$enable_debug" = "xyes"], [ ++ ax_enable_debug=yes + AC_DEFINE([DEBUG],[1],[Define to 1 to enable debugging code.]) + AX_CHECK_LIBRARY([MCHECK],[mcheck.h],[mcheck],[AX_APPEND_LINK_FLAGS([-lmcheck])]) + AX_ADD_AM_MACRO([--debug],[AM_YFLAGS]) +- AX_ADD_AM_MACRO([-D_GLIBCXX_DEBUG],[AM_CPPFLAGS])], +- [ax_enable_debug=no ++ AX_ADD_AM_MACRO([-D_GLIBCXX_DEBUG],[AM_CPPFLAGS]) ++ ], [ ++ ax_enable_debug=no + AC_SUBST([MCHECK]) +- AC_DEFINE([DEBUG],[0],[Define to 1 to enable debugging code.])]) +- ++ AC_DEFINE([DEBUG],[0],[Define to 1 to enable debugging code.]) ++ ]) + AC_MSG_CHECKING([for debug]) + AC_MSG_RESULT([$ax_enable_debug]) + AM_CONDITIONAL([DEBUG],[test "x${ax_enable_debug}" = "xyes"])]) Added: head/databases/libmemcached/files/patch-libmemcached_assert.hpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/libmemcached/files/patch-libmemcached_assert.hpp Thu Dec 11 05:26:39 2014 (r374511) @@ -0,0 +1,13 @@ +--- libmemcached/assert.hpp.orig 2014-12-10 05:16:11 UTC ++++ libmemcached/assert.hpp +@@ -51,8 +51,10 @@ + # ifdef _WIN32 + # include <malloc.h> + # else ++#ifdef HAVE_ALLOCA_H + # include <alloca.h> + # endif ++# endif + + #ifdef __cplusplus + # include <cstdarg> Added: head/databases/libmemcached/files/patch-libtest_lite.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/libmemcached/files/patch-libtest_lite.h Thu Dec 11 05:26:39 2014 (r374511) @@ -0,0 +1,13 @@ +--- libtest/lite.h.orig 2014-12-09 03:34:21 UTC ++++ libtest/lite.h +@@ -54,8 +54,10 @@ + #if defined(WIN32) + # include <malloc.h> + #else ++#ifdef HAVE_ALLOCA_H + # include <alloca.h> + #endif ++#endif + + #ifndef __PRETTY_FUNCTION__ + # define __PRETTY_FUNCTION__ __func__ Modified: head/databases/libmemcached/pkg-descr ============================================================================== --- head/databases/libmemcached/pkg-descr Thu Dec 11 05:23:34 2014 (r374510) +++ head/databases/libmemcached/pkg-descr Thu Dec 11 05:26:39 2014 (r374511) @@ -20,4 +20,4 @@ memcp - Copy files to a memached server. memstat - Dump the stats of your servers to standard output memslap - Generate testing loads on a memcached cluster -WWW: http://tangent.org/552/libmemcached.html +WWW: http://libmemcached.org Modified: head/databases/libmemcached/pkg-plist ============================================================================== --- head/databases/libmemcached/pkg-plist Thu Dec 11 05:23:34 2014 (r374510) +++ head/databases/libmemcached/pkg-plist Thu Dec 11 05:26:39 2014 (r374511) @@ -103,8 +103,8 @@ lib/libhashkit.so.2 lib/libhashkit.so.2.0.0 lib/libmemcached.a lib/libmemcached.so -lib/libmemcached.so.10 -lib/libmemcached.so.10.0.0 +lib/libmemcached.so.11 +lib/libmemcached.so.11.0.0 lib/libmemcachedprotocol.a lib/libmemcachedprotocol.so lib/libmemcachedprotocol.so.0 @@ -120,10 +120,14 @@ man/man1/memcat.1.gz man/man1/memcp.1.gz man/man1/memdump.1.gz man/man1/memerror.1.gz +man/man1/memexist.1.gz man/man1/memflush.1.gz +man/man1/memparse.1.gz +man/man1/memping.1.gz man/man1/memrm.1.gz man/man1/memslap.1.gz man/man1/memstat.1.gz +man/man1/memtouch.1.gz man/man3/hashkit_clone.3.gz man/man3/hashkit_crc32.3.gz man/man3/hashkit_create.3.gz @@ -227,3 +231,4 @@ man/man3/memcached_touch.3.gz man/man3/memcached_touch_by_key.3.gz man/man3/memcached_verbosity.3.gz man/man3/memcached_version.3.gz +share/aclocal/ax_libmemcached.m4 Modified: head/databases/p5-Cache-Memcached-libmemcached/Makefile ============================================================================== --- head/databases/p5-Cache-Memcached-libmemcached/Makefile Thu Dec 11 05:23:34 2014 (r374510) +++ head/databases/p5-Cache-Memcached-libmemcached/Makefile Thu Dec 11 05:26:39 2014 (r374511) @@ -3,7 +3,7 @@ PORTNAME= Cache-Memcached-libmemcached PORTVERSION= 0.02011 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases MASTER_SITES= CPAN MASTER_SITE_SUBDIR= CPAN:DMAKI Modified: head/databases/pecl-memcached/Makefile ============================================================================== --- head/databases/pecl-memcached/Makefile Thu Dec 11 05:23:34 2014 (r374510) +++ head/databases/pecl-memcached/Makefile Thu Dec 11 05:26:39 2014 (r374511) @@ -3,7 +3,7 @@ PORTNAME= memcached PORTVERSION= 2.2.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= databases MASTER_SITES= http://pecl.php.net/get/ PKGNAMEPREFIX= pecl- Modified: head/databases/pgpool-II-33/Makefile ============================================================================== --- head/databases/pgpool-II-33/Makefile Thu Dec 11 05:23:34 2014 (r374510) +++ head/databases/pgpool-II-33/Makefile Thu Dec 11 05:26:39 2014 (r374511) @@ -2,6 +2,7 @@ PORTNAME= pgpool-II PORTVERSION= 3.3.3 +PORTREVISION= 1 CATEGORIES= databases MASTER_SITES= http://www.pgpool.net/mediawiki/images/ \ LOCAL/matthew/${PORTNAME} Modified: head/databases/py-pylibmc/Makefile ============================================================================== --- head/databases/py-pylibmc/Makefile Thu Dec 11 05:23:34 2014 (r374510) +++ head/databases/py-pylibmc/Makefile Thu Dec 11 05:26:39 2014 (r374511) @@ -3,6 +3,7 @@ PORTNAME= pylibmc PORTVERSION= 1.4.1 +PORTREVISION= 1 CATEGORIES= databases python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} Modified: head/databases/rubygem-memcache/Makefile ============================================================================== --- head/databases/rubygem-memcache/Makefile Thu Dec 11 05:23:34 2014 (r374510) +++ head/databases/rubygem-memcache/Makefile Thu Dec 11 05:26:39 2014 (r374511) @@ -3,6 +3,7 @@ PORTNAME= memcache PORTVERSION= 1.5.1 +PORTREVISION= 1 CATEGORIES= databases rubygems MASTER_SITES= RG Modified: head/devel/gearmand-devel/Makefile ============================================================================== --- head/devel/gearmand-devel/Makefile Thu Dec 11 05:23:34 2014 (r374510) +++ head/devel/gearmand-devel/Makefile Thu Dec 11 05:26:39 2014 (r374511) @@ -3,7 +3,7 @@ PORTNAME= gearmand PORTVERSION= 1.1.8 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel MASTER_SITES= http://launchpad.net/gearmand/1.2/${PORTVERSION}/+download/ Modified: head/devel/gearmand/Makefile ============================================================================== --- head/devel/gearmand/Makefile Thu Dec 11 05:23:34 2014 (r374510) +++ head/devel/gearmand/Makefile Thu Dec 11 05:26:39 2014 (r374511) @@ -3,7 +3,7 @@ PORTNAME= gearmand PORTVERSION= 1.0.6 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= devel MASTER_SITES= http://launchpad.net/gearmand/1.0/${PORTVERSION}/+download/ Modified: head/devel/pecl-memoize/Makefile ============================================================================== --- head/devel/pecl-memoize/Makefile Thu Dec 11 05:23:34 2014 (r374510) +++ head/devel/pecl-memoize/Makefile Thu Dec 11 05:26:39 2014 (r374511) @@ -3,6 +3,7 @@ PORTNAME= memoize PORTVERSION= 0.2.0 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= http://pecl.php.net/get/ PKGNAMEPREFIX= pecl- Modified: head/devel/php-memoize/Makefile ============================================================================== --- head/devel/php-memoize/Makefile Thu Dec 11 05:23:34 2014 (r374510) +++ head/devel/php-memoize/Makefile Thu Dec 11 05:26:39 2014 (r374511) @@ -3,7 +3,7 @@ PORTNAME= memoize PORTVERSION= 0.2.0b1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel PKGNAMEPREFIX= php- Modified: head/ftp/proftpd/Makefile ============================================================================== --- head/ftp/proftpd/Makefile Thu Dec 11 05:23:34 2014 (r374510) +++ head/ftp/proftpd/Makefile Thu Dec 11 05:26:39 2014 (r374511) @@ -5,7 +5,7 @@ PORTNAME?= proftpd .if !defined(DISTVERSION) PORTVERSION?= ${PROFTPD_VERSION} .endif -PORTREVISION?= 3 +PORTREVISION?= 4 CATEGORIES?= ftp MASTER_SITES= ftp://ftp.proftpd.org/distrib/source/ \ https://github.com/downloads/proftpd/proftpd.github.com/ \ Modified: head/mail/opendkim/Makefile ============================================================================== --- head/mail/opendkim/Makefile Thu Dec 11 05:23:34 2014 (r374510) +++ head/mail/opendkim/Makefile Thu Dec 11 05:26:39 2014 (r374511) @@ -3,7 +3,7 @@ PORTNAME= opendkim PORTVERSION= 2.9.2 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= mail security MASTER_SITES= SF MASTER_SITE_SUBDIR= ${PORTNAME} \ Modified: head/net-mgmt/collectd/Makefile ============================================================================== --- head/net-mgmt/collectd/Makefile Thu Dec 11 05:23:34 2014 (r374510) +++ head/net-mgmt/collectd/Makefile Thu Dec 11 05:26:39 2014 (r374511) @@ -3,7 +3,7 @@ PORTNAME= collectd PORTVERSION= 4.10.9 -PORTREVISION= 17 +PORTREVISION= 18 CATEGORIES= net-mgmt MASTER_SITES= http://collectd.org/files/ Modified: head/net-mgmt/collectd5/Makefile ============================================================================== --- head/net-mgmt/collectd5/Makefile Thu Dec 11 05:23:34 2014 (r374510) +++ head/net-mgmt/collectd5/Makefile Thu Dec 11 05:26:39 2014 (r374511) @@ -3,7 +3,7 @@ PORTNAME= collectd PORTVERSION= 5.4.1 -PORTREVISION= 15 +PORTREVISION= 16 CATEGORIES= net-mgmt MASTER_SITES= http://collectd.org/files/ PKGNAMESUFFIX= 5 Modified: head/net-mgmt/nagios-check_memcached_paranoid/Makefile ============================================================================== --- head/net-mgmt/nagios-check_memcached_paranoid/Makefile Thu Dec 11 05:23:34 2014 (r374510) +++ head/net-mgmt/nagios-check_memcached_paranoid/Makefile Thu Dec 11 05:26:39 2014 (r374511) @@ -2,7 +2,7 @@ PORTNAME= check_memcached_paranoid PORTVERSION= 0.20131004 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-mgmt MASTER_SITES= SF/nagiosplug/nagiosplug/1.5 DISTFILES= nagios-plugins-1.5.tar.gz Modified: head/net/yaz/Makefile ============================================================================== --- head/net/yaz/Makefile Thu Dec 11 05:23:34 2014 (r374510) +++ head/net/yaz/Makefile Thu Dec 11 05:26:39 2014 (r374511) @@ -3,6 +3,7 @@ PORTNAME= yaz PORTVERSION= 5.7.1 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= http://ftp.indexdata.dk/pub/yaz/ Modified: head/security/razorback-dispatcher/Makefile ============================================================================== --- head/security/razorback-dispatcher/Makefile Thu Dec 11 05:23:34 2014 (r374510) +++ head/security/razorback-dispatcher/Makefile Thu Dec 11 05:26:39 2014 (r374511) @@ -3,7 +3,7 @@ PORTNAME= dispatcher PORTVERSION= 0.5.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= security MASTER_SITES= SF/razorbacktm/Dispatcher PKGNAMEPREFIX= razorback- Modified: head/www/mod_memcache_block/Makefile ============================================================================== --- head/www/mod_memcache_block/Makefile Thu Dec 11 05:23:34 2014 (r374510) +++ head/www/mod_memcache_block/Makefile Thu Dec 11 05:26:39 2014 (r374511) @@ -3,6 +3,7 @@ PORTNAME= mod_memcache_block PORTVERSION= 20120821 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= https://github.com/netik/mod_memcache_block/tarball/${GITVERSION}/ DISTNAME= mod_memcache_block-${GITVERSION}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201412110526.sBB5QdiN072713>