Index: head/devel/etcd/Makefile
===================================================================
--- head/devel/etcd/Makefile	(revision 515180)
+++ head/devel/etcd/Makefile	(revision 515181)
@@ -1,38 +1,39 @@
 # $FreeBSD$
 
 PORTNAME=	etcd
 PORTVERSION=	2.3.8
 DISTVERSIONPREFIX=	v
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 PKGNAMEPREFIX=	coreos-
 
 MAINTAINER=	robak@FreeBSD.org
 COMMENT=	Highly-available key value store and service discovery
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+USES=		go
+
 CONFLICTS_INSTALL=	coreos-etcd31-* coreos-etcd32-* coreos-etcd33-* \
-			coreos-etcdctl-0.*
+			coreos-etcd34-* coreos-etcdctl-0.*
 
 PORTSCOUT=	limit:^2.*
 
-USES=		go
 GO_PKGNAME=	github.com/coreos/etcd
 GO_TARGET=	github.com/coreos/etcd github.com/coreos/etcd/etcdctl
 USE_GITHUB=	yes
 GH_ACCOUNT=	coreos
 
 PLIST_FILES=	bin/etcd \
 		bin/etcdctl
 PORTDOCS=	README.md
 
 OPTIONS_DEFINE=	DOCS
 DOCS_DESC=	Install etcd README file
 
 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/devel/etcd31/Makefile
===================================================================
--- head/devel/etcd31/Makefile	(revision 515180)
+++ head/devel/etcd31/Makefile	(revision 515181)
@@ -1,39 +1,40 @@
 # $FreeBSD$
 
 PORTNAME=	etcd
 PORTVERSION=	3.1.20
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	coreos-
 PKGNAMESUFFIX=	31
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Highly-available key value store and service discovery
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-CONFLICTS_INSTALL=	coreos-etcd-* coreos-etcd32-* coreos-etcd33-* \
-			coreos-etcdctl-0.*
-
 USES=		go
+
+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
 
 PLIST_FILES=	bin/etcd \
 		bin/etcdctl
 PORTDOCS=	README.md
 
 OPTIONS_DEFINE=	DOCS
 DOCS_DESC=	Install etcd README file
 
 post-patch:
 	${REINPLACE_CMD} -i '' "s@#cgo LDFLAGS: -ldl@@g;" ${WRKSRC}/cmd/vendor/github.com/coreos/pkg/dlopen/dlopen.go
 
 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/devel/etcd32/Makefile
===================================================================
--- head/devel/etcd32/Makefile	(revision 515180)
+++ head/devel/etcd32/Makefile	(revision 515181)
@@ -1,39 +1,41 @@
 # $FreeBSD$
 
 PORTNAME=	etcd
 PORTVERSION=	3.2.27
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	coreos-
 PKGNAMESUFFIX=	32
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Highly-available key value store and service discovery
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+USES=		go
+
 CONFLICTS_INSTALL=	coreos-etcd-* coreos-etcd31-* coreos-etcd33-* \
-			coreos-etcdctl-0.*
+			coreos-etcd34-* coreos-etcdctl-0.*
 
-USES=		go
 GO_PKGNAME=	github.com/coreos/etcd
 GO_TARGET=	./cmd/etcd ./cmd/etcdctl
 USE_GITHUB=	yes
 GH_ACCOUNT=	coreos
 
 PLIST_FILES=	bin/etcd \
 		bin/etcdctl
 PORTDOCS=	README.md
 
 OPTIONS_DEFINE=	DOCS
 DOCS_DESC=	Install etcd README file
 
 post-patch:
 	${REINPLACE_CMD} -i '' "s@#cgo LDFLAGS: -ldl@@g;" ${WRKSRC}/cmd/vendor/github.com/coreos/pkg/dlopen/dlopen.go
 
 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/devel/etcd33/Makefile
===================================================================
--- head/devel/etcd33/Makefile	(revision 515180)
+++ head/devel/etcd33/Makefile	(revision 515181)
@@ -1,36 +1,38 @@
 # $FreeBSD$
 
 PORTNAME=	etcd
 PORTVERSION=	3.3.17
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	coreos-
 PKGNAMESUFFIX=	33
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Highly-available key value store and service discovery
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+USES=		go
+
 CONFLICTS_INSTALL=	coreos-etcd-* coreos-etcd31-* coreos-etcd32-* \
-			coreos-etcdctl-0.*
+			coreos-etcd34-* coreos-etcdctl-0.*
 
-USES=		go
 GO_PKGNAME=	github.com/coreos/etcd
 GO_TARGET=	. ./etcdctl
 USE_GITHUB=	yes
 GH_ACCOUNT=	coreos
 
 PLIST_FILES=	bin/etcd \
 		bin/etcdctl
 PORTDOCS=	README.md
 
 OPTIONS_DEFINE=	DOCS
 DOCS_DESC=	Install etcd README file
 
 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/devel/etcd34/Makefile
===================================================================
--- head/devel/etcd34/Makefile	(revision 515180)
+++ head/devel/etcd34/Makefile	(revision 515181)
@@ -1,36 +1,37 @@
 # $FreeBSD$
 
 PORTNAME=	etcd
 PORTVERSION=	3.4.2
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 PKGNAMEPREFIX=	coreos-
 PKGNAMESUFFIX=	34
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Highly-available key value store and service discovery
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+USES=		go:modules
+
 CONFLICTS_INSTALL=	coreos-etcd-* coreos-etcd31-* coreos-etcd32-* \
 			coreos-etcd33-* coreos-etcdctl-0.*
 
-USES=		go:modules
 GO_PKGNAME=	github.com/coreos/etcd
 GO_TARGET=	. ./etcdctl
 USE_GITHUB=	yes
 GH_ACCOUNT=	coreos
 
 PLIST_FILES=	bin/etcd \
 		bin/etcdctl
 PORTDOCS=	README.md
 
 OPTIONS_DEFINE=	DOCS
 DOCS_DESC=	Install etcd README file
 
 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>