aboutsummaryrefslogtreecommitdiff
path: root/databases/redis-devel
diff options
context:
space:
mode:
authorYasuhiro Kimura <yasu@FreeBSD.org>2023-03-23 08:28:07 +0000
committerYasuhiro Kimura <yasu@FreeBSD.org>2023-08-17 03:29:07 +0000
commit6659086924531271f17a33c584c3a47d68e8642c (patch)
tree26afd3ed30d3c06e1a5d54b053ba852d15f96b74 /databases/redis-devel
parentcc255110778d9e5dacb9a878f62022a43c1689a9 (diff)
downloadports-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-devel')
-rw-r--r--databases/redis-devel/Makefile4
1 files changed, 1 insertions, 3 deletions
diff --git a/databases/redis-devel/Makefile b/databases/redis-devel/Makefile
index 97715e870680..f264b7675b53 100644
--- a/databases/redis-devel/Makefile
+++ b/databases/redis-devel/Makefile
@@ -18,7 +18,7 @@ GH_TAGNAME= 6abb3c403
MAKE_ENV= OPTIMIZATION= \
V=yo
-CONFLICTS_INSTALL= redis redis6 redis62 # etc/rc.d/redis
+CONFLICTS_INSTALL= redis redis6 redis62 redis70 # etc/rc.d/redis
PORTSCOUT= ignore:1
@@ -75,8 +75,6 @@ EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src-Makefile.luajit-or \
LDFLAGS+= -lpthread -lm -lexecinfo
-CONFLICTS?= redis-[1-9].* redis6-* redis62-*
-
USE_RC_SUBR= redis sentinel
BIN_FILES= redis-benchmark redis-check-aof redis-check-rdb redis-cli \
redis-sentinel redis-server