Attachment 113917 Details for Bug 155533 – file.diff

[patch] file.diff

file.diff (text/plain), 2.96 KB, created by Steve Wills on 2011-03-13 16:20:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Steve Wills

Created: 2011-03-13 16:20:09 UTC

Size: 2.96 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /home/ncvs/ports/databases/memcached/Makefile,v
>retrieving revision 1.47
>diff -u -r1.47 Makefile
>--- Makefile	2 Mar 2011 04:08:13 -0000	1.47
>+++ Makefile	13 Mar 2011 16:07:36 -0000
>@@ -32,7 +32,7 @@
> PLIST_FILES=	bin/memcached \
> 		bin/memcached-tool \
> 		include/memcached/protocol_binary.h
>-PLIST_DIRS=	include/memcached
>+PLIST_DIRS=	include/memcached /var/run/memcached
> 
> PORTDOCS=	protocol.txt threads.txt readme.txt
> 
>@@ -67,6 +67,8 @@
> post-install:
> 	${INSTALL_SCRIPT} ${WRKSRC}/scripts/memcached-tool ${PREFIX}/bin
> 	${INSTALL_MAN} ${WRKSRC}/doc/${MAN1} ${MAN1PREFIX}/man/man1
>+	@${MKDIR} -p /var/run/memcached
>+	@${CHOWN} nobody:nobody /var/run/memcached
> .if !defined(NOPORTDOCS)
> 	@${ECHO_MSG} "===>   Installing documentation for ${PKGNAME}"
> 	@${MKDIR} ${DOCSDIR}
>Index: files/memcached.in
>===================================================================
>RCS file: /home/ncvs/ports/databases/memcached/files/memcached.in,v
>retrieving revision 1.4
>diff -u -r1.4 memcached.in
>--- files/memcached.in	27 Mar 2010 00:12:46 -0000	1.4
>+++ files/memcached.in	13 Mar 2011 16:04:07 -0000
>@@ -13,6 +13,8 @@
> #				Default is empty "".
> # memcached_user (user):	Set user to run memcached.
> #				Default is "nobody".
>+# memcached_profiles (str):     Set to "" by default.
>+#                               Define your profiles here.
> #
> 
> . /etc/rc.subr
>@@ -20,13 +22,61 @@
> name="memcached"
> rcvar=${name}_enable
> 
>+_pidprefix="/var/run/memcached/memcached"
>+pidfile="${_pidprefix}.pid"
>+
> load_rc_config ${name}
> 
>+if [ -n "$2" ]; then
>+	profile="$2"
>+	if [ "x${memcached_profiles}" != "x" ]; then
>+		pidfile="${_pidprefix}.${profile}.pid"
>+		eval memcached_enable="\${memcached_${profile}_enable:-${memcached_enable}}"
>+		eval memcached_flags="\${memcached_${profile}_flags:-${memcached_flags}}"
>+	else
>+		echo "$0: extra argument ignored"
>+	fi
>+else
>+	if [ "x${memcached_profiles}" != "x" -a "x$1" != "x" ]; then
>+		for profile in ${memcached_profiles}; do
>+			eval _enable="\${memcached_${profile}_enable}"
>+			case "x${_enable:-${memcached_enable}}" in
>+			x|x[Nn][Oo]|x[Nn][Oo][Nn][Ee])
>+				continue
>+				;;
>+			x[Yy][Ee][Ss])
>+				;;
>+			*)
>+				if test -z "$_enable"; then
>+					_var=memcached_enable
>+				else
>+					_var=memcached_"${profile}"_enable
>+				fi
>+				echo "Bad value" \
>+				    "'${_enable:-${memcached_enable}}'" \
>+				    "for ${_var}. " \
>+				    "Profile ${profile} skipped."
>+				continue
>+				;;
>+			esac
>+			echo "===> memcached profile: ${profile}"
>+			/usr/local/etc/rc.d/memcached $1 ${profile}
>+			retcode="$?"
>+			if [ "0${retcode}" -ne 0 ]; then
>+				failed="${profile} (${retcode}) ${failed:-}"
>+			else
>+				success="${profile} ${success:-}"
>+			fi
>+		done
>+		exit 0
>+	fi
>+fi
>+
> : ${memcached_enable="NO"}
> : ${memcached_user="nobody"}
> 
> command=%%PREFIX%%/bin/memcached
>-command_args="-d -u ${memcached_user}"
>+command_args="-d -u ${memcached_user} -P ${pidfile} "
> 
> unset memcached_user

Actions: View | Diff

Attachments on bug 155533: 113917