Add devel/etcd33, tracking branch 3.3 of etcd.

Document conflicts in devel/etcd, etcd31, and etcd32.

devel/Makefile

@@ -590,6 +590,7 @@
     SUBDIR += etcd
     SUBDIR += etcd31
     SUBDIR += etcd32
+    SUBDIR += etcd33
     SUBDIR += etl
     SUBDIR += euca2ools
     SUBDIR += evemu

devel/etcd33/Makefile

+# $FreeBSD$
+
+PORTNAME=	etcd
+PORTVERSION=	3.3.3
+DISTVERSIONPREFIX=	v
+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
+
+CONFLICTS_INSTALL=coreos-etcdctl-0.* coreos-etcd-* coreos-etcd31-* coreos-etcd32-*
+
+USES=		go
+GO_PKGNAME=	github.com/coreos/etcd
+GO_TARGET=	github.com/coreos/etcd \
+		github.com/coreos/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-extract:
+	@${MV} ${WRKSRC}/cmd/vendor ${WRKDIR}/src
+	@${RM} ${GO_WRKDIR_SRC}/github.com/${GH_ACCOUNT}/${PORTNAME}
+	@${LN} -s ${WRKSRC} ${GO_WRKDIR_SRC}/github.com/${GH_ACCOUNT}/etcd
+	@${LN} -s ${WRKSRC}/etcdctl ${GO_WRKDIR_SRC}/github.com/${GH_ACCOUNT}/etcdctl
+
+post-patch:
+	${REINPLACE_CMD} -i '' "s@#cgo LDFLAGS: -ldl@@g;" ${GO_WRKDIR_SRC}/github.com/coreos/pkg/dlopen/dlopen.go
+
+do-install:
+	${INSTALL_PROGRAM} ${GO_WRKDIR_BIN}/etcd ${STAGEDIR}${PREFIX}/bin/
+	${INSTALL_PROGRAM} ${GO_WRKDIR_BIN}/etcdctl ${STAGEDIR}${PREFIX}/bin/
+
+do-install-DOCS-on:
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
+
+.include <bsd.port.mk>

devel/etcd33/distinfo

+TIMESTAMP = 1522268674
+SHA256 (coreos-etcd-v3.3.3_GH0.tar.gz) = 6551878987f860d1b47fbf10ec34b910399f642c6541d86d835e1b5c29bc25ed
+SIZE (coreos-etcd-v3.3.3_GH0.tar.gz) = 3387223

devel/etcd33/files/patch-.._src_github.com_coreos_go-systemd_util_util__cgo.go

+--- ../src/github.com/coreos/go-systemd/util/util_cgo.go.orig
++++ ../src/github.com/coreos/go-systemd/util/util_cgo.go
+@@ -127,7 +127,7 @@
+ 	switch {
+ 	case errno >= 0:
+ 		ret = false
+-	case serrno == syscall.ENOENT, serrno == syscall.ENXIO, serrno == syscall.ENODATA:
++	case serrno == syscall.ENOENT, serrno == syscall.ENXIO:
+ 		// Since the implementation of sessions in systemd relies on
+ 		// the `pam_systemd` module, using the sd_pid_get_owner_uid
+ 		// heuristic alone can result in false positives if that module

devel/etcd33/pkg-descr

+A highly-available key value store for shared
+configuration and service discovery. etcd is
+inspired by zookeeper and doozer, with a focus on:
+
+* Simple: curl'able user facing API (HTTP+JSON)
+* Secure: optional SSL client cert authentication
+* Fast: benchmarked 1000s of writes/s per instance
+* Reliable: Properly distributed using Raft
+
+Etcd is written in Go and uses the raft consensus
+algorithm to manage a highly-available replicated log.
+
+WWW: https://github.com/coreos/etcd