Update from 2.2.5 to 2.2.7.

Also update port infrastructure, remove needless script.

<ChangeLog>

What's new in Redis 2.2.7
=========================

* Fixed bug #543-2 (the issue was reopened with a completely different report)
  that caused Redis to randomly crash on list push performed against lists
  with other clients blocked with BLPOP (or variants).

What's new in Redis 2.2.6
=========================

* Fixed bug #543. If you saw Redis instances crashing on List operations
  (only happening with a non-default max entry size ziplist setting in
  redis.conf) it was almost certainly this problem.
* Fixed a bug with replication where SLAVEOF NO ONE caused a slave to close the
  connection with all its slaves.

</ChangeLog>

3 files changed, 8 insertions, 101 deletions

diff --git a/databases/redis/Makefile b/databases/redis/Makefile
index e157e095dd8b..2a52d1344963 100644
--- a/databases/redis/Makefile
+++ b/databases/redis/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	redis
-PORTVERSION=	2.2.5
+PORTVERSION=	2.2.7
 CATEGORIES=	databases
 MASTER_SITES=	GOOGLE_CODE
 
@@ -22,25 +22,19 @@ USE_RC_SUBR=	redis.sh
 BIN_FILES=	redis-benchmark redis-check-aof redis-check-dump \
 		redis-cli redis-server
 
-PKGINSTALL=	${WRKDIR}/pkg-install
-PKGDEINSTALL=	${WRKDIR}/pkg-install
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
-REDIS_USER?=	redis
-REDIS_UID?=	535
-REDIS_GROUP?=	redis
-REDIS_GID?=	535
+USERS=	redis
+GROUPS=	redis
 
 REDIS_DBDIR?=	/var/db/redis
 REDIS_RUNDIR?=	/var/run/redis
 REDIS_LOGDIR?=	/var/log/redis
 
-SUB_FILES=	pkg-message pkg-install
+SUB_FILES=	pkg-message
 SUB_LIST+=	PORTNAME="${PORTNAME}" \
-	REDIS_USER="${REDIS_USER}" \
-	REDIS_UID="${REDIS_UID}" \
-	REDIS_GROUP="${REDIS_GROUP}" \
-	REDIS_GID="${REDIS_GID}" \
+	REDIS_USER="${USERS}" \
+	REDIS_GROUP="${GROUPS}" \
 	REDIS_LOGDIR="${REDIS_LOGDIR}" \
 	REDIS_DBDIR="${REDIS_DBDIR}" \
 	REDIS_RUNDIR="${REDIS_RUNDIR}"
@@ -50,9 +44,7 @@ post-build:
 		${WRKSRC}/redis.conf > ${WRKDIR}/redis.conf
 
 do-install:
-	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 	${INSTALL_PROGRAM} ${BIN_FILES:C!^!${WRKSRC}/src/!} ${PREFIX}/bin/
 	${INSTALL_DATA} ${WRKDIR}/redis.conf ${PREFIX}/etc/redis.conf.sample
-	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 
 .include <bsd.port.mk>
diff --git a/databases/redis/distinfo b/databases/redis/distinfo
index 5a97dccfb1ea..cc36922b4fe7 100644
--- a/databases/redis/distinfo
+++ b/databases/redis/distinfo
@@ -1,2 +1,2 @@
-SHA256 (redis-2.2.5.tar.gz) = 983b97b4edfed26e30c535af8fe23528a8a8b6afaebbe5c2a2c0ac003d8d6bc5
-SIZE (redis-2.2.5.tar.gz) = 447725
+SHA256 (redis-2.2.7.tar.gz) = a3497a6ee23b678585f92e81da2239e2ef12ff1524bb7216bfe3e9395d1e0a2b
+SIZE (redis-2.2.7.tar.gz) = 448151
diff --git a/databases/redis/files/pkg-install.in b/databases/redis/files/pkg-install.in
deleted file mode 100644
index 9eec80ea70f9..000000000000
--- a/databases/redis/files/pkg-install.in
+++ /dev/null
@@ -1,85 +0,0 @@
-#!/bin/sh
-
-# $FreeBSD$
-
-PATH=/bin:/usr/bin:/usr/sbin
-
-USER="%%REDIS_USER%%"
-USER_ID="%%REDIS_UID%%"
-GROUP="%%REDIS_GROUP%%"
-GROUP_ID="%%REDIS_GID%%"
-
-RUNTIME_DIRS="%%REDIS_LOGDIR%% %%REDIS_DBDIR%% %%REDIS_RUNDIR%%"
-
-case $2 in
-PRE-INSTALL)
-
-if [ `id -u` -ne 0 ]; then
-	echo; echo "You must be root to run this step!"; echo; echo
-	exit 1
-fi
-
-RES=`pw groupshow -n ${GROUP} 2>/dev/null`
-if [ $? -eq 0 ]; then
-	echo "You already have a group \"${GROUP}\", so we will use it."
-else
-	RES=`pw groupshow -g ${GROUP_ID} 2>/dev/null`
-	if [ $? -ne 0 ]; then
-		_GID="-g ${GROUP_ID}"
-	else
-		_GID=''
-	fi
-
-	if pw groupadd -n ${GROUP} ${_GID}; then
-	echo "Added group \"${GROUP}\"."
-	else
-		echo "Adding group \"${GROUP}\" failed..."
-		exit 1
-	fi
-fi
-
-RES=`id -u ${USER} 2>/dev/null`
-if [ $? -ne 0 ]; then
-	RES=`id -un ${USER_ID} 2>/dev/null`
-	if [ $? -ne 0 ]; then
-		_UID="-u ${USER_ID}"
-	else
-		_UID=''
-	fi
-
-	if pw useradd -n ${USER} ${_UID} -g ${GROUP} \
-	-w no -s /usr/sbin/nologin; then
-		echo  "Added user \"${USER}\"."
-	else
-		echo "Adding user \"${USER}\" failed..."
-		exit 1
-	fi
-fi
-
-;;
-
-POST-INSTALL)
-
-for DIR in ${RUNTIME_DIRS}; do
-	mkdir -p ${DIR}
-	chown -R ${USER}:${GROUP} ${DIR}
-	chmod -R 755 ${DIR}
-done
-
-;;
-
-DEINSTALL)
-
-if [ -z ${UPGRADE_PORT} ] ; then
-
-	echo
-	echo "If you do not intend to reinstall \"%%PORTNAME%%\" you should manually"
-        echo "remove user '${USER}' (uid='${USER_ID}') and group '${GROUP}' (gid='${USER_ID}')."
-	echo
-	echo "Also you may want to remove the no longer required directoris:"
-	echo ${RUNTIME_DIRS}
-	echo
-
-fi
-
-esac