git: 91ab6ec3dce1 - main - databases/redis*: Update CONFLICTS
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 06 Apr 2022 01:22:57 UTC
The branch main has been updated by yasu:
URL: https://cgit.FreeBSD.org/ports/commit/?id=91ab6ec3dce13d813ee82cc93de993b0e7baa38d
commit 91ab6ec3dce13d813ee82cc93de993b0e7baa38d
Author: Yasuhiro Kimura <yasu@FreeBSD.org>
AuthorDate: 2022-04-06 01:04:19 +0000
Commit: Yasuhiro Kimura <yasu@FreeBSD.org>
CommitDate: 2022-04-06 01:21:08 +0000
databases/redis*: Update CONFLICTS
databases/redis5 is removed from ports tree.
---
databases/redis-devel/Makefile | 2 +-
databases/redis/Makefile | 2 +-
databases/redis6/Makefile | 2 +-
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 \