1: Upgrade libmemcached to 1.0.6.

2: bump revision to chase shared library version.
3: drop maintainer

4 files changed, 22 insertions, 54 deletions

diff --git a/databases/libmemcached/Makefile b/databases/libmemcached/Makefile
index ff3d0ccd4778..7af00e2d0c06 100644
--- a/databases/libmemcached/Makefile
+++ b/databases/libmemcached/Makefile
@@ -6,34 +6,41 @@
 #
 
 PORTNAME=	libmemcached
-PORTVERSION=	1.0.4
+PORTVERSION=	1.0.6
 PORTREVISION=	0
 CATEGORIES=	databases
 MASTER_SITES=	http://launchpad.net/${PORTNAME}/1.0/${PORTVERSION}/+download/
 
-MAINTAINER=	vanilla@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A C and C++ client library to the memcached server
 
-LIB_DEPENDS?=	execinfo.1:${PORTSDIR}/devel/libexecinfo
+LIB_DEPENDS?=	execinfo.1:${PORTSDIR}/devel/libexecinfo \
+		event-1.4.4:${PORTSDIR}/devel/libevent
 
-FETCH_ARGS?= 	-pRr
+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_ARGS=	--without-memcached
 CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib -lexecinfo"
 
-OPTIONS=	SASL "With (Cyrus) SASL2 support" off
-
 .include <bsd.port.pre.mk>
 
+.if exists(${LOCALBASE}/lib/libsasl.so.2)
+LIB_DEPENDS+=	sasl2.2:${PORTSDIR}/security/cyrus-sasl2
+.endif
+
+.if ${OSVERSION} < 800000
+BROKEN=		does not compile on FreeBSD 7.x
+.endif
+
 post-patch:
-	${REINPLACE_CMD} -e 's|^pkgconfigdir.*|pkgconfigdir = $${PREFIX}/libdata/pkgconfig|' \
+	@${REINPLACE_CMD} -e 's|^pkgconfigdir.*|pkgconfigdir = $${PREFIX}/libdata/pkgconfig|' \
 			 -e '/^LDFLAGS *=/ s/$$/ $${LTLIBSASL2}/' \
 			${WRKSRC}/Makefile.in ${WRKSRC}/support/include.am
 .if defined(NO_INSTALL_MANPAGES)
-	${REINPLACE_CMD} -e 's|^SUBDIRS = docs |SUBDIRS = |' ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e 's|^SUBDIRS = docs |SUBDIRS = |' ${WRKSRC}/Makefile.in
 .endif
 
 .if !defined(NO_INSTALL_MANPAGES)
@@ -153,11 +160,4 @@ MAN3=		hashkit_clone.3 \
 		memcached_version.3
 .endif
 
-.if defined(WITH_SASL)
-LIB_DEPENDS+=		sasl2.2:${PORTSDIR}/security/cyrus-sasl2
-CONFIGURE_ARGS+=	--with-libsasl2-prefix="${LOCALBASE}"
-.else
-CONFIGURE_ARGS+=	--disable-sasl
-.endif
-
 .include <bsd.port.post.mk>
diff --git a/databases/libmemcached/distinfo b/databases/libmemcached/distinfo
index 7af451f8ff77..4c384ea8c1f1 100644
--- a/databases/libmemcached/distinfo
+++ b/databases/libmemcached/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libmemcached-1.0.4.tar.gz) = 1dd0a9fb5823aa6f8337a3beaeb287bb92041005c136622b4d82622a9428e20c
-SIZE (libmemcached-1.0.4.tar.gz) = 951310
+SHA256 (libmemcached-1.0.6.tar.gz) = 1403b24fe8d32a8e5ae4c39aadb8ad9c72f17b2a3244943eb0d8fc4821f02c70
+SIZE (libmemcached-1.0.6.tar.gz) = 1068743
diff --git a/databases/libmemcached/files/patch-configure b/databases/libmemcached/files/patch-configure
deleted file mode 100644
index c64f737154e1..000000000000
--- a/databases/libmemcached/files/patch-configure
+++ /dev/null
@@ -1,34 +0,0 @@
---- ./configure.orig	2011-05-03 00:12:18.000000000 +0800
-+++ ./configure	2011-05-03 00:12:18.000000000 +0800
-@@ -17926,7 +17926,7 @@
- 
-         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
- fi
-@@ -19903,9 +19903,9 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_libevent" >&5
- $as_echo "$ac_cv_libevent" >&6; }
-   if test "$ac_cv_libevent" = yes; then
--    HAVE_LIBEVENT=yes
-+    HAVE_LIBEVENT=no
- 
--$as_echo "#define HAVE_LIBEVENT 1" >>confdefs.h
-+$as_echo "#define HAVE_LIBEVENT 0" >>confdefs.h
- 
-     { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with libevent" >&5
- $as_echo_n "checking how to link with libevent... " >&6; }
-@@ -19927,8 +19927,8 @@
- 
- 
-    if test "x${ac_cv_libevent}" = "xyes"; then
--  HAVE_LIBEVENT_TRUE=
--  HAVE_LIBEVENT_FALSE='#'
-+  HAVE_LIBEVENT_TRUE='#'
-+  HAVE_LIBEVENT_FALSE=
- else
-   HAVE_LIBEVENT_TRUE='#'
-   HAVE_LIBEVENT_FALSE=
diff --git a/databases/libmemcached/pkg-plist b/databases/libmemcached/pkg-plist
index 1ad0a25b16f0..081fd39069cf 100644
--- a/databases/libmemcached/pkg-plist
+++ b/databases/libmemcached/pkg-plist
@@ -21,6 +21,7 @@ include/libhashkit-1.0/has.h
 include/libhashkit-1.0/hashkit.h
 include/libhashkit-1.0/hashkit.hpp
 include/libhashkit-1.0/strerror.h
+include/libhashkit-1.0/string.h
 include/libhashkit-1.0/str_algorithm.h
 include/libhashkit-1.0/types.h
 include/libhashkit-1.0/visibility.h
@@ -40,6 +41,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
@@ -98,11 +100,11 @@ include/libmemcachedutil-1.0/version.h
 lib/libhashkit.a
 lib/libhashkit.la
 lib/libhashkit.so
-lib/libhashkit.so.1
+lib/libhashkit.so.2
 lib/libmemcached.a
 lib/libmemcached.la
 lib/libmemcached.so
-lib/libmemcached.so.9
+lib/libmemcached.so.10
 lib/libmemcachedprotocol.a
 lib/libmemcachedprotocol.la
 lib/libmemcachedprotocol.so