databases/redis*: Update CONFLICTS_INSTALL, remove CONFLICTS

* Update CONFLICTS_INSTALL after databases/redis70 is added to ports tree. * Remove CONFLICTS as build of one redis version succeeds even if another version is installed.
freebsd · Aug 17, 2023 · 6659086 · 6659086
1 parent cc25511
commit 6659086
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 12 deletions.
diff --git a/databases/redis-devel/Makefile b/databases/redis-devel/Makefile
@@ -18,7 +18,7 @@ GH_TAGNAME=	6abb3c403
 MAKE_ENV=	OPTIMIZATION= \
 		V=yo
 
-CONFLICTS_INSTALL=	redis redis6 redis62 # etc/rc.d/redis
+CONFLICTS_INSTALL=	redis redis6 redis62 redis70 # etc/rc.d/redis
 
 PORTSCOUT=	ignore:1
 
@@ -75,8 +75,6 @@ EXTRA_PATCHES=	${PATCHDIR}/extra-patch-src-Makefile.luajit-or \
 
 LDFLAGS+=	-lpthread -lm -lexecinfo
 
-CONFLICTS?=	redis-[1-9].* redis6-* redis62-*
-
 USE_RC_SUBR=	redis sentinel
 BIN_FILES=	redis-benchmark redis-check-aof redis-check-rdb redis-cli \
 		redis-sentinel redis-server

diff --git a/databases/redis/Makefile b/databases/redis/Makefile
@@ -16,7 +16,7 @@ CPE_VENDOR=	redislabs
 MAKE_ENV=	OPTIMIZATION= \
 		V=yo
 
-CONFLICTS_INSTALL=	redis-devel redis6 redis62 # etc/rc.d/redis
+CONFLICTS_INSTALL=	redis-devel redis6 redis62 redis70 # etc/rc.d/redis
 
 OPTIONS_DEFINE=		JEMALLOC TESTS TLS TRIB
 OPTIONS_RADIO=		EXTLUA
@@ -71,8 +71,6 @@ EXTRA_PATCHES=	${PATCHDIR}/extra-patch-src-Makefile.luajit-or \
 
 LDFLAGS+=	-lpthread -lm -lexecinfo
 
-CONFLICTS?=	redis-devel-* redis6-* redis62-*
-
 USE_RC_SUBR=	redis sentinel
 BIN_FILES=	redis-benchmark redis-check-aof redis-check-rdb redis-cli \
 		redis-sentinel redis-server

diff --git a/databases/redis6/Makefile b/databases/redis6/Makefile
@@ -16,7 +16,7 @@ USES+=		compiler:c11 gmake
 MAKE_ENV=	OPTIMIZATION= \
 		V=yo
 
-CONFLICTS_INSTALL=	redis redis-devel redis62 # etc/rc.d/redis
+CONFLICTS_INSTALL=	redis redis-devel redis62 redis70 # etc/rc.d/redis
 
 PORTSCOUT=	limit:^6\.0
 
@@ -69,8 +69,6 @@ EXTRA_PATCHES=	${PATCHDIR}/extra-patch-src-Makefile.luajit-or \
 
 LDFLAGS+=	-lpthread -lm -lexecinfo
 
-CONFLICTS?=	redis-[1-9].* redis-devel-* redis62-*
-
 USE_RC_SUBR=	redis sentinel
 BIN_FILES=	redis-benchmark redis-check-aof redis-check-rdb redis-cli \
 		redis-sentinel redis-server

diff --git a/databases/redis62/Makefile b/databases/redis62/Makefile
@@ -18,7 +18,7 @@ CPE_PRODUCT=	redis
 MAKE_ENV=	OPTIMIZATION= \
 		V=yo
 
-CONFLICTS_INSTALL=	redis redis-devel redis6 # etc/rc.d/redis
+CONFLICTS_INSTALL=	redis redis-devel redis6 redis70 # etc/rc.d/redis
 
 PORTSCOUT=	limit:^6\.2
 

diff --git a/databases/redis70/Makefile b/databases/redis70/Makefile
@@ -74,8 +74,6 @@ EXTRA_PATCHES=	${PATCHDIR}/extra-patch-src-Makefile.luajit-or \
 
 LDFLAGS+=	-lpthread -lm -lexecinfo
 
-CONFLICTS?=	redis-devel-* redis6-* redis62-*
-
 USE_RC_SUBR=	redis sentinel
 BIN_FILES=	redis-benchmark redis-check-aof redis-check-rdb redis-cli \
 		redis-sentinel redis-server