Index: Makefile =================================================================== RCS file: /cvs/ports/devel/libmemcached/Makefile,v diff -u -r1.28 Makefile --- Makefile 21 Sep 2023 09:49:58 -0000 1.28 +++ Makefile 12 Feb 2026 15:30:01 -0000 @@ -1,34 +1,38 @@ COMMENT= C C++ API for memcached -VERSION= 1.0.18 -REVISION= 4 -DISTNAME= libmemcached-${VERSION} +VERSION= 1.1.4 +DIST_TUPLE = github awesomized libmemcached ${VERSION} . CATEGORIES= devel misc -HOMEPAGE= http://libmemcached.org/ -SITES= http://launchpad.net/libmemcached/1.0/${VERSION}/+download/ - -MAINTAINER= Sebastian Reitenbach - SHARED_LIBS += memcached 1.0 # 0.0 SHARED_LIBS += hashkit 1.0 # 0.0 SHARED_LIBS += memcachedutil 1.0 # 1.0 +SHARED_LIBS += memcachedprotocol 0.0 # 0.0 # BSD PERMIT_PACKAGE= Yes +MODULES = devel/cmake + WANTLIB += ${COMPILER_LIBCXX} c crypto m pthread sasl2 +WANTLIB += event_core event_extra execinfo COMPILER = base-clang ports-gcc base-gcc -BUILD_DEPENDS= sysutils/e2fsprogs # detects libuuid in autoconf; only used when building tests -LIB_DEPENDS= security/cyrus-sasl2 +BUILD_DEPENDS= devel/bison +LIB_DEPENDS= devel/libevent2 \ + security/cyrus-sasl2 + +#The following tests FAILED: +# 51 - memcached_regression_lp1630615 (Timeout) +# 53 - memcached_sasl (Timeout) TEST_DEPENDS= misc/memcached -USE_GMAKE= yes -CONFIGURE_STYLE= gnu -CONFIGURE_ENV += CFLAGS="${CFLAGS} -I${LOCALBASE}/include" -CONFIGURE_ENV += CXXFLAGS="${CFLAGS} -I${LOCALBASE}/include" -CONFIGURE_ENV += LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" +CONFIGURE_ARGS = -DENABLE_OPENSSL_CRYPTO=ON \ + -DENABLE_SASL=ON \ + -DBUILD_TESTING=ON \ + -DCMAKE_C_FLAGS="${CFLAGS} -I${LOCALBASE}/include" \ + -DCMAKE_CXX_FLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \ + -DCMAKE_EXE_LINKER_FLAGS="${LDFLAGS} -L${LOCALBASE}/lib" .include "bsd.port.mk" Index: distinfo =================================================================== RCS file: /cvs/ports/devel/libmemcached/distinfo,v diff -u -r1.5 distinfo --- distinfo 10 Nov 2015 08:43:36 -0000 1.5 +++ distinfo 12 Feb 2026 15:30:01 -0000 @@ -1,2 +1,2 @@ -SHA256 (libmemcached-1.0.18.tar.gz) = 4iwLsDL94I9T3p/7xaEoIzBB2fM7XeAiwJeKIUmIX4I= -SIZE (libmemcached-1.0.18.tar.gz) = 1039649 +SHA256 (awesomized-libmemcached-1.1.4.tar.gz) = xHfh9lEOHcaY6E83F85pCo9luUxhbsqmIwbM4PXjEWo= +SIZE (awesomized-libmemcached-1.1.4.tar.gz) = 530337 Index: patches/patch-clients_memflush_cc =================================================================== RCS file: patches/patch-clients_memflush_cc diff -N patches/patch-clients_memflush_cc --- patches/patch-clients_memflush_cc 11 Mar 2022 18:50:36 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,20 +0,0 @@ ---- clients/memflush.cc.orig Fri Apr 28 00:57:12 2017 -+++ clients/memflush.cc Fri Apr 28 00:57:30 2017 -@@ -39,7 +39,7 @@ int main(int argc, char *argv[]) - { - options_parse(argc, argv); - -- if (opt_servers == false) -+ if (!opt_servers) - { - char *temp; - -@@ -48,7 +48,7 @@ int main(int argc, char *argv[]) - opt_servers= strdup(temp); - } - -- if (opt_servers == false) -+ if (!opt_servers) - { - std::cerr << "No Servers provided" << std::endl; - exit(EXIT_FAILURE); Index: patches/patch-libmemcached-1_0_memcached_h =================================================================== RCS file: patches/patch-libmemcached-1_0_memcached_h diff -N patches/patch-libmemcached-1_0_memcached_h --- patches/patch-libmemcached-1_0_memcached_h 11 Mar 2022 18:50:36 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,17 +0,0 @@ -our cinttypes is in tr1/cinttypes. - ---- libmemcached-1.0/memcached.h.orig Sun Feb 9 12:52:42 2014 -+++ libmemcached-1.0/memcached.h Fri Apr 28 00:44:43 2017 -@@ -43,7 +43,11 @@ - #endif - - #ifdef __cplusplus --# include -+# ifdef __clang__ -+# include -+# else -+# include -+#endif - # include - # include - #else Index: patches/patch-libtest_lite_h =================================================================== RCS file: patches/patch-libtest_lite_h diff -N patches/patch-libtest_lite_h --- patches/patch-libtest_lite_h 11 Mar 2022 18:50:36 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,14 +0,0 @@ -configure tests for availability of alloca.h, but -it's used unconditionally here. - ---- libtest/lite.h.orig Sun Nov 8 20:10:49 2015 -+++ libtest/lite.h Sun Nov 8 20:10:32 2015 -@@ -53,7 +53,7 @@ - - #if defined(WIN32) - # include --#else -+#elif defined(HAVE_ALLOCA_H) - # include - #endif - Index: patches/patch-libtest_main_cc =================================================================== RCS file: patches/patch-libtest_main_cc diff -N patches/patch-libtest_main_cc --- patches/patch-libtest_main_cc 11 Mar 2022 18:50:36 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,15 +0,0 @@ -Configure tests for sigignore, but it's used -unconditionally. - ---- libtest/main.cc.orig Sun Nov 8 22:05:06 2015 -+++ libtest/main.cc Sun Nov 8 22:05:53 2015 -@@ -288,7 +288,9 @@ int main(int argc, char *argv[]) - do - { - exit_code= EXIT_SUCCESS; -+#if defined(HAVE_SIGIGNORE) - fatal_assert(sigignore(SIGPIPE) == 0); -+#endif - - libtest::SignalThread signal; - if (signal.setup() == false) Index: patches/patch-libtest_test_hpp =================================================================== RCS file: patches/patch-libtest_test_hpp diff -N patches/patch-libtest_test_hpp --- patches/patch-libtest_test_hpp 11 Mar 2022 18:50:36 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,13 +0,0 @@ -unbreak with gcc 4.9 - -Index: libtest/test.hpp ---- libtest/test.hpp.orig -+++ libtest/test.hpp -@@ -59,6 +59,7 @@ - - #include - #include -+#include - #include - - #include Index: patches/patch-test_lib_random_hpp =================================================================== RCS file: patches/patch-test_lib_random_hpp diff -N patches/patch-test_lib_random_hpp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-test_lib_random_hpp 12 Feb 2026 15:30:01 -0000 @@ -0,0 +1,16 @@ +Index: test/lib/random.hpp +--- test/lib/random.hpp.orig ++++ test/lib/random.hpp +@@ -36,7 +36,11 @@ void random_setup(); + template + enable_if_t, T> random_num(T min, T max) { + lock_guard m{rnd_mtx}; +- return uniform_int_distribution(min, max)(rnd_eng); ++ /* + * std::uniform_int_distribution is undefined for char types in strict C++ ++ * Promote 8-bit types to int for the distribution, then cast back. ++ */ ++ using D = conditional_t<(sizeof(T) <= 1), int, T>; ++ return static_cast(uniform_int_distribution(min, max)(rnd_eng)); + } + + unsigned random_port(); Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/devel/libmemcached/pkg/PLIST,v diff -u -r1.5 PLIST --- pkg/PLIST 11 Mar 2022 18:50:36 -0000 1.5 +++ pkg/PLIST 12 Feb 2026 15:30:01 -0000 @@ -1,3 +1,4 @@ +@bin bin/memaslap @bin bin/memcapable @bin bin/memcat @bin bin/memcp @@ -14,6 +15,7 @@ include/libhashkit/ include/libhashkit-1.0/ 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 @@ -92,6 +94,12 @@ include/libmemcached/memcached.h include/libmemcached/memcached.hpp include/libmemcached/util.h +include/libmemcachedprotocol-0.0/ +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/ include/libmemcachedutil-1.0/flush.h include/libmemcachedutil-1.0/ostream.hpp @@ -100,132 +108,44 @@ include/libmemcachedutil-1.0/pool.h include/libmemcachedutil-1.0/util.h include/libmemcachedutil-1.0/version.h -lib/libhashkit.a -lib/libhashkit.la +lib/cmake/ +lib/cmake/libmemcached-awesome/ +lib/cmake/libmemcached-awesome/libhashkit-targets${MODCMAKE_BUILD_SUFFIX} +lib/cmake/libmemcached-awesome/libhashkit-targets.cmake +lib/cmake/libmemcached-awesome/libhashkit-version.cmake +lib/cmake/libmemcached-awesome/libmemcached-config.cmake +lib/cmake/libmemcached-awesome/libmemcached-targets${MODCMAKE_BUILD_SUFFIX} +lib/cmake/libmemcached-awesome/libmemcached-targets.cmake +lib/cmake/libmemcached-awesome/libmemcached-version.cmake +lib/cmake/libmemcached-awesome/libmemcachedprotocol-targets${MODCMAKE_BUILD_SUFFIX} +lib/cmake/libmemcached-awesome/libmemcachedprotocol-targets.cmake +lib/cmake/libmemcached-awesome/libmemcachedprotocol-version.cmake +lib/cmake/libmemcached-awesome/libmemcachedutil-targets${MODCMAKE_BUILD_SUFFIX} +lib/cmake/libmemcached-awesome/libmemcachedutil-targets.cmake +lib/cmake/libmemcached-awesome/libmemcachedutil-version.cmake +lib/cmake/libmemcached-awesome/p9y-targets${MODCMAKE_BUILD_SUFFIX} +lib/cmake/libmemcached-awesome/p9y-targets.cmake @lib lib/libhashkit.so.${LIBhashkit_VERSION} -lib/libmemcached.a -lib/libmemcached.la @lib lib/libmemcached.so.${LIBmemcached_VERSION} -lib/libmemcachedutil.a -lib/libmemcachedutil.la +@lib lib/libmemcachedprotocol.so.${LIBmemcachedprotocol_VERSION} @lib lib/libmemcachedutil.so.${LIBmemcachedutil_VERSION} +@static-lib lib/libp9y.a lib/pkgconfig/libmemcached.pc -@man man/man1/memaslap.1 -@man man/man1/memcapable.1 -@man man/man1/memcat.1 -@man man/man1/memcp.1 -@man man/man1/memdump.1 -@man man/man1/memerror.1 -@man man/man1/memexist.1 -@man man/man1/memflush.1 -@man man/man1/memparse.1 -@man man/man1/memping.1 -@man man/man1/memrm.1 -@man man/man1/memslap.1 -@man man/man1/memstat.1 -@man man/man1/memtouch.1 -@man man/man3/hashkit_clone.3 -@man man/man3/hashkit_crc32.3 -@man man/man3/hashkit_create.3 -@man man/man3/hashkit_fnv1_32.3 -@man man/man3/hashkit_fnv1_64.3 -@man man/man3/hashkit_fnv1a_32.3 -@man man/man3/hashkit_fnv1a_64.3 -@man man/man3/hashkit_free.3 -@man man/man3/hashkit_functions.3 -@man man/man3/hashkit_hsieh.3 -@man man/man3/hashkit_is_allocated.3 -@man man/man3/hashkit_jenkins.3 -@man man/man3/hashkit_md5.3 -@man man/man3/hashkit_murmur.3 -@man man/man3/hashkit_value.3 -@man man/man3/libhashkit.3 -@man man/man3/libmemcached.3 -@man man/man3/libmemcached_check_configuration.3 -@man man/man3/libmemcached_configuration.3 -@man man/man3/libmemcached_examples.3 -@man man/man3/libmemcachedutil.3 -@man man/man3/memcached.3 -@man man/man3/memcached_add.3 -@man man/man3/memcached_add_by_key.3 -@man man/man3/memcached_analyze.3 -@man man/man3/memcached_append.3 -@man man/man3/memcached_append_by_key.3 -@man man/man3/memcached_behavior_get.3 -@man man/man3/memcached_behavior_set.3 -@man man/man3/memcached_callback_get.3 -@man man/man3/memcached_callback_set.3 -@man man/man3/memcached_cas.3 -@man man/man3/memcached_cas_by_key.3 -@man man/man3/memcached_clone.3 -@man man/man3/memcached_create.3 -@man man/man3/memcached_decrement.3 -@man man/man3/memcached_decrement_with_initial.3 -@man man/man3/memcached_delete.3 -@man man/man3/memcached_delete_by_key.3 -@man man/man3/memcached_destroy_sasl_auth_data.3 -@man man/man3/memcached_dump.3 -@man man/man3/memcached_exist.3 -@man man/man3/memcached_exist_by_key.3 -@man man/man3/memcached_fetch.3 -@man man/man3/memcached_fetch_execute.3 -@man man/man3/memcached_fetch_result.3 -@man man/man3/memcached_flush_buffers.3 -@man man/man3/memcached_free.3 -@man man/man3/memcached_generate_hash.3 -@man man/man3/memcached_generate_hash_value.3 -@man man/man3/memcached_get.3 -@man man/man3/memcached_get_by_key.3 -@man man/man3/memcached_get_memory_allocators.3 -@man man/man3/memcached_get_sasl_callbacks.3 -@man man/man3/memcached_get_user_data.3 -@man man/man3/memcached_increment.3 -@man man/man3/memcached_increment_with_initial.3 -@man man/man3/memcached_last_error_message.3 -@man man/man3/memcached_lib_version.3 -@man man/man3/memcached_mget.3 -@man man/man3/memcached_mget_by_key.3 -@man man/man3/memcached_mget_execute.3 -@man man/man3/memcached_mget_execute_by_key.3 -@man man/man3/memcached_pool.3 -@man man/man3/memcached_pool_behavior_get.3 -@man man/man3/memcached_pool_behavior_set.3 -@man man/man3/memcached_pool_create.3 -@man man/man3/memcached_pool_destroy.3 -@man man/man3/memcached_pool_fetch.3 -@man man/man3/memcached_pool_pop.3 -@man man/man3/memcached_pool_push.3 -@man man/man3/memcached_pool_release.3 -@man man/man3/memcached_pool_st.3 -@man man/man3/memcached_prepend.3 -@man man/man3/memcached_prepend_by_key.3 -@man man/man3/memcached_quit.3 -@man man/man3/memcached_replace.3 -@man man/man3/memcached_replace_by_key.3 -@man man/man3/memcached_sasl_set_auth_data.3 -@man man/man3/memcached_server_add.3 -@man man/man3/memcached_server_count.3 -@man man/man3/memcached_server_cursor.3 -@man man/man3/memcached_server_list.3 -@man man/man3/memcached_server_list_append.3 -@man man/man3/memcached_server_list_count.3 -@man man/man3/memcached_server_list_free.3 -@man man/man3/memcached_server_push.3 -@man man/man3/memcached_servers_parse.3 -@man man/man3/memcached_set.3 -@man man/man3/memcached_set_by_key.3 -@man man/man3/memcached_set_memory_allocators.3 -@man man/man3/memcached_set_sasl_callbacks.3 -@man man/man3/memcached_set_user_data.3 -@man man/man3/memcached_stat.3 -@man man/man3/memcached_stat_execute.3 -@man man/man3/memcached_stat_get_keys.3 -@man man/man3/memcached_stat_get_value.3 -@man man/man3/memcached_stat_servername.3 -@man man/man3/memcached_strerror.3 -@man man/man3/memcached_touch.3 -@man man/man3/memcached_touch_by_key.3 -@man man/man3/memcached_verbosity.3 -@man man/man3/memcached_version.3 share/aclocal/ share/aclocal/ax_libmemcached.m4 +share/doc/libmemcached-awesome/ +share/doc/libmemcached-awesome/AUTHORS +share/doc/libmemcached-awesome/BUGS.md +share/doc/libmemcached-awesome/CONTRIBUTING.md +share/doc/libmemcached-awesome/COPYING +share/doc/libmemcached-awesome/ChangeLog +share/doc/libmemcached-awesome/ChangeLog-0.md +share/doc/libmemcached-awesome/ChangeLog-1.0.md +share/doc/libmemcached-awesome/ChangeLog-1.1.md +share/doc/libmemcached-awesome/ChangeLog.md +share/doc/libmemcached-awesome/LICENSE +share/doc/libmemcached-awesome/NEWS +share/doc/libmemcached-awesome/README.md +share/doc/libmemcached-awesome/TODO +share/libmemcached-awesome/ +share/libmemcached-awesome/example.cnf