diff options
| author | Yasuhiro Kimura <yasu@FreeBSD.org> | 2025-02-17 19:40:03 +0900 |
|---|---|---|
| committer | Yasuhiro Kimura <yasu@FreeBSD.org> | 2025-02-17 19:43:49 +0900 |
| commit | 9e4e65dcd8a365824d683363c81ddbb01ff767dc (patch) | |
| tree | 4d2a4c99622280de2ffceb97a807cdd93234dac9 /databases | |
| parent | devel/py-libevdev: add missing dependency (diff) | |
databases/redis*: Adjust CONFLICTS_INSTALL after removal of databases/redis70
While here, remove confusing comment.
Diffstat (limited to 'databases')
| -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/redis72/Makefile | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/databases/redis-devel/Makefile b/databases/redis-devel/Makefile index e9ba2193c938..044be5ae7273 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 redis70 redis72 # etc/rc.d/redis +CONFLICTS_INSTALL= redis redis62 redis72 PORTSCOUT= ignore:1 SUB_FILES= pkg-message diff --git a/databases/redis/Makefile b/databases/redis/Makefile index aea3088da9db..5bef71b9211c 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 redis70 redis72 # etc/rc.d/redis +CONFLICTS_INSTALL= redis-devel redis62 redis72 SUB_FILES= pkg-message SUB_LIST= PORTNAME=${PORTNAME} \ diff --git a/databases/redis62/Makefile b/databases/redis62/Makefile index 413e7837bdd6..966836dc55a6 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 redis70 redis72 # etc/rc.d/redis +CONFLICTS_INSTALL= redis redis-devel redis72 PORTSCOUT= limit:^6\.2 SUB_FILES= pkg-message diff --git a/databases/redis72/Makefile b/databases/redis72/Makefile index 9e083800eead..56436730129f 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 redis70 # etc/rc.d/redis +CONFLICTS_INSTALL= redis redis-devel redis62 SUB_FILES= pkg-message SUB_LIST= PORTNAME=${PORTNAME} \ |