Upgrade libmemcached to 1.0.4,

bump revision to chase shared library version.

7 files changed, 34 insertions, 7 deletions

diff --git a/databases/drizzle/Makefile b/databases/drizzle/Makefile
index 3bee5c86f2f1..890973b81463 100644
--- a/databases/drizzle/Makefile
+++ b/databases/drizzle/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	drizzle
 PORTVERSION=	2010.05.1561
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases
 MASTER_SITES=	http://launchpadlibrarian.net/49101349/ \
 		LOCAL/glarkin
diff --git a/databases/libmemcached/Makefile b/databases/libmemcached/Makefile
index b18d75fb8034..270fe952df5f 100644
--- a/databases/libmemcached/Makefile
+++ b/databases/libmemcached/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libmemcached
-PORTVERSION=	1.0.2
+PORTVERSION=	1.0.4
 PORTREVISION=	0
 CATEGORIES=	databases
 MASTER_SITES=	http://launchpad.net/${PORTNAME}/1.0/${PORTVERSION}/+download/
@@ -14,12 +14,15 @@ MASTER_SITES=	http://launchpad.net/${PORTNAME}/1.0/${PORTVERSION}/+download/
 MAINTAINER=	vanilla@FreeBSD.org
 COMMENT=	A C and C++ client library to the memcached server
 
+LIB_DEPENDS?=	execinfo.1:${PORTSDIR}/deve/libexecinfo
+
 FETCH_ARGS?= 	-pRr
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	gnomehack pkgconfig
 CONFIGURE_ARGS=	--with-memcached=no --disable-libevent --without-libevent-prefix
+CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib -lexecinfo"
 
 OPTIONS=	SASL "With (Cyrus) SASL2 support" off
 
diff --git a/databases/libmemcached/distinfo b/databases/libmemcached/distinfo
index c2aeb567bac5..7af451f8ff77 100644
--- a/databases/libmemcached/distinfo
+++ b/databases/libmemcached/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libmemcached-1.0.2.tar.gz) = c5ca21dbb85ce4a4de91e4aed6b3d1f8a4599980aa606ef0812eeb52b7d017f2
-SIZE (libmemcached-1.0.2.tar.gz) = 942891
+SHA256 (libmemcached-1.0.4.tar.gz) = 1dd0a9fb5823aa6f8337a3beaeb287bb92041005c136622b4d82622a9428e20c
+SIZE (libmemcached-1.0.4.tar.gz) = 951310
diff --git a/databases/libmemcached/pkg-plist b/databases/libmemcached/pkg-plist
index 2106918d5eff..1ad0a25b16f0 100644
--- a/databases/libmemcached/pkg-plist
+++ b/databases/libmemcached/pkg-plist
@@ -28,14 +28,17 @@ include/libmemcached/memcached.h
 include/libmemcached/memcached.hpp
 include/libmemcached/util.h
 include/libmemcached-1.0/allocators.h
+include/libmemcached-1.0/alloc.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/constants.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
@@ -45,6 +48,7 @@ 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
@@ -59,8 +63,23 @@ 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/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/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/types.h
 include/libmemcached-1.0/verbosity.h
 include/libmemcached-1.0/version.h
@@ -83,7 +102,7 @@ lib/libhashkit.so.1
 lib/libmemcached.a
 lib/libmemcached.la
 lib/libmemcached.so
-lib/libmemcached.so.8
+lib/libmemcached.so.9
 lib/libmemcachedprotocol.a
 lib/libmemcachedprotocol.la
 lib/libmemcachedprotocol.so
@@ -95,6 +114,8 @@ lib/libmemcachedutil.so.2
 libdata/pkgconfig/libmemcached.pc
 @dirrm include/libmemcachedutil-1.0
 @dirrm include/libmemcachedprotocol-0.0
+@dirrm include/libmemcached-1.0/types
+@dirrm include/libmemcached-1.0/struct
 @dirrm include/libmemcached-1.0
 @dirrm include/libmemcached
 @dirrm include/libhashkit-1.0
diff --git a/databases/pecl-memcached/Makefile b/databases/pecl-memcached/Makefile
index b12947a91e31..7851de1ff1fb 100644
--- a/databases/pecl-memcached/Makefile
+++ b/databases/pecl-memcached/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	memcached
 PORTVERSION=	1.0.2
+PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	http://pecl.php.net/get/
 PKGNAMEPREFIX=	pecl-
diff --git a/databases/py-pylibmc/Makefile b/databases/py-pylibmc/Makefile
index 9cbab561ab26..ae2d03ccf582 100644
--- a/databases/py-pylibmc/Makefile
+++ b/databases/py-pylibmc/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	pylibmc
 PORTVERSION=	1.2.2
+PORTREVISION=	1
 CATEGORIES=	databases python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/databases/rubygem-memcache/Makefile b/databases/rubygem-memcache/Makefile
index 74926b4ecfa6..c13ae2fd26ef 100644
--- a/databases/rubygem-memcache/Makefile
+++ b/databases/rubygem-memcache/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	memcache
 PORTVERSION=	1.2.13
+PORTREVISION=	1
 CATEGORIES=	databases rubygems
 MASTER_SITES=	RG