aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorosa <osa@FreeBSD.org>2010-08-15 17:23:37 +0800
committerosa <osa@FreeBSD.org>2010-08-15 17:23:37 +0800
commit7d82a30501f2645701317462b924ecb33779662a (patch)
tree6983583e7e2b196c8cb7e34e2c18c12c8fd37690
parent95598135f65db034bf10d895baad8678dcd05d0b (diff)
downloadfreebsd-ports-gnome-7d82a30501f2645701317462b924ecb33779662a.tar.gz
freebsd-ports-gnome-7d82a30501f2645701317462b924ecb33779662a.tar.zst
freebsd-ports-gnome-7d82a30501f2645701317462b924ecb33779662a.zip
Add CONFLICTS with databases/redis-devel.
Bump PORTREVISION.
-rw-r--r--databases/redis/Makefile3
-rw-r--r--databases/redis1/Makefile3
-rw-r--r--databases/redis2/Makefile3
3 files changed, 9 insertions, 0 deletions
diff --git a/databases/redis/Makefile b/databases/redis/Makefile
index f4c84ea7d8a8..2dc49cb39206 100644
--- a/databases/redis/Makefile
+++ b/databases/redis/Makefile
@@ -7,6 +7,7 @@
PORTNAME= redis
PORTVERSION= 1.2.6
+PORTREVISION= 1
CATEGORIES= databases
MASTER_SITES= GOOGLE_CODE
@@ -17,6 +18,8 @@ LIB_DEPENDS= execinfo.1:${PORTSDIR}/devel/libexecinfo
CFLAGS+= -I${LOCALBASE}/include
+CONFLICTS?= redis-devel-2.*
+
USE_GMAKE= yes
USE_RC_SUBR= redis.sh
BIN_FILES= redis-server redis-benchmark redis-cli
diff --git a/databases/redis1/Makefile b/databases/redis1/Makefile
index f4c84ea7d8a8..2dc49cb39206 100644
--- a/databases/redis1/Makefile
+++ b/databases/redis1/Makefile
@@ -7,6 +7,7 @@
PORTNAME= redis
PORTVERSION= 1.2.6
+PORTREVISION= 1
CATEGORIES= databases
MASTER_SITES= GOOGLE_CODE
@@ -17,6 +18,8 @@ LIB_DEPENDS= execinfo.1:${PORTSDIR}/devel/libexecinfo
CFLAGS+= -I${LOCALBASE}/include
+CONFLICTS?= redis-devel-2.*
+
USE_GMAKE= yes
USE_RC_SUBR= redis.sh
BIN_FILES= redis-server redis-benchmark redis-cli
diff --git a/databases/redis2/Makefile b/databases/redis2/Makefile
index f4c84ea7d8a8..2dc49cb39206 100644
--- a/databases/redis2/Makefile
+++ b/databases/redis2/Makefile
@@ -7,6 +7,7 @@
PORTNAME= redis
PORTVERSION= 1.2.6
+PORTREVISION= 1
CATEGORIES= databases
MASTER_SITES= GOOGLE_CODE
@@ -17,6 +18,8 @@ LIB_DEPENDS= execinfo.1:${PORTSDIR}/devel/libexecinfo
CFLAGS+= -I${LOCALBASE}/include
+CONFLICTS?= redis-devel-2.*
+
USE_GMAKE= yes
USE_RC_SUBR= redis.sh
BIN_FILES= redis-server redis-benchmark redis-cli