Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 2 Sep 2016 10:14:38 +0000 (UTC)
From:      Jimmy Olgeni <olgeni@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r421261 - in head/devel: . etcd3
Message-ID:  <201609021014.u82AEcsc058142@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: olgeni
Date: Fri Sep  2 10:14:38 2016
New Revision: 421261
URL: https://svnweb.freebsd.org/changeset/ports/421261

Log:
  Add devel/etcd3, the (very different) 3.x branch of devel/etcd.

Added:
  head/devel/etcd3/
     - copied from r421168, head/devel/etcd/
Modified:
  head/devel/Makefile
  head/devel/etcd3/Makefile
  head/devel/etcd3/distinfo

Modified: head/devel/Makefile
==============================================================================
--- head/devel/Makefile	Fri Sep  2 09:53:55 2016	(r421260)
+++ head/devel/Makefile	Fri Sep  2 10:14:38 2016	(r421261)
@@ -520,6 +520,7 @@
     SUBDIR += erlang-syslog
     SUBDIR += es-eric6
     SUBDIR += etcd
+    SUBDIR += etcd3
     SUBDIR += etl
     SUBDIR += euca2ools
     SUBDIR += eventxx

Modified: head/devel/etcd3/Makefile
==============================================================================
--- head/devel/etcd/Makefile	Wed Aug 31 14:33:36 2016	(r421168)
+++ head/devel/etcd3/Makefile	Fri Sep  2 10:14:38 2016	(r421261)
@@ -1,21 +1,24 @@
 # $FreeBSD$
 
 PORTNAME=	etcd
-PORTVERSION=	2.3.7
+PORTVERSION=	3.0.6
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 PKGNAMEPREFIX=	coreos-
+PKGNAMESUFFIX=	3
 
-MAINTAINER=	robak@FreeBSD.org
+MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Highly-available key value store and service discovery
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/go:lang/go
-
-CONFLICTS_INSTALL=coreos-etcdctl-0.*
+CONFLICTS_INSTALL=coreos-etcdctl-0.* coreos-etcd-*
 
+USES=		go
+GO_PKGNAME=	github.com/coreos/etcd
+GO_TARGET=	github.com/coreos/etcd \
+		github.com/coreos/etcdctl
 USE_GITHUB=	yes
 GH_ACCOUNT=	coreos
 
@@ -23,18 +26,16 @@ PLIST_FILES=	bin/etcd \
 		bin/etcdctl
 PORTDOCS=	README.md
 
-OPTIONS_DEFINE=	DOCS
-DOCS_DESC=	Install etcd README file
-
-do-build:
-	cd ${WRKSRC}; ${SH} build
+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
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/etcd ${STAGEDIR}${PREFIX}/bin/
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/etcdctl ${STAGEDIR}${PREFIX}/bin/
-
-do-install-DOCS-on:
+	${INSTALL_PROGRAM} ${GO_WRKDIR_BIN}/etcd ${STAGEDIR}${PREFIX}/bin/
+	${INSTALL_PROGRAM} ${GO_WRKDIR_BIN}/etcdctl ${STAGEDIR}${PREFIX}/bin/
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>

Modified: head/devel/etcd3/distinfo
==============================================================================
--- head/devel/etcd/distinfo	Wed Aug 31 14:33:36 2016	(r421168)
+++ head/devel/etcd3/distinfo	Fri Sep  2 10:14:38 2016	(r421261)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1466253404
-SHA256 (coreos-etcd-v2.3.7_GH0.tar.gz) = aa3a6340bb08d072d1d2ecfbe3c1e02235251760d031a2b699ee1710510ee883
-SIZE (coreos-etcd-v2.3.7_GH0.tar.gz) = 2209051
+TIMESTAMP = 1472548300
+SHA256 (coreos-etcd-v3.0.6_GH0.tar.gz) = dbcbab0b3f55923b0d1047fc533a6a69514ba62eda99671839b0e5e985f61c83
+SIZE (coreos-etcd-v3.0.6_GH0.tar.gz) = 2207310



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201609021014.u82AEcsc058142>