4 files changed, 21 insertions, 27 deletions

diff --git a/databases/memcached/Makefile b/databases/memcached/Makefile
index 6beeccdf94f0..6c85fd88bf61 100644
--- a/databases/memcached/Makefile
+++ b/databases/memcached/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	memcached
-PORTVERSION=	1.4.4
-PORTREVISION=	3
+PORTVERSION=	1.4.5
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE} \
 		${MASTER_SITE_GENTOO}
@@ -20,9 +19,11 @@ LIB_DEPENDS=	event-1.4:${PORTSDIR}/devel/libevent
 
 CONFLICTS=	memcached-1.2*
 
+USE_AUTOTOOLS=	autoconf:262 aclocal:110 automake:110
+AUTOMAKE_ARGS+=	--add-missing
 USE_RC_SUBR=	memcached
 GNU_CONFIGURE=	YES
-CONFIGURE_ARGS=		--with-libevent=${LOCALBASE} --program-prefix=
+CONFIGURE_ARGS=	--with-libevent=${LOCALBASE} --program-prefix=
 
 OPTIONS=	REPCACHED	"Enable data replication feature"	off \
 		SASL		"Enable SASL support"			off
@@ -37,12 +38,13 @@ PORTDOCS=	protocol.txt threads.txt readme.txt
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} >= 800000
-CFLAGS+=       -fstack-protector
+CFLAGS+=	-fstack-protector
 .endif
 
 .if defined(WITH_REPCACHED)
 # WWW: http://repcached.lab.klab.org/
-PATCH_SITES+=		http://mdounin.ru/files/
+PATCH_SITES+=		${MASTER_SITE_LOCAL}
+PATCH_SITE_SUBDIR=	mm
 PATCH_DIST_STRIP+=	-p1
 PATCHFILES+=		repcached-2.2-${PORTVERSION}.patch.gz
 CONFIGURE_ARGS+=	--enable-replication
diff --git a/databases/memcached/distinfo b/databases/memcached/distinfo
index 6c2b9c65bda1..ee20fb8802df 100644
--- a/databases/memcached/distinfo
+++ b/databases/memcached/distinfo
@@ -1,6 +1,6 @@
-MD5 (memcached-1.4.4.tar.gz) = 5ca5b24de347e97ac1f48f3785b4178a
-SHA256 (memcached-1.4.4.tar.gz) = 6bbca41460ded17c6d56c76d96309cd3dee518603fa093938e252262935f8bac
-SIZE (memcached-1.4.4.tar.gz) = 297920
-MD5 (repcached-2.2-1.4.4.patch.gz) = 47f9b2953798a89a2602050e589938c1
-SHA256 (repcached-2.2-1.4.4.patch.gz) = 73f5f7bef52dd2b65b91efa9bdb06af15377877ca3e82bcda1615ce561678215
-SIZE (repcached-2.2-1.4.4.patch.gz) = 35361
+MD5 (memcached-1.4.5.tar.gz) = 583441a25f937360624024f2881e5ea8
+SHA256 (memcached-1.4.5.tar.gz) = 9571b4b85484e46b3b10f07ccba77a1fa97d60660b32859f990effefb3005f91
+SIZE (memcached-1.4.5.tar.gz) = 302516
+MD5 (repcached-2.2-1.4.5.patch.gz) = 84b95195ca3d8b31b9d8c47374856ef4
+SHA256 (repcached-2.2-1.4.5.patch.gz) = 423200894f3b4b8fcef45c6037ed5a930a7bc746377dc18b4fc6e0cb9270b1d1
+SIZE (repcached-2.2-1.4.5.patch.gz) = 13026
diff --git a/databases/memcached/files/patch-Makefile.am b/databases/memcached/files/patch-Makefile.am
new file mode 100644
index 000000000000..0a2c8bc4f2b4
--- /dev/null
+++ b/databases/memcached/files/patch-Makefile.am
@@ -0,0 +1,8 @@
+--- Makefile.am.orig	2010-07-25 19:31:54.258163012 +0200
++++ Makefile.am	2010-07-25 19:34:35.321075314 +0200
+@@ -1,5 +1,4 @@
+ bin_PROGRAMS = memcached
+-pkginclude_HEADERS = protocol_binary.h
+ noinst_PROGRAMS = memcached-debug sizes testapp timedrun
+ 
+ BUILT_SOURCES=
diff --git a/databases/memcached/files/patch-Makefile.in b/databases/memcached/files/patch-Makefile.in
deleted file mode 100644
index 5e4bddd93e80..000000000000
--- a/databases/memcached/files/patch-Makefile.in
+++ /dev/null
@@ -1,16 +0,0 @@
---- Makefile.in.orig	2009-10-11 01:13:43.000000000 -0300
-+++ Makefile.in	2009-10-11 01:14:02.000000000 -0300
-@@ -730,13 +730,6 @@
- @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(memcached_debug_CFLAGS) $(CFLAGS) -c -o memcached_debug-solaris_priv.obj `if test -f 'solaris_priv.c'; then $(CYGPATH_W) 'solaris_priv.c'; else $(CYGPATH_W) '$(srcdir)/solaris_priv.c'; fi`
- install-pkgincludeHEADERS: $(pkginclude_HEADERS)
- 	@$(NORMAL_INSTALL)
--	test -z "$(pkgincludedir)" || $(MKDIR_P) "$(DESTDIR)$(pkgincludedir)"
--	@list='$(pkginclude_HEADERS)'; for p in $$list; do \
--	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
--	  f=$(am__strip_dir) \
--	  echo " $(pkgincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgincludedir)/$$f'"; \
--	  $(pkgincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgincludedir)/$$f"; \
--	done
- 
- uninstall-pkgincludeHEADERS:
- 	@$(NORMAL_UNINSTALL)