Update from 2.0.4 (after repocopy to databases/redis2) to latest

release candidate 2.2.rc4.

Add CONFLICTS with redis-2.0.
Add NO_LATEST_LINK, should be removed after 2.2 release.

6 files changed, 85 insertions, 13 deletions

diff --git a/databases/redis/Makefile b/databases/redis/Makefile
index 6f4cc8233890..71e3d1263ab0 100644
--- a/databases/redis/Makefile
+++ b/databases/redis/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	redis
-DISTVERSION=	2.0.4
+DISTVERSION=	2.2.0-rc4
 CATEGORIES=	databases
 MASTER_SITES=	GOOGLE_CODE
 
@@ -17,10 +17,11 @@ LIB_DEPENDS=	execinfo.1:${PORTSDIR}/devel/libexecinfo
 
 CFLAGS+=	-I${LOCALBASE}/include
 
-CONFLICTS?=	redis-1.*
+CONFLICTS?=	redis-1.* redis-2.0.*
 
 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
 
@@ -47,21 +48,13 @@ SUB_LIST+=	PORTNAME="${PORTNAME}" \
 	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_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
 
diff --git a/databases/redis/distinfo b/databases/redis/distinfo
index b4a1f349222c..ef21051501d9 100644
--- a/databases/redis/distinfo
+++ b/databases/redis/distinfo
@@ -1,2 +1,2 @@
-SHA256 (redis-2.0.4.tar.gz) = f635d31c72bde541ce160bfb43db8e081de23322723cffdf315d1b76b010bf3d
-SIZE (redis-2.0.4.tar.gz) = 346383
+SHA256 (redis-2.2.0-rc4.tar.gz) = 5f3398c0b6d8e01132ea07f2b3143193db0a1e4dc8408cc5bd789a1e97cffc85
+SIZE (redis-2.2.0-rc4.tar.gz) = 445431
diff --git a/databases/redis/files/patch-deps::hiredis::Makefile b/databases/redis/files/patch-deps::hiredis::Makefile
new file mode 100644
index 000000000000..f6d34bd3a9de
--- /dev/null
+++ b/databases/redis/files/patch-deps::hiredis::Makefile
@@ -0,0 +1,29 @@
+--- deps/hiredis/Makefile.orig	2010-12-23 15:17:54.000000000 +0300
++++ deps/hiredis/Makefile	2010-12-24 09:24:45.000000000 +0300
+@@ -24,6 +24,14 @@
+   DYLIB_MAKE_CMD?=libtool -dynamic -o ${DYLIBNAME} -lm ${DEBUG} - ${OBJ}
+   STLIBNAME?=libhiredis.a
+   STLIB_MAKE_CMD?=libtool -static -o ${STLIBNAME} - ${OBJ}
++else ifeq ($(uname_S),FreeBSD)
++  CFLAGS?=$(CFLAGS)
++  CCLINK?=-pthread
++  LDFLAGS?=-L. -Wl,-rpath,.
++  DYLIBNAME?=libhiredis.so
++  DYLIB_MAKE_CMD?=$(CC) -o ${DYLIBNAME} ${OBJ}
++  STLIBNAME?=libhiredis.a
++  STLIB_MAKE_CMD?=ar rcs ${STLIBNAME} ${OBJ}
+ else
+   CFLAGS?=-std=c99 -pedantic $(OPTIMIZATION) -fPIC -Wall -W -Wwrite-strings $(ARCH) $(PROF)
+   CCLINK?=-lm -pthread
+@@ -34,9 +42,9 @@
+   STLIB_MAKE_CMD?=ar rcs ${STLIBNAME} ${OBJ}
+ endif
+ CCOPT= $(CFLAGS) $(CCLINK)
+-DEBUG?= -g -ggdb
++#DEBUG?= -g -ggdb
+ 
+-PREFIX?= /usr/local
++PREFIX?= ${PREFIX}
+ INSTALL_INC= $(PREFIX)/include/hiredis
+ INSTALL_LIB= $(PREFIX)/lib
+ INSTALL= cp -a
diff --git a/databases/redis/files/patch-deps::linenoise::Makefile b/databases/redis/files/patch-deps::linenoise::Makefile
new file mode 100644
index 000000000000..2a79e2e3208c
--- /dev/null
+++ b/databases/redis/files/patch-deps::linenoise::Makefile
@@ -0,0 +1,15 @@
+--- deps/linenoise/Makefile.orig	2010-12-24 09:27:03.000000000 +0300
++++ deps/linenoise/Makefile	2010-12-24 09:27:47.000000000 +0300
+@@ -1,10 +1,10 @@
+ linenoise_example: linenoise.h linenoise.c
+ 
+ linenoise_example: linenoise.o example.o
+-	$(CC) $(ARCH) -Wall -W -Os -g -o linenoise_example linenoise.o example.o
++	$(CC) $(CFLAGS) -o linenoise_example linenoise.o example.o
+ 
+ .c.o:
+-	$(CC) $(ARCH) -c -Wall -W -Os -g $<
++	$(CC) $(CFLAGS) -c $<
+ 
+ clean:
+ 	rm -f linenoise_example *.o
diff --git a/databases/redis/files/patch-src::Makefile b/databases/redis/files/patch-src::Makefile
new file mode 100644
index 000000000000..21674a4798b2
--- /dev/null
+++ b/databases/redis/files/patch-src::Makefile
@@ -0,0 +1,24 @@
+--- src/Makefile.orig	2010-12-24 09:29:14.000000000 +0300
++++ src/Makefile	2010-12-24 09:31:51.000000000 +0300
+@@ -9,6 +9,9 @@
+   CFLAGS?= -std=c99 -pedantic $(OPTIMIZATION) -Wall -W -D__EXTENSIONS__ -D_XPG6
+   CCLINK?= -ldl -lnsl -lsocket -lm -lpthread
+   DEBUG?= -g -ggdb 
++else ifeq ($(uname_S),FreeBSD)
++  CFLAGS?= $(CFLAGS)
++  CCLINK?= -pthread -lm
+ else
+   CFLAGS?= -std=c99 -pedantic $(OPTIMIZATION) -Wall -W $(ARCH) $(PROF)
+   CCLINK?= -lm -pthread
+@@ -19,9 +22,9 @@
+   CCLINK+= -ltcmalloc
+   CFLAGS+= -DUSE_TCMALLOC
+ endif
+-CCOPT= $(CFLAGS) $(CCLINK) $(ARCH) $(PROF)
++CCOPT= $(CFLAGS) $(CCLINK) $(PROF)
+ 
+-PREFIX= /usr/local
++PREFIX?= $(PREFIX)
+ INSTALL_BIN= $(PREFIX)/bin
+ INSTALL= cp -p
+ 
diff --git a/databases/redis/files/patch-src::mkreleasehdr.sh b/databases/redis/files/patch-src::mkreleasehdr.sh
new file mode 100644
index 000000000000..2d818f69198b
--- /dev/null
+++ b/databases/redis/files/patch-src::mkreleasehdr.sh
@@ -0,0 +1,11 @@
+--- src/mkreleasehdr.sh.orig	2010-12-24 09:37:11.000000000 +0300
++++ src/mkreleasehdr.sh	2010-12-24 09:37:16.000000000 +0300
+@@ -1,6 +1,6 @@
+ #!/bin/sh
+-GIT_SHA1=`(git show-ref --head --hash=8 2> /dev/null || echo 00000000) | head -n1`
+-GIT_DIRTY=`git diff 2> /dev/null | wc -l`
++GIT_SHA1="00000000"
++GIT_DIRTY="0"
+ test -f release.h || touch release.h
+ (cat release.h | grep SHA1 | grep $GIT_SHA1) && \
+ (cat release.h | grep DIRTY | grep $GIT_DIRTY) && exit 0 # Already uptodate