Remove legacy redis 2.0.4.

10 files changed, 1 insertions, 257 deletions

diff --git a/MOVED b/MOVED
index c32a296d3fb4..7f2745df46d3 100644
--- a/MOVED
+++ b/MOVED
@@ -1545,3 +1545,4 @@ sysutils/perf||2011-02-21|Has expired: Does not build on supported versions of F
 databases/redis1||2011-02-24|Removed
 devel/pmake||2011-02-24|Has expired: does not build on any supported version of FreeBSD
 net-p2p/linux-agsatellite||2011-02-24|Has expired: the whole service went to cloud
+databases/redis2||2011-02-25|Removed, use databases/redis instead
diff --git a/databases/Makefile b/databases/Makefile
index 63acf992c68f..851bb2fa98fc 100644
--- a/databases/Makefile
+++ b/databases/Makefile
@@ -703,7 +703,6 @@
     SUBDIR += rdb
     SUBDIR += rdfdb
     SUBDIR += redis
-    SUBDIR += redis2
     SUBDIR += rrdman
     SUBDIR += rrdtool
     SUBDIR += rrdtool10
diff --git a/databases/redis2/Makefile b/databases/redis2/Makefile
deleted file mode 100644
index 5d529a17ff71..000000000000
--- a/databases/redis2/Makefile
+++ /dev/null
@@ -1,70 +0,0 @@
-# New ports collection makefile for:	redis
-# Date created:	   03 Jul 2009
-# Whom:		   Sergey Skvortsov <skv@protey.ru>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	redis
-DISTVERSION=	2.0.4
-PORTREVISION=	2
-CATEGORIES=	databases
-MASTER_SITES=	GOOGLE_CODE
-
-MAINTAINER=	osa@FreeBSD.org
-COMMENT=	A persistent key-value database with built-in net interface
-
-LIB_DEPENDS=	execinfo.1:${PORTSDIR}/devel/libexecinfo
-
-CFLAGS+=	-I${LOCALBASE}/include
-
-CONFLICTS?=	redis-2.2.*
-
-USE_GMAKE=	yes
-USE_RC_SUBR=	redis.sh
-NO_LATEST_LINK=	yes
-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
-
-REDIS_DBDIR?=	/var/db/redis
-REDIS_RUNDIR?=	/var/run/redis
-REDIS_LOGDIR?=	/var/log/redis
-
-SUB_FILES=	pkg-message pkg-install
-SUB_LIST+=	PORTNAME="${PORTNAME}" \
-	REDIS_USER="${REDIS_USER}" \
-	REDIS_UID="${REDIS_UID}" \
-	REDIS_GROUP="${REDIS_GROUP}" \
-	REDIS_GID="${REDIS_GID}" \
-	REDIS_LOGDIR="${REDIS_LOGDIR}" \
-	REDIS_DBDIR="${REDIS_DBDIR}" \
-	REDIS_RUNDIR="${REDIS_RUNDIR}"
-
-PATTERN=	'16d;119d;15s|$$$$(ARCH) ||'
-.if !defined(WITH_DEBUG)
-PATTERN:=	${PATTERN:S/'$/;5s|^|\#|'/}
-.endif
-
-post-patch:
-	${REINPLACE_CMD} ${PATTERN} ${WRKSRC}/Makefile
-
-post-build:
-	${SED} ${SUB_LIST:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
-		${WRKSRC}/redis.conf > ${WRKDIR}/redis.conf
-
-do-install:
-	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
-	${INSTALL_PROGRAM} ${BIN_FILES:C!^!${WRKSRC}/!} ${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/redis2/distinfo b/databases/redis2/distinfo
deleted file mode 100644
index b4a1f349222c..000000000000
--- a/databases/redis2/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (redis-2.0.4.tar.gz) = f635d31c72bde541ce160bfb43db8e081de23322723cffdf315d1b76b010bf3d
-SIZE (redis-2.0.4.tar.gz) = 346383
diff --git a/databases/redis2/files/patch-redis.conf b/databases/redis2/files/patch-redis.conf
deleted file mode 100644
index d105b89a9e95..000000000000
--- a/databases/redis2/files/patch-redis.conf
+++ /dev/null
@@ -1,34 +0,0 @@
---- redis.conf.orig	2010-07-02 16:00:49.000000000 +0400
-+++ redis.conf	2010-07-02 16:01:46.000000000 +0400
-@@ -14,11 +14,11 @@
- 
- # By default Redis does not run as a daemon. Use 'yes' if you need it.
- # Note that Redis will write a pid file in /var/run/redis.pid when daemonized.
--daemonize no
-+daemonize yes
- 
- # When running daemonized, Redis writes a pid file in /var/run/redis.pid by
- # default. You can specify a custom pid file location here.
--pidfile /var/run/redis.pid
-+pidfile %%REDIS_RUNDIR%%/redis.pid
- 
- # Accept connections on the specified port, default is 6379
- port 6379
-@@ -42,7 +42,7 @@
- # Specify the log file name. Also 'stdout' can be used to force
- # Redis to log on the standard output. Note that if you use standard
- # output for logging but daemonize, logs will be sent to /dev/null
--logfile stdout
-+logfile %%REDIS_LOGDIR%%/redis.log
- 
- # Set the number of databases. The default database is DB 0, you can select
- # a different one on a per-connection basis using SELECT <dbid> where
-@@ -86,7 +86,7 @@
- # Also the Append Only File will be created inside this directory.
- # 
- # Note that you must specify a directory here, not a file name.
--dir ./
-+dir %%REDIS_DBDIR%%/
- 
- ################################# REPLICATION #################################
- 
diff --git a/databases/redis2/files/pkg-install.in b/databases/redis2/files/pkg-install.in
deleted file mode 100644
index 9eec80ea70f9..000000000000
--- a/databases/redis2/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
diff --git a/databases/redis2/files/pkg-message.in b/databases/redis2/files/pkg-message.in
deleted file mode 100644
index fd3763137ea3..000000000000
--- a/databases/redis2/files/pkg-message.in
+++ /dev/null
@@ -1,8 +0,0 @@
-
-===>  CONFIGURATION NOTE:
-
-      To setup "%%PORTNAME%%" you need to edit the configuration file:
-      %%PREFIX%%/etc/%%PORTNAME%%.conf
-
-      To run redis from startup, add %%PORTNAME%%_enable="YES"
-      in your /etc/rc.conf.
diff --git a/databases/redis2/files/redis.sh.in b/databases/redis2/files/redis.sh.in
deleted file mode 100644
index 30d006b15c54..000000000000
--- a/databases/redis2/files/redis.sh.in
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-# PROVIDE: redis
-# REQUIRE: LOGIN
-# BEFORE:  securelevel
-# KEYWORD: shutdown
-
-# Add the following line to /etc/rc.conf to enable `redis':
-#
-#redis_enable="YES"
-#
-
-. /etc/rc.subr
-
-name="redis"
-rcvar=`set_rcvar`
-
-extra_commands="reload"
-
-command="%%PREFIX%%/bin/redis-server"
-config_file="%%PREFIX%%/etc/$name.conf"
-command_args="${config_file}"
-pidfile="%%REDIS_RUNDIR%%/$name.pid"
-required_files="${config_file}"
-
-# read configuration and set defaults
-load_rc_config "$name"
-: ${redis_enable="NO"}
-: ${redis_user="%%REDIS_USER%%"}
-: ${redis_flags=""}
-
-run_rc_command "$1"
diff --git a/databases/redis2/pkg-descr b/databases/redis2/pkg-descr
deleted file mode 100644
index 81dd3e5bdd3b..000000000000
--- a/databases/redis2/pkg-descr
+++ /dev/null
@@ -1,14 +0,0 @@
-Redis is a key-value database.  It is similar to memcached but the
-dataset is not volatile, and values can be strings, exactly like in
-memcached, but also lists and sets with atomic operations to push/pop
-elements.
-
-In order to be very fast but at the same time persistent the whole
-dataset is taken in memory and from time to time and/or when a number of
-changes to the dataset are performed it is written asynchronously on
-disk.  You may lost the last few queries that is acceptable in many
-applications but it is as fast as an in memory DB (Redis supports
-non-blocking master-slave replication in order to solve this problem by
-redundancy).
-
-WWW: http://code.google.com/p/redis/
diff --git a/databases/redis2/pkg-plist b/databases/redis2/pkg-plist
deleted file mode 100644
index 8391247fbe51..000000000000
--- a/databases/redis2/pkg-plist
+++ /dev/null
@@ -1,8 +0,0 @@
-bin/redis-benchmark
-bin/redis-check-aof
-bin/redis-check-dump
-bin/redis-cli
-bin/redis-server
-@unexec (cmp -s %D/etc/redis.conf %D/etc/redis.conf.sample && rm -f %D/etc/redis.conf) || true
-etc/redis.conf.sample
-@exec [ -f %B/redis.conf ] || cp %B/%f %B/redis.conf