devel/etcd*: remove coreos- prefix and pet portclippy.

8 files changed, 32 insertions, 39 deletions

diff --git a/devel/etcd/Makefile b/devel/etcd/Makefile
index ab61a0ffe49b..2777948b921a 100644
--- a/devel/etcd/Makefile
+++ b/devel/etcd/Makefile
@@ -1,9 +1,8 @@
 PORTNAME=	etcd
 PORTVERSION=	2.3.8
 DISTVERSIONPREFIX=	v
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	devel
-PKGNAMEPREFIX=	coreos-
 
 MAINTAINER=	robak@FreeBSD.org
 COMMENT=	Highly-available key value store and service discovery
@@ -12,16 +11,15 @@ LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		cpe go
-
-CONFLICTS_INSTALL=	coreos-etcd31-* coreos-etcd32-* coreos-etcd33-* \
-			coreos-etcd34-* coreos-etcdctl-0.*
-
-PORTSCOUT=	limit:^2.*
+USE_GITHUB=	yes
+GH_ACCOUNT=	coreos
 
 GO_PKGNAME=	github.com/coreos/etcd
 GO_TARGET=	github.com/coreos/etcd github.com/coreos/etcd/etcdctl
-USE_GITHUB=	yes
-GH_ACCOUNT=	coreos
+
+CONFLICTS_INSTALL=	etcd31-* etcd32-* etcd33-* etcd34-* etcdctl-0.*
+
+PORTSCOUT=	limit:^2.*
 
 PLIST_FILES=	bin/etcd \
 		bin/etcdctl
diff --git a/devel/etcd/pkg-descr b/devel/etcd/pkg-descr
index 267a029accae..e3311e598c89 100644
--- a/devel/etcd/pkg-descr
+++ b/devel/etcd/pkg-descr
@@ -10,4 +10,4 @@ inspired by zookeeper and doozer, with a focus on:
 Etcd is written in Go and uses the raft consensus
 algorithm to manage a highly-available replicated log.
 
-WWW: https://github.com/coreos/etcd
+WWW: https://github.com/etcd-io/etcd
diff --git a/devel/etcd31/Makefile b/devel/etcd31/Makefile
index 2a1985b63661..8bfd82307507 100644
--- a/devel/etcd31/Makefile
+++ b/devel/etcd31/Makefile
@@ -1,9 +1,8 @@
 PORTNAME=	etcd
 PORTVERSION=	3.1.20
 DISTVERSIONPREFIX=	v
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
-PKGNAMEPREFIX=	coreos-
 PKGNAMESUFFIX=	31
 
 MAINTAINER=	olgeni@FreeBSD.org
@@ -13,13 +12,13 @@ LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		cpe go
+USE_GITHUB=	yes
+GH_ACCOUNT=	coreos
 
-CONFLICTS_INSTALL=	coreos-etcd-* coreos-etcd32-* coreos-etcd33-* \
-			coreos-etcd34-* coreos-etcdctl-0.*
 GO_PKGNAME=	github.com/coreos/etcd
 GO_TARGET=	./cmd/etcd ./cmd/etcdctl
-USE_GITHUB=	yes
-GH_ACCOUNT=	coreos
+
+CONFLICTS_INSTALL=	etcd-* etcd32-* etcd33-* etcd34-* etcdctl-0.*
 
 PLIST_FILES=	bin/etcd \
 		bin/etcdctl
diff --git a/devel/etcd31/pkg-descr b/devel/etcd31/pkg-descr
index 267a029accae..e3311e598c89 100644
--- a/devel/etcd31/pkg-descr
+++ b/devel/etcd31/pkg-descr
@@ -10,4 +10,4 @@ inspired by zookeeper and doozer, with a focus on:
 Etcd is written in Go and uses the raft consensus
 algorithm to manage a highly-available replicated log.
 
-WWW: https://github.com/coreos/etcd
+WWW: https://github.com/etcd-io/etcd
diff --git a/devel/etcd32/Makefile b/devel/etcd32/Makefile
index 31377e08aef3..ce2fec1dcc91 100644
--- a/devel/etcd32/Makefile
+++ b/devel/etcd32/Makefile
@@ -1,8 +1,8 @@
 PORTNAME=	etcd
 PORTVERSION=	3.2.32
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	devel
-PKGNAMEPREFIX=	coreos-
 PKGNAMESUFFIX=	32
 
 MAINTAINER=	olgeni@FreeBSD.org
@@ -12,14 +12,13 @@ LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		cpe go
-
-CONFLICTS_INSTALL=	coreos-etcd-* coreos-etcd31-* coreos-etcd33-* \
-			coreos-etcd34-* coreos-etcdctl-0.*
+USE_GITHUB=	yes
+GH_ACCOUNT=	coreos
 
 GO_PKGNAME=	github.com/coreos/etcd
 GO_TARGET=	./cmd/etcd ./cmd/etcdctl
-USE_GITHUB=	yes
-GH_ACCOUNT=	coreos
+
+CONFLICTS_INSTALL=	etcd-* etcd31-* etcd33-* etcd34-* etcdctl-0.*
 
 PLIST_FILES=	bin/etcd \
 		bin/etcdctl
diff --git a/devel/etcd32/pkg-descr b/devel/etcd32/pkg-descr
index 267a029accae..e3311e598c89 100644
--- a/devel/etcd32/pkg-descr
+++ b/devel/etcd32/pkg-descr
@@ -10,4 +10,4 @@ inspired by zookeeper and doozer, with a focus on:
 Etcd is written in Go and uses the raft consensus
 algorithm to manage a highly-available replicated log.
 
-WWW: https://github.com/coreos/etcd
+WWW: https://github.com/etcd-io/etcd
diff --git a/devel/etcd33/Makefile b/devel/etcd33/Makefile
index 695c656ffb72..8789660615ae 100644
--- a/devel/etcd33/Makefile
+++ b/devel/etcd33/Makefile
@@ -1,8 +1,8 @@
 PORTNAME=	etcd
 PORTVERSION=	3.3.23
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	devel
-PKGNAMEPREFIX=	coreos-
 PKGNAMESUFFIX=	33
 
 MAINTAINER=	olgeni@FreeBSD.org
@@ -12,16 +12,9 @@ LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		cpe go:modules
-
-CONFLICTS_INSTALL=	coreos-etcd-* coreos-etcd31-* coreos-etcd32-* \
-			coreos-etcd34-* coreos-etcdctl-0.*
-
-GO_PKGNAME=	github.com/coreos/etcd
-GO_TARGET=	. ./etcdctl
 USE_GITHUB=	yes
 GH_ACCOUNT=	coreos
-GH_TUPLE=	\
-		beorn7:perks:v1.0.1:beorn7_perks/vendor/github.com/beorn7/perks \
+GH_TUPLE=	beorn7:perks:v1.0.1:beorn7_perks/vendor/github.com/beorn7/perks \
 		bgentry:speakeasy:v0.1.0:bgentry_speakeasy/vendor/github.com/bgentry/speakeasy \
 		cheggaaa:pb:v1.0.2:cheggaaa_pb/vendor/gopkg.in/cheggaaa/pb.v1 \
 		coreos:bbolt:v1.3.3:coreos_bbolt/vendor/github.com/coreos/bbolt \
@@ -76,6 +69,11 @@ GH_TUPLE=	\
 		urfave:cli:v1.18.0:urfave_cli/vendor/github.com/urfave/cli \
 		xiang90:probing:07dd2e8dfe18:xiang90_probing/vendor/github.com/xiang90/probing
 
+GO_PKGNAME=	github.com/coreos/etcd
+GO_TARGET=	. ./etcdctl
+
+CONFLICTS_INSTALL=	etcd-* etcd31-* etcd32-* etcd34-* etcdctl-0.*
+
 PLIST_FILES=	bin/etcd \
 		bin/etcdctl
 PORTDOCS=	README.md
diff --git a/devel/etcd34/Makefile b/devel/etcd34/Makefile
index f0afd0d012b8..ff93a4ad64ae 100644
--- a/devel/etcd34/Makefile
+++ b/devel/etcd34/Makefile
@@ -1,8 +1,8 @@
 PORTNAME=	etcd
 PORTVERSION=	3.4.16
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	devel
-PKGNAMEPREFIX=	coreos-
 PKGNAMESUFFIX=	34
 
 MAINTAINER=	olgeni@FreeBSD.org
@@ -12,14 +12,13 @@ LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		cpe go:modules
-
-CONFLICTS_INSTALL=	coreos-etcd-* coreos-etcd31-* coreos-etcd32-* \
-			coreos-etcd33-* coreos-etcdctl-0.*
+USE_GITHUB=	yes
+GH_ACCOUNT=	coreos
 
 GO_PKGNAME=	github.com/coreos/etcd
 GO_TARGET=	. ./etcdctl
-USE_GITHUB=	yes
-GH_ACCOUNT=	coreos
+
+CONFLICTS_INSTALL=	etcd-* etcd31-* etcd32-* etcd33-* etcdctl-0.*
 
 PLIST_FILES=	bin/etcd \
 		bin/etcdctl