ports/91931: Update port: databases/memcached fix REQUIRED in rc script
Marcus Alves Grando
mnag at FreeBSD.org
Wed Jan 18 01:10:09 UTC 2006
>Number: 91931
>Category: ports
>Synopsis: Update port: databases/memcached fix REQUIRED in rc script
>Confidential: no
>Severity: non-critical
>Priority: high
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Wed Jan 18 01:10:07 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Marcus Alves Grando
>Release: FreeBSD 6.0-STABLE i386
>Organization:
Grupos Internet S/A
>Environment:
System: FreeBSD marcus.grupos.com.br 6.0-STABLE FreeBSD 6.0-STABLE #5: Tue Jan 17 13:13:16 BRST 2006 root at marcus.grupos.com.br:/usr/obj/usr/src/sys/MARCUS i386
>Description:
Fix REQUIRED in rc script
Add option to change startup user in rc script
Reorganize Makefile and rc script
Remove pkg-plist and add PLIST_FILES and PORTDOCS
Bump PORTREVISION
Tested in tinderbox:
http://marcus.grupos.com.br:8080/logs/4-STABLE-FreeBSD/memcached-1.1.12_2.log
http://marcus.grupos.com.br:8080/logs/6-STABLE-FreeBSD/memcached-1.1.12_2.log
>How-To-Repeat:
>Fix:
--- memcached.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/databases/memcached/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- Makefile 9 Dec 2005 12:48:40 -0000 1.13
+++ Makefile 18 Jan 2006 00:56:38 -0000
@@ -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,29 @@
LIB_DEPENDS= event-1.1a.1:${PORTSDIR}/devel/libevent
+USE_RC_SUBR= memcached.sh
USE_REINPLACE= YES
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
+ ${INSTALL_MAN} ${WRKSRC}/doc/${MAN1} ${MAN1PREFIX}/man/man1
.ifndef(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>
Index: pkg-plist
===================================================================
RCS file: pkg-plist
diff -N pkg-plist
--- pkg-plist 9 Dec 2005 12:48:40 -0000 1.5
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,4 +0,0 @@
-bin/memcached
-%%PORTDOCS%%%%DOCSDIR%%/memory_management.txt
-%%PORTDOCS%%%%DOCSDIR%%/protocol.txt
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
Index: files/memcached.sh.in
===================================================================
RCS file: /home/pcvs/ports/databases/memcached/files/memcached.sh.in,v
retrieving revision 1.1
diff -u -r1.1 memcached.sh.in
--- files/memcached.sh.in 9 Dec 2005 12:48:40 -0000 1.1
+++ files/memcached.sh.in 18 Jan 2006 00:56:38 -0000
@@ -2,22 +2,31 @@
#
# $FreeBSD: ports/databases/memcached/files/memcached.sh.in,v 1.1 2005/12/09 12:48:40 mnag Exp $
#
-
# PROVIDE: memcached
-# REQUIRE: NETWORKING
-
+# REQUIRE: DAEMON
#
# Add the following lines to /etc/rc.conf to run memcached:
#
-#memcached_enable="YES"
-#memcached_flags=""
+# memcached_enable (bool): Set it to "YES" to enable postfix.
+# Default is "NO".
+# memcached_flags (flags): Set extra flags here. More options in memcached(3)
+# Default is empty "".
+# memcached_user (user): Set user to run memcached.
+# Default is "nobody".
#
+
. %%RC_SUBR%%
name="memcached"
rcvar=`set_rcvar`
-command=%%PREFIX%%/bin/memcached
-command_args="-du nobody ${memcached_flags}"
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"
--- memcached.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list