On Thursday, December 15, 2011 11:55 CET, "Sebastian Reitenbach"
<sebas...@l00-bugdead-prods.de> wrote:
>
> On Tuesday, November 22, 2011 00:10 CET, "Sebastian Reitenbach"
> <sebas...@l00-bugdead-prods.de> wrote:
>
> >
> > On Monday, November 14, 2011 11:20 CET, "Sebastian Reitenbach"
> > <sebas...@l00-bugdead-prods.de> wrote:
> >
> > > Hi,
> > >
> > > attached port updates libmemcached to 1.0.2. The regressions suite seems
> > > to be new, some tests seem to fail, but better than hanging. Tested on
> > > i386 with old and updated misc/memcached and www/sogo, which seems to be
> > > the only consumer of libmemcached.
> > >
> > > Due to the atomic woes, could someone maybe test it on PPC?
> > >
> > > Otherwise, is it OK?
> > >
> > > Sebastian
> >
> > ping!
>
> pong.
> Now with updated patch to configure script, to correctly detect availability
> of MSG_NOSIGNAL and friends.
>
I'd really like to get this in, and removed from my TODO list ;) This time
added inlined for ease of review. Also last time the wrong patch was attached,
now the right one.
OK?
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/libmemcached/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- Makefile 11 Jul 2011 14:04:42 -0000 1.10
+++ Makefile 15 Dec 2011 10:48:19 -0000
@@ -2,9 +2,8 @@
COMMENT= C C++ API for memcached
-VERSION= 0.48
+VERSION = 1.0.2
DISTNAME= libmemcached-${VERSION}
-REVISION= 0
CATEGORIES= devel misc
HOMEPAGE= http://libmemcached.org/
@@ -13,8 +12,8 @@
MAINTAINER= Sebastian Reitenbach <sebas...@openbsd.org>
USE_LIBTOOL= Yes
-SHARED_LIBS += memcached 0.0 # 0.0
-SHARED_LIBS += hashkit 0.0 # 0.0
+SHARED_LIBS += memcached 1.0 # 0.0
+SHARED_LIBS += hashkit 1.0 # 0.0
SHARED_LIBS += memcachedprotocol 0.0 # 0.0
SHARED_LIBS += memcachedutil 0.0 # 1.0
@@ -25,7 +24,8 @@
PERMIT_DISTFILES_FTP= Yes
USE_GROFF = Yes
-WANTLIB += c event m pthread sasl2
+USE_GMAKE = Yes
+WANTLIB += c m pthread sasl2 stdc++
LIB_DEPENDS= security/cyrus-sasl2
REGRESS_DEPENDS= misc/memcached
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/libmemcached/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- distinfo 14 Apr 2011 11:17:49 -0000 1.3
+++ distinfo 15 Dec 2011 10:48:19 -0000
@@ -1,5 +1,5 @@
-MD5 (libmemcached-0.48.tar.gz) = 4ArlFJKh+dy7bPulDcVHWA==
-RMD160 (libmemcached-0.48.tar.gz) = h7L+IkDHDPZuPWWI8ZyfEt+qhAE=
-SHA1 (libmemcached-0.48.tar.gz) = 9z0K1Va+QQl95rQmhyhBLxfaNUI=
-SHA256 (libmemcached-0.48.tar.gz) =
rQDyqGBhy1YfQiCDED+Y1eUAASPDkXfPXhtNv3bwUpY=
-SIZE (libmemcached-0.48.tar.gz) = 763754
+MD5 (libmemcached-1.0.2.tar.gz) = Wh69XeIvbiRHTLn1eUVv1Q==
+RMD160 (libmemcached-1.0.2.tar.gz) = gKGDq2hToMwHy7O811IobBhyIEg=
+SHA1 (libmemcached-1.0.2.tar.gz) = 2ZKEX+cSEOLpMUe6jynfH8oU5xY=
+SHA256 (libmemcached-1.0.2.tar.gz) =
xcoh27hc5KTekeSu1rPR+KRZmYCqYG7wgS7rUrfQF/I=
+SIZE (libmemcached-1.0.2.tar.gz) = 942891
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/devel/libmemcached/patches/patch-configure,v
retrieving revision 1.2
diff -u -r1.2 patch-configure
--- patches/patch-configure 14 Apr 2011 11:17:49 -0000 1.2
+++ patches/patch-configure 15 Dec 2011 10:48:19 -0000
@@ -1,10 +1,11 @@
$OpenBSD: patch-configure,v 1.2 2011/04/14 11:17:49 sebastia Exp $
get rid of a truckload of warnings when compiling
+allow to detect MSG_NOSIGNAL and friends
---- configure.orig Wed Mar 16 03:40:33 2011
-+++ configure Fri Apr 1 01:47:32 2011
-@@ -17719,7 +17719,7 @@ fi
+--- configure.orig Wed Oct 26 17:48:39 2011
++++ configure Thu Dec 15 11:12:42 2011
+@@ -7820,7 +7820,7 @@ fi
fi
@@ -13,7 +14,7 @@
CXX_WARNINGS="${BASE_WARNINGS} -Woverloaded-virtual -Wnon-virtual-dtor
-Wctor-dtor-privacy -Wno-long-long ${CXX_WARNINGS_FULL}"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to
use -Wmissing-declarations from C++" >&5
-@@ -17868,7 +17868,7 @@ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAG
+@@ -7969,7 +7969,7 @@ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAG
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
save_CXXFLAGS="${CXXFLAGS}"
@@ -22,7 +23,7 @@
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-@@ -17901,9 +17901,9 @@ fi
+@@ -8002,9 +8002,9 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result:
$ac_cv_safe_to_use_Wredundant_decls_" >&5
$as_echo "$ac_cv_safe_to_use_Wredundant_decls_" >&6; }
if test "$ac_cv_safe_to_use_Wredundant_decls_" = "yes"; then :
@@ -34,7 +35,7 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to
use -Wattributes from C++" >&5
-@@ -18013,7 +18013,7 @@ fi
+@@ -8114,7 +8114,7 @@ fi
fi
@@ -43,3 +44,27 @@
PROTOSKIP_WARNINGS="-Wno-effc++ -Wno-shadow -Wno-missing-braces
${NO_ATTRIBUTES}"
NO_WERROR="-Wno-error"
PERMISSIVE_WARNINGS="-Wno-error -Wno-unused-function -fpermissive"
+@@ -25737,6 +25737,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
++#include <sys/types.h>
+ #include <sys/socket.h>
+
+ int
+@@ -25785,6 +25786,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
++#include <sys/types.h>
+ #include <sys/socket.h>
+
+ int
+@@ -25833,6 +25835,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
++#include <sys/types.h>
+ #include <sys/socket.h>
+
+ int
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/libmemcached/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 PLIST
--- pkg/PLIST 1 Oct 2010 09:32:36 -0000 1.1.1.1
+++ pkg/PLIST 15 Dec 2011 10:48:19 -0000
@@ -6,65 +6,84 @@
@bin bin/memcp
@bin bin/memdump
@bin bin/memerror
+@bin bin/memexist
@bin bin/memflush
+@bin bin/memparse
+@bin bin/memping
@bin bin/memrm
@bin bin/memstat
+@bin bin/memtouch
include/libhashkit/
-include/libhashkit/algorithm.h
-include/libhashkit/behavior.h
-include/libhashkit/configure.h
-include/libhashkit/digest.h
-include/libhashkit/function.h
+include/libhashkit-1.0/
+include/libhashkit-1.0/algorithm.h
+include/libhashkit-1.0/behavior.h
+include/libhashkit-1.0/configure.h
+include/libhashkit-1.0/digest.h
+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/types.h
+include/libhashkit-1.0/visibility.h
include/libhashkit/hashkit.h
-include/libhashkit/strerror.h
-include/libhashkit/types.h
-include/libhashkit/visibility.h
include/libmemcached/
-include/libmemcached/allocators.h
-include/libmemcached/analyze.h
-include/libmemcached/auto.h
-include/libmemcached/behavior.h
-include/libmemcached/callback.h
-include/libmemcached/configure.h
-include/libmemcached/constants.h
-include/libmemcached/delete.h
-include/libmemcached/dump.h
-include/libmemcached/exception.hpp
-include/libmemcached/fetch.h
-include/libmemcached/flush.h
-include/libmemcached/flush_buffers.h
-include/libmemcached/get.h
-include/libmemcached/hash.h
-include/libmemcached/memcached/
+include/libmemcached-1.0/
+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
+include/libmemcached-1.0/behavior.h
+include/libmemcached-1.0/callback.h
+include/libmemcached-1.0/configure.h
+include/libmemcached-1.0/constants.h
+include/libmemcached-1.0/delete.h
+include/libmemcached-1.0/dump.h
+include/libmemcached-1.0/error.h
+include/libmemcached-1.0/exception.hpp
+include/libmemcached-1.0/exist.h
+include/libmemcached-1.0/fetch.h
+include/libmemcached-1.0/flush.h
+include/libmemcached-1.0/flush_buffers.h
+include/libmemcached-1.0/get.h
+include/libmemcached-1.0/hash.h
+include/libmemcached-1.0/memcached.h
+include/libmemcached-1.0/memcached.hpp
+include/libmemcached-1.0/options.h
+include/libmemcached-1.0/parse.h
+include/libmemcached-1.0/platform.h
+include/libmemcached-1.0/quit.h
+include/libmemcached-1.0/result.h
+include/libmemcached-1.0/return.h
+include/libmemcached-1.0/sasl.h
+include/libmemcached-1.0/server.h
+include/libmemcached-1.0/server_list.h
+include/libmemcached-1.0/stats.h
+include/libmemcached-1.0/storage.h
+include/libmemcached-1.0/strerror.h
+include/libmemcached-1.0/string.h
+include/libmemcached-1.0/touch.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/memcached/protocol_binary.h
-include/libmemcached/memcached_util.h
-include/libmemcached/parse.h
-include/libmemcached/platform.h
-include/libmemcached/protocol/
-include/libmemcached/protocol/cache.h
-include/libmemcached/protocol/callback.h
-include/libmemcached/protocol_handler.h
-include/libmemcached/quit.h
-include/libmemcached/result.h
-include/libmemcached/sasl.h
-include/libmemcached/server.h
-include/libmemcached/server_list.h
-include/libmemcached/stats.h
-include/libmemcached/storage.h
-include/libmemcached/strerror.h
-include/libmemcached/string.h
-include/libmemcached/types.h
-include/libmemcached/util/
include/libmemcached/util.h
-include/libmemcached/util/ping.h
-include/libmemcached/util/pool.h
-include/libmemcached/util/version.h
-include/libmemcached/verbosity.h
-include/libmemcached/version.h
-include/libmemcached/visibility.h
-include/libmemcached/watchpoint.h
+include/libmemcachedprotocol-0.0/
+include/libmemcachedprotocol-0.0/binary.h
+include/libmemcachedprotocol-0.0/callback.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
+include/libmemcachedutil-1.0/pid.h
+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/libhashkit.la
lib/libmemcached.a
@@ -75,6 +94,7 @@
lib/libmemcachedutil.la
lib/pkgconfig/
lib/pkgconfig/libmemcached.pc
+@man man/man1/memaslap.1
@man man/man1/memcapable.1
@man man/man1/memcat.1
@man man/man1/memcp.1
@@ -98,9 +118,13 @@
@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
@@ -120,11 +144,14 @@
@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
@@ -133,17 +160,22 @@
@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
@@ -170,5 +202,7 @@
@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
