aboutsummaryrefslogtreecommitdiffstats
path: root/databases
diff options
context:
space:
mode:
authorosa <osa@FreeBSD.org>2011-02-13 20:13:41 +0800
committerosa <osa@FreeBSD.org>2011-02-13 20:13:41 +0800
commit84ac1a614cf2000866ea74fcc554317eece4dd08 (patch)
tree78e6722998290e300daf215b427dfbcbeaefc727 /databases
parent7e49e252860fc3c44ddb26e2059dd417128a633f (diff)
downloadfreebsd-ports-gnome-84ac1a614cf2000866ea74fcc554317eece4dd08.tar.gz
freebsd-ports-gnome-84ac1a614cf2000866ea74fcc554317eece4dd08.tar.zst
freebsd-ports-gnome-84ac1a614cf2000866ea74fcc554317eece4dd08.zip
Add CONFLICTS with upcoming redis-2.2.
Bump RORTREVISION.
Diffstat (limited to 'databases')
-rw-r--r--databases/redis2/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/databases/redis2/Makefile b/databases/redis2/Makefile
index 6f4cc8233890..5f9b8dac15ce 100644
--- a/databases/redis2/Makefile
+++ b/databases/redis2/Makefile
@@ -6,6 +6,7 @@
#
PORTNAME= redis
+PORTREVISION= 1
DISTVERSION= 2.0.4
CATEGORIES= databases
MASTER_SITES= GOOGLE_CODE
@@ -17,7 +18,7 @@ LIB_DEPENDS= execinfo.1:${PORTSDIR}/devel/libexecinfo
CFLAGS+= -I${LOCALBASE}/include
-CONFLICTS?= redis-1.*
+CONFLICTS?= redis-1.* redis-2.2.*
USE_GMAKE= yes
USE_RC_SUBR= redis.sh