summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYasuhiro Kimura <yasu@FreeBSD.org>2025-05-02 21:48:39 +0900
committerYasuhiro Kimura <yasu@FreeBSD.org>2025-05-02 22:08:48 +0900
commitcef5050a93fb6b618d7c58ce46b0b9939a53f0fd (patch)
treefb467c675d682a1d003c9b31259b2bfd17688e58
parentdatabases/redis: Update to 8.0.0 (diff)
databases/redis*: Update CONFLICTS_INSTALL
Update CONFLICTS_INSTALL aftter databases/redis74 is added to ports tree.
-rw-r--r--databases/redis-devel/Makefile2
-rw-r--r--databases/redis/Makefile2
-rw-r--r--databases/redis62/Makefile2
-rw-r--r--databases/redis72/Makefile2
-rw-r--r--databases/redis74/Makefile2
5 files changed, 5 insertions, 5 deletions
diff --git a/databases/redis-devel/Makefile b/databases/redis-devel/Makefile
index 7a297bbdc0d1..7093959b1a1e 100644
--- a/databases/redis-devel/Makefile
+++ b/databases/redis-devel/Makefile
@@ -27,7 +27,7 @@ MAKE_ENV= OPTIMIZATION= \
CFLAGS+= -Wno-deprecated-declarations
LDFLAGS+= -lpthread -lm -lexecinfo
-CONFLICTS_INSTALL= redis redis62 redis72
+CONFLICTS_INSTALL= redis redis62 redis72 redis74
PORTSCOUT= ignore:1
SUB_FILES= pkg-message
diff --git a/databases/redis/Makefile b/databases/redis/Makefile
index 3ce925bb3346..18a76b09e4cb 100644
--- a/databases/redis/Makefile
+++ b/databases/redis/Makefile
@@ -24,7 +24,7 @@ MAKE_ENV= OPTIMIZATION= \
LDFLAGS+= -lpthread -lm -lexecinfo
-CONFLICTS_INSTALL= redis-devel redis62 redis72
+CONFLICTS_INSTALL= redis-devel redis62 redis72 redis74
SUB_FILES= pkg-message
SUB_LIST= PORTNAME=${PORTNAME} \
diff --git a/databases/redis62/Makefile b/databases/redis62/Makefile
index 11269af6158e..56e83ca42ff7 100644
--- a/databases/redis62/Makefile
+++ b/databases/redis62/Makefile
@@ -21,7 +21,7 @@ MAKE_ENV= OPTIMIZATION= \
LDFLAGS+= -lpthread -lm -lexecinfo
-CONFLICTS_INSTALL= redis redis-devel redis72
+CONFLICTS_INSTALL= redis redis-devel redis72 redis74
PORTSCOUT= limit:^6\.2
SUB_FILES= pkg-message
diff --git a/databases/redis72/Makefile b/databases/redis72/Makefile
index 07c3af468d7f..2793eef717a7 100644
--- a/databases/redis72/Makefile
+++ b/databases/redis72/Makefile
@@ -20,7 +20,7 @@ MAKE_ENV= OPTIMIZATION= \
LDFLAGS+= -lpthread -lm -lexecinfo
-CONFLICTS_INSTALL= redis redis-devel redis62
+CONFLICTS_INSTALL= redis redis-devel redis62 redis74
SUB_FILES= pkg-message
SUB_LIST= PORTNAME=${PORTNAME} \
diff --git a/databases/redis74/Makefile b/databases/redis74/Makefile
index ee650777b1bc..f1fc140628c9 100644
--- a/databases/redis74/Makefile
+++ b/databases/redis74/Makefile
@@ -25,7 +25,7 @@ MAKE_ENV= OPTIMIZATION= \
LDFLAGS+= -lpthread -lm -lexecinfo
-CONFLICTS_INSTALL= redis-devel redis62 redis72
+CONFLICTS_INSTALL= redis redis-devel redis62 redis72
SUB_FILES= pkg-message
SUB_LIST= PORTNAME=${PORTNAME} \