diff options
| author | Yasuhiro Kimura <yasu@FreeBSD.org> | 2023-03-23 08:28:07 +0000 |
|---|---|---|
| committer | Yasuhiro Kimura <yasu@FreeBSD.org> | 2023-08-17 03:29:07 +0000 |
| commit | 6659086924531271f17a33c584c3a47d68e8642c (patch) | |
| tree | 26afd3ed30d3c06e1a5d54b053ba852d15f96b74 /databases/redis | |
| parent | cc255110778d9e5dacb9a878f62022a43c1689a9 (diff) | |
| download | ports-6659086924531271f17a33c584c3a47d68e8642c.tar.gz ports-6659086924531271f17a33c584c3a47d68e8642c.zip | |
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/redis')
| -rw-r--r-- | databases/redis/Makefile | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/databases/redis/Makefile b/databases/redis/Makefile index 5fa8434b338b..47fbccde0d11 100644 --- a/databases/redis/Makefile +++ b/databases/redis/Makefile @@ -16,7 +16,7 @@ CPE_VENDOR= redislabs MAKE_ENV= OPTIMIZATION= \ V=yo -CONFLICTS_INSTALL= redis-devel redis6 redis62 # etc/rc.d/redis +CONFLICTS_INSTALL= redis-devel redis6 redis62 redis70 # etc/rc.d/redis OPTIONS_DEFINE= JEMALLOC TESTS TLS TRIB OPTIONS_RADIO= EXTLUA @@ -71,8 +71,6 @@ EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src-Makefile.luajit-or \ LDFLAGS+= -lpthread -lm -lexecinfo -CONFLICTS?= redis-devel-* redis6-* redis62-* - USE_RC_SUBR= redis sentinel BIN_FILES= redis-benchmark redis-check-aof redis-check-rdb redis-cli \ redis-sentinel redis-server |