Update from 1.2.6 to latest development version 2.0.0rc4 after repocopy.

Add CONFLICTS.
Add the note in UPDATING about configuration file changes.

4 files changed, 25 insertions, 19 deletions

diff --git a/databases/redis-devel/Makefile b/databases/redis-devel/Makefile
index f4c84ea7d8a8..4875c8032e44 100644
--- a/databases/redis-devel/Makefile
+++ b/databases/redis-devel/Makefile
@@ -6,9 +6,10 @@
 #
 
 PORTNAME=	redis
-PORTVERSION=	1.2.6
+DISTVERSION=	2.0.0-rc4
 CATEGORIES=	databases
 MASTER_SITES=	GOOGLE_CODE
+PKGNAMESUFFIX=	-devel
 
 MAINTAINER=	osa@FreeBSD.org
 COMMENT=	A persistent key-value database with built-in net interface
@@ -17,9 +18,12 @@ LIB_DEPENDS=	execinfo.1:${PORTSDIR}/devel/libexecinfo
 
 CFLAGS+=	-I${LOCALBASE}/include
 
+CONFLICTS?=	redis-1.*
+
 USE_GMAKE=	yes
 USE_RC_SUBR=	redis.sh
-BIN_FILES=	redis-server redis-benchmark redis-cli
+BIN_FILES=	redis-benchmark redis-check-aof redis-check-dump \
+		redis-cli redis-server
 
 PKGINSTALL=	${WRKDIR}/pkg-install
 PKGDEINSTALL=	${WRKDIR}/pkg-install
@@ -44,9 +48,9 @@ SUB_LIST+=	PORTNAME="${PORTNAME}" \
 	REDIS_DBDIR="${REDIS_DBDIR}" \
 	REDIS_RUNDIR="${REDIS_RUNDIR}"
 
-PATTERN=	'10d;13s|$$$$(ARCH) ||'
+PATTERN=	'16d;115d;15s|$$$$(ARCH) ||'
 .if !defined(WITH_DEBUG)
-PATTERN:=	${PATTERN:S/'$/;14s|^|\#|'/}
+PATTERN:=	${PATTERN:S/'$/;5s|^|\#|'/}
 .endif
 
 post-patch:
diff --git a/databases/redis-devel/distinfo b/databases/redis-devel/distinfo
index 9a3389d30aac..becf76b943f3 100644
--- a/databases/redis-devel/distinfo
+++ b/databases/redis-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (redis-1.2.6.tar.gz) = 0c5355e57606523f9e8ce816db5e542f
-SHA256 (redis-1.2.6.tar.gz) = bed0641225f786f225a2c4897ffbec1e6573a3c31e9f899884ee3041eab96873
-SIZE (redis-1.2.6.tar.gz) = 213341
+MD5 (redis-2.0.0-rc4.tar.gz) = 700b6475c168e9116fd80a5c8643db47
+SHA256 (redis-2.0.0-rc4.tar.gz) = 6096278a2ea64b7b6f75606f620cbf3df5b1de06e7a3a7dc4b34a97485fc3e22
+SIZE (redis-2.0.0-rc4.tar.gz) = 346479
diff --git a/databases/redis-devel/files/patch-redis.conf b/databases/redis-devel/files/patch-redis.conf
index 4aab6fedaf65..d105b89a9e95 100644
--- a/databases/redis-devel/files/patch-redis.conf
+++ b/databases/redis-devel/files/patch-redis.conf
@@ -1,32 +1,32 @@
---- redis.conf.orig	2009-12-27 11:54:09.000000000 +0300
-+++ redis.conf	2009-12-27 11:56:16.000000000 +0300
-@@ -2,11 +2,11 @@
+--- 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 run as a daemon, Redis write a pid file in /var/run/redis.pid by default.
- # You can specify a custom pid file location here.
+ # 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
-@@ -29,7 +29,7 @@
+@@ -42,7 +42,7 @@
  # Specify the log file name. Also 'stdout' can be used to force
- # the demon to log on the standard output. Note that if you use standard
+ # 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
-@@ -64,7 +64,7 @@
- 
- # For default save/load DB in/from the working directory
- # Note that you must specify a directory not a file name.
+@@ -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%%/
  
diff --git a/databases/redis-devel/pkg-plist b/databases/redis-devel/pkg-plist
index 3f7c08dc7eee..8391247fbe51 100644
--- a/databases/redis-devel/pkg-plist
+++ b/databases/redis-devel/pkg-plist
@@ -1,6 +1,8 @@
-bin/redis-server
 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