git: e1d32975edd7 - main - Update CONFLICTS after databases/redis4 removal.

[Sergey A. Osokin]

The branch main has been updated by osa:

URL: https://cgit.FreeBSD.org/ports/commit/?id=e1d32975edd728ef151815790045094bc131bbd0

commit e1d32975edd728ef151815790045094bc131bbd0
Author:     Sergey A. Osokin <osa at FreeBSD.org>
AuthorDate: 2021-04-08 19:30:59 +0000
Commit:     Sergey A. Osokin <osa at FreeBSD.org>
CommitDate: 2021-04-08 19:31:37 +0000

    Update CONFLICTS after databases/redis4 removal.
---
 databases/redis-devel/Makefile | 2 +-
 databases/redis/Makefile       | 2 +-
 databases/redis5/Makefile      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/databases/redis-devel/Makefile b/databases/redis-devel/Makefile
index f738f60d28b6..1b79be50bfb2 100644
--- a/databases/redis-devel/Makefile
+++ b/databases/redis-devel/Makefile
@@ -69,7 +69,7 @@ LDFLAGS=	-Wl,-E
 
 LDFLAGS+=	-lpthread -lm -lexecinfo
 
-CONFLICTS?=	redis4-4.* redis5-5.* redis-6.*
+CONFLICTS?=	redis5-5.* redis-6.*
 
 USE_RC_SUBR=	redis sentinel
 BIN_FILES=	redis-benchmark redis-check-aof redis-check-rdb \
diff --git a/databases/redis/Makefile b/databases/redis/Makefile
index a6800b785f79..a191fc1b6138 100644
--- a/databases/redis/Makefile
+++ b/databases/redis/Makefile
@@ -68,7 +68,7 @@ LDFLAGS=	-Wl,-E
 
 LDFLAGS+=	-lpthread -lm -lexecinfo
 
-CONFLICTS?=	redis4-4.* redis5-5.* redis-devel-6.*
+CONFLICTS?=	redis5-5.* redis-devel-6.*
 
 USE_RC_SUBR=	redis sentinel
 BIN_FILES=	redis-benchmark redis-check-aof redis-check-rdb \
diff --git a/databases/redis5/Makefile b/databases/redis5/Makefile
index 962d1f061aca..7ac21aaef344 100644
--- a/databases/redis5/Makefile
+++ b/databases/redis5/Makefile
@@ -71,7 +71,7 @@ USES+=		tcl:build
 
 LDFLAGS+=	-lpthread -lm -lexecinfo
 
-CONFLICTS?=	redis4-4.* redis-6.* redis-devel-6.*
+CONFLICTS?=	redis-6.* redis-devel-6.*
 
 USE_RC_SUBR=	redis sentinel
 BIN_FILES=	redis-benchmark redis-check-aof redis-check-rdb \