From owner-svn-ports-all@freebsd.org  Fri Feb  5 03:49:38 2021
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id B9D6E53BA16;
 Fri,  5 Feb 2021 03:49:38 +0000 (UTC) (envelope-from osa@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 4DX1dG4xBZz4RLJ;
 Fri,  5 Feb 2021 03:49:38 +0000 (UTC) (envelope-from osa@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9C3D917F26;
 Fri,  5 Feb 2021 03:49:38 +0000 (UTC) (envelope-from osa@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 1153ncgD091537;
 Fri, 5 Feb 2021 03:49:38 GMT (envelope-from osa@FreeBSD.org)
Received: (from osa@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 1153nchD091536;
 Fri, 5 Feb 2021 03:49:38 GMT (envelope-from osa@FreeBSD.org)
Message-Id: <202102050349.1153nchD091536@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: osa set sender to osa@FreeBSD.org
 using -f
From: "Sergey A. Osokin" <osa@FreeBSD.org>
Date: Fri, 5 Feb 2021 03:49:38 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r564082 - head/databases/redis
X-SVN-Group: ports-head
X-SVN-Commit-Author: osa
X-SVN-Commit-Paths: head/databases/redis
X-SVN-Commit-Revision: 564082
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.34
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Feb 2021 03:49:38 -0000

Author: osa
Date: Fri Feb  5 03:49:38 2021
New Revision: 564082
URL: https://svnweb.freebsd.org/changeset/ports/564082

Log:
  Update CONFLICTS.

Modified:
  head/databases/redis/Makefile

Modified: head/databases/redis/Makefile
==============================================================================
--- head/databases/redis/Makefile	Fri Feb  5 03:27:37 2021	(r564081)
+++ head/databases/redis/Makefile	Fri Feb  5 03:49:38 2021	(r564082)
@@ -69,7 +69,7 @@ LDFLAGS=	-Wl,-E
 
 LDFLAGS+=	-lpthread -lm -lexecinfo
 
-CONFLICTS?=	redis4-4.* redis-6.* redis-devel-6.*
+CONFLICTS?=	redis4-4.* redis5-5.* redis-devel-6.*
 
 USE_RC_SUBR=	redis sentinel
 BIN_FILES=	redis-benchmark redis-check-aof redis-check-rdb \