diff options
| author | Yasuhiro Kimura <yasu@FreeBSD.org> | 2024-08-16 09:15:58 +0900 |
|---|---|---|
| committer | Yasuhiro Kimura <yasu@FreeBSD.org> | 2024-08-16 11:48:43 +0900 |
| commit | e0fe408f52b9c4b2c46c196ceb88ce77379edd23 (patch) | |
| tree | b99b9e38d47f66b567c23caa421266a8082f40cb | |
| parent | databases/redis72: Copy from databases/redis (diff) | |
databases/redis*: Update CONFLICTS_INSTALL
Update CONFLICTS_INSTALL aftter databases/redis72 is added to ports
tree.
| -rw-r--r-- | databases/redis-devel/Makefile | 2 | ||||
| -rw-r--r-- | databases/redis/Makefile | 2 | ||||
| -rw-r--r-- | databases/redis62/Makefile | 2 | ||||
| -rw-r--r-- | databases/redis70/Makefile | 2 | ||||
| -rw-r--r-- | databases/redis72/Makefile | 3 |
5 files changed, 6 insertions, 5 deletions
diff --git a/databases/redis-devel/Makefile b/databases/redis-devel/Makefile index a450f106e90f..de3892a267ac 100644 --- a/databases/redis-devel/Makefile +++ b/databases/redis-devel/Makefile @@ -26,7 +26,7 @@ MAKE_ENV= OPTIMIZATION= \ LDFLAGS+= -lpthread -lm -lexecinfo -CONFLICTS_INSTALL= redis redis6 redis62 redis70 # etc/rc.d/redis +CONFLICTS_INSTALL= redis redis62 redis70 redis72 # etc/rc.d/redis PORTSCOUT= ignore:1 SUB_FILES= pkg-message diff --git a/databases/redis/Makefile b/databases/redis/Makefile index e401c6a97abb..ccd4f507cd88 100644 --- a/databases/redis/Makefile +++ b/databases/redis/Makefile @@ -19,7 +19,7 @@ MAKE_ENV= OPTIMIZATION= \ LDFLAGS+= -lpthread -lm -lexecinfo -CONFLICTS_INSTALL= redis-devel redis6 redis62 redis70 # etc/rc.d/redis +CONFLICTS_INSTALL= redis-devel redis62 redis70 redis72 # etc/rc.d/redis SUB_FILES= pkg-message SUB_LIST= PORTNAME=${PORTNAME} \ diff --git a/databases/redis62/Makefile b/databases/redis62/Makefile index cb25c52f4506..fa820fe71cfa 100644 --- a/databases/redis62/Makefile +++ b/databases/redis62/Makefile @@ -22,7 +22,7 @@ MAKE_ENV= OPTIMIZATION= \ LDFLAGS+= -lpthread -lm -lexecinfo -CONFLICTS_INSTALL= redis redis-devel redis6 redis70 # etc/rc.d/redis +CONFLICTS_INSTALL= redis redis-devel redis70 redis72 # etc/rc.d/redis PORTSCOUT= limit:^6\.2 SUB_FILES= pkg-message diff --git a/databases/redis70/Makefile b/databases/redis70/Makefile index 53806d0dd09f..39a1477b4cf4 100644 --- a/databases/redis70/Makefile +++ b/databases/redis70/Makefile @@ -18,7 +18,7 @@ CPE_VENDOR= redislabs MAKE_ENV= OPTIMIZATION= \ V=yo -CONFLICTS_INSTALL= redis redis-devel redis6 redis62 # etc/rc.d/redis +CONFLICTS_INSTALL= redis redis-devel redis62 redis72 # etc/rc.d/redis PORTSCOUT= limit:^7\.0 diff --git a/databases/redis72/Makefile b/databases/redis72/Makefile index e401c6a97abb..1786fd08b324 100644 --- a/databases/redis72/Makefile +++ b/databases/redis72/Makefile @@ -2,6 +2,7 @@ PORTNAME= redis DISTVERSION= 7.2.5 CATEGORIES= databases MASTER_SITES= https://download.redis.io/releases/ +PKGNAMESUFFIX= 72 MAINTAINER= yasu@FreeBSD.org COMMENT= Persistent key-value database with built-in net interface @@ -19,7 +20,7 @@ MAKE_ENV= OPTIMIZATION= \ LDFLAGS+= -lpthread -lm -lexecinfo -CONFLICTS_INSTALL= redis-devel redis6 redis62 redis70 # etc/rc.d/redis +CONFLICTS_INSTALL= redis redis-devel redis62 redis70 # etc/rc.d/redis SUB_FILES= pkg-message SUB_LIST= PORTNAME=${PORTNAME} \ |