git: 549c29a1125e - main - devel/etcd*: restore PKGNAMEPREFIX due to audio/etcd conflict.

[Jimmy Olgeni]

The branch main has been updated by olgeni:

URL: https://cgit.FreeBSD.org/ports/commit/?id=549c29a1125e2f753a70f65ed1c50a37441741b8

commit 549c29a1125e2f753a70f65ed1c50a37441741b8
Author:     Jimmy Olgeni <olgeni at FreeBSD.org>
AuthorDate: 2021-10-02 20:24:35 +0000
Commit:     Jimmy Olgeni <olgeni at FreeBSD.org>
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