1.0.17 Tue Apr 2 14:02:01 HST 2013

* Remove c++ namespace that was being exposed (the API should be plug
  compatible)..
* Fix cases where --servers wasn't behaving the same in all clients.

1.0.16 Thu Jan 31 19:14:32 EST 2013
* Added support to do two part shutdown of socket.
* Fixes for Fedora 18.
* Fix for binary memcached_touch()

1.0.15 Mon Dec 17 07:25:44 EST 2012
* Added support for Murmur3 (HASHKIT_HASH_MURMUR3)
* Portability fixes.

1.0.14 Wed Nov 14 04:56:25 EST 2012
* CLIENT_ERROR fixed to not be treated as a fatal error.
* Compiler fixes for older Ubuntu releases.

1.0.13 Fri Oct 19 00:09:28 EDT 2012
* Fix bug that caused version string to not be exported correctly.

1.0.12 Tue Oct  9 03:30:20 EDT 2012
* Added memcached_result_take_value().
* Added ax_libmemcached.m4

1.0.11 Sun Sep 16 20:32:13 EDT 2012
* Removed custom version of memcached.
* Updated hardening rules.
* Fixed a case where the return error from a socket connection differred
  from that of a TCP/IP socket.

1.0.10 Sun Jul 29 21:50:15 PDT 2012
* --disable-assert has been removed from configure, and --enable-assert
  has been added in its place.
* Compiling fixes for Clang on OSX Mountain Lion.

1.0.9 Wed Jul  4 22:46:19 EDT 2012
* Faster close on socket.
* Instance allocation is now seperated from server interface. This should
  allow for a better preservation of ABI compliance from now on.
* Fix close on exec bug.
* Numerous other bug fixes.

1.0.8 Tue May 22 15:06:04 EDT 2012
* Added support for setting options via ENV variable LIBMEMCACHED
* Fix corner case on last used result.

1.0.7 Sat Apr 28 00:48:29 PDT 2012
* Add API call for exist calls.
* Update all license files to be BSD.

1.0.6 Sat Apr  7 18:26:49 PDT 2012
* Fixes for gcc 4.7, lp:961812
* Fix for restart issue that happens under testing.
* Fix for lp:962815.
* Support for transparent AES encryption.

1.0.5 Tue Mar 13 22:56:47 PDT 2012
* Fixes for OSX.
* Version is now parsed directly in the parser, which makes buffered
  operations now work with it..
* memstat has been extended so that it can be used to find the version
  of the server.
* Update documentation.
* Fixes for compile issues on Debian and Ubuntu

1.0.4 Thu Jan 26 22:33:54 PST 2012
* Fix for memcached_dump().
* Additional testing for memcached_stat_execute().

11 files changed, 110 insertions, 67 deletions

diff --git a/devel/libmemcached/Makefile b/devel/libmemcached/Makefile
index fd2a7012f10..71965276a68 100644
--- a/devel/libmemcached/Makefile
+++ b/devel/libmemcached/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2013/05/04 12:43:50 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2013/09/12 14:20:56 fhajny Exp $
 #
 
-DISTNAME=	libmemcached-1.0.4
+DISTNAME=	libmemcached-1.0.17
 CATEGORIES=	devel
-MASTER_SITES=	http://launchpad.net/libmemcached/1.0/${PKGVERSION}/+download/
+MASTER_SITES=	http://launchpad.net/libmemcached/1.0/${PKGVERSION_NOREV}/+download/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://libmemcached.org/
@@ -18,16 +18,17 @@ USE_LIBTOOL=	yes
 PKGCONFIG_OVERRIDE+=	support/libmemcached.pc.in
 
 .include "../../mk/bsd.prefs.mk"
-# Avoid building 64bit on a 32bit bootstrap (affects SunOS)
-.if defined(ABI) && empty(ABI:M64)
-CONFIGURE_ARGS+=	--disable-64bit
-.endif
+.include "options.mk"
 
-# for backtrace
-.if ${OPSYS} == "NetBSD" && exists(/usr/include/execinfo.h)
-LIBS+=	-lexecinfo
-.endif
+CONFIGURE_ARGS+=--enable-jobserver=no
 
 CPPFLAGS+=	-D__STDC_FORMAT_MACROS
 
+LIBS.SunOS+=	-lsocket
+
+post-configure:
+	${ECHO} '#define HAVE_MEMCACHED_BINARY 1' >> ${WRKSRC}/mem_config.h
+	${ECHO} '#define MEMCACHED_BINARY "${PREFIX}/bin/memcached"' >> ${WRKSRC}/mem_config.h
+
+.include "../../devel/libexecinfo/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/libmemcached/PLIST b/devel/libmemcached/PLIST
index 4fb88904061..6f215e7cfde 100644
--- a/devel/libmemcached/PLIST
+++ b/devel/libmemcached/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2012/02/07 11:34:00 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.3 2013/09/12 14:20:56 fhajny Exp $
 bin/memcapable
 bin/memcat
 bin/memcp
@@ -22,6 +22,7 @@ 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/types.h
 include/libhashkit-1.0/visibility.h
 include/libhashkit/hashkit.h
@@ -38,6 +39,7 @@ include/libmemcached-1.0/defaults.h
 include/libmemcached-1.0/delete.h
 include/libmemcached-1.0/deprecated_types.h
 include/libmemcached-1.0/dump.h
+include/libmemcached-1.0/encoding_key.h
 include/libmemcached-1.0/error.h
 include/libmemcached-1.0/exception.hpp
 include/libmemcached-1.0/exist.h
@@ -85,10 +87,6 @@ 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
-include/libmemcachedprotocol-0.0/vbucket.h
 include/libmemcachedutil-1.0/flush.h
 include/libmemcachedutil-1.0/ostream.hpp
 include/libmemcachedutil-1.0/pid.h
@@ -98,7 +96,6 @@ include/libmemcachedutil-1.0/util.h
 include/libmemcachedutil-1.0/version.h
 lib/libhashkit.la
 lib/libmemcached.la
-lib/libmemcachedprotocol.la
 lib/libmemcachedutil.la
 lib/pkgconfig/libmemcached.pc
 man/man1/memaslap.1
@@ -107,10 +104,14 @@ man/man1/memcat.1
 man/man1/memcp.1
 man/man1/memdump.1
 man/man1/memerror.1
+man/man1/memexist.1
 man/man1/memflush.1
+man/man1/memparse.1
+man/man1/memping.1
 man/man1/memrm.1
 man/man1/memslap.1
 man/man1/memstat.1
+man/man1/memtouch.1
 man/man3/hashkit_clone.3
 man/man3/hashkit_crc32.3
 man/man3/hashkit_create.3
@@ -214,3 +215,4 @@ man/man3/memcached_touch.3
 man/man3/memcached_touch_by_key.3
 man/man3/memcached_verbosity.3
 man/man3/memcached_version.3
+share/aclocal/ax_libmemcached.m4
diff --git a/devel/libmemcached/distinfo b/devel/libmemcached/distinfo
index 1c6e776d8fd..12f88ae6c39 100644
--- a/devel/libmemcached/distinfo
+++ b/devel/libmemcached/distinfo
@@ -1,8 +1,12 @@
-$NetBSD: distinfo,v 1.4 2013/06/04 21:17:17 fhajny Exp $
+$NetBSD: distinfo,v 1.5 2013/09/12 14:20:56 fhajny Exp $
 
-SHA1 (libmemcached-1.0.4.tar.gz) = a74644a368b14954c80623879bd722ebf552f857
-RMD160 (libmemcached-1.0.4.tar.gz) = 2a9c71cd7894ed1c55d2557fd71fc75b5bc54ceb
-Size (libmemcached-1.0.4.tar.gz) = 951310 bytes
-SHA1 (patch-configure) = 9bda748d780dc2b3d0f114e302c04a5f5d3b0eee
-SHA1 (patch-tests_libmemcached-1.0_ketama.cc) = 80a4d84457659dfc22c9004469426ba1c35a6f73
-SHA1 (patch-tests_libmemcached-1.0_pool.cc) = b222a16d3ef03a9d60379aeacb10a205961732e0
+SHA1 (libmemcached-1.0.17.tar.gz) = 1023bc8c738b1f5b8ea2cd16d709ec6b47c3efa8
+RMD160 (libmemcached-1.0.17.tar.gz) = f0e617e0dc5f2eb27f9da7ea5a9f5a7b043b80a8
+Size (libmemcached-1.0.17.tar.gz) = 1023177 bytes
+SHA1 (patch-libmemcached-1.0_deprecated__types.h) = 9dcb5a508df69f0959e2b7a34f20ff8311cd41de
+SHA1 (patch-libmemcached_byteorder.cc) = 18d5b6447e7457bf35dbac6c693735932871f095
+SHA1 (patch-libtest_lite.h) = 6460bd76650111613311c35d3d836674dab0c801
+SHA1 (patch-libtest_main.cc) = e9c2d88085f2a66b3296f7acd40484e485fd3c16
+SHA1 (patch-libtest_test.hpp) = 684d1dcfe5c6a4b510353bd578c8919da216542b
+SHA1 (patch-tests_libmemcached-1.0_ketama.cc) = 8dacea6366738254e1a71eef8cd4e04329f4e53c
+SHA1 (patch-tests_libmemcached-1.0_pool.cc) = d5656a54277f7155b1b78a0f90fd0f939ef39be6
diff --git a/devel/libmemcached/patches/patch-configure b/devel/libmemcached/patches/patch-configure
deleted file mode 100644
index e12588872d6..00000000000
--- a/devel/libmemcached/patches/patch-configure
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-configure,v 1.1 2012/02/07 11:34:00 fhajny Exp $
-
-* Fix DTrace flags.
-* Avoid installing under ${PREFIX}/lib/amd64 on SunOS.
-
---- configure.orig	2011-09-28 15:26:49.000000000 +0000
-+++ configure
-@@ -5267,10 +5267,11 @@ fi
- 
- 
-     isainfo_k=`${ISAINFO} -k`
--    DTRACEFLAGS="${DTRACEFLAGS} -${isainfo_b}"
-+    DTRACEFLAGS="${DTRACEFLAGS}"
- 
-     if test "x$ac_enable_64bit" = "xyes"; then :
- 
-+      DTRACEFLAGS="${DTRACEFLAGS} -64"
- 
-       if test "x${ac_cv_env_LDFLAGS_set}" = "x"; then :
- 
-@@ -5278,11 +5279,6 @@ fi
- 
- fi
- 
--      if test "x$libdir" = "x\${exec_prefix}/lib"; then :
--
--                     libdir="${libdir}/${isainfo_k}"
--
--fi
- 
-       if test "x${ac_cv_env_CFLAGS_set}" = "x"; then :
- 
diff --git a/devel/libmemcached/patches/patch-libmemcached-1.0_deprecated__types.h b/devel/libmemcached/patches/patch-libmemcached-1.0_deprecated__types.h
new file mode 100644
index 00000000000..db9104ae4f5
--- /dev/null
+++ b/devel/libmemcached/patches/patch-libmemcached-1.0_deprecated__types.h
@@ -0,0 +1,12 @@
+$NetBSD: patch-libmemcached-1.0_deprecated__types.h,v 1.1 2013/09/12 14:20:56 fhajny Exp $
+
+Add type to overcome a breaking API change.
+https://bugs.launchpad.net/libmemcached/+bug/1190240
+--- libmemcached-1.0/deprecated_types.h.orig	2013-04-03 04:22:00.000000000 +0000
++++ libmemcached-1.0/deprecated_types.h
+@@ -57,4 +57,5 @@ typedef memcached_server_fn memcached_se
+ typedef memcached_trigger_key_fn memcached_trigger_key;
+ typedef memcached_trigger_delete_key_fn memcached_trigger_delete_key;
+ typedef memcached_dump_fn memcached_dump_func;
++typedef memcached_instance_st memcached_server_instance_st;
+ 
diff --git a/devel/libmemcached/patches/patch-libmemcached_byteorder.cc b/devel/libmemcached/patches/patch-libmemcached_byteorder.cc
new file mode 100644
index 00000000000..ac4a91ec91a
--- /dev/null
+++ b/devel/libmemcached/patches/patch-libmemcached_byteorder.cc
@@ -0,0 +1,15 @@
+$NetBSD: patch-libmemcached_byteorder.cc,v 1.1 2013/09/12 14:20:56 fhajny Exp $
+
+Need ntohll/htonll defined.
+--- libmemcached/byteorder.cc.orig	2013-04-03 04:22:00.000000000 +0000
++++ libmemcached/byteorder.cc
+@@ -36,6 +36,9 @@
+  */
+ 
+ #include "mem_config.h"
++#ifdef __sun
++# include "sys/byteorder.h"
++#endif
+ #include "libmemcached/byteorder.h"
+ 
+ /* Byte swap a 64-bit number. */
diff --git a/devel/libmemcached/patches/patch-libtest_lite.h b/devel/libmemcached/patches/patch-libtest_lite.h
new file mode 100644
index 00000000000..a6d9ed35f6e
--- /dev/null
+++ b/devel/libmemcached/patches/patch-libtest_lite.h
@@ -0,0 +1,14 @@
+$NetBSD: patch-libtest_lite.h,v 1.1 2013/09/12 14:20:56 fhajny Exp $
+
+NetBSD doesn't have alloca.h.
+--- libtest/lite.h.orig	2013-04-03 04:22:00.000000000 +0000
++++ libtest/lite.h
+@@ -53,7 +53,7 @@
+ 
+ #if defined(_WIN32)
+ # include <malloc.h>
+-#else
++#elif !defined(__NetBSD__)
+ # include <alloca.h>
+ #endif
+ 
diff --git a/devel/libmemcached/patches/patch-libtest_main.cc b/devel/libmemcached/patches/patch-libtest_main.cc
new file mode 100644
index 00000000000..2a30cd13816
--- /dev/null
+++ b/devel/libmemcached/patches/patch-libtest_main.cc
@@ -0,0 +1,13 @@
+$NetBSD: patch-libtest_main.cc,v 1.1 2013/09/12 14:20:56 fhajny Exp $
+
+strings.h needed for rindex.
+--- libtest/main.cc.orig	2013-04-03 04:22:00.000000000 +0000
++++ libtest/main.cc
+@@ -45,6 +45,7 @@
+ #include <iostream>
+ #include <fstream>
+ #include <memory>
++#include <strings.h>
+ #include <sys/stat.h>
+ #include <sys/time.h>
+ #include <sys/types.h>
diff --git a/devel/libmemcached/patches/patch-libtest_test.hpp b/devel/libmemcached/patches/patch-libtest_test.hpp
new file mode 100644
index 00000000000..ef5e361ef11
--- /dev/null
+++ b/devel/libmemcached/patches/patch-libtest_test.hpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-libtest_test.hpp,v 1.1 2013/09/12 14:20:56 fhajny Exp $
+
+cstdarg needed for va_start.
+--- libtest/test.hpp.orig	2013-04-03 04:22:00.000000000 +0000
++++ libtest/test.hpp
+@@ -57,6 +57,7 @@
+ 
+ #define LIBYATL_DEFAULT_PARAM __FILE__, __LINE__, __PRETTY_FUNCTION__
+ 
++#include <cstdarg>
+ #include <cstdio>
+ #include <cstdlib>
+ #include <arpa/inet.h>
diff --git a/devel/libmemcached/patches/patch-tests_libmemcached-1.0_ketama.cc b/devel/libmemcached/patches/patch-tests_libmemcached-1.0_ketama.cc
index fe054d81313..e6d73f7a1c8 100644
--- a/devel/libmemcached/patches/patch-tests_libmemcached-1.0_ketama.cc
+++ b/devel/libmemcached/patches/patch-tests_libmemcached-1.0_ketama.cc
@@ -1,6 +1,7 @@
-$NetBSD: patch-tests_libmemcached-1.0_ketama.cc,v 1.2 2013/06/04 21:17:17 fhajny Exp $
+$NetBSD: patch-tests_libmemcached-1.0_ketama.cc,v 1.3 2013/09/12 14:20:56 fhajny Exp $
 
---- tests/libmemcached-1.0/ketama.cc.orig	2013-05-05 20:35:41.000000000 +0000
+Use stdint.
+--- tests/libmemcached-1.0/ketama.cc.orig	2013-04-03 04:22:00.000000000 +0000
 +++ tests/libmemcached-1.0/ketama.cc
 @@ -33,6 +33,7 @@
   *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
@@ -8,9 +9,9 @@ $NetBSD: patch-tests_libmemcached-1.0_ketama.cc,v 1.2 2013/06/04 21:17:17 fhajny
   */
 +#define __STDC_CONSTANT_MACROS
  
- #include <config.h>
+ #include <mem_config.h>
  #include <libtest/test.hpp>
-@@ -43,6 +44,7 @@
+@@ -45,6 +46,7 @@
  
  #include <tests/ketama.h>
  #include <tests/ketama_test_cases.h>
diff --git a/devel/libmemcached/patches/patch-tests_libmemcached-1.0_pool.cc b/devel/libmemcached/patches/patch-tests_libmemcached-1.0_pool.cc
index 3b49725655e..38ab45438be 100644
--- a/devel/libmemcached/patches/patch-tests_libmemcached-1.0_pool.cc
+++ b/devel/libmemcached/patches/patch-tests_libmemcached-1.0_pool.cc
@@ -1,17 +1,17 @@
-$NetBSD: patch-tests_libmemcached-1.0_pool.cc,v 1.2 2013/06/04 21:17:17 fhajny Exp $
+$NetBSD: patch-tests_libmemcached-1.0_pool.cc,v 1.3 2013/09/12 14:20:56 fhajny Exp $
 
---- tests/libmemcached-1.0/pool.cc.orig	2013-05-05 20:36:30.000000000 +0000
+Use stdint.
+--- tests/libmemcached-1.0/pool.cc.orig	2013-04-03 04:22:00.000000000 +0000
 +++ tests/libmemcached-1.0/pool.cc
-@@ -34,7 +34,7 @@
+@@ -34,6 +34,7 @@
   *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   *
   */
--
 +#define __STDC_CONSTANT_MACROS
- #include <config.h>
- #include <libtest/test.hpp>
  
-@@ -44,6 +44,7 @@ using namespace libtest;
+ #include <mem_config.h>
+ #include <libtest/test.hpp>
+@@ -44,6 +45,7 @@ using namespace libtest;
  #include <iostream>
  #include <string>
  #include <cerrno>