summaryrefslogtreecommitdiff
path: root/databases/redis6
diff options
context:
space:
mode:
Diffstat (limited to 'databases/redis6')
-rw-r--r--databases/redis6/Makefile4
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