From owner-dev-commits-ports-all@freebsd.org Sat Oct 2 20:30:18 2021 Return-Path: Delivered-To: dev-commits-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 CD8D76A99DB; Sat, 2 Oct 2021 20:30:18 +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 4HMJWZ5SDbz3CL1; Sat, 2 Oct 2021 20:30:18 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 9B1B11983D; Sat, 2 Oct 2021 20:30:18 +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 192KUI9K008319; Sat, 2 Oct 2021 20:30:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 192KUIcf008313; Sat, 2 Oct 2021 20:30:18 GMT (envelope-from git) Date: Sat, 2 Oct 2021 20:30:18 GMT Message-Id: <202110022030.192KUIcf008313@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jimmy Olgeni Subject: git: 549c29a1125e - main - devel/etcd*: restore PKGNAMEPREFIX due to audio/etcd conflict. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olgeni X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 549c29a1125e2f753a70f65ed1c50a37441741b8 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Oct 2021 20:30:18 -0000 The branch main has been updated by olgeni: URL: https://cgit.FreeBSD.org/ports/commit/?id=549c29a1125e2f753a70f65ed1c50a37441741b8 commit 549c29a1125e2f753a70f65ed1c50a37441741b8 Author: Jimmy Olgeni AuthorDate: 2021-10-02 20:24:35 +0000 Commit: Jimmy Olgeni CommitDate: 2021-10-02 20:30:13 +0000 devel/etcd*: restore PKGNAMEPREFIX due to audio/etcd conflict. (partial rollback of 89eb41e) Reported by: antoine --- devel/etcd/Makefile | 5 +++-- devel/etcd31/Makefile | 5 +++-- devel/etcd32/Makefile | 5 +++-- devel/etcd33/Makefile | 5 +++-- devel/etcd34/Makefile | 5 +++-- 5 files changed, 15 insertions(+), 10 deletions(-) diff --git a/devel/etcd/Makefile b/devel/etcd/Makefile index 984e815f4d05..7c8d3dea72e2 100644 --- a/devel/etcd/Makefile +++ b/devel/etcd/Makefile @@ -1,7 +1,7 @@ PORTNAME= etcd PORTVERSION= 2.3.8 DISTVERSIONPREFIX= v -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= devel PKGNAMEPREFIX= coreos- @@ -18,7 +18,8 @@ GH_ACCOUNT= coreos GO_PKGNAME= github.com/coreos/etcd GO_TARGET= github.com/coreos/etcd github.com/coreos/etcd/etcdctl -CONFLICTS_INSTALL= etcd31-* etcd32-* etcd33-* etcd34-* etcdctl-0.* +CONFLICTS_INSTALL= coreos-etcd31-* coreos-etcd32-* coreos-etcd33-* \ + coreos-etcd34-* coreos-etcdctl-0.* PORTSCOUT= limit:^2.* diff --git a/devel/etcd31/Makefile b/devel/etcd31/Makefile index 27721d381621..4a6fb008832a 100644 --- a/devel/etcd31/Makefile +++ b/devel/etcd31/Makefile @@ -1,7 +1,7 @@ PORTNAME= etcd PORTVERSION= 3.1.20 DISTVERSIONPREFIX= v -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel PKGNAMEPREFIX= coreos- PKGNAMESUFFIX= 31 @@ -19,7 +19,8 @@ GH_ACCOUNT= coreos GO_PKGNAME= github.com/coreos/etcd GO_TARGET= ./cmd/etcd ./cmd/etcdctl -CONFLICTS_INSTALL= etcd-* etcd32-* etcd33-* etcd34-* etcdctl-0.* +CONFLICTS_INSTALL= coreos-etcd-* coreos-etcd32-* coreos-etcd33-* \ + coreos-etcd34-* coreos-etcdctl-0.* PLIST_FILES= bin/etcd \ bin/etcdctl diff --git a/devel/etcd32/Makefile b/devel/etcd32/Makefile index 55d919b5027d..e033d6d86adb 100644 --- a/devel/etcd32/Makefile +++ b/devel/etcd32/Makefile @@ -1,7 +1,7 @@ PORTNAME= etcd PORTVERSION= 3.2.32 DISTVERSIONPREFIX= v -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel PKGNAMEPREFIX= coreos- PKGNAMESUFFIX= 32 @@ -19,7 +19,8 @@ GH_ACCOUNT= coreos GO_PKGNAME= github.com/coreos/etcd GO_TARGET= ./cmd/etcd ./cmd/etcdctl -CONFLICTS_INSTALL= etcd-* etcd31-* etcd33-* etcd34-* etcdctl-0.* +CONFLICTS_INSTALL= coreos-etcd-* coreos-etcd31-* coreos-etcd33-* \ + coreos-etcd34-* coreos-etcdctl-0.* PLIST_FILES= bin/etcd \ bin/etcdctl diff --git a/devel/etcd33/Makefile b/devel/etcd33/Makefile index f2b0ae640900..8dc792c6e180 100644 --- a/devel/etcd33/Makefile +++ b/devel/etcd33/Makefile @@ -1,7 +1,7 @@ PORTNAME= etcd PORTVERSION= 3.3.23 DISTVERSIONPREFIX= v -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel PKGNAMEPREFIX= coreos- PKGNAMESUFFIX= 33 @@ -73,7 +73,8 @@ GH_TUPLE= beorn7:perks:v1.0.1:beorn7_perks/vendor/github.com/beorn7/perks \ GO_PKGNAME= github.com/coreos/etcd GO_TARGET= . ./etcdctl -CONFLICTS_INSTALL= etcd-* etcd31-* etcd32-* etcd34-* etcdctl-0.* +CONFLICTS_INSTALL= coreos-etcd-* coreos-etcd31-* coreos-etcd32-* \ + coreos-etcd34-* coreos-etcdctl-0.* PLIST_FILES= bin/etcd \ bin/etcdctl diff --git a/devel/etcd34/Makefile b/devel/etcd34/Makefile index 9a9dd6bfc052..c5b9f29d76f5 100644 --- a/devel/etcd34/Makefile +++ b/devel/etcd34/Makefile @@ -1,7 +1,7 @@ PORTNAME= etcd PORTVERSION= 3.4.16 DISTVERSIONPREFIX= v -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel PKGNAMEPREFIX= coreos- PKGNAMESUFFIX= 34 @@ -19,7 +19,8 @@ GH_ACCOUNT= coreos GO_PKGNAME= github.com/coreos/etcd GO_TARGET= . ./etcdctl -CONFLICTS_INSTALL= etcd-* etcd31-* etcd32-* etcd33-* etcdctl-0.* +CONFLICTS_INSTALL= coreos-etcd-* coreos-etcd31-* coreos-etcd32-* \ + coreos-etcd33-* coreos-etcdctl-0.* PLIST_FILES= bin/etcd \ bin/etcdctl