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