sysutils/consul: update to 0.6.4

2 files changed, 65 insertions, 46 deletions

diff --git a/sysutils/consul/Makefile b/sysutils/consul/Makefile
index 32792ee5a47b..69e457f55c5d 100644
--- a/sysutils/consul/Makefile
+++ b/sysutils/consul/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	consul
-PORTVERSION=	0.6.3
+PORTVERSION=	0.6.4
 DISTVERSIONPREFIX=	v
 CATEGORIES=	sysutils
 MASTER_SITES=	https://releases.hashicorp.com/consul/${PORTVERSION}/:web_ui
@@ -20,10 +20,10 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	hashicorp:DEFAULT,go_checkpoint,go_msgpack,go_multierror,go_syslog \
 		hashicorp:golang_lru,hcl,logutils,memberlist,raft,raft_mdb,serf \
 		hashicorp:scada,yamux,migrate,msgpackrpc,boltdb,reap,memdb \
-		hashicorp:iradix,chttp,errwrap \
+		hashicorp:iradix,chttp,errwrap,gouuid,hil \
 		armon:circbuf,go_metrics,go_radix,gomdb golang:protobuf,crypto,sys \
 		boltdb:bolt inconshreveable:muxado matttproud:protobuf_ext \
-		miekg:dns mitchellh:cli mitchellh:mapstructure \
+		miekg:dns mitchellh:cli,mapstructure,copystructure,reflectwalk \
 		prometheus:client_golang,client_model,procfs \
 		ryanuber:columnize ugorji:go mattn:isatty \
 		fsouza:dclient elazarl:assetfs bgentry:speakeasy DataDog:datadog
@@ -41,20 +41,22 @@ GH_PROJECT=	circbuf:circbuf protobuf:protobuf go-metrics:go_metrics \
 		go:go go-isatty:isatty go-reap:reap sys:sys go-memdb:memdb \
 		go-immutable-radix:iradix go-cleanhttp:chttp errwrap:errwrap \
 		go-dockerclient:dclient go-bindata-assetfs:assetfs \
-		speakeasy:speakeasy datadog-go:datadog
+		speakeasy:speakeasy datadog-go:datadog go-uuid:gouuid \
+		hil:hil copystructure:copystructure reflectwalk:reflectwalk
 GH_TAGNAME=	bbbad09:circbuf 2402d76:protobuf 345426c:go_metrics \
 		4239b77:go_radix 151f2e0:gomdb e4b2dc3:go_checkpoint \
 		fa3f638:go_msgpack d30f099:go_multierror 42a2b57:go_syslog \
-		bf88e0d:golang_lru aee8c49:hcl 0dc08b1:logutils \
-		9888dc5:memberlist 8023e5e:raft 55f2947:raft_mdb b60fe33:serf \
+		5c7531c:golang_lru 578dd97:hcl 0dc08b1:logutils \
+		cef12ad:memberlist 057b893:raft 55f2947:raft_mdb e4ec8cc:serf \
 		84989fd:scada df94978:yamux 678fb10:migrate \
-		a14192a:msgpackrpc d1e82c1:boltdb 3760e01:crypto 109049b:bolt \
-		f693c7e:muxado d0c3fe8:protobuf_ext 297a77c:dns cb6853d:cli \
+		a14192a:msgpackrpc d1e82c1:boltdb 3760e01:crypto ee4a088:bolt \
+		f693c7e:muxado d0c3fe8:protobuf_ext 75e6e86:dns cb6853d:cli \
 		281073e:mapstructure 67994f1:client_golang \
 		fa8ad6f:client_model 406e5b7:procfs 983d3a5:columnize \
-		646ae4a:go 56b76bd:isatty 2d85522:reap 442cd60:sys 31949d5:memdb \
-		12e9005:iradix ce617e7:chttp 7554cd9:errwrap 2fb7694:dclient \
-		57eb5e1:assetfs 36e9cfd:speakeasy bc97e07:datadog
+		646ae4a:go 56b76bd:isatty 2d85522:reap 20457ee:sys 98f52f5:memdb \
+		8e8ed81:iradix 875fb67:chttp 7554cd9:errwrap 9b6c972:dclient \
+		57eb5e1:assetfs 36e9cfd:speakeasy b050cd8:datadog 3628998:gouuid \
+		0457360:hil 6fc6626:copystructure eecf4c7:reflectwalk
 
 USE_RC_SUBR=	consul
 
@@ -65,10 +67,10 @@ STRIP=		# stripping can break go binaries
 
 post-patch:
 	@${MKDIR} ${WRKSRC}/src/github.com/hashicorp/consul
-.for src in .gitignore .travis.yml CHANGELOG.md LICENSE Makefile README.md \
-	Vagrantfile acl api bench command commands.go consul contrib demo deps \
-	main.go main_test.go make.bat scripts terraform test testutil \
-	tlsutil ui version.go watch website
+.for src in .gitignore .travis.yml CHANGELOG.md GNUmakefile Godeps LICENSE \
+	README.md acl api bench command commands.go consul contrib demo lib \
+	main.go main_test.go make.bat scripts terraform test testutil tlsutil \
+	ui vendor version.go watch website
 	@${MV} ${WRKSRC}/${src} \
 		${WRKSRC}/src/github.com/hashicorp/consul
 .endfor
@@ -174,9 +176,18 @@ post-patch:
 		${WRKSRC}/src/golang.org/x/sys
 	@${MV} ${WRKSRC_crypto} \
 		${WRKSRC}/src/golang.org/x/crypto
+	@${MV} ${WRKSRC_gouuid} \
+		${WRKSRC}/src/github.com/hashicorp/go-uuid
+	@${MV} ${WRKSRC_hil} \
+		${WRKSRC}/src/github.com/hashicorp/hil
+	@${MV} ${WRKSRC_copystructure} \
+		${WRKSRC}/src/github.com/mitchellh/copystructure
+	@${MV} ${WRKSRC_reflectwalk} \
+		${WRKSRC}/src/github.com/mitchellh/reflectwalk
 
 do-build:
-	@cd ${WRKSRC}/src/github.com/hashicorp/consul; ${SETENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build -o bin/consul
+	@cd ${WRKSRC}/src/github.com/hashicorp/consul; ${SETENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build \
+		-ldflags "-X main.GitDescribe v${PORTVERSION}" -o bin/consul
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/github.com/hashicorp/consul/bin/consul ${STAGEDIR}${PREFIX}/bin/consul
diff --git a/sysutils/consul/distinfo b/sysutils/consul/distinfo
index df4b151b8d7a..0b3f5f730285 100644
--- a/sysutils/consul/distinfo
+++ b/sysutils/consul/distinfo
@@ -1,7 +1,7 @@
-SHA256 (consul_0.6.3_web_ui.zip) = 93bbb300cacfe8de90fb3bd5ede7d37ae6ce014898edc520b9c96a676b2bbb72
-SIZE (consul_0.6.3_web_ui.zip) = 253861
-SHA256 (hashicorp-consul-v0.6.3_GH0.tar.gz) = 5cdc21d6f20f9b703d38e19d3d2ed1c037dcbb236b80bff6a9b9c481ded74435
-SIZE (hashicorp-consul-v0.6.3_GH0.tar.gz) = 2224536
+SHA256 (consul_0.6.4_web_ui.zip) = 5f8841b51e0e3e2eb1f1dc66a47310ae42b0448e77df14c83bb49e0e0d5fa4b7
+SIZE (consul_0.6.4_web_ui.zip) = 253852
+SHA256 (hashicorp-consul-v0.6.4_GH0.tar.gz) = 327c72211af1d6613477856c15bf7bcfc3c80d23542fcffe535d30d09347e08b
+SIZE (hashicorp-consul-v0.6.4_GH0.tar.gz) = 3912207
 SHA256 (hashicorp-go-checkpoint-e4b2dc3_GH0.tar.gz) = 5dc0efd36e5581dc04f40c4f3a705219f8c7bb92ef9728ec6a0857d7f322d175
 SIZE (hashicorp-go-checkpoint-e4b2dc3_GH0.tar.gz) = 9966
 SHA256 (hashicorp-go-msgpack-fa3f638_GH0.tar.gz) = 6353c623d5d58c7ca03e2bdac63f9da7da8848fb1f5f7f239b33e3ce6fe6c6bd
@@ -10,20 +10,20 @@ SHA256 (hashicorp-go-multierror-d30f099_GH0.tar.gz) = 3a1ea11a45d9ec6aab4aeea142
 SIZE (hashicorp-go-multierror-d30f099_GH0.tar.gz) = 8785
 SHA256 (hashicorp-go-syslog-42a2b57_GH0.tar.gz) = c092db8da3dc2c7279b4ad6afbb6ee7c4daae9ac3020a591096be59f94330544
 SIZE (hashicorp-go-syslog-42a2b57_GH0.tar.gz) = 4394
-SHA256 (hashicorp-golang-lru-bf88e0d_GH0.tar.gz) = 67f5087b1e28bd17f5cc6c2f028944884233393348d460261c7034d9b373fe0e
-SIZE (hashicorp-golang-lru-bf88e0d_GH0.tar.gz) = 12311
-SHA256 (hashicorp-hcl-aee8c49_GH0.tar.gz) = 2e8367b39ffcdbe6da1892ed4115789a48ed9c2302874e4abf8f191bc6051708
-SIZE (hashicorp-hcl-aee8c49_GH0.tar.gz) = 57358
+SHA256 (hashicorp-golang-lru-5c7531c_GH0.tar.gz) = 867a69d0ee2e06a7e5cfe1c4cec7dfde3e6568b49d3b7157f250c6cc825bf738
+SIZE (hashicorp-golang-lru-5c7531c_GH0.tar.gz) = 12307
+SHA256 (hashicorp-hcl-578dd97_GH0.tar.gz) = 53631bd3cc69084c4da3cd9d818eb9bb218901424dec87db9d30a0fda2b32092
+SIZE (hashicorp-hcl-578dd97_GH0.tar.gz) = 54709
 SHA256 (hashicorp-logutils-0dc08b1_GH0.tar.gz) = d1272f06f8df434ee06bf965028debe32686a240818729beed5468eedf7f845e
 SIZE (hashicorp-logutils-0dc08b1_GH0.tar.gz) = 7705
-SHA256 (hashicorp-memberlist-9888dc5_GH0.tar.gz) = 83b49325a1d39435d2a16ef0b4f4f089089372303792412a1d67ed17dc1d4b72
-SIZE (hashicorp-memberlist-9888dc5_GH0.tar.gz) = 56809
-SHA256 (hashicorp-raft-8023e5e_GH0.tar.gz) = 3110569d32c982dd2ac0f3d43576fd8418c611b5914f737a8c8fada3cdedb966
-SIZE (hashicorp-raft-8023e5e_GH0.tar.gz) = 59406
+SHA256 (hashicorp-memberlist-cef12ad_GH0.tar.gz) = 68e605e778d6a2beec877374ec0fadb51d0f5e2ce507dc14bf812494b0adfcbc
+SIZE (hashicorp-memberlist-cef12ad_GH0.tar.gz) = 57485
+SHA256 (hashicorp-raft-057b893_GH0.tar.gz) = 01490a9454a0b346d78a7c81b5bb0b0c20c2e52828a7cc23640638e53ad03251
+SIZE (hashicorp-raft-057b893_GH0.tar.gz) = 60534
 SHA256 (hashicorp-raft-mdb-55f2947_GH0.tar.gz) = 1d98b208f1928419af39f5878fee8ae5905871bfeb0aaae57cba333b0ee690d0
 SIZE (hashicorp-raft-mdb-55f2947_GH0.tar.gz) = 9809
-SHA256 (hashicorp-serf-b60fe33_GH0.tar.gz) = 7f2e72169ba0e69f0e2faed17950171ee9f93f54a770b7003df5e1050de1654d
-SIZE (hashicorp-serf-b60fe33_GH0.tar.gz) = 578795
+SHA256 (hashicorp-serf-e4ec8cc_GH0.tar.gz) = 8241348ef5ca891bcc6742c2ff760cf86d16395548f626f8b95ad8719b6e84df
+SIZE (hashicorp-serf-e4ec8cc_GH0.tar.gz) = 639442
 SHA256 (hashicorp-scada-client-84989fd_GH0.tar.gz) = b951a6efad5079146c76bdf5da1422aa4792fc6ef34d3243b0a7554a57a92fc6
 SIZE (hashicorp-scada-client-84989fd_GH0.tar.gz) = 15811
 SHA256 (hashicorp-yamux-df94978_GH0.tar.gz) = 24ea55176dc9ba8f8a55710f3837600ca949816ef25f6f075d978ecd66f2aedc
@@ -36,14 +36,18 @@ SHA256 (hashicorp-raft-boltdb-d1e82c1_GH0.tar.gz) = 68bb2996a4ec490c099612efcc25
 SIZE (hashicorp-raft-boltdb-d1e82c1_GH0.tar.gz) = 8879
 SHA256 (hashicorp-go-reap-2d85522_GH0.tar.gz) = 9ae2938e9bec3003226e59dd3d41f4c4a5b7150342c90f55c0003dd2c5c3968a
 SIZE (hashicorp-go-reap-2d85522_GH0.tar.gz) = 8465
-SHA256 (hashicorp-go-memdb-31949d5_GH0.tar.gz) = 042c9276b5d779a9a8f638b900710039bbd17231cb0514e8accec491f23acb55
-SIZE (hashicorp-go-memdb-31949d5_GH0.tar.gz) = 17359
-SHA256 (hashicorp-go-immutable-radix-12e9005_GH0.tar.gz) = 4eafa72ab78719a7d9c64fd09b6f9922ab5919dc6ebdf686bdddde46f867c87a
-SIZE (hashicorp-go-immutable-radix-12e9005_GH0.tar.gz) = 12578
-SHA256 (hashicorp-go-cleanhttp-ce617e7_GH0.tar.gz) = 89651ed81df354d0576e4889a54a2d78686f0eea641d3f1c1ecb7cbe732a1509
-SIZE (hashicorp-go-cleanhttp-ce617e7_GH0.tar.gz) = 6592
+SHA256 (hashicorp-go-memdb-98f52f5_GH0.tar.gz) = 48dc5d6e00d5b0bf0810c1b098f3616dd1a10a9d46ae19289530dd4e53ec2a42
+SIZE (hashicorp-go-memdb-98f52f5_GH0.tar.gz) = 18834
+SHA256 (hashicorp-go-immutable-radix-8e8ed81_GH0.tar.gz) = 521841bab559b082bc7b1ce31288651bce4e4cc432ad508b9724cd1199f4d400
+SIZE (hashicorp-go-immutable-radix-8e8ed81_GH0.tar.gz) = 12594
+SHA256 (hashicorp-go-cleanhttp-875fb67_GH0.tar.gz) = a09a1f166fb844ec7b648fc62011a8964cca0666ff536bc737498a20a350a083
+SIZE (hashicorp-go-cleanhttp-875fb67_GH0.tar.gz) = 7124
 SHA256 (hashicorp-errwrap-7554cd9_GH0.tar.gz) = b800e361c15decd0ebb39a0ff02ad046a1fc81021267f8625232f3921617daa0
 SIZE (hashicorp-errwrap-7554cd9_GH0.tar.gz) = 8312
+SHA256 (hashicorp-go-uuid-3628998_GH0.tar.gz) = b74ff6ff14a88d2eb4fde9bfd88d9a3daab328bc79994873c6d9ba3c8e41f531
+SIZE (hashicorp-go-uuid-3628998_GH0.tar.gz) = 6487
+SHA256 (hashicorp-hil-0457360_GH0.tar.gz) = 8113a25467712df0e3d88c5e1a319b62ea479855f9985a2c8e0947502c402811
+SIZE (hashicorp-hil-0457360_GH0.tar.gz) = 27393
 SHA256 (armon-circbuf-bbbad09_GH0.tar.gz) = da1aac85443932dd76d33467d678fd04d673f9ba3d6b00da0a57ce274b8b2ec7
 SIZE (armon-circbuf-bbbad09_GH0.tar.gz) = 2884
 SHA256 (armon-go-metrics-345426c_GH0.tar.gz) = 1a46954fcd70725f4831fda117f68d1e551c3a6ba9c0df8f1021bbc254195d4c
@@ -56,20 +60,24 @@ SHA256 (golang-protobuf-2402d76_GH0.tar.gz) = 05fa1bc029a8731f83a0c1ef81e2fe244c
 SIZE (golang-protobuf-2402d76_GH0.tar.gz) = 179772
 SHA256 (golang-crypto-3760e01_GH0.tar.gz) = 5c79944c37becac5579adf8bd3ce8bdbe83d1a38ca02f73615a409ce7095f9c5
 SIZE (golang-crypto-3760e01_GH0.tar.gz) = 901427
-SHA256 (golang-sys-442cd60_GH0.tar.gz) = 1ecc7b3be1743595adefdd646846dfda7312290a8d3a2bdef6cf43697eea548a
-SIZE (golang-sys-442cd60_GH0.tar.gz) = 541727
-SHA256 (boltdb-bolt-109049b_GH0.tar.gz) = 3093cc1bdebbe6149577c76e141e964a3c88dbdeb765c810afd33bbf812b79f7
-SIZE (boltdb-bolt-109049b_GH0.tar.gz) = 77967
+SHA256 (golang-sys-20457ee_GH0.tar.gz) = b2f6fda71e0b167cdf8c99c331da565afe6847bb3f6db79258b0ace86792e08f
+SIZE (golang-sys-20457ee_GH0.tar.gz) = 541643
+SHA256 (boltdb-bolt-ee4a088_GH0.tar.gz) = cdc4c4288b6e3fe70e2ab087ef931486983d495b8ed10366678815fdaba15245
+SIZE (boltdb-bolt-ee4a088_GH0.tar.gz) = 78032
 SHA256 (inconshreveable-muxado-f693c7e_GH0.tar.gz) = 2ef25a734872d8beb7740fbf58598f56653d6c47d0ee971ca950dad90823344d
 SIZE (inconshreveable-muxado-f693c7e_GH0.tar.gz) = 25814
 SHA256 (matttproud-golang_protobuf_extensions-d0c3fe8_GH0.tar.gz) = f78680b1ceb9e2f17cb2c4053cbe86051b8f79c203ed4914d39db83036b15f9b
 SIZE (matttproud-golang_protobuf_extensions-d0c3fe8_GH0.tar.gz) = 10721
-SHA256 (miekg-dns-297a77c_GH0.tar.gz) = a8450175aa515f94a39a983a7c7731d5306f2df5292afb10ca3e3d56b32a310e
-SIZE (miekg-dns-297a77c_GH0.tar.gz) = 158614
+SHA256 (miekg-dns-75e6e86_GH0.tar.gz) = 346b2bc30f800db5570336bdf0c04e7b2907f9df6d970c774416c2a262b1ab69
+SIZE (miekg-dns-75e6e86_GH0.tar.gz) = 154998
 SHA256 (mitchellh-cli-cb6853d_GH0.tar.gz) = b501d29aca4b7fb6adf6c3e6ed3b2739899968b557b33bca34c5bd214581510c
 SIZE (mitchellh-cli-cb6853d_GH0.tar.gz) = 15708
 SHA256 (mitchellh-mapstructure-281073e_GH0.tar.gz) = e511fe333b7ce7cbe2b1d03e35f8a3d9ed1bf52eb3aca32859fe5f7acb54ea33
 SIZE (mitchellh-mapstructure-281073e_GH0.tar.gz) = 13968
+SHA256 (mitchellh-copystructure-6fc6626_GH0.tar.gz) = b632b0536ab26766989d11287d798417b7583e4f55928ee2c1100d11a222d64a
+SIZE (mitchellh-copystructure-6fc6626_GH0.tar.gz) = 4029
+SHA256 (mitchellh-reflectwalk-eecf4c7_GH0.tar.gz) = a681b9f5f9a8c24d01d9e05a088dc2053fa637060cf4fa8a4232d5ef4f00ca11
+SIZE (mitchellh-reflectwalk-eecf4c7_GH0.tar.gz) = 4272
 SHA256 (prometheus-client_golang-67994f1_GH0.tar.gz) = 8c4d167c4c842bb374fcb3973cb9db7a927b52d0f379029593ec2fb217249a7d
 SIZE (prometheus-client_golang-67994f1_GH0.tar.gz) = 65347
 SHA256 (prometheus-client_model-fa8ad6f_GH0.tar.gz) = 726ebe6d3aba7c99ffc30788972ef693d0521072c6a33794a9d8ee1f26389466
@@ -82,11 +90,11 @@ SHA256 (ugorji-go-646ae4a_GH0.tar.gz) = 84d2b0dbfd61f662eff060ea35159d8c3c298399
 SIZE (ugorji-go-646ae4a_GH0.tar.gz) = 166652
 SHA256 (mattn-go-isatty-56b76bd_GH0.tar.gz) = c424f22dcd10290266a3413c1ebe055bd3278c030aab065ba955b604c455c881
 SIZE (mattn-go-isatty-56b76bd_GH0.tar.gz) = 1950
-SHA256 (fsouza-go-dockerclient-2fb7694_GH0.tar.gz) = 3da486e81268478de96c9aeb6f099620ec589a42e219a028091e3b0bcdc0887d
-SIZE (fsouza-go-dockerclient-2fb7694_GH0.tar.gz) = 715250
+SHA256 (fsouza-go-dockerclient-9b6c972_GH0.tar.gz) = be2f2a5020cd315eaadfb43b15ab1c93fa93fa983159396d15a7c11a21961d64
+SIZE (fsouza-go-dockerclient-9b6c972_GH0.tar.gz) = 719407
 SHA256 (elazarl-go-bindata-assetfs-57eb5e1_GH0.tar.gz) = c42a45d609448bb7ad0fa42f7654a67ce2e5558d7a843c5268d67d7b31567220
 SIZE (elazarl-go-bindata-assetfs-57eb5e1_GH0.tar.gz) = 3676
 SHA256 (bgentry-speakeasy-36e9cfd_GH0.tar.gz) = 502733d9fa63803cc9e554b43122b1c3e1ec43efc39f516c13507f344d696d95
 SIZE (bgentry-speakeasy-36e9cfd_GH0.tar.gz) = 6895
-SHA256 (DataDog-datadog-go-bc97e07_GH0.tar.gz) = 873212eb5ac582afba450e958c80507ada04f2c9bd6307e69778fce4db0dbf11
-SIZE (DataDog-datadog-go-bc97e07_GH0.tar.gz) = 6725
+SHA256 (DataDog-datadog-go-b050cd8_GH0.tar.gz) = 1f5e0051279d007d2744c245791327537389c61bf948832ff217950324811c39
+SIZE (DataDog-datadog-go-b050cd8_GH0.tar.gz) = 6054