From nobody Thu Aug 17 03:36:52 2023 X-Original-To: dev-commits-ports-main@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 4RR9fY0Jmkz4q6gQ; Thu, 17 Aug 2023 03:36:53 +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 4RR9fX5PpBz3H2T; Thu, 17 Aug 2023 03:36:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692243412; 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=rQWZrG2dJBNzLqMnN2dHwSKRekOmVUXDzIU6PZ62xJ0=; b=vZS8xqukpnRk/vcTolkuTGLNSK40OHekPII7jCUOawxxCafJ0lH7/SMTnOhich1Z7TEQDS QakSF0DRYBJE7edVTVo0gdzSkyuAatydPfG+EIUyVLf06MMfutu2MLK60V+2zRkUHDqWAb nQKMlLAtLFgIqSFHSnTk0gF0snFXfFAXbl3kYSH1nZHDHu1YmX1rvkNyvpGC3s/rBlD7IJ T9Vs4tGC1ZQuNX/jiDg4qFco9N1PYhVtblrYcw1tNgX192eJxjr0EmdF9z9GqzIO7dGcCa u76JYxVFMiSKmoZRxVfgK6wSDCYva4sNr72XXRtr+/1LBRmNSqrbEg9DaF6XnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692243412; 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=rQWZrG2dJBNzLqMnN2dHwSKRekOmVUXDzIU6PZ62xJ0=; b=sUNetU9IwVA9kNqStNitk1Z+PXwkrstHEjTHPiiInqJo9Tf+2EUqR1RWeuMlIJ7mRPUPLb 7O1OQkMPAbBraKw/xNrLeGmq4+ZGoRheeGNQiUmMdsA1NRtzEXNiESUoLDzH2cby4aW1RL g5WsYTFEIGT5bU7iVlNVyZYUk9GLy8192HC781S3eIgENAl4pi8prvWI1JDW0EXlAILTSh hYCMj24bj2E3BrrXlFoDa3CcR6L0ZAYtgUQmwkiQamR+Bm2AF9gArCh548WiGjeoaQv363 U7KK4gzwSCdirfUfjCmOzuSb5qZ7cxP0Q9acRmvkE1BxXyUtvm44lle+bhszaQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692243412; a=rsa-sha256; cv=none; b=Ql9MXywC8YTzUvaP88KrUPgh0KoIBQuOp7XAum22narD4SsqMgV/Ak5y6bV8KrAnFvhjBq PICrrJziRP42ZlblfqCzVvxCBqb34QwBwDYKv2JZc1/VN13Q0+XBOMhWWBbLAwO/mgD9K/ 8nxLlh9fjdOFP7JYcyKdOQZgTpfPI3S5y/pYWwy4JRJdPPcRqFBE8DePj5I7wBNMibkuNE uRv72/iINevkSvcwaM61s/6ggKZg4ZKB0seMGaDOWjCxZ1hLauiaNvGqTVCBxXHqmkYoWq T/52Y2mG6iz8kj/AV0jDhNaUPqxuihPKqIYRfhQFd7Y0YJYRZrVfWgzikgaVrQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RR9fX4JDxz3wY; Thu, 17 Aug 2023 03:36:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37H3aqtC045649; Thu, 17 Aug 2023 03:36:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37H3aqwY045646; Thu, 17 Aug 2023 03:36:52 GMT (envelope-from git) Date: Thu, 17 Aug 2023 03:36:52 GMT Message-Id: <202308170336.37H3aqwY045646@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: 665908692453 - main - databases/redis*: Update CONFLICTS_INSTALL, remove CONFLICTS List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: 6659086924531271f17a33c584c3a47d68e8642c Auto-Submitted: auto-generated The branch main has been updated by yasu: URL: https://cgit.FreeBSD.org/ports/commit/?id=6659086924531271f17a33c584c3a47d68e8642c commit 6659086924531271f17a33c584c3a47d68e8642c Author: Yasuhiro Kimura AuthorDate: 2023-03-23 08:28:07 +0000 Commit: Yasuhiro Kimura CommitDate: 2023-08-17 03:29:07 +0000 databases/redis*: Update CONFLICTS_INSTALL, remove CONFLICTS * Update CONFLICTS_INSTALL after databases/redis70 is added to ports tree. * Remove CONFLICTS as build of one redis version succeeds even if another version is installed. --- databases/redis-devel/Makefile | 4 +--- databases/redis/Makefile | 4 +--- databases/redis6/Makefile | 4 +--- databases/redis62/Makefile | 2 +- databases/redis70/Makefile | 2 -- 5 files changed, 4 insertions(+), 12 deletions(-) diff --git a/databases/redis-devel/Makefile b/databases/redis-devel/Makefile index 97715e870680..f264b7675b53 100644 --- a/databases/redis-devel/Makefile +++ b/databases/redis-devel/Makefile @@ -18,7 +18,7 @@ GH_TAGNAME= 6abb3c403 MAKE_ENV= OPTIMIZATION= \ V=yo -CONFLICTS_INSTALL= redis redis6 redis62 # etc/rc.d/redis +CONFLICTS_INSTALL= redis redis6 redis62 redis70 # etc/rc.d/redis PORTSCOUT= ignore:1 @@ -75,8 +75,6 @@ EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src-Makefile.luajit-or \ LDFLAGS+= -lpthread -lm -lexecinfo -CONFLICTS?= redis-[1-9].* redis6-* redis62-* - USE_RC_SUBR= redis sentinel BIN_FILES= redis-benchmark redis-check-aof redis-check-rdb redis-cli \ redis-sentinel redis-server 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 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 diff --git a/databases/redis62/Makefile b/databases/redis62/Makefile index b78ca9c93ae6..a8800e25640e 100644 --- a/databases/redis62/Makefile +++ b/databases/redis62/Makefile @@ -18,7 +18,7 @@ CPE_PRODUCT= redis MAKE_ENV= OPTIMIZATION= \ V=yo -CONFLICTS_INSTALL= redis redis-devel redis6 # etc/rc.d/redis +CONFLICTS_INSTALL= redis redis-devel redis6 redis70 # etc/rc.d/redis PORTSCOUT= limit:^6\.2 diff --git a/databases/redis70/Makefile b/databases/redis70/Makefile index 9434679082e3..65a94c8980d5 100644 --- a/databases/redis70/Makefile +++ b/databases/redis70/Makefile @@ -74,8 +74,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