diff options
| author | Yasuhiro Kimura <yasu@FreeBSD.org> | 2023-03-23 17:28:07 +0900 |
|---|---|---|
| committer | Yasuhiro Kimura <yasu@FreeBSD.org> | 2023-08-17 12:29:07 +0900 |
| commit | 6659086924531271f17a33c584c3a47d68e8642c (patch) | |
| tree | 26afd3ed30d3c06e1a5d54b053ba852d15f96b74 /databases/redis6 | |
| parent | databases/redis70: Copy from databases/redis (diff) | |
databases/redis*: Update CONFLICTS_INSTALL, remove CONFLICTS
* Update CONFLICTS_INSTALL after databases/redis70 is added to ports
tree.
* Remove CONFLICTS as build of one redis version succeeds even if
another version is installed.
Diffstat (limited to 'databases/redis6')
| -rw-r--r-- | databases/redis6/Makefile | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/databases/redis6/Makefile b/databases/redis6/Makefile index 57f5664323df..9b636c433bb8 100644 --- a/databases/redis6/Makefile +++ b/databases/redis6/Makefile @@ -16,7 +16,7 @@ USES+= compiler:c11 gmake MAKE_ENV= OPTIMIZATION= \ V=yo -CONFLICTS_INSTALL= redis redis-devel redis62 # etc/rc.d/redis +CONFLICTS_INSTALL= redis redis-devel redis62 redis70 # etc/rc.d/redis PORTSCOUT= limit:^6\.0 @@ -69,8 +69,6 @@ EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src-Makefile.luajit-or \ LDFLAGS+= -lpthread -lm -lexecinfo -CONFLICTS?= redis-[1-9].* redis-devel-* redis62-* - USE_RC_SUBR= redis sentinel BIN_FILES= redis-benchmark redis-check-aof redis-check-rdb redis-cli \ redis-sentinel redis-server |