From nobody Fri Aug 16 02:49:57 2024 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 4WlRKy0X7kz5Hk4q; Fri, 16 Aug 2024 02:49:58 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WlRKx6rLXz4cQN; Fri, 16 Aug 2024 02:49:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723776598; 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=za/8s8w2Rq4BU4xuYBVf1Bzweut11/pHCa8V2PeLBkw=; b=lNRGdWAfEFQS8SF0pJ0C1zzbfd1DJ+XkYfG9v/9JRiV14LzU2Bj8JI0Keo5G2SXFxqTeAo O4rrKJ9JxQvpuyPfrGPKZtAPRn5yOhgJ3+xKzx8gXtisS+NPTTG9k6OHBAYCknpAoH/Y1U BxH18D5wgMNcKiwi3vZL0rhpHsG2tJVPW0mTCQTFQNmlLQMWYifoJBBGbpMVQoRXtefnix mNc3Vom1YtLqL6JR7PwdjsDLtBLXEk0vV4rqNvKhdlHiER3EQ7UE6j2MmqWwr7Lv2FD/sw VMOKdbkmYRaVqJglSU9pu8lUIX2hj/SLVFxRG7f+Fqfyr9o57PeqL+3fWaeu9Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723776598; a=rsa-sha256; cv=none; b=n+vaptU9la998aNWN5yi8aXvbp5CCKZcleL/4j+RFBVEdR+L0V/qhNAF1whWtZqnh4zZoR QKi5lG5m+ZQ5yN9ULXc75jZruqSzyepTJkKZzkkvJZNCbwWrF6xqzzfOfJs5KYuOwIQ3FS bjWLEZ/A3Tg1BR4BmGd6/vGVbvRH9A1luJ+569K0NdDCXM3c3mR0jkoUPWoktaNuqUK2h/ NQCHFzgtnhJnaCiGcr3+xzS7h12VrZE5qSiOs6A1xXjFKT1narFnQ5gBFQJC1QhfzIP3e+ U/b0rkMTNoMyOg2Q+E2mrwwwnXOiPavii9fkxJEBiFSwB3D5o7R8lD6y6/pUig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723776598; 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=za/8s8w2Rq4BU4xuYBVf1Bzweut11/pHCa8V2PeLBkw=; b=tWK/bxM/r80jUE3xOIBhdhgU4vJWlYbwpH5vjCG5pivX1dVciZWv6GofYpjnDfgDuJAn8i rFpRYjv9RuBqSyGlK0/dNxdhR36Ai5AkXz1GqLNnBywgqIaR5llxPZjHuIxZ3Tmf5TRo15 syeaFhwbXwcqPqKbsXLuDZkpgvxHtvtIzUJZQdq70XkqjNTIGDE1NBOhprmaMR13/EYY3Z PzlK8H8wbWwfEo3afaNIziUplZv3s9S10M+u2QMORDHjFsfRRpVUqxQPjiQ3Eu5/7Ql9k3 zAifeUfTNLe9GWMxwebbdfkQ6ZNx1LaaG2dvxXSz/ohuyp4x3t7E+K1bQg9z1Q== 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 4WlRKx6RlDzphv; Fri, 16 Aug 2024 02:49:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47G2nv9b070722; Fri, 16 Aug 2024 02:49:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47G2nvCd070719; Fri, 16 Aug 2024 02:49:57 GMT (envelope-from git) Date: Fri, 16 Aug 2024 02:49:57 GMT Message-Id: <202408160249.47G2nvCd070719@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: e0fe408f52b9 - main - databases/redis*: Update CONFLICTS_INSTALL 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-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: e0fe408f52b9c4b2c46c196ceb88ce77379edd23 Auto-Submitted: auto-generated The branch main has been updated by yasu: URL: https://cgit.FreeBSD.org/ports/commit/?id=e0fe408f52b9c4b2c46c196ceb88ce77379edd23 commit e0fe408f52b9c4b2c46c196ceb88ce77379edd23 Author: Yasuhiro Kimura AuthorDate: 2024-08-16 00:15:58 +0000 Commit: Yasuhiro Kimura CommitDate: 2024-08-16 02:48:43 +0000 databases/redis*: Update CONFLICTS_INSTALL Update CONFLICTS_INSTALL aftter databases/redis72 is added to ports tree. --- databases/redis-devel/Makefile | 2 +- databases/redis/Makefile | 2 +- databases/redis62/Makefile | 2 +- databases/redis70/Makefile | 2 +- databases/redis72/Makefile | 3 ++- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/databases/redis-devel/Makefile b/databases/redis-devel/Makefile index a450f106e90f..de3892a267ac 100644 --- a/databases/redis-devel/Makefile +++ b/databases/redis-devel/Makefile @@ -26,7 +26,7 @@ MAKE_ENV= OPTIMIZATION= \ LDFLAGS+= -lpthread -lm -lexecinfo -CONFLICTS_INSTALL= redis redis6 redis62 redis70 # etc/rc.d/redis +CONFLICTS_INSTALL= redis redis62 redis70 redis72 # etc/rc.d/redis PORTSCOUT= ignore:1 SUB_FILES= pkg-message diff --git a/databases/redis/Makefile b/databases/redis/Makefile index e401c6a97abb..ccd4f507cd88 100644 --- a/databases/redis/Makefile +++ b/databases/redis/Makefile @@ -19,7 +19,7 @@ MAKE_ENV= OPTIMIZATION= \ LDFLAGS+= -lpthread -lm -lexecinfo -CONFLICTS_INSTALL= redis-devel redis6 redis62 redis70 # etc/rc.d/redis +CONFLICTS_INSTALL= redis-devel redis62 redis70 redis72 # etc/rc.d/redis SUB_FILES= pkg-message SUB_LIST= PORTNAME=${PORTNAME} \ diff --git a/databases/redis62/Makefile b/databases/redis62/Makefile index cb25c52f4506..fa820fe71cfa 100644 --- a/databases/redis62/Makefile +++ b/databases/redis62/Makefile @@ -22,7 +22,7 @@ MAKE_ENV= OPTIMIZATION= \ LDFLAGS+= -lpthread -lm -lexecinfo -CONFLICTS_INSTALL= redis redis-devel redis6 redis70 # etc/rc.d/redis +CONFLICTS_INSTALL= redis redis-devel redis70 redis72 # etc/rc.d/redis PORTSCOUT= limit:^6\.2 SUB_FILES= pkg-message diff --git a/databases/redis70/Makefile b/databases/redis70/Makefile index 53806d0dd09f..39a1477b4cf4 100644 --- a/databases/redis70/Makefile +++ b/databases/redis70/Makefile @@ -18,7 +18,7 @@ CPE_VENDOR= redislabs MAKE_ENV= OPTIMIZATION= \ V=yo -CONFLICTS_INSTALL= redis redis-devel redis6 redis62 # etc/rc.d/redis +CONFLICTS_INSTALL= redis redis-devel redis62 redis72 # etc/rc.d/redis PORTSCOUT= limit:^7\.0 diff --git a/databases/redis72/Makefile b/databases/redis72/Makefile index e401c6a97abb..1786fd08b324 100644 --- a/databases/redis72/Makefile +++ b/databases/redis72/Makefile @@ -2,6 +2,7 @@ PORTNAME= redis DISTVERSION= 7.2.5 CATEGORIES= databases MASTER_SITES= https://download.redis.io/releases/ +PKGNAMESUFFIX= 72 MAINTAINER= yasu@FreeBSD.org COMMENT= Persistent key-value database with built-in net interface @@ -19,7 +20,7 @@ MAKE_ENV= OPTIMIZATION= \ LDFLAGS+= -lpthread -lm -lexecinfo -CONFLICTS_INSTALL= redis-devel redis6 redis62 redis70 # etc/rc.d/redis +CONFLICTS_INSTALL= redis redis-devel redis62 redis70 # etc/rc.d/redis SUB_FILES= pkg-message SUB_LIST= PORTNAME=${PORTNAME} \