sysutils/serf: update to 0.7.0

2 files changed, 42 insertions, 36 deletions

diff --git a/sysutils/serf/Makefile b/sysutils/serf/Makefile
index 59cf1ce5ec4b..5f26e589955f 100644
--- a/sysutils/serf/Makefile
+++ b/sysutils/serf/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	serf
-PORTVERSION=	0.6.4
+PORTVERSION=	0.7.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	sysutils
 PKGNAMEPREFIX=	hashicorp-
@@ -16,15 +16,16 @@ BUILD_DEPENDS=	go14>=1.4:lang/go14
 USE_GITHUB=	yes
 GH_ACCOUNT=	hashicorp:DEFAULT,go_msgpack,go_syslog,go_net,logutils,mdns,memberlist \
 		armon:circbuf,go_metrics miekg:dns mitchellh:cli,mapstructure \
-		ryanuber:columnize
+		ryanuber:columnize golang:crypto
 GH_PROJECT=	circbuf:circbuf cli:cli columnize:columnize dns:dns \
 		go-metrics:go_metrics go-msgpack:go_msgpack \
 		go-syslog:go_syslog go.net:go_net logutils:logutils \
-		mapstructure:mapstructure mdns:mdns memberlist:memberlist
-GH_TAGNAME=	23b0af5:logutils 442e588:mapstructure 44cb478:columnize \
-		71c2886:go_msgpack 9a1e242:memberlist ac3963b:go_syslog \
-		b65f52f:dns cbad13b:go_net e3c2e3d:cli eb0af21:go_metrics \
-		eb98acc:mdns f092b4f:circbuf
+		mapstructure:mapstructure mdns:mdns memberlist:memberlist \
+		crypto:crypto
+GH_TAGNAME=	0dc08b1:logutils 281073e:mapstructure 983d3a5:columnize \
+		fa3f638:go_msgpack 9888dc5:memberlist 42a2b57:go_syslog \
+		75e6e86:dns 104dcad:go_net 8102d0e:cli 06b6099:go_metrics \
+		9d85cf2:mdns bbbad09:circbuf f18420e:crypto
 
 USE_RC_SUBR=	serf
 
@@ -38,8 +39,8 @@ STRIP=		# stripping can break go binaries
 post-patch:
 	@${MKDIR} ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${PORTNAME}
 .for src in .gitignore .travis.yml CHANGELOG.md LICENSE Makefile README.md \
-	client command commands.go demo deps main.go main_test.go ops-misc \
-	scripts serf testutil version.go website
+	client coordinate command commands.go demo deps main.go main_test.go \
+	ops-misc scripts serf testutil version.go website
 	@${MV} ${WRKSRC}/${src} \
 		${WRKSRC}/src/github.com/hashicorp/${PORTNAME}
 .endfor
@@ -47,6 +48,7 @@ post-patch:
 	@${MKDIR} ${WRKSRC}/src/github.com/mitchellh
 	@${MKDIR} ${WRKSRC}/src/github.com/miekg
 	@${MKDIR} ${WRKSRC}/src/github.com/ryanuber
+	@${MKDIR} ${WRKSRC}/src/golang.org/x
 	@${MKDIR} ${WRKSRC}/src/code.google.com/p/go.net
 	@${MV} ${WRKSRC_circbuf} \
 		${WRKSRC}/src/github.com/armon/circbuf
@@ -72,12 +74,14 @@ post-patch:
 		${WRKSRC}/src/github.com/miekg/dns
 	@${MV} ${WRKSRC_go_net} \
 		${WRKSRC}/src/github.com/hashicorp/go.net
+	@${MV} ${WRKSRC_crypto} \
+		${WRKSRC}/src/golang.org/x/crypto
 	@${CP} -r ${WRKSRC}/src/github.com/hashicorp/go.net/internal \
 		${WRKSRC}/src/code.google.com/p/go.net
 
 do-build:
 	@cd ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${PORTNAME}; \
-		${SETENV} PATH=${PATH}:${LOCALBASE}/go14/bin ${BUILD_ENV} GOPATH=${WRKSRC} \
+		${SETENV} CGO_ENABLED=0 PATH=${PATH}:${LOCALBASE}/go14/bin ${BUILD_ENV} GOPATH=${WRKSRC} \
 		go build -o bin/${PORTNAME}
 
 do-install:
diff --git a/sysutils/serf/distinfo b/sysutils/serf/distinfo
index 2582093f2181..3bdb00f194af 100644
--- a/sysutils/serf/distinfo
+++ b/sysutils/serf/distinfo
@@ -1,26 +1,28 @@
-SHA256 (hashicorp-serf-v0.6.4_GH0.tar.gz) = 452540c9a475b45cacb4a883108f41aab3198b8e9b41ba0ba957325c1d1fded8
-SIZE (hashicorp-serf-v0.6.4_GH0.tar.gz) = 571489
-SHA256 (hashicorp-go-msgpack-71c2886_GH0.tar.gz) = 052a52b77e262daa6f4bb618970d6673dd77713be031c6da18bd3aff5bc1448d
-SIZE (hashicorp-go-msgpack-71c2886_GH0.tar.gz) = 49479
-SHA256 (hashicorp-go-syslog-ac3963b_GH0.tar.gz) = 0f2f37b490a498a6e8afac326dd5468e85b92d65a88bbd25c0645990fb4ae1ff
-SIZE (hashicorp-go-syslog-ac3963b_GH0.tar.gz) = 4388
-SHA256 (hashicorp-go.net-cbad13b_GH0.tar.gz) = 533f96f0c59fd24a3e552d3963d11a6a34c4e38e76e82e98beb0e48728c80521
-SIZE (hashicorp-go.net-cbad13b_GH0.tar.gz) = 394145
-SHA256 (hashicorp-logutils-23b0af5_GH0.tar.gz) = 357fe9e27ef2ca04df6a80d35d942cc017b426be8f0bcdaeef89b8b1ae0374f3
-SIZE (hashicorp-logutils-23b0af5_GH0.tar.gz) = 7690
-SHA256 (hashicorp-mdns-eb98acc_GH0.tar.gz) = 3a78a2e190ee174525d7c7688578ea1033b77b6a51b43ac8cd9df1db27c296d1
-SIZE (hashicorp-mdns-eb98acc_GH0.tar.gz) = 10626
-SHA256 (hashicorp-memberlist-9a1e242_GH0.tar.gz) = cff946936f358f99766f66032b01a36ad441cd95a256c04a0163ad17c83ef898
-SIZE (hashicorp-memberlist-9a1e242_GH0.tar.gz) = 49729
-SHA256 (armon-circbuf-f092b4f_GH0.tar.gz) = e18e259eab192a3d820ed6d5a813268726ea80acd438d28f2a0cea92b7c94a6b
-SIZE (armon-circbuf-f092b4f_GH0.tar.gz) = 2744
-SHA256 (armon-go-metrics-eb0af21_GH0.tar.gz) = cab4c42948fbfe2316ff31e89d9c84b52a377a9259d75c8cf26b33c99a9856fd
-SIZE (armon-go-metrics-eb0af21_GH0.tar.gz) = 10480
-SHA256 (miekg-dns-b65f52f_GH0.tar.gz) = b58d335fd9c0961207d3d7bd173d04f631f0e07bb4dfbe6bd62a8a58a7eb2416
-SIZE (miekg-dns-b65f52f_GH0.tar.gz) = 112584
-SHA256 (mitchellh-cli-e3c2e3d_GH0.tar.gz) = 9042c6d2ad5da705c1ae7d0f12d07dc76e87f6dbea524df52edee0c00982cf36
-SIZE (mitchellh-cli-e3c2e3d_GH0.tar.gz) = 12178
-SHA256 (mitchellh-mapstructure-442e588_GH0.tar.gz) = 5ca01f6ba1175733ae94a13e532e9465b11951519dcdcc6693651842ed1d6205
-SIZE (mitchellh-mapstructure-442e588_GH0.tar.gz) = 12216
-SHA256 (ryanuber-columnize-44cb478_GH0.tar.gz) = 6d69bf022706ff59a5e5478da7e437451b62dcc8c614fde10b104d830148644b
-SIZE (ryanuber-columnize-44cb478_GH0.tar.gz) = 3673
+SHA256 (hashicorp-serf-v0.7.0_GH0.tar.gz) = 2699dbbc616e4b76fb158d8ea3291b0ae43bb0499ab263907ef38de61f75d652
+SIZE (hashicorp-serf-v0.7.0_GH0.tar.gz) = 597426
+SHA256 (hashicorp-go-msgpack-fa3f638_GH0.tar.gz) = 6353c623d5d58c7ca03e2bdac63f9da7da8848fb1f5f7f239b33e3ce6fe6c6bd
+SIZE (hashicorp-go-msgpack-fa3f638_GH0.tar.gz) = 49496
+SHA256 (hashicorp-go-syslog-42a2b57_GH0.tar.gz) = c092db8da3dc2c7279b4ad6afbb6ee7c4daae9ac3020a591096be59f94330544
+SIZE (hashicorp-go-syslog-42a2b57_GH0.tar.gz) = 4394
+SHA256 (hashicorp-go.net-104dcad_GH0.tar.gz) = afd4485e42182d5fa02020a3095a89cde09fddcb473cba8ff3dcfee97a8b7b87
+SIZE (hashicorp-go.net-104dcad_GH0.tar.gz) = 394192
+SHA256 (hashicorp-logutils-0dc08b1_GH0.tar.gz) = d1272f06f8df434ee06bf965028debe32686a240818729beed5468eedf7f845e
+SIZE (hashicorp-logutils-0dc08b1_GH0.tar.gz) = 7705
+SHA256 (hashicorp-mdns-9d85cf2_GH0.tar.gz) = 4a7b9e54acc9909348fcff249ef262222ed5613ef3f39023bba18324145ea17e
+SIZE (hashicorp-mdns-9d85cf2_GH0.tar.gz) = 10658
+SHA256 (hashicorp-memberlist-9888dc5_GH0.tar.gz) = 83b49325a1d39435d2a16ef0b4f4f089089372303792412a1d67ed17dc1d4b72
+SIZE (hashicorp-memberlist-9888dc5_GH0.tar.gz) = 56809
+SHA256 (armon-circbuf-bbbad09_GH0.tar.gz) = da1aac85443932dd76d33467d678fd04d673f9ba3d6b00da0a57ce274b8b2ec7
+SIZE (armon-circbuf-bbbad09_GH0.tar.gz) = 2884
+SHA256 (armon-go-metrics-06b6099_GH0.tar.gz) = 9536fa2418200cc060edeb24fa3c778abbed7dfce626784663aa39b411477a8a
+SIZE (armon-go-metrics-06b6099_GH0.tar.gz) = 13229
+SHA256 (miekg-dns-75e6e86_GH0.tar.gz) = 346b2bc30f800db5570336bdf0c04e7b2907f9df6d970c774416c2a262b1ab69
+SIZE (miekg-dns-75e6e86_GH0.tar.gz) = 154998
+SHA256 (mitchellh-cli-8102d0e_GH0.tar.gz) = 673be64ba7e1e285db690e7c5dc15c416874c2ed135356ea808b5e11c364f380
+SIZE (mitchellh-cli-8102d0e_GH0.tar.gz) = 13045
+SHA256 (mitchellh-mapstructure-281073e_GH0.tar.gz) = e511fe333b7ce7cbe2b1d03e35f8a3d9ed1bf52eb3aca32859fe5f7acb54ea33
+SIZE (mitchellh-mapstructure-281073e_GH0.tar.gz) = 13968
+SHA256 (ryanuber-columnize-983d3a5_GH0.tar.gz) = fbab9de96d3a73f2407798ae3e32f75a98870c9d2864b58c1b2a2f57e0ef340f
+SIZE (ryanuber-columnize-983d3a5_GH0.tar.gz) = 3803
+SHA256 (golang-crypto-f18420e_GH0.tar.gz) = 69d5a5cec778e1cb96170427c7d82df20b355a9f1e73cbf2f96693ceffb94017
+SIZE (golang-crypto-f18420e_GH0.tar.gz) = 897955