Update libmemcached to 1.0.4.

pkgsrc changes:
* Fix build on SunOS
* Add proper libtool support

Upstream changes:

1.0.4
* Fix for memcached_dump().
* Additional testing for memcached_stat_execute().

1.0.3
* Increased size of sort buffer used during Ketama.
* Added support for new behavior to handle dead servers.
* Overall haul of UDP IO.
* Fixed C compile issue with memcached_exist()
* Numerous bug fixes.
* Clang support for OSX.
* All commands now using vector send support.

1.0.2
* Dropped libmemcached/memcached_util.h (undocumented header file)
* Added memcached_touch() and memcached_touch_by_key()
* UDP support restructured to toggle on a complete memcached_st structure.

5 files changed, 133 insertions, 87 deletions

diff --git a/devel/libmemcached/Makefile b/devel/libmemcached/Makefile
index 3395f232ed6..c0859f16d75 100644
--- a/devel/libmemcached/Makefile
+++ b/devel/libmemcached/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/10/16 05:33:56 manu Exp $
+# $NetBSD: Makefile,v 1.2 2012/02/07 11:34:00 fhajny Exp $
 #
 
-DISTNAME=	libmemcached-0.53
+DISTNAME=	libmemcached-1.0.4
 CATEGORIES=	devel
-MASTER_SITES=	http://launchpad.net/libmemcached/1.0/0.53/+download/
+MASTER_SITES=	http://launchpad.net/libmemcached/1.0/${PKGVERSION}/+download/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://libmemcached.org
+HOMEPAGE=	http://libmemcached.org/
 COMMENT=	C/C++ client library and tools for the memcached server
 LICENSE=	modified-bsd
 
@@ -15,7 +15,13 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 GNU_CONFIGURE=	yes
 USE_TOOLS+=	pkg-config gmake
 USE_LANGUAGES=	c c++
+USE_LIBTOOL=	yes
 
 PKGCONFIG_OVERRIDE+=	support/libmemcached.pc.in
 
+# Avoid building 64bit on a 32bit bootstrap (affects SunOS)
+.if empty(ABI:M64)
+CONFIGURE_ARGS+=	--disable-64bit
+.endif
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/libmemcached/PLIST b/devel/libmemcached/PLIST
index 9ff2da59cc5..4fb88904061 100644
--- a/devel/libmemcached/PLIST
+++ b/devel/libmemcached/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2011/10/16 05:33:56 manu Exp $
+@comment $NetBSD: PLIST,v 1.2 2012/02/07 11:34:00 fhajny Exp $
 bin/memcapable
 bin/memcat
 bin/memcp
@@ -11,90 +11,95 @@ bin/memping
 bin/memrm
 bin/memslap
 bin/memstat
-include/libhashkit/algorithm.h
-include/libhashkit/behavior.h
-include/libhashkit/configure.h
-include/libhashkit/digest.h
-include/libhashkit/function.h
-include/libhashkit/has.h
+bin/memtouch
+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/hashkit.hpp
-include/libhashkit/str_algorithm.h
-include/libhashkit/strerror.h
-include/libhashkit/types.h
-include/libhashkit/visibility.h
-include/libmemcached/allocators.h
-include/libmemcached/analyze.h
-include/libmemcached/array.h
-include/libmemcached/auto.h
-include/libmemcached/basic_string.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/error.h
-include/libmemcached/exception.hpp
-include/libmemcached/exist.h
-include/libmemcached/fetch.h
-include/libmemcached/flush.h
-include/libmemcached/flush_buffers.h
-include/libmemcached/get.h
-include/libmemcached/hash.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
+include/libmemcached-1.0/behavior.h
+include/libmemcached-1.0/callback.h
+include/libmemcached-1.0/callbacks.h
+include/libmemcached-1.0/configure.h
+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/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/limits.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/struct/allocator.h
+include/libmemcached-1.0/struct/analysis.h
+include/libmemcached-1.0/struct/callback.h
+include/libmemcached-1.0/struct/memcached.h
+include/libmemcached-1.0/struct/result.h
+include/libmemcached-1.0/struct/sasl.h
+include/libmemcached-1.0/struct/server.h
+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/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/vbucket.h
-include/libmemcached/memcached_util.h
-include/libmemcached/namespace.h
-include/libmemcached/options.h
-include/libmemcached/parse.h
-include/libmemcached/platform.h
-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/return.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.h
-include/libmemcached/util/flush.h
-include/libmemcached/util/pid.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
-lib/libhashkit.a
+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
+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.la
-lib/libhashkit.so
-lib/libhashkit.so.1
-lib/libhashkit.so.1.0
-lib/libmemcached.a
 lib/libmemcached.la
-lib/libmemcached.so
-lib/libmemcached.so.8
-lib/libmemcached.so.8.0
-lib/libmemcachedprotocol.a
 lib/libmemcachedprotocol.la
-lib/libmemcachedprotocol.so
-lib/libmemcachedprotocol.so.0
-lib/libmemcachedprotocol.so.0.0
-lib/libmemcachedutil.a
 lib/libmemcachedutil.la
-lib/libmemcachedutil.so
-lib/libmemcachedutil.so.2
-lib/libmemcachedutil.so.2.0
 lib/pkgconfig/libmemcached.pc
 man/man1/memaslap.1
 man/man1/memcapable.1
@@ -205,5 +210,7 @@ man/man3/memcached_stat_get_keys.3
 man/man3/memcached_stat_get_value.3
 man/man3/memcached_stat_servername.3
 man/man3/memcached_strerror.3
+man/man3/memcached_touch.3
+man/man3/memcached_touch_by_key.3
 man/man3/memcached_verbosity.3
 man/man3/memcached_version.3
diff --git a/devel/libmemcached/buildlink3.mk b/devel/libmemcached/buildlink3.mk
index 9c31fc95797..f1c3ced51a4 100644
--- a/devel/libmemcached/buildlink3.mk
+++ b/devel/libmemcached/buildlink3.mk
@@ -1,8 +1,8 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2011/10/16 05:33:56 manu Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2012/02/07 11:34:00 fhajny Exp $
 
 BUILDLINK_TREE+=	libmemcached
 
-.if !defined(libmemcached_BUILDLINK3_MK)
+.if !defined(LIBMEMCACHED_BUILDLINK3_MK)
 LIBMEMCACHED_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libmemcached+=	libmemcached>=0.53
diff --git a/devel/libmemcached/distinfo b/devel/libmemcached/distinfo
index b1f55e7eb2d..d6621e48ca8 100644
--- a/devel/libmemcached/distinfo
+++ b/devel/libmemcached/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2011/10/16 05:33:56 manu Exp $
+$NetBSD: distinfo,v 1.2 2012/02/07 11:34:00 fhajny Exp $
 
-SHA1 (libmemcached-0.53.tar.gz) = 52e0422a8916814b7c416d1671018e9aab50e9cc
-RMD160 (libmemcached-0.53.tar.gz) = 82b5ee6b72ebb5127c4c9c32484ac0ab0c6e8310
-Size (libmemcached-0.53.tar.gz) = 940481 bytes
+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
diff --git a/devel/libmemcached/patches/patch-configure b/devel/libmemcached/patches/patch-configure
new file mode 100644
index 00000000000..e12588872d6
--- /dev/null
+++ b/devel/libmemcached/patches/patch-configure
@@ -0,0 +1,32 @@
+$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 :
+