4 files changed, 42 insertions, 36 deletions

diff --git a/databases/memcached/Makefile b/databases/memcached/Makefile
index c0defac56f6a..74539ee2c485 100644
--- a/databases/memcached/Makefile
+++ b/databases/memcached/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	memcached
 PORTVERSION=	1.1.12
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases
 MASTER_SITES=	http://www.danga.com/memcached/dist/ \
 		${MASTER_SITE_GENTOO}
@@ -18,27 +18,28 @@ COMMENT=	High-performance distributed memory object cache system
 
 LIB_DEPENDS=	event-1.1a.1:${PORTSDIR}/devel/libevent
 
-USE_REINPLACE=	YES
+USE_RC_SUBR=	memcached
 GNU_CONFIGURE=	YES
-
-CONFIGURE_ARGS+=	--with-libevent=${LOCALBASE} --program-prefix=
+CONFIGURE_ARGS=		--with-libevent=${LOCALBASE} --program-prefix=
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 MAN1=		memcached.1
 
-DOCS_LIST=	memory_management.txt protocol.txt
+PLIST_FILES=	bin/memcached
 
-USE_RC_SUBR=	memcached.sh
+PORTDOCS=	memory_management.txt protocol.txt
 
 post-configure:
 	@${REINPLACE_CMD} -e 's#doc/memcached.1##' ${WRKSRC}/Makefile
 
 post-install:
-	${INSTALL_MAN} ${MAN1:S!^!${WRKSRC}/doc/!} ${MAN1PREFIX}/man/man1
-.ifndef(NOPORTDOCS)
+	${INSTALL_MAN} ${WRKSRC}/doc/${MAN1} ${MAN1PREFIX}/man/man1
+.if !defined(NOPORTDOCS)
 	@${ECHO_MSG} "===>   Installing documentation for ${PKGNAME}"
 	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${DOCS_LIST:S!^!${WRKSRC}/doc/!} ${DOCSDIR}
+.for i in ${PORTDOCS}
+	${INSTALL_DATA} ${WRKSRC}/doc/${i} ${DOCSDIR}
+.endfor
 .endif
 
 .include <bsd.port.mk>
diff --git a/databases/memcached/files/memcached.in b/databases/memcached/files/memcached.in
new file mode 100644
index 000000000000..f991c18e3677
--- /dev/null
+++ b/databases/memcached/files/memcached.in
@@ -0,0 +1,32 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+# PROVIDE: memcached
+# REQUIRE: DAEMON
+#
+# Add the following lines to /etc/rc.conf to run memcached:
+#
+# memcached_enable (bool):	Set it to "YES" to enable memcached.
+#				Default is "NO".
+# memcached_flags (flags):	Set extra flags here. More options in memcached(1)
+#				Default is empty "".
+# memcached_user (user):	Set user to run memcached.
+#				Default is "nobody".
+#
+
+. %%RC_SUBR%%
+
+name="memcached"
+rcvar=`set_rcvar`
+
+load_rc_config $name
+
+: ${memcached_enable="NO"}
+: ${memcached_flags=""}
+: ${memcached_user="nobody"}
+
+command=%%PREFIX%%/bin/memcached
+command_args="-d -u ${memcached_user} ${memcached_flags}"
+
+run_rc_command "$1"
diff --git a/databases/memcached/files/memcached.sh.in b/databases/memcached/files/memcached.sh.in
deleted file mode 100644
index 202aac5c5e5b..000000000000
--- a/databases/memcached/files/memcached.sh.in
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-# PROVIDE: memcached
-# REQUIRE: NETWORKING
-
-#
-# Add the following lines to /etc/rc.conf to run memcached:
-#
-#memcached_enable="YES"
-#memcached_flags=""
-#
-. %%RC_SUBR%%
-
-name="memcached"
-rcvar=`set_rcvar`
-command=%%PREFIX%%/bin/memcached
-command_args="-du nobody ${memcached_flags}"
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/databases/memcached/pkg-plist b/databases/memcached/pkg-plist
deleted file mode 100644
index bd06b67299d6..000000000000
--- a/databases/memcached/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-bin/memcached
-%%PORTDOCS%%%%DOCSDIR%%/memory_management.txt
-%%PORTDOCS%%%%DOCSDIR%%/protocol.txt
-%%PORTDOCS%%@dirrm %%DOCSDIR%%