aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYasuhiro Kimura <yasu@FreeBSD.org>2022-04-06 01:04:19 +0000
committerYasuhiro Kimura <yasu@FreeBSD.org>2022-04-06 01:21:08 +0000
commit91ab6ec3dce13d813ee82cc93de993b0e7baa38d (patch)
tree1ff9e5ef1ffa7104c87ad317ef23ba9336103d48
parentc18c1057fd1e6a0dbd4800700b929064e43e1a29 (diff)
downloadports-91ab6ec3dce13d813ee82cc93de993b0e7baa38d.tar.gz
ports-91ab6ec3dce13d813ee82cc93de993b0e7baa38d.zip
databases/redis*: Update CONFLICTS
databases/redis5 is removed from ports tree.
-rw-r--r--databases/redis-devel/Makefile2
-rw-r--r--databases/redis/Makefile2
-rw-r--r--databases/redis6/Makefile2
3 files changed, 3 insertions, 3 deletions
diff --git a/databases/redis-devel/Makefile b/databases/redis-devel/Makefile
index 44e5f12fecb3..69c44dfb31de 100644
--- a/databases/redis-devel/Makefile
+++ b/databases/redis-devel/Makefile
@@ -68,7 +68,7 @@ LDFLAGS+= -Wl,-E
LDFLAGS+= -lpthread -lm -lexecinfo
-CONFLICTS?= redis-6.* redis5-5.* redis6-6.*
+CONFLICTS?= redis-6.* redis6-6.*
USE_RC_SUBR= redis sentinel
BIN_FILES= redis-benchmark redis-check-aof redis-check-rdb redis-cli \
diff --git a/databases/redis/Makefile b/databases/redis/Makefile
index 46939f33b844..31855c4059c8 100644
--- a/databases/redis/Makefile
+++ b/databases/redis/Makefile
@@ -70,7 +70,7 @@ LDFLAGS= -Wl,-E
LDFLAGS+= -lpthread -lm -lexecinfo
-CONFLICTS?= redis5-5.* redis6-6.* redis-devel-6.*
+CONFLICTS?= redis6-6.* redis-devel-6.*
USE_RC_SUBR= redis sentinel
BIN_FILES= redis-benchmark redis-check-aof redis-check-rdb \
diff --git a/databases/redis6/Makefile b/databases/redis6/Makefile
index 041eaaa3e577..15b12ac4ab38 100644
--- a/databases/redis6/Makefile
+++ b/databases/redis6/Makefile
@@ -69,7 +69,7 @@ LDFLAGS= -Wl,-E
LDFLAGS+= -lpthread -lm -lexecinfo
-CONFLICTS?= redis5-5.* redis-6.* redis-devel-6.*
+CONFLICTS?= redis-6.* redis-devel-6.*
USE_RC_SUBR= redis sentinel
BIN_FILES= redis-benchmark redis-check-aof redis-check-rdb \