[Midnightbsd-cvs] mports [15976] trunk/databases/memcached: memcached 1.4.17

[laffer1 at midnightbsd.org]

Revision: 15976
          http://svnweb.midnightbsd.org/mports/?rev=15976
Author:   laffer1
Date:     2014-02-28 22:16:53 -0500 (Fri, 28 Feb 2014)
Log Message:
-----------
memcached 1.4.17

Modified Paths:
--------------
    trunk/databases/memcached/Makefile
    trunk/databases/memcached/distinfo
    trunk/databases/memcached/files/memcached.in

Modified: trunk/databases/memcached/Makefile
===================================================================
--- trunk/databases/memcached/Makefile	2014-03-01 03:15:32 UTC (rev 15975)
+++ trunk/databases/memcached/Makefile	2014-03-01 03:16:53 UTC (rev 15976)
@@ -1,7 +1,7 @@
 # $MidnightBSD$
 
 PORTNAME=	memcached
-PORTVERSION=	1.4.15
+PORTVERSION=	1.4.17
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE} \
 		${MASTER_SITE_GENTOO}
@@ -9,6 +9,7 @@
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	High-performance distributed memory object cache system
+
 LICENSE=	bsd3
 
 LIB_DEPENDS=	event-1.4:${PORTSDIR}/devel/libevent

Modified: trunk/databases/memcached/distinfo
===================================================================
--- trunk/databases/memcached/distinfo	2014-03-01 03:15:32 UTC (rev 15975)
+++ trunk/databases/memcached/distinfo	2014-03-01 03:16:53 UTC (rev 15976)
@@ -1,3 +1,2 @@
-SHA256 (memcached-1.4.15.tar.gz) = 169721ab7a7531add6ae9f6b14b6b5641725fe0b1f0bdf5c3a4327725901e2b4
-RMD160 (memcached-1.4.15.tar.gz) = 13fc94ec7e5781e6e940645890a77ed814303ec9
-SIZE (memcached-1.4.15.tar.gz) = 324451
+SHA256 (memcached-1.4.17.tar.gz) = d9173ef6d99ba798c982ea4566cb4f0e64eb23859fdbf9926a89999d8cdc0458
+SIZE (memcached-1.4.17.tar.gz) = 326970

Modified: trunk/databases/memcached/files/memcached.in
===================================================================
--- trunk/databases/memcached/files/memcached.in	2014-03-01 03:15:32 UTC (rev 15975)
+++ trunk/databases/memcached/files/memcached.in	2014-03-01 03:16:53 UTC (rev 15976)
@@ -1,9 +1,9 @@
 #!/bin/sh
+
+# $FreeBSD: head/databases/memcached/files/memcached.in 340872 2014-01-24 00:14:07Z mat $
 #
-# $FreeBSD: ports/databases/memcached/files/memcached.in,v 1.6 2011/08/14 00:44:33 swills Exp $
-#
 # PROVIDE: memcached
-# REQUIRE: DAEMON
+# REQUIRE: LOGIN
 # KEYWORD: shutdown
 #
 # Add the following lines to /etc/rc.conf to run memcached:
@@ -16,36 +16,35 @@
 #				Default is "nobody".
 # memcached_profiles (str):     Set to "" by default.
 #                               Define your profiles here.
-#
 
 . /etc/rc.subr
 
 name="memcached"
-rcvar=${name}_enable
+rcvar=memcached_enable
 
-_pidprefix="/var/run/memcached/memcached"
-pidfile="${_pidprefix}.pid"
+_piddir="/var/run/memcached"
+pidfile="${_piddir}/memcached.pid"
 
 load_rc_config ${name}
 
 if [ -n "$2" ]; then
 	profile="$2"
-	if [ "x${memcached_profiles}" != "x" ]; then
-		pidfile="${_pidprefix}.${profile}.pid"
+	if [ -n "${memcached_profiles}" ]; then
+		pidfile="${_piddir}/memcached.${profile}.pid"
 		eval memcached_enable="\${memcached_${profile}_enable:-${memcached_enable}}"
 		eval memcached_flags="\${memcached_${profile}_flags:-${memcached_flags}}"
 	else
-		echo "$0: extra argument ignored"
+		echo "%%PREFIX%%/etc/rc.d/memcached%%RC_SUBR_SUFFIX%%: extra argument ignored"
 	fi
 else
-	if [ "x${memcached_profiles}" != "x" -a "x$1" != "x" ]; then
+	if [ -n "${memcached_profiles}" -a -n "$1" ]; then
 		for profile in ${memcached_profiles}; do
 			eval _enable="\${memcached_${profile}_enable}"
-			case "x${_enable:-${memcached_enable}}" in
-			x[Nn][Oo]|x[Ff][Aa][Ll][Ss][Ee]|x[Oo][Ff][Ff]|x0)
+			case "${_enable:-${memcached_enable}}" in
+			[Nn][Oo]|[Ff][Aa][Ll][Ss][Ee]|[Oo][Ff][Ff]|0)
 				continue
 				;;
-			x[Yy][Ee][Ss]|x[Tt][Rr][Uu][Ee]|x[Oo][Nn]|x1)
+			[Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1)
 				;;
 			*)
 				if test -z "$_enable"; then
@@ -53,7 +52,7 @@
 				else
 					_var=memcached_"${profile}"_enable
 				fi
-				echo "Bad value" \
+				warn "Bad value" \
 				    "'${_enable:-${memcached_enable}}'" \
 				    "for ${_var}. " \
 				    "Profile ${profile} skipped."
@@ -61,12 +60,10 @@
 				;;
 			esac
 			echo "===> memcached profile: ${profile}"
-			/usr/local/etc/rc.d/memcached $1 ${profile}
-			retcode="$?"
-			if [ "0${retcode}" -ne 0 ]; then
+			if %%PREFIX%%/etc/rc.d/memcached%%RC_SUBR_SUFFIX%% $1 ${profile} ; then
+				success="${profile} ${success:-}"
+			else
 				failed="${profile} (${retcode}) ${failed:-}"
-			else
-				success="${profile} ${success:-}"
 			fi
 		done
 		exit 0
@@ -73,6 +70,23 @@
 	fi
 fi
 
+memcached_poststop()
+{
+	if [ -n "${profile}" ]; then
+		[ -e "$pidfile" ] && unlink $pidfile
+	else
+		local file
+
+		for file in ${_piddir}/* ; do
+			case "$file" in
+			*\*)
+				continue ;;
+			esac
+			unlink $file
+		done
+	fi
+}
+
 : ${memcached_enable="NO"}
 : ${memcached_user="nobody"}
 
@@ -79,4 +93,7 @@
 command=%%PREFIX%%/bin/memcached
 command_args="-d -u ${memcached_user} -P ${pidfile} "
 
+start_precmd="install -d -o $memcached_user -g $memcached_user -m 755 $_piddir"
+stop_postcmd="${name}_poststop"
+
 run_rc_command "$1"