Re: git: e53026bc184e - main - databases/libmemcached: Update to 1.1.4
- In reply to: Po-Chuan Hsieh : "git: e53026bc184e - main - databases/libmemcached: Update to 1.1.4"
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 30 Jun 2023 17:15:01 UTC
On 2023-06-30 15:18, Po-Chuan Hsieh wrote:
> The branch main has been updated by sunpoet:
>
> URL:
> https://cgit.FreeBSD.org/ports/commit/?id=e53026bc184e89e5453a2eb4c805cec13781c5bb
>
> commit e53026bc184e89e5453a2eb4c805cec13781c5bb
> Author: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
> AuthorDate: 2023-06-30 13:17:17 +0000
> Commit: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
> CommitDate: 2023-06-30 13:17:17 +0000
>
> databases/libmemcached: Update to 1.1.4
>
> Changes: https://github.com/awesomized/libmemcached/releases
> ---
> databases/libmemcached/Makefile | 59 ++--
> databases/libmemcached/distinfo | 5 +-
> databases/libmemcached/files/patch-CMakeLists.txt | 19 ++
> databases/libmemcached/files/patch-Makefile.in | 11 -
> databases/libmemcached/files/patch-bug1245562 | 34 ---
> .../libmemcached/files/patch-clients_memaslap.c | 14 -
> .../libmemcached/files/patch-clients_ms__memslap.h | 23 --
> databases/libmemcached/files/patch-configure.ac | 19 --
> .../files/patch-libmemcached_assert.hpp | 13 -
> databases/libmemcached/files/patch-libtest_lite.h | 13 -
> databases/libmemcached/files/patch-m4_ax__debug.m4 | 28 --
> databases/libmemcached/files/patch-man_include.am | 10 -
> databases/libmemcached/files/patch-sasl | 87 ++++++
> databases/libmemcached/files/patch-util_log.hpp | 10 -
> databases/libmemcached/pkg-plist | 302
> ++++++++++++---------
> 15 files changed, 316 insertions(+), 331 deletions(-)
>
> diff --git a/databases/libmemcached/Makefile
> b/databases/libmemcached/Makefile
> index 00b691e5a2ab..e044f28499fd 100644
> --- a/databases/libmemcached/Makefile
> +++ b/databases/libmemcached/Makefile
> @@ -1,54 +1,47 @@
> PORTNAME= libmemcached
> -PORTVERSION= 1.0.18
> -PORTREVISION= 7
> +PORTVERSION= 1.1.4
> CATEGORIES= databases
> -MASTER_SITES= https://launchpad.net/libmemcached/${PORTVERSION:R}/${PORTVERSION}/+download/
>
> MAINTAINER= sunpoet@FreeBSD.org
> -COMMENT= C and C++ client library to the memcached server
> -WWW= https://libmemcached.org/
> +COMMENT= C/C++ client library and tools for the memcached server
> +WWW= https://awesomized.github.io/libmemcached/ \
> + https://github.com/awesomized/libmemcached
>
> LICENSE= BSD3CLAUSE
> -LICENSE_FILE= ${WRKSRC}/COPYING
> +LICENSE_FILE= ${WRKSRC}/LICENSE
>
> LIB_DEPENDS= libevent.so:devel/libevent
> -TEST_DEPENDS= memcached:databases/memcached
> -
> -USES= autoreconf gmake libtool localbase pathfix pkgconfig
> -
> -CONFIGURE_ARGS= --enable-libmemcachedprotocol \
> - --without-memcached \
> - --without-sphinx-build
> -CXXFLAGS+= -D__STDC_CONSTANT_MACROS -pthread
> -GNU_CONFIGURE= yes
> -LIBS+= -lexecinfo
> -PATHFIX_MAKEFILEIN= include.am
> -TEST_TARGET= check
> +TEST_DEPENDS= memcached:databases/memcached \
> + onetbb>=0:devel/onetbb
> +
> +USES= bison compiler:c++11-lang pathfix pkgconfig ssl
> +
> +CMAKE_OFF= BUILD_DOCSONLY BUILD_DOCS_MANGZ BUILD_DOCS_HTML
> BUILD_TESTING ENABLE_DTRACE
> +CMAKE_ON= BUILD_SHARED_LIBS ENABLE_MEMASLAP ENABLE_OPENSSL_CRYPTO
> +CMAKE_TESTING_ON= BUILD_TESTING
> USE_LDCONFIG= yes
>
> -CONFLICTS_INSTALL= memdump # man/man1/memdump.1.gz
> +USE_GITHUB= yes
> +GH_ACCOUNT= awesomized
>
> -OPTIONS_DEFINE= DEBUG MEMASLAP SASL
> +OPTIONS_DEFINE= DOCS MANPAGES SASL
> OPTIONS_GROUP= HASH
> OPTIONS_GROUP_HASH= FNV64 HSIEH MURMUR
> -OPTIONS_DEFAULT=MEMASLAP SASL MURMUR FNV64
> +OPTIONS_DEFAULT=FNV64 HSIEH MURMUR SASL
> +OPTIONS_SUB= yes
> 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
> -FNV64_CONFIGURE_ENABLE= fnv64_hash
> -HSIEH_CONFIGURE_ENABLE= hsieh_hash
> -MEMASLAP_CONFIGURE_ENABLE= memaslap
> -MURMUR_CONFIGURE_ENABLE=murmur_hash
> -SASL_CONFIGURE_ENABLE= sasl
> +FNV64_CMAKE_BOOL= ENABLE_HASH_FNV64
> +HSIEH_CMAKE_BOOL= ENABLE_HASH_HSIEH
> +MANPAGES_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR}
> +MANPAGES_CMAKE_BOOL= BUILD_DOCS BUILD_DOCS_MAN
> +MANPAGES_USES= cmake:noninja,testing python:env
> +MANPAGES_USES_OFF= cmake:testing
> +MURMUR_CMAKE_BOOL= ENABLE_HASH_MURMUR
> +SASL_CMAKE_BOOL= ENABLE_SASL
> SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2
>
> -post-patch:
> - @${REINPLACE_CMD} -e 's|%%LTLIBSASL2%%|${LTLIBSASL2}|'
> ${WRKSRC}/Makefile.in
> -
> -post-install:
> - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so
> -
> .include <bsd.port.mk>
> diff --git a/databases/libmemcached/distinfo
> b/databases/libmemcached/distinfo
> index 240b9b4527c6..6d3acc8f5af7 100644
> --- a/databases/libmemcached/distinfo
> +++ b/databases/libmemcached/distinfo
> @@ -1,2 +1,3 @@
> -SHA256 (libmemcached-1.0.18.tar.gz) =
> e22c0bb032fde08f53de9ffbc5a128233041d9f33b5de022c0978a2149885f82
> -SIZE (libmemcached-1.0.18.tar.gz) = 1039649
> +TIMESTAMP = 1685986616
> +SHA256 (awesomized-libmemcached-1.1.4_GH0.tar.gz) =
> c477e1f6510e1dc698e84f3717ce690a8f65b94c616ecaa62306cce0f5e3116a
> +SIZE (awesomized-libmemcached-1.1.4_GH0.tar.gz) = 530337
> diff --git a/databases/libmemcached/files/patch-CMakeLists.txt
> b/databases/libmemcached/files/patch-CMakeLists.txt
> new file mode 100644
> index 000000000000..1935d2316675
> --- /dev/null
> +++ b/databases/libmemcached/files/patch-CMakeLists.txt
> @@ -0,0 +1,19 @@
> +--- CMakeLists.txt.orig 2023-03-06 08:47:30 UTC
> ++++ CMakeLists.txt
> +@@ -6,7 +6,7 @@ endif()
> +
> + include(CMakeVersions.txt)
> +
> +-project(libmemcached-awesome
> ++project(libmemcached
> + VERSION "${LIBMEMCACHED_VERSION}"
> + DESCRIPTION "libmemcached-awesome, a C/C++ memcached client
> library"
> + )
> +@@ -70,7 +70,6 @@ install(FILES
> + ChangeLog-1.0.md
> + ChangeLog-1.1.md
> + CONTRIBUTING.md
> +- LICENSE
> + NEWS
> + README.md
> + TODO
> diff --git a/databases/libmemcached/files/patch-Makefile.in
> b/databases/libmemcached/files/patch-Makefile.in
> deleted file mode 100644
> index 5e14e0106b9a..000000000000
> --- a/databases/libmemcached/files/patch-Makefile.in
> +++ /dev/null
> @@ -1,11 +0,0 @@
> ---- 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-bug1245562
> b/databases/libmemcached/files/patch-bug1245562
> deleted file mode 100644
> index 6c29b93886a5..000000000000
> --- a/databases/libmemcached/files/patch-bug1245562
> +++ /dev/null
> @@ -1,34 +0,0 @@
> ---- clients/memflush.cc.orig 2014-02-09 11:52:42 UTC
> -+++ 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);
> ---- libmemcached-1.0/memcached.h.orig 2014-02-09 11:52:42 UTC
> -+++ 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
> diff --git a/databases/libmemcached/files/patch-clients_memaslap.c
> b/databases/libmemcached/files/patch-clients_memaslap.c
> deleted file mode 100644
> index 02ea7c490ed7..000000000000
> --- a/databases/libmemcached/files/patch-clients_memaslap.c
> +++ /dev/null
> @@ -1,14 +0,0 @@
> ---- clients/memaslap.c.orig 2020-08-22 10:06:16 UTC
> -+++ clients/memaslap.c
> -@@ -45,6 +45,11 @@
> - #define OPTIONSTRING const char*
> - #endif
> -
> -+/* global variables */
> -+ms_global_t ms_global;
> -+ms_statistic_t ms_statistic;
> -+ms_stats_t ms_stats;
> -+
> - /* options */
> - static struct option long_options[]=
> - {
> diff --git a/databases/libmemcached/files/patch-clients_ms__memslap.h
> b/databases/libmemcached/files/patch-clients_ms__memslap.h
> deleted file mode 100644
> index 7b992f71119b..000000000000
> --- a/databases/libmemcached/files/patch-clients_ms__memslap.h
> +++ /dev/null
> @@ -1,23 +0,0 @@
> ---- clients/ms_memslap.h.orig 2020-08-22 10:06:28 UTC
> -+++ clients/ms_memslap.h
> -@@ -116,14 +116,14 @@ typedef struct global
> - bool time_out;
> - } ms_global_t;
> -
> --/* global structure */
> --ms_global_t ms_global;
> -+/* global structure, defined in memaslap.c */
> -+extern ms_global_t ms_global;
> -
> --/* global stats information structure */
> --ms_stats_t ms_stats;
> -+/* global stats information structure, defined in memaslap.c */
> -+extern ms_stats_t ms_stats;
> -
> --/* global statistic structure */
> --ms_statistic_t ms_statistic;
> -+/* global statistic structure, defined in mamaslap.c */
> -+extern ms_statistic_t ms_statistic;
> -
> - #ifdef __cplusplus
> - }
> diff --git a/databases/libmemcached/files/patch-configure.ac
> b/databases/libmemcached/files/patch-configure.ac
> deleted file mode 100644
> index 6b9c0665e33d..000000000000
> --- a/databases/libmemcached/files/patch-configure.ac
> +++ /dev/null
> @@ -1,19 +0,0 @@
> ---- configure.ac.orig 2014-02-09 11:52:42 UTC
> -+++ configure.ac
> -@@ -13,13 +13,13 @@ m4_include([version.m4])
> - AC_PREREQ([2.61])
> - AC_INIT([libmemcached],VERSION_NUMBER,[http://libmemcached.org/])
> -
> -+AC_CONFIG_AUX_DIR([build-aux])
> -+AC_CONFIG_MACRO_DIR([m4])
> -+
> - # Setup the compilers early on
> - AC_PROG_CC([cc gcc clang])
> - AC_PROG_CXX([c++ g++ clang++])
> -
> --AC_CONFIG_AUX_DIR([build-aux])
> --AC_CONFIG_MACRO_DIR([m4])
> --
> - AC_CANONICAL_HOST
> - AC_ARG_PROGRAM
> - AC_USE_SYSTEM_EXTENSIONS
> diff --git
> a/databases/libmemcached/files/patch-libmemcached_assert.hpp
> b/databases/libmemcached/files/patch-libmemcached_assert.hpp
> deleted file mode 100644
> index 91c68e89a1cc..000000000000
> --- a/databases/libmemcached/files/patch-libmemcached_assert.hpp
> +++ /dev/null
> @@ -1,13 +0,0 @@
> ---- libmemcached/assert.hpp.orig 2014-02-09 11:52:42 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>
> diff --git a/databases/libmemcached/files/patch-libtest_lite.h
> b/databases/libmemcached/files/patch-libtest_lite.h
> deleted file mode 100644
> index c9cd4a3605e1..000000000000
> --- a/databases/libmemcached/files/patch-libtest_lite.h
> +++ /dev/null
> @@ -1,13 +0,0 @@
> ---- libtest/lite.h.orig 2014-02-09 11:52:42 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__
> diff --git a/databases/libmemcached/files/patch-m4_ax__debug.m4
> b/databases/libmemcached/files/patch-m4_ax__debug.m4
> deleted file mode 100644
> index 53a5aeceff9c..000000000000
> --- a/databases/libmemcached/files/patch-m4_ax__debug.m4
> +++ /dev/null
> @@ -1,28 +0,0 @@
> -Fixed a bug that caused configure to disobey the enable/disable debug
> flag. The debug flag will default to disabled if not specified.
> ---- m4/ax_debug.m4.orig 2014-02-09 11:52:42 UTC
> -+++ m4/ax_debug.m4
> -@@ -49,16 +49,18 @@ AC_DEFUN([AX_DEBUG],
> - [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"])])
> diff --git a/databases/libmemcached/files/patch-man_include.am
> b/databases/libmemcached/files/patch-man_include.am
> deleted file mode 100644
> index 32aa812967b1..000000000000
> --- a/databases/libmemcached/files/patch-man_include.am
> +++ /dev/null
> @@ -1,10 +0,0 @@
> ---- 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/files/patch-sasl
> b/databases/libmemcached/files/patch-sasl
> new file mode 100644
> index 000000000000..44b43acbe8a4
> --- /dev/null
> +++ b/databases/libmemcached/files/patch-sasl
> @@ -0,0 +1,87 @@
> +---
> test/tests/memcached/regression/lp_001-630-615.cpp.orig 2023-06-03
> 12:15:40 UTC
> ++++ test/tests/memcached/regression/lp_001-630-615.cpp
> +@@ -6,29 +6,8 @@
> + TEST_CASE("memcached_regression_lp1630615") {
> + #if !LIBMEMCACHED_WITH_SASL_SUPPORT
> + WARN("ENABLE_SASL=OFF");
> +-#else
> +- Shell sh;
> +- string mc{MEMCACHED_BINARY}, err;
> +-
> +- if (!sh.run(mc + " -S --version", err)) {
> +- WARN(mc << ": " << err);
> +- } else {
> +- memcached_return_t rc;
> +- auto test = MemcachedCluster::sasl();
> +- auto memc = &test.memc;
> +- MemcachedPtr copy{memcached_clone(nullptr, memc)};
> +-
> +- REQUIRE(memcached_server_by_key(memc, S(__func__), &rc)->fd ==
> INVALID_SOCKET);
> +- REQUIRE_SUCCESS(memcached_set(memc, S(__func__), S(__func__), 0,
> 0));
> +- REQUIRE(memcached_server_by_key(memc, S(__func__), &rc)->fd !=
> INVALID_SOCKET);
> +-
> +- REQUIRE(memcached_server_by_key(*copy, S(__func__), &rc)->fd ==
> INVALID_SOCKET);
> +- Malloced val{memcached_get(*copy, S(__func__), nullptr, nullptr,
> &rc)};
> +- REQUIRE(memcached_server_by_key(*copy, S(__func__), &rc)->fd !=
> INVALID_SOCKET);
> +-
> +- REQUIRE_SUCCESS(rc);
> +- REQUIRE(*val);
> +- REQUIRE(string(__func__) == string(*val));
> +- }
> ++#endif
> ++#if LIBMEMCACHED_WITH_SASL_SUPPORT
> ++ WARN("SASL_TESTS disabled due to permission issues");
> + #endif
> + }
> +--- test/tests/memcached/sasl.cpp.orig 2023-06-03 11:11:01 UTC
> ++++ test/tests/memcached/sasl.cpp
> +@@ -6,46 +6,8 @@
> + TEST_CASE("memcached_sasl") {
> + #if !LIBMEMCACHED_WITH_SASL_SUPPORT
> + WARN("ENABLE_SASL=OFF");
> +-#else
> +- Shell sh;
> +- string mc{MEMCACHED_BINARY}, err;
> +-
> +- if (!sh.run(mc + " -S --version", err)) {
> +- WARN(mc << ": " << err);
> +- } else {
> +- auto test = MemcachedCluster::sasl();
> +- auto memc = &test.memc;
> +-
> +- REQUIRE_SUCCESS(memcached_set(memc, S(__func__), S(__func__), 0,
> 0));
> +- REQUIRE_SUCCESS(memcached_delete(memc, S(__func__), 0));
> +- REQUIRE_SUCCESS(memcached_destroy_sasl_auth_data(memc));
> +- REQUIRE_SUCCESS(memcached_destroy_sasl_auth_data(memc));
> +- REQUIRE_RC(MEMCACHED_INVALID_ARGUMENTS,
> memcached_destroy_sasl_auth_data(nullptr));
> +-
> +- memcached_quit(memc);
> +-
> +- REQUIRE_RC(MEMCACHED_AUTH_FAILURE, memcached_set(memc,
> S(__func__), S(__func__), 0, 0));
> +-
> +- REQUIRE_SUCCESS(memcached_set_sasl_auth_data(memc, "username",
> "password"));
> +- REQUIRE_RC(MEMCACHED_AUTH_FAILURE, memcached_set(memc,
> S(__func__), S(__func__), 0, 0));
> +-
> +- SECTION("getpid2") {
> +- memcached_return_t rc;
> +-
> +- for (auto &server : test.cluster.getServers()) {
> +- REQUIRE(server.getPid() ==
> libmemcached_util_getpid2("localhost",
> get<int>(server.getSocketOrPort()), "memcached", "memcached", &rc));
> +- REQUIRE_SUCCESS(rc);
> +- }
> +-
> +- REQUIRE(-1 == libmemcached_util_getpid2("localhost", 1, "foo",
> "bar", &rc));
> +- REQUIRE(memcached_fatal(rc));
> +- }
> +-
> +- SECTION("ping2") {
> +- memcached_server_fn fptr[] = {&ping2_callback};
> +-
> +- REQUIRE_SUCCESS(memcached_server_cursor(memc, fptr, nullptr,
> 1));
> +- }
> +- }
> ++#endif
> ++#if LIBMEMCACHED_WITH_SASL_SUPPORT
> ++ WARN("SASL_TESTS disabled due to permission issues");
> + #endif
> + }
> diff --git a/databases/libmemcached/files/patch-util_log.hpp
> b/databases/libmemcached/files/patch-util_log.hpp
> deleted file mode 100644
> index 5dd9f530971e..000000000000
> --- a/databases/libmemcached/files/patch-util_log.hpp
> +++ /dev/null
> @@ -1,10 +0,0 @@
> ---- util/log.hpp.orig 2014-02-09 11:52:42 UTC
> -+++ util/log.hpp
> -@@ -42,6 +42,7 @@
> - #include <fcntl.h>
> - #include <iostream>
> - #include <string>
> -+#include <string.h>
> - #include <syslog.h>
> -
> - #define UTIL_MAX_ERROR_SIZE 2048
> diff --git a/databases/libmemcached/pkg-plist
> b/databases/libmemcached/pkg-plist
> index 6e8563c50adf..2afd0c8f8f4e 100644
> --- a/databases/libmemcached/pkg-plist
> +++ b/databases/libmemcached/pkg-plist
> @@ -13,6 +13,7 @@ bin/memslap
> bin/memstat
> bin/memtouch
> include/libhashkit-1.0/algorithm.h
> +include/libhashkit-1.0/basic_string.h
> include/libhashkit-1.0/behavior.h
> include/libhashkit-1.0/configure.h
> include/libhashkit-1.0/digest.h
> @@ -89,6 +90,7 @@ include/libmemcached/memcached.hpp
> include/libmemcached/util.h
> include/libmemcachedprotocol-0.0/binary.h
> include/libmemcachedprotocol-0.0/callback.h
> +include/libmemcachedprotocol-0.0/configure.h
> include/libmemcachedprotocol-0.0/handler.h
> include/libmemcachedprotocol-0.0/vbucket.h
> include/libmemcachedutil-1.0/flush.h
> @@ -98,138 +100,196 @@ include/libmemcachedutil-1.0/ping.h
> include/libmemcachedutil-1.0/pool.h
> include/libmemcachedutil-1.0/util.h
> include/libmemcachedutil-1.0/version.h
> -lib/libhashkit.a
> +lib/cmake/libmemcached/libhashkit-targets-%%CMAKE_BUILD_TYPE%%.cmake
> +lib/cmake/libmemcached/libhashkit-targets.cmake
> +lib/cmake/libmemcached/libhashkit-version.cmake
> +lib/cmake/libmemcached/libmemcached-config.cmake
> +lib/cmake/libmemcached/libmemcached-targets-%%CMAKE_BUILD_TYPE%%.cmake
> +lib/cmake/libmemcached/libmemcached-targets.cmake
> +lib/cmake/libmemcached/libmemcached-version.cmake
> +lib/cmake/libmemcached/libmemcachedprotocol-targets-%%CMAKE_BUILD_TYPE%%.cmake
> +lib/cmake/libmemcached/libmemcachedprotocol-targets.cmake
> +lib/cmake/libmemcached/libmemcachedprotocol-version.cmake
> +lib/cmake/libmemcached/libmemcachedutil-targets-%%CMAKE_BUILD_TYPE%%.cmake
> +lib/cmake/libmemcached/libmemcachedutil-targets.cmake
> +lib/cmake/libmemcached/libmemcachedutil-version.cmake
> +lib/cmake/libmemcached/p9y-targets-%%CMAKE_BUILD_TYPE%%.cmake
> +lib/cmake/libmemcached/p9y-targets.cmake
> lib/libhashkit.so
> lib/libhashkit.so.2
> lib/libhashkit.so.2.0.0
> -lib/libmemcached.a
> lib/libmemcached.so
> lib/libmemcached.so.11
> lib/libmemcached.so.11.0.0
> -lib/libmemcachedprotocol.a
> lib/libmemcachedprotocol.so
> lib/libmemcachedprotocol.so.0
> lib/libmemcachedprotocol.so.0.0.0
> -lib/libmemcachedutil.a
> lib/libmemcachedutil.so
> lib/libmemcachedutil.so.2
> lib/libmemcachedutil.so.2.0.0
> +lib/libp9y.a
> libdata/pkgconfig/libmemcached.pc
> -man/man1/memaslap.1.gz
> -man/man1/memcapable.1.gz
> -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
> -man/man3/hashkit_fnv1_32.3.gz
> -man/man3/hashkit_fnv1_64.3.gz
> -man/man3/hashkit_fnv1a_32.3.gz
> -man/man3/hashkit_fnv1a_64.3.gz
> -man/man3/hashkit_free.3.gz
> -man/man3/hashkit_functions.3.gz
> -man/man3/hashkit_hsieh.3.gz
> -man/man3/hashkit_is_allocated.3.gz
> -man/man3/hashkit_jenkins.3.gz
> -man/man3/hashkit_md5.3.gz
> -man/man3/hashkit_murmur.3.gz
> -man/man3/hashkit_value.3.gz
> -man/man3/libhashkit.3.gz
> -man/man3/libmemcached.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
> -man/man3/memcached_analyze.3.gz
> -man/man3/memcached_append.3.gz
> -man/man3/memcached_append_by_key.3.gz
> -man/man3/memcached_behavior_get.3.gz
> -man/man3/memcached_behavior_set.3.gz
> -man/man3/memcached_callback_get.3.gz
> -man/man3/memcached_callback_set.3.gz
> -man/man3/memcached_cas.3.gz
> -man/man3/memcached_cas_by_key.3.gz
> -man/man3/memcached_clone.3.gz
> -man/man3/memcached_create.3.gz
> -man/man3/memcached_decrement.3.gz
> -man/man3/memcached_decrement_with_initial.3.gz
> -man/man3/memcached_delete.3.gz
> -man/man3/memcached_delete_by_key.3.gz
> -man/man3/memcached_destroy_sasl_auth_data.3.gz
> -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_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_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
> -man/man3/memcached_last_error_message.3.gz
> -man/man3/memcached_lib_version.3.gz
> -man/man3/memcached_mget.3.gz
> -man/man3/memcached_mget_by_key.3.gz
> -man/man3/memcached_mget_execute.3.gz
> -man/man3/memcached_mget_execute_by_key.3.gz
> -man/man3/memcached_pool.3.gz
> -man/man3/memcached_pool_behavior_get.3.gz
> -man/man3/memcached_pool_behavior_set.3.gz
> -man/man3/memcached_pool_create.3.gz
> -man/man3/memcached_pool_destroy.3.gz
> -man/man3/memcached_pool_fetch.3.gz
> -man/man3/memcached_pool_pop.3.gz
> -man/man3/memcached_pool_push.3.gz
> -man/man3/memcached_pool_release.3.gz
> -man/man3/memcached_pool_st.3.gz
> -man/man3/memcached_prepend.3.gz
> -man/man3/memcached_prepend_by_key.3.gz
> -man/man3/memcached_quit.3.gz
> -man/man3/memcached_replace.3.gz
> -man/man3/memcached_replace_by_key.3.gz
> -man/man3/memcached_sasl_set_auth_data.3.gz
> -man/man3/memcached_server_add.3.gz
> -man/man3/memcached_server_count.3.gz
> -man/man3/memcached_server_cursor.3.gz
> -man/man3/memcached_server_list.3.gz
> -man/man3/memcached_server_list_append.3.gz
> -man/man3/memcached_server_list_count.3.gz
> -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_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
> -man/man3/memcached_stat_get_keys.3.gz
> -man/man3/memcached_stat_get_value.3.gz
> -man/man3/memcached_stat_servername.3.gz
> -man/man3/memcached_strerror.3.gz
> -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
> +%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
> +%%PORTDOCS%%%%DOCSDIR%%/BUGS.md
> +%%PORTDOCS%%%%DOCSDIR%%/CONTRIBUTING.md
> +%%PORTDOCS%%%%DOCSDIR%%/COPYING
> +%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
> +%%PORTDOCS%%%%DOCSDIR%%/ChangeLog-0.md
> +%%PORTDOCS%%%%DOCSDIR%%/ChangeLog-1.0.md
> +%%PORTDOCS%%%%DOCSDIR%%/ChangeLog-1.1.md
> +%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.md
> +%%PORTDOCS%%%%DOCSDIR%%/NEWS
> +%%PORTDOCS%%%%DOCSDIR%%/README.md
> +%%PORTDOCS%%%%DOCSDIR%%/TODO
> +%%DATADIR%%/example.cnf
> +%%MANPAGES%%share/man/man1/memaslap.1.gz
> +%%MANPAGES%%share/man/man1/memcapable.1.gz
> +%%MANPAGES%%share/man/man1/memcat.1.gz
> +%%MANPAGES%%share/man/man1/memcp.1.gz
> +%%MANPAGES%%share/man/man1/memdump.1.gz
> +%%MANPAGES%%share/man/man1/memerror.1.gz
> +%%MANPAGES%%share/man/man1/memexist.1.gz
> +%%MANPAGES%%share/man/man1/memflush.1.gz
> +%%MANPAGES%%share/man/man1/memparse.1.gz
> +%%MANPAGES%%share/man/man1/memping.1.gz
> +%%MANPAGES%%share/man/man1/memrm.1.gz
> +%%MANPAGES%%share/man/man1/memslap.1.gz
> +%%MANPAGES%%share/man/man1/memstat.1.gz
> +%%MANPAGES%%share/man/man1/memtouch.1.gz
> +%%MANPAGES%%share/man/man3/hashkit_clone.3.gz
> +%%MANPAGES%%share/man/man3/hashkit_crc32.3.gz
> +%%MANPAGES%%share/man/man3/hashkit_create.3.gz
> +%%MANPAGES%%share/man/man3/hashkit_fnv1_32.3.gz
> +%%MANPAGES%%share/man/man3/hashkit_fnv1_64.3.gz
> +%%MANPAGES%%share/man/man3/hashkit_fnv1a_32.3.gz
> +%%MANPAGES%%share/man/man3/hashkit_fnv1a_64.3.gz
> +%%MANPAGES%%share/man/man3/hashkit_free.3.gz
> +%%MANPAGES%%share/man/man3/hashkit_function.3.gz
> +%%MANPAGES%%share/man/man3/hashkit_functions.3.gz
> +%%MANPAGES%%share/man/man3/hashkit_get_distribution_function.3.gz
> +%%MANPAGES%%share/man/man3/hashkit_get_function.3.gz
> +%%MANPAGES%%share/man/man3/hashkit_hsieh.3.gz
> +%%MANPAGES%%share/man/man3/hashkit_is_allocated.3.gz
> +%%MANPAGES%%share/man/man3/hashkit_jenkins.3.gz
> +%%MANPAGES%%share/man/man3/hashkit_md5.3.gz
> +%%MANPAGES%%share/man/man3/hashkit_murmur.3.gz
> +%%MANPAGES%%share/man/man3/hashkit_set_custom_distribution_function.3.gz
> +%%MANPAGES%%share/man/man3/hashkit_set_custom_function.3.gz
> +%%MANPAGES%%share/man/man3/hashkit_set_distribution_function.3.gz
> +%%MANPAGES%%share/man/man3/hashkit_set_function.3.gz
> +%%MANPAGES%%share/man/man3/hashkit_value.3.gz
> +%%MANPAGES%%share/man/man3/libhashkit.3.gz
> +%%MANPAGES%%share/man/man3/libmemcached.3.gz
> +%%MANPAGES%%share/man/man3/libmemcached_check_configuration.3.gz
> +%%MANPAGES%%share/man/man3/libmemcached_configuration.3.gz
> +%%MANPAGES%%share/man/man3/libmemcached_examples.3.gz
> +%%MANPAGES%%share/man/man3/libmemcachedutil.3.gz
> +%%MANPAGES%%share/man/man3/memcached.3.gz
> +%%MANPAGES%%share/man/man3/memcached_add.3.gz
> +%%MANPAGES%%share/man/man3/memcached_add_by_key.3.gz
> +%%MANPAGES%%share/man/man3/memcached_analyze.3.gz
> +%%MANPAGES%%share/man/man3/memcached_append.3.gz
> +%%MANPAGES%%share/man/man3/memcached_append_by_key.3.gz
> +%%MANPAGES%%share/man/man3/memcached_auto.3.gz
> +%%MANPAGES%%share/man/man3/memcached_behavior.3.gz
> +%%MANPAGES%%share/man/man3/memcached_behavior_get.3.gz
> +%%MANPAGES%%share/man/man3/memcached_behavior_set.3.gz
> +%%MANPAGES%%share/man/man3/memcached_callback.3.gz
> +%%MANPAGES%%share/man/man3/memcached_callback_get.3.gz
> +%%MANPAGES%%share/man/man3/memcached_callback_set.3.gz
> +%%MANPAGES%%share/man/man3/memcached_cas.3.gz
> +%%MANPAGES%%share/man/man3/memcached_cas_by_key.3.gz
> +%%MANPAGES%%share/man/man3/memcached_clone.3.gz
> +%%MANPAGES%%share/man/man3/memcached_create.3.gz
> +%%MANPAGES%%share/man/man3/memcached_decrement.3.gz
> +%%MANPAGES%%share/man/man3/memcached_decrement_with_initial.3.gz
> +%%MANPAGES%%share/man/man3/memcached_delete.3.gz
> +%%MANPAGES%%share/man/man3/memcached_delete_by_key.3.gz
> +%%MANPAGES%%share/man/man3/memcached_destroy_sasl_auth_data.3.gz
> +%%MANPAGES%%share/man/man3/memcached_dump.3.gz
> +%%MANPAGES%%share/man/man3/memcached_exist.3.gz
> +%%MANPAGES%%share/man/man3/memcached_exist_by_key.3.gz
> +%%MANPAGES%%share/man/man3/memcached_fetch.3.gz
> +%%MANPAGES%%share/man/man3/memcached_fetch_execute.3.gz
> +%%MANPAGES%%share/man/man3/memcached_fetch_result.3.gz
> +%%MANPAGES%%share/man/man3/memcached_flush.3.gz
> +%%MANPAGES%%share/man/man3/memcached_flush_buffers.3.gz
> +%%MANPAGES%%share/man/man3/memcached_free.3.gz
> +%%MANPAGES%%share/man/man3/memcached_generate_hash.3.gz
> +%%MANPAGES%%share/man/man3/memcached_generate_hash_value.3.gz
> +%%MANPAGES%%share/man/man3/memcached_get.3.gz
> +%%MANPAGES%%share/man/man3/memcached_get_by_key.3.gz
> +%%MANPAGES%%share/man/man3/memcached_get_memory_allocators.3.gz
> +%%MANPAGES%%share/man/man3/memcached_get_sasl_callbacks.3.gz
> +%%MANPAGES%%share/man/man3/memcached_get_user_data.3.gz
> +%%MANPAGES%%share/man/man3/memcached_increment.3.gz
> +%%MANPAGES%%share/man/man3/memcached_increment_with_initial.3.gz
> +%%MANPAGES%%share/man/man3/memcached_last_error.3.gz
> +%%MANPAGES%%share/man/man3/memcached_last_error_errno.3.gz
> +%%MANPAGES%%share/man/man3/memcached_last_error_message.3.gz
> +%%MANPAGES%%share/man/man3/memcached_lib_version.3.gz
> +%%MANPAGES%%share/man/man3/memcached_memory_allocators.3.gz
> +%%MANPAGES%%share/man/man3/memcached_mget.3.gz
> +%%MANPAGES%%share/man/man3/memcached_mget_by_key.3.gz
> +%%MANPAGES%%share/man/man3/memcached_mget_execute.3.gz
> +%%MANPAGES%%share/man/man3/memcached_mget_execute_by_key.3.gz
> +%%MANPAGES%%share/man/man3/memcached_pool.3.gz
> +%%MANPAGES%%share/man/man3/memcached_pool_behavior_get.3.gz
> +%%MANPAGES%%share/man/man3/memcached_pool_behavior_set.3.gz
> +%%MANPAGES%%share/man/man3/memcached_pool_create.3.gz
> +%%MANPAGES%%share/man/man3/memcached_pool_destroy.3.gz
> +%%MANPAGES%%share/man/man3/memcached_pool_fetch.3.gz
> +%%MANPAGES%%share/man/man3/memcached_pool_pop.3.gz
> +%%MANPAGES%%share/man/man3/memcached_pool_push.3.gz
> +%%MANPAGES%%share/man/man3/memcached_pool_%%CMAKE_BUILD_TYPE%%.3.gz
> +%%MANPAGES%%share/man/man3/memcached_pool_st.3.gz
> +%%MANPAGES%%share/man/man3/memcached_prepend.3.gz
> +%%MANPAGES%%share/man/man3/memcached_prepend_by_key.3.gz
> +%%MANPAGES%%share/man/man3/memcached_quit.3.gz
> +%%MANPAGES%%share/man/man3/memcached_replace.3.gz
> +%%MANPAGES%%share/man/man3/memcached_replace_by_key.3.gz
> +%%MANPAGES%%share/man/man3/memcached_result_cas.3.gz
> +%%MANPAGES%%share/man/man3/memcached_result_create.3.gz
> +%%MANPAGES%%share/man/man3/memcached_result_flags.3.gz
> +%%MANPAGES%%share/man/man3/memcached_result_free.3.gz
> +%%MANPAGES%%share/man/man3/memcached_result_key_length.3.gz
> +%%MANPAGES%%share/man/man3/memcached_result_key_value.3.gz
> +%%MANPAGES%%share/man/man3/memcached_result_length.3.gz
> +%%MANPAGES%%share/man/man3/memcached_result_st.3.gz
> +%%MANPAGES%%share/man/man3/memcached_result_value.3.gz
> +%%MANPAGES%%share/man/man3/memcached_return_t.3.gz
> +%%MANPAGES%%share/man/man3/memcached_sasl.3.gz
> +%%MANPAGES%%share/man/man3/memcached_sasl_set_auth_data.3.gz
> +%%MANPAGES%%share/man/man3/memcached_server_add.3.gz
> +%%MANPAGES%%share/man/man3/memcached_server_add_unix_socket.3.gz
> +%%MANPAGES%%share/man/man3/memcached_server_count.3.gz
> +%%MANPAGES%%share/man/man3/memcached_server_cursor.3.gz
> +%%MANPAGES%%share/man/man3/memcached_server_list.3.gz
> +%%MANPAGES%%share/man/man3/memcached_server_list_append.3.gz
> +%%MANPAGES%%share/man/man3/memcached_server_list_count.3.gz
> +%%MANPAGES%%share/man/man3/memcached_server_list_free.3.gz
> +%%MANPAGES%%share/man/man3/memcached_server_push.3.gz
> +%%MANPAGES%%share/man/man3/memcached_server_st.3.gz
> +%%MANPAGES%%share/man/man3/memcached_servers.3.gz
> +%%MANPAGES%%share/man/man3/memcached_servers_parse.3.gz
> +%%MANPAGES%%share/man/man3/memcached_servers_reset.3.gz
> +%%MANPAGES%%share/man/man3/memcached_set.3.gz
> +%%MANPAGES%%share/man/man3/memcached_set_by_key.3.gz
> +%%MANPAGES%%share/man/man3/memcached_set_encoding_key.3.gz
> +%%MANPAGES%%share/man/man3/memcached_set_memory_allocators.3.gz
> +%%MANPAGES%%share/man/man3/memcached_set_memory_allocators_context.3.gz
> +%%MANPAGES%%share/man/man3/memcached_set_sasl_callbacks.3.gz
> +%%MANPAGES%%share/man/man3/memcached_set_user_data.3.gz
> +%%MANPAGES%%share/man/man3/memcached_stat.3.gz
> +%%MANPAGES%%share/man/man3/memcached_stat_execute.3.gz
> +%%MANPAGES%%share/man/man3/memcached_stat_get_keys.3.gz
> +%%MANPAGES%%share/man/man3/memcached_stat_get_value.3.gz
> +%%MANPAGES%%share/man/man3/memcached_stat_servername.3.gz
> +%%MANPAGES%%share/man/man3/memcached_stats.3.gz
> +%%MANPAGES%%share/man/man3/memcached_strerror.3.gz
> +%%MANPAGES%%share/man/man3/memcached_touch.3.gz
> +%%MANPAGES%%share/man/man3/memcached_touch_by_key.3.gz
> +%%MANPAGES%%share/man/man3/memcached_user_data.3.gz
> +%%MANPAGES%%share/man/man3/memcached_verbosity.3.gz
> +%%MANPAGES%%share/man/man3/memcached_version.3.gz
Hi,
I few things I noticed compared to the PR I submitted about this port.
-std=gnu++17 is set when unit tests are enabled so USES=
compiler:c++11-lang is incorrect
Is there a reason why default filenames aren't used for patches?
Why are we using flex from base rather from ports?
Best regards,
Daniel