From nobody Wed Jan 18 04:46:12 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NxY9w4ls0z2t5g2; Wed, 18 Jan 2023 04:46:12 +0000 (UTC) (envelope-from git@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 4NxY9w4DNkz3N9h; Wed, 18 Jan 2023 04:46:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674017172; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5s9jY/fKd2z6PWuLC47bNkLvXROpis9sfP3OwKZ6hws=; b=WnOTjMqKHll65Rwpsesx6wfwATw0pekPyOE2dc3pqFRUSxYSpuEuzKqUF8qTFd4lYLneAB mlvTOuhVP29fdJQ+pjh4JRiEVHchQNS+W3eUhxjDwFSvCbfOytQVf57H9KiTOS8yqcJ8ch 9jcspFq3i1PAA33fHJUV/W9Y2dLB3SzH0SJXS3Lz/D1yUI9D7puT8onSKpHOWazYngwsna ghI30SkBQzp0Ek5zHhH0ThQQ1iQ/UKZ1dd1D9c9jZ+q+c7RBWTPeDIIucxDByCaAPwxIP1 gM2w+Ze5Xk+qz8/ol40oJFfwGYmzoqr4Xmc96mIrVGjrBBqRhOjVHRnbUy9LuQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674017172; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5s9jY/fKd2z6PWuLC47bNkLvXROpis9sfP3OwKZ6hws=; b=bm20m7SACxcHWEd/rrmisnINd3+NXIqSjFcX3DUKnOYD7koQ4h9SUg3TJprt8tkwgMZF7N WZ/cu907w/EvJgA4wiKFH3GqcTZ239Lt8mT2+CRTzRUTvS9Br9TCm2ectUhYvxdqYnochL PUG4d3CbtugprUovVD6DnfI7/4O9S/7EIM3u7+HiXY4FHPuKMrAdXZ+PihPXMpo0oua7c+ 7IsM2cyP5vihzji02flLqVb6+MySsPqL9LlR8PS1/We4yEZVFHs6yCLNxl5BnK9nOjTNYQ BtUYi45q/UfMOaF9ITuDY0AFuAmL1rp3pojDuktZ37aglnDhw11Z4b2Em9r5iw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674017172; a=rsa-sha256; cv=none; b=B4lIrD3+XfrciUAJeVRbmNCzi6wU9wv4cPdgEOldQ9lBbIJJhCVfK1CF6Vb4gud6WxC1If SnpspBQD0dbBxP5py7zIMjhZi2tV9c5yl+WBZ1JxuAfPO1N6gAXs49QLtvfr4bzpT2lV0q pjdjxuCpCIyHu430TMx4OrNe0g2BTZgIvAZkTU1FGZEZjsKh1vPLmywXeGQ59iHeDmwRjL THgxelkDu3SJBg82cjMfb6Li8MaPJLAQJdps1RunyHEHWh1ZbHZ0vvKQMe+bVrpT9oiZg/ hTExVVWkFdOQ456wB8EBd61WGSim7nEe897/IJuoqvERjWu4+XYQnG5/VNtHww== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4NxY9w3LGGzyd5; Wed, 18 Jan 2023 04:46:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30I4kCqx038364; Wed, 18 Jan 2023 04:46:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30I4kCUs038363; Wed, 18 Jan 2023 04:46:12 GMT (envelope-from git) Date: Wed, 18 Jan 2023 04:46:12 GMT Message-Id: <202301180446.30I4kCUs038363@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yasuhiro Kimura Subject: git: 95bbd18366cc - main - databases/redis*: Adjust CONFLICTS_INSTALL List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yasu X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 95bbd18366cce8c376fbf73218d495e8a099d53a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yasu: URL: https://cgit.FreeBSD.org/ports/commit/?id=95bbd18366cce8c376fbf73218d495e8a099d53a commit 95bbd18366cce8c376fbf73218d495e8a099d53a Author: Yasuhiro Kimura AuthorDate: 2023-01-18 04:18:41 +0000 Commit: Yasuhiro Kimura CommitDate: 2023-01-18 04:45:06 +0000 databases/redis*: Adjust CONFLICTS_INSTALL --- databases/redis-devel/Makefile | 2 +- databases/redis/Makefile | 3 ++- databases/redis6/Makefile | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/databases/redis-devel/Makefile b/databases/redis-devel/Makefile index 12d540ce27ba..a3dae3f7bd16 100644 --- a/databases/redis-devel/Makefile +++ b/databases/redis-devel/Makefile @@ -18,7 +18,7 @@ GH_TAGNAME= b4123663c MAKE_ENV= OPTIMIZATION= \ V=yo -CONFLICTS_INSTALL= redis redis6 # etc/rc.d/redis +CONFLICTS_INSTALL= redis redis6 redis62 # etc/rc.d/redis PORTSCOUT= ignore:1 diff --git a/databases/redis/Makefile b/databases/redis/Makefile index 00c80a6199d1..38290b0aaada 100644 --- a/databases/redis/Makefile +++ b/databases/redis/Makefile @@ -15,7 +15,8 @@ CPE_VENDOR= redislabs MAKE_ENV= OPTIMIZATION= \ V=yo -CONFLICTS_INSTALL= redis-devel redis6 # etc/rc.d/redis + +CONFLICTS_INSTALL= redis-devel redis6 redis62 # etc/rc.d/redis OPTIONS_DEFINE= JEMALLOC TESTS TLS TRIB OPTIONS_RADIO= EXTLUA diff --git a/databases/redis6/Makefile b/databases/redis6/Makefile index 0f210aa9afd5..bd4ad8087e1a 100644 --- a/databases/redis6/Makefile +++ b/databases/redis6/Makefile @@ -17,7 +17,7 @@ USES+= compiler:c11 gmake MAKE_ENV= OPTIMIZATION= \ V=yo -CONFLICTS_INSTALL= redis redis-devel # etc/rc.d/redis +CONFLICTS_INSTALL= redis redis-devel redis62 # etc/rc.d/redis PORTSCOUT= limit:^6\.0