4 files changed, 65 insertions, 32 deletions

diff --git a/databases/libmemcached/Makefile b/databases/libmemcached/Makefile
index abb64743a800..9e5739a90eb3 100644
--- a/databases/libmemcached/Makefile
+++ b/databases/libmemcached/Makefile
@@ -6,22 +6,23 @@
 #
 
 PORTNAME=	libmemcached
-PORTVERSION=	0.35
-PORTREVISION=	1
+PORTVERSION=	0.37
+PORTREVISION=	0
 CATEGORIES=	databases
 MASTER_SITES=	http://download.tangent.org/
 
 MAINTAINER=	vanilla@FreeBSD.org
 COMMENT=	A C and C++ client library to the memcached server
 
+USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-USE_GNOME=	gnometarget pkgconfig
-CONFIGURE_ARGS=	--with-memcached=no
+USE_GNOME=	gnomehack gnometarget pkgconfig
+CONFIGURE_ARGS=	--with-memcached=no --disable-libevent --without-libevent-prefix
 
 post-patch:
 	${REINPLACE_CMD} -e 's|^pkgconfigdir.*|pkgconfigdir = $${PREFIX}/libdata/pkgconfig|' \
-			${WRKSRC}/support/Makefile.in
+			${WRKSRC}/Makefile.in
 .if defined(NO_INSTALL_MANPAGES)
 	${REINPLACE_CMD} -e 's|^SUBDIRS = docs |SUBDIRS = |' ${WRKSRC}/Makefile.in
 .endif
@@ -37,7 +38,22 @@ MAN1=		memcapable.1 \
 		memrm.1 \
 		memslap.1 \
 		memstat.1
-MAN3=		libmemcached.3 \
+MAN3=		hashkit_clone.3 \
+		hashkit_crc32.3 \
+		hashkit_create.3 \
+		hashkit_fnv1_32.3 \
+		hashkit_fnv1_64.3 \
+		hashkit_fnv1a_32.3 \
+		hashkit_fnv1a_64.3 \
+		hashkit_free.3 \
+		hashkit_functions.3 \
+		hashkit_hsieh.3 \
+		hashkit_is_allocated.3 \
+		hashkit_jenkins.3 \
+		hashkit_md5.3 \
+		hashkit_murmur.3 \
+		hashkit_value.3 \
+		libmemcached.3 \
 		libmemcachedutil.3 \
 		libmemcached_examples.3 \
 		memcached_add.3 \
@@ -88,6 +104,7 @@ MAN3=		libmemcached.3 \
 		memcached_replace_by_key.3 \
 		memcached_server_add.3 \
 		memcached_server_count.3 \
+		memcached_server_cursor.3 \
 		memcached_server_list.3 \
 		memcached_server_list_append.3 \
 		memcached_server_list_count.3 \
diff --git a/databases/libmemcached/distinfo b/databases/libmemcached/distinfo
index 2909c7ceda37..854abfe8ca13 100644
--- a/databases/libmemcached/distinfo
+++ b/databases/libmemcached/distinfo
@@ -1,3 +1,3 @@
-MD5 (libmemcached-0.35.tar.gz) = 1fd295009451933ac837a49265d702da
-SHA256 (libmemcached-0.35.tar.gz) = aeb08e334eb9f51d56a93119285f997c5f4fccc435be162e828ddb9fe65a5bb7
-SIZE (libmemcached-0.35.tar.gz) = 586058
+MD5 (libmemcached-0.37.tar.gz) = 7005e5965d9619be7b0b696606927e3e
+SHA256 (libmemcached-0.37.tar.gz) = a10a0a4403f62591256cea838c5e40bd85f99bb798e0b3f5ff06a69249ad8da8
+SIZE (libmemcached-0.37.tar.gz) = 661959
diff --git a/databases/libmemcached/files/patch-configure b/databases/libmemcached/files/patch-configure
index f57dbeb3de82..dc9abf6967b7 100644
--- a/databases/libmemcached/files/patch-configure
+++ b/databases/libmemcached/files/patch-configure
@@ -1,11 +1,11 @@
---- configure.orig	2009-10-14 11:07:04.000000000 +0800
-+++ configure	2009-10-14 11:07:11.000000000 +0800
-@@ -19820,7 +19820,7 @@
-       if test "$ac_cv_safe_to_use_Wattributes_" = "yes"; then
-   :
- else
--  CXX_WARNINGS="${CXX_WARNINGS} -Wno-attributes"
-+  CXX_WARNINGS="${CXX_WARNINGS}"
- fi
+--- configure.orig	2010-01-07 11:15:40.000000000 +0800
++++ configure	2010-01-08 10:38:18.000000000 +0800
+@@ -22430,7 +22430,7 @@ $as_echo "$ac_cv_safe_to_use_Wno_attribu
+ 
+         if test "$ac_cv_safe_to_use_Wno_attributes_" = "yes"; then
  
+-          CC_WARNINGS="${CC_WARNINGS} -Wno-attributes"
++          CC_WARNINGS="${CC_WARNINGS}"
+           NO_ATTRIBUTES="-Wno-attributes"
+ fi
  
diff --git a/databases/libmemcached/pkg-plist b/databases/libmemcached/pkg-plist
index 439e2f09b0cb..039ac3c73338 100644
--- a/databases/libmemcached/pkg-plist
+++ b/databases/libmemcached/pkg-plist
@@ -7,36 +7,52 @@ bin/memflush
 bin/memrm
 bin/memslap
 bin/memstat
+include/libhashkit/algorithm.h
+include/libhashkit/behavior.h
+include/libhashkit/hashkit.h
+include/libhashkit/strerror.h
+include/libhashkit/types.h
+include/libhashkit/visibility.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/dump.h
 include/libmemcached/exception.hpp
+include/libmemcached/get.h
 include/libmemcached/memcached.h
 include/libmemcached/memcached.hpp
-include/libmemcached/memcached_configure.h
-include/libmemcached/memcached_constants.h
-include/libmemcached/memcached_get.h
-include/libmemcached/memcached_pool.h
-include/libmemcached/memcached_result.h
-include/libmemcached/memcached_server.h
-include/libmemcached/memcached_storage.h
-include/libmemcached/memcached_string.h
-include/libmemcached/memcached_types.h
-include/libmemcached/memcached_watchpoint.h
 include/libmemcached/memcached_util.h
+include/libmemcached/memcached/protocol_binary.h
 include/libmemcached/protocol_handler.h
 include/libmemcached/protocol/cache.h
 include/libmemcached/protocol/callback.h
+include/libmemcached/result.h
+include/libmemcached/server.h
+include/libmemcached/stats.h
+include/libmemcached/storage.h
+include/libmemcached/string.h
+include/libmemcached/types.h
+include/libmemcached/util/pool.h
 include/libmemcached/visibility.h
-lib/libmemcached.a
+include/libmemcached/watchpoint.h
+lib/libhashkit.la
+lib/libhashkit.so
+lib/libhashkit.so.0
 lib/libmemcached.la
 lib/libmemcached.so
-lib/libmemcached.so.3
-lib/libmemcachedprotocol.a
+lib/libmemcached.so.4
 lib/libmemcachedprotocol.la
 lib/libmemcachedprotocol.so
 lib/libmemcachedprotocol.so.0
-lib/libmemcachedutil.a
 lib/libmemcachedutil.la
 lib/libmemcachedutil.so
 lib/libmemcachedutil.so.0
 libdata/pkgconfig/libmemcached.pc
+@dirrm include/libmemcached/util
 @dirrm include/libmemcached/protocol
+@dirrm include/libmemcached/memcached
 @dirrm include/libmemcached
+@dirrm include/libhashkit