Date: Sun, 19 Sep 2021 06:06:52 GMT From: Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: bc2f4731f386 - main - databases/libmemcached: Update MASTER_SITES Message-ID: <202109190606.18J66qsD052499@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=bc2f4731f3861044d7537b3acb11de47415edb0b commit bc2f4731f3861044d7537b3acb11de47415edb0b Author: Po-Chuan Hsieh <sunpoet@FreeBSD.org> AuthorDate: 2021-09-19 05:27:31 +0000 Commit: Po-Chuan Hsieh <sunpoet@FreeBSD.org> CommitDate: 2021-09-19 05:59:42 +0000 databases/libmemcached: Update MASTER_SITES - Convert REINPLACE_CMD to patch files - Do not silence installation message - Cosmetic change - Sort PLIST - Take maintainership --- databases/libmemcached/Makefile | 44 ++++++++++------------- databases/libmemcached/files/patch-Makefile.in | 11 ++++++ databases/libmemcached/files/patch-man_include.am | 10 ++++++ databases/libmemcached/pkg-plist | 22 ++++++------ 4 files changed, 51 insertions(+), 36 deletions(-) diff --git a/databases/libmemcached/Makefile b/databases/libmemcached/Makefile index 248f2f472a36..210a57e724ba 100644 --- a/databases/libmemcached/Makefile +++ b/databases/libmemcached/Makefile @@ -2,9 +2,9 @@ PORTNAME= libmemcached PORTVERSION= 1.0.18 PORTREVISION= 7 CATEGORIES= databases -MASTER_SITES= http://launchpad.net/${PORTNAME}/1.0/${PORTVERSION}/+download/ +MASTER_SITES= https://launchpad.net/${PORTNAME}/${PORTVERSION:R}/${PORTVERSION}/+download/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= sunpoet@FreeBSD.org COMMENT= C and C++ client library to the memcached server LICENSE= BSD3CLAUSE @@ -14,44 +14,38 @@ LIB_DEPENDS= libevent.so:devel/libevent TEST_DEPENDS= memcached:databases/memcached USES= autoreconf gmake libtool localbase pathfix pkgconfig -USE_LDCONFIG= yes +CONFIGURE_ARGS= --enable-libmemcachedprotocol \ + --without-memcached \ + --without-sphinx-build +CXXFLAGS+= -D__STDC_CONSTANT_MACROS -pthread GNU_CONFIGURE= yes -CONFIGURE_ARGS= --without-memcached \ - --without-sphinx-build \ - --enable-libmemcachedprotocol -TEST_TARGET= check - LIBS+= -lexecinfo -CXXFLAGS+= -D__STDC_CONSTANT_MACROS -pthread +PATHFIX_MAKEFILEIN= include.am +TEST_TARGET= check +USE_LDCONFIG= yes -OPTIONS_DEFINE= DEBUG MEMASLAP SASL -OPTIONS_DEFAULT= MEMASLAP SASL MURMUR FNV64 -OPTIONS_GROUP= HASH +OPTIONS_DEFINE= DEBUG MEMASLAP SASL +OPTIONS_GROUP= HASH OPTIONS_GROUP_HASH= FNV64 HSIEH MURMUR - -MEMASLAP_DESC= Load generation and benchmark tool +OPTIONS_DEFAULT=MEMASLAP SASL MURMUR FNV64 FNV64_DESC= Enable fnv64 hashing HSIEH_DESC= Enable hsieh hashing +MEMASLAP_DESC= Load generation and benchmark tool MURMUR_DESC= Enable murmur hashing -DEBUG_CONFIGURE_ENABLE= debug +DEBUG_CONFIGURE_ENABLE= debug +FNV64_CONFIGURE_ENABLE= fnv64_hash +HSIEH_CONFIGURE_ENABLE= hsieh_hash MEMASLAP_CONFIGURE_ENABLE= memaslap -FNV64_CONFIGURE_ENABLE= fnv64_hash -HSIEH_CONFIGURE_ENABLE= hsieh_hash -MURMUR_CONFIGURE_ENABLE= murmur_hash - +MURMUR_CONFIGURE_ENABLE=murmur_hash SASL_CONFIGURE_ENABLE= sasl SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 -PATHFIX_MAKEFILEIN= include.am - post-patch: - @${REINPLACE_CMD} -e '/^LDFLAGS *=/ s/$$/ $${LTLIBSASL2}/' \ - ${WRKSRC}/Makefile.in - @${REINPLACE_CMD} '/MAKE.*man/d' ${WRKSRC}/man/include.am + @${REINPLACE_CMD} -e 's|%%LTLIBSASL2%%|${LTLIBSASL2}|' ${WRKSRC}/Makefile.in post-install: - @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so.* + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so .include <bsd.port.mk> diff --git a/databases/libmemcached/files/patch-Makefile.in b/databases/libmemcached/files/patch-Makefile.in new file mode 100644 index 000000000000..5e14e0106b9a --- /dev/null +++ b/databases/libmemcached/files/patch-Makefile.in @@ -0,0 +1,11 @@ +--- Makefile.in.orig 2014-02-09 11:52:56 UTC ++++ Makefile.in +@@ -2934,7 +2934,7 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ + LCOV = @LCOV@ + LCOV_GENHTML = @LCOV_GENHTML@ + LD = @LD@ +-LDFLAGS = @LDFLAGS@ ++LDFLAGS = @LDFLAGS@ %%LTLIBSASL2%% + LEX = @LEX@ + LIBEVENT_LIB = @LIBEVENT_LIB@ + LIBGEARMAN_CPPFLAGS = @LIBGEARMAN_CPPFLAGS@ diff --git a/databases/libmemcached/files/patch-man_include.am b/databases/libmemcached/files/patch-man_include.am new file mode 100644 index 000000000000..32aa812967b1 --- /dev/null +++ b/databases/libmemcached/files/patch-man_include.am @@ -0,0 +1,10 @@ +--- man/include.am.orig 2014-02-09 11:52:42 UTC ++++ man/include.am +@@ -4,7 +4,6 @@ + + # Build rule for documentation + $(dist_man_MANS): $(top_srcdir)/configure.ac +- $(MAKE) $(AM_MAKEFLAGS) man + + .NOTPARALLEL: $(dist_man_MANS) + diff --git a/databases/libmemcached/pkg-plist b/databases/libmemcached/pkg-plist index 556fcf05919d..6e8563c50adf 100644 --- a/databases/libmemcached/pkg-plist +++ b/databases/libmemcached/pkg-plist @@ -12,7 +12,6 @@ bin/memrm bin/memslap bin/memstat bin/memtouch -include/libhashkit/hashkit.h include/libhashkit-1.0/algorithm.h include/libhashkit-1.0/behavior.h include/libhashkit-1.0/configure.h @@ -21,16 +20,14 @@ include/libhashkit-1.0/function.h include/libhashkit-1.0/has.h include/libhashkit-1.0/hashkit.h include/libhashkit-1.0/hashkit.hpp +include/libhashkit-1.0/str_algorithm.h include/libhashkit-1.0/strerror.h include/libhashkit-1.0/string.h -include/libhashkit-1.0/str_algorithm.h include/libhashkit-1.0/types.h include/libhashkit-1.0/visibility.h -include/libmemcached/memcached.h -include/libmemcached/memcached.hpp -include/libmemcached/util.h -include/libmemcached-1.0/allocators.h +include/libhashkit/hashkit.h include/libmemcached-1.0/alloc.h +include/libmemcached-1.0/allocators.h include/libmemcached-1.0/analyze.h include/libmemcached-1.0/auto.h include/libmemcached-1.0/basic_string.h @@ -77,16 +74,19 @@ include/libmemcached-1.0/struct/stat.h include/libmemcached-1.0/struct/string.h include/libmemcached-1.0/touch.h include/libmemcached-1.0/triggers.h +include/libmemcached-1.0/types.h include/libmemcached-1.0/types/behavior.h include/libmemcached-1.0/types/callback.h include/libmemcached-1.0/types/connection.h include/libmemcached-1.0/types/hash.h include/libmemcached-1.0/types/return.h include/libmemcached-1.0/types/server_distribution.h -include/libmemcached-1.0/types.h include/libmemcached-1.0/verbosity.h include/libmemcached-1.0/version.h include/libmemcached-1.0/visibility.h +include/libmemcached/memcached.h +include/libmemcached/memcached.hpp +include/libmemcached/util.h include/libmemcachedprotocol-0.0/binary.h include/libmemcachedprotocol-0.0/callback.h include/libmemcachedprotocol-0.0/handler.h @@ -146,10 +146,10 @@ man/man3/hashkit_murmur.3.gz man/man3/hashkit_value.3.gz man/man3/libhashkit.3.gz man/man3/libmemcached.3.gz -man/man3/libmemcachedutil.3.gz man/man3/libmemcached_check_configuration.3.gz man/man3/libmemcached_configuration.3.gz man/man3/libmemcached_examples.3.gz +man/man3/libmemcachedutil.3.gz man/man3/memcached.3.gz man/man3/memcached_add.3.gz man/man3/memcached_add_by_key.3.gz @@ -173,16 +173,16 @@ man/man3/memcached_dump.3.gz man/man3/memcached_exist.3.gz man/man3/memcached_exist_by_key.3.gz man/man3/memcached_fetch.3.gz -man/man3/memcached_flush_buffers.3.gz man/man3/memcached_fetch_execute.3.gz man/man3/memcached_fetch_result.3.gz +man/man3/memcached_flush_buffers.3.gz man/man3/memcached_free.3.gz man/man3/memcached_generate_hash.3.gz man/man3/memcached_generate_hash_value.3.gz man/man3/memcached_get.3.gz -man/man3/memcached_get_sasl_callbacks.3.gz man/man3/memcached_get_by_key.3.gz man/man3/memcached_get_memory_allocators.3.gz +man/man3/memcached_get_sasl_callbacks.3.gz man/man3/memcached_get_user_data.3.gz man/man3/memcached_increment.3.gz man/man3/memcached_increment_with_initial.3.gz @@ -218,9 +218,9 @@ man/man3/memcached_server_list_free.3.gz man/man3/memcached_server_push.3.gz man/man3/memcached_servers_parse.3.gz man/man3/memcached_set.3.gz -man/man3/memcached_set_sasl_callbacks.3.gz man/man3/memcached_set_by_key.3.gz man/man3/memcached_set_memory_allocators.3.gz +man/man3/memcached_set_sasl_callbacks.3.gz man/man3/memcached_set_user_data.3.gz man/man3/memcached_stat.3.gz man/man3/memcached_stat_execute.3.gz
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202109190606.18J66qsD052499>