git: 95bbd18366cc - main - databases/redis*: Adjust CONFLICTS_INSTALL

Go to: [ bottom of page ] [ top of archives ] [ this month ]

From: Yasuhiro Kimura <yasu_at_FreeBSD.org>
Date: Wed, 18 Jan 2023 04:46:12 UTC

The branch main has been updated by yasu:

URL: https://cgit.FreeBSD.org/ports/commit/?id=95bbd18366cce8c376fbf73218d495e8a099d53a

commit 95bbd18366cce8c376fbf73218d495e8a099d53a
Author:     Yasuhiro Kimura <yasu@FreeBSD.org>
AuthorDate: 2023-01-18 04:18:41 +0000
Commit:     Yasuhiro Kimura <yasu@FreeBSD.org>
CommitDate: 2023-01-18 04:45:06 +0000

    databases/redis*: Adjust CONFLICTS_INSTALL
---
 databases/redis-devel/Makefile | 2 +-
 databases/redis/Makefile       | 3 ++-
 databases/redis6/Makefile      | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/databases/redis-devel/Makefile b/databases/redis-devel/Makefile
index 12d540ce27ba..a3dae3f7bd16 100644
--- a/databases/redis-devel/Makefile
+++ b/databases/redis-devel/Makefile
@@ -18,7 +18,7 @@ GH_TAGNAME=	b4123663c
 MAKE_ENV=	OPTIMIZATION= \
 		V=yo
 
-CONFLICTS_INSTALL=	redis redis6 # etc/rc.d/redis
+CONFLICTS_INSTALL=	redis redis6 redis62 # etc/rc.d/redis
 
 PORTSCOUT=	ignore:1
 
diff --git a/databases/redis/Makefile b/databases/redis/Makefile
index 00c80a6199d1..38290b0aaada 100644
--- a/databases/redis/Makefile
+++ b/databases/redis/Makefile
@@ -15,7 +15,8 @@ CPE_VENDOR=	redislabs
 
 MAKE_ENV=	OPTIMIZATION= \
 		V=yo
-CONFLICTS_INSTALL=	redis-devel redis6 # etc/rc.d/redis
+
+CONFLICTS_INSTALL=	redis-devel redis6 redis62 # etc/rc.d/redis
 
 OPTIONS_DEFINE=		JEMALLOC TESTS TLS TRIB
 OPTIONS_RADIO=		EXTLUA
diff --git a/databases/redis6/Makefile b/databases/redis6/Makefile
index 0f210aa9afd5..bd4ad8087e1a 100644
--- a/databases/redis6/Makefile
+++ b/databases/redis6/Makefile
@@ -17,7 +17,7 @@ USES+=		compiler:c11 gmake
 MAKE_ENV=	OPTIMIZATION= \
 		V=yo
 
-CONFLICTS_INSTALL=	redis redis-devel # etc/rc.d/redis
+CONFLICTS_INSTALL=	redis redis-devel redis62 # etc/rc.d/redis
 
 PORTSCOUT=	limit:^6\.0