sysutils/consul: update to 0.5.0

4 files changed, 286 insertions, 102 deletions

diff --git a/sysutils/consul/Makefile b/sysutils/consul/Makefile
index 8071a81cdb7a..80a171c06a70 100644
--- a/sysutils/consul/Makefile
+++ b/sysutils/consul/Makefile
@@ -1,58 +1,70 @@
 # $FreeBSD$
 
 PORTNAME=	consul
-PORTVERSION=	0.4.1
+PORTVERSION=	0.5.0
 CATEGORIES=	sysutils
 MASTER_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/archive/${GH_TAGNAME}.tar.gz?dummy=/:group1 \
 		https://github.com/armon/circbuf/archive/f092b4f207b6e5cce0569056fba9e1a2735cb6cf.tar.gz?dummy=/:group2 \
-		https://github.com/armon/consul-api/archive/1b81c8e0c4cbf1d382310e4c0dc11221632e79d1.tar.gz?dummy=/:group3 \
-		https://github.com/armon/go-metrics/archive/2b75159ce5d3641fb35b5a159cff309ac3cf4177.tar.gz?dummy=/:group4 \
-		https://github.com/armon/go-radix/archive/b045fc0ad3587e8620fb42a0dea882cf8c08aef9.tar.gz?dummy=/:group5 \
-		https://github.com/armon/gomdb/archive/a8e036c4dabe7437014ecf9dbc03c6f6f0766ef8.tar.gz?dummy=/:group6 \
-		https://github.com/hashicorp/go-checkpoint/archive/89ef2a697dd8cdb4623097d5bb9acdb19a470767.tar.gz?dummy=/:group7 \
+		https://github.com/golang/protobuf/archive/5677a0e3d5e89854c9974e1256839ee23f8233ca.tar.gz?dummy=/:group3 \
+		https://github.com/armon/go-metrics/archive/88b7658f24511c4b885942b26e9ea7a61ee37ebc.tar.gz?dummy=/:group4 \
+		https://github.com/armon/go-radix/archive/e39d623f12e8e41c7b5529e9a9dd67a1e2261f80.tar.gz?dummy=/:group5 \
+		https://github.com/armon/gomdb/archive/151f2e08ef45cb0e57d694b2562f351955dff572.tar.gz?dummy=/:group6 \
+		https://github.com/hashicorp/go-checkpoint/archive/88326f6851319068e7b34981032128c0b1a6524d.tar.gz?dummy=/:group7 \
 		https://github.com/hashicorp/go-msgpack/archive/71c2886f5a673a35f909803f38ece5810165097b.tar.gz?dummy=/:group8 \
-		https://github.com/hashicorp/go-syslog/archive/ac3963b72ac367e48b1e68a831e62b93fb69091c.tar.gz?dummy=/:group9 \
-		https://github.com/hashicorp/golang-lru/archive/253b2dc1ca8bae42c3b5b6e53dd2eab1a7551116.tar.gz?dummy=/:group10 \
-		https://github.com/hashicorp/hcl/archive/e51eabcdf801f663738fa12f4340fbad13062738.tar.gz?dummy=/:group11 \
-		https://github.com/hashicorp/logutils/archive/23b0af5510a2d1442103ef83ffcf53eb82f3debc.tar.gz?dummy=/:group12 \
-		https://github.com/hashicorp/memberlist/archive/16d947e2d4b3f1fe508ee1d9b6ec34b8fd2e96d8.tar.gz?dummy=/:group13 \
-		https://github.com/hashicorp/raft/archive/cc9710ab540985954a67c108f414aa3152f5916f.tar.gz?dummy=/:group14 \
-		https://github.com/hashicorp/raft-mdb/archive/6f52d0ce62a34e3f5bd29aa4d7068030d700d94a.tar.gz?dummy=/:group15 \
-		https://github.com/hashicorp/serf/archive/0479bc1b942fd84205587f7e73867ac78809966b.tar.gz?dummy=/:group16 \
-		https://github.com/hashicorp/terraform/archive/2d117326edb33b7155d1ec9d0ab9d3542ba1b230.tar.gz?dummy=/:group17 \
-		https://github.com/hashicorp/yamux/archive/9feabe6854fadca1abec9cd3bd2a613fe9a34000.tar.gz?dummy=/:group18 \
-		https://github.com/inconshreveable/muxado/archive/f693c7e88ba316d1a0ae3e205e22a01aa3ec2848.tar.gz?dummy=/:group19 \
-		https://github.com/miekg/dns/archive/dc30c7cd4ed2fc8af73d49da4ee285404958b8bd.tar.gz?dummy=/:group20 \
-		https://github.com/mitchellh/cli/archive/e3c2e3d39391e9beb9660ccd6b4bd9a2f38dd8a0.tar.gz?dummy=/:group21 \
-		https://github.com/mitchellh/mapstructure/archive/740c764bc6149d3f1806231418adb9f52c11bcbf.tar.gz?dummy=/:group22 \
-		https://github.com/ryanuber/columnize/archive/44cb4788b2ec3c3d158dd3d1b50aba7d66f4b59a.tar.gz?dummy=/:group23 \
-		https://github.com/ugorji/go/archive/e906e395b9d45d3230e800c8ad1f92f99764e753.tar.gz?dummy=/:group24 \
-		https://dl.bintray.com/mitchellh/consul/:group25
-DISTFILES=	consul-0.4.1.tar.gz:group1 \
+		https://github.com/hashicorp/go-multierror/archive/fcdddc395df1ddf4247c69bd436e84cfa0733f7e.tar.gz?dummy=/:group9 \
+		https://github.com/hashicorp/go-syslog/archive/42a2b573b664dbf281bd48c3cc12c086b17a39ba.tar.gz?dummy=/:group10 \
+		https://github.com/hashicorp/golang-lru/archive/f09f965649501e2ac1b0c310c632a7bebdbdc1d4.tar.gz?dummy=/:group11 \
+		https://github.com/hashicorp/hcl/archive/513e04c400ee2e81e97f5e011c08fb42c6f69b84.tar.gz?dummy=/:group12 \
+		https://github.com/hashicorp/logutils/archive/23b0af5510a2d1442103ef83ffcf53eb82f3debc.tar.gz?dummy=/:group13 \
+		https://github.com/hashicorp/memberlist/archive/9a1e242e454d2443df330bdd51a436d5a9058fc4.tar.gz?dummy=/:group14 \
+		https://github.com/hashicorp/raft/archive/a88bfa8385bc52c1f25d0fc02d1b55a2708d04ab.tar.gz?dummy=/:group15 \
+		https://github.com/hashicorp/raft-mdb/archive/4ec3694ffbc74d34f7532e70ef2e9c3546a0c0b0.tar.gz?dummy=/:group16 \
+		https://github.com/hashicorp/serf/archive/cc95df950d69acfd117128c98a3bc6b64c1da3fd.tar.gz?dummy=/:group17 \
+		https://github.com/hashicorp/scada-client/archive/c26580cfe35393f6f4bf1b9ba55e6afe33176bae.tar.gz?dummy=/:group18 \
+		https://github.com/hashicorp/yamux/archive/b4f943b3f25da97dec8e26bee1c3269019de070d.tar.gz?dummy=/:group19 \
+		https://github.com/inconshreveable/muxado/archive/f693c7e88ba316d1a0ae3e205e22a01aa3ec2848.tar.gz?dummy=/:group20 \
+		https://github.com/miekg/dns/archive/64fea017a260b4ccbfbb3f60ab027e0398cd8f6f.tar.gz?dummy=/:group21 \
+		https://github.com/mitchellh/cli/archive/e3c2e3d39391e9beb9660ccd6b4bd9a2f38dd8a0.tar.gz?dummy=/:group22 \
+		https://github.com/mitchellh/mapstructure/archive/740c764bc6149d3f1806231418adb9f52c11bcbf.tar.gz?dummy=/:group23 \
+		https://github.com/ryanuber/columnize/archive/44cb4788b2ec3c3d158dd3d1b50aba7d66f4b59a.tar.gz?dummy=/:group24 \
+		https://github.com/ugorji/go/archive/e906e395b9d45d3230e800c8ad1f92f99764e753.tar.gz?dummy=/:group25 \
+		https://github.com/hashicorp/net-rpc-msgpackrpc/archive/d377902b7aba83dd3895837b902f6cf3f71edcb2.tar.gz?dummy=/:group26 \
+		https://github.com/matttproud/golang_protobuf_extensions/archive/ba7d65ac66e9da93a714ca18f6d1bc7a0c09100c.tar.gz?dummy=/:group27 \
+		https://github.com/prometheus/client_golang/archive/38dbb2e26868d15db0275ddbaac0cbe450ec03de.tar.gz?dummy=/:group28 \
+		https://github.com/prometheus/client_model/archive/fa8ad6fec33561be4280a8f0514318c79d7f6cb6.tar.gz?dummy=/:group29 \
+		https://github.com/prometheus/procfs/archive/92faa308558161acab0ada1db048e9996ecec160.tar.gz?dummy=/:group30 \
+		https://dl.bintray.com/mitchellh/consul/:group31
+DISTFILES=	consul-${PORTVERSION}.tar.gz:group1 \
 		armon_circbuf_f092b4f207b6e5cce0569056fba9e1a2735cb6cf.tar.gz:group2 \
-		armon_consul-api_1b81c8e0c4cbf1d382310e4c0dc11221632e79d1.tar.gz:group3 \
-		armon_go-metrics_2b75159ce5d3641fb35b5a159cff309ac3cf4177.tar.gz:group4 \
-		armon_go-radix_b045fc0ad3587e8620fb42a0dea882cf8c08aef9.tar.gz:group5 \
-		armon_gomdb_a8e036c4dabe7437014ecf9dbc03c6f6f0766ef8.tar.gz:group6 \
-		hashicorp_go-checkpoint_89ef2a697dd8cdb4623097d5bb9acdb19a470767.tar.gz:group7 \
+		golang_protobuf_5677a0e3d5e89854c9974e1256839ee23f8233ca.tar.gz:group3 \
+		armon_go-metrics_88b7658f24511c4b885942b26e9ea7a61ee37ebc.tar.gz:group4 \
+		armon_go-radix_e39d623f12e8e41c7b5529e9a9dd67a1e2261f80.tar.gz:group5 \
+		armon_gomdb_151f2e08ef45cb0e57d694b2562f351955dff572.tar.gz:group6 \
+		hashicorp_go-checkpoint_88326f6851319068e7b34981032128c0b1a6524d.tar.gz:group7 \
 		hashicorp_go-msgpack_71c2886f5a673a35f909803f38ece5810165097b.tar.gz:group8 \
-		hashicorp_go-syslog_ac3963b72ac367e48b1e68a831e62b93fb69091c.tar.gz:group9 \
-		hashicorp_golang-lru_253b2dc1ca8bae42c3b5b6e53dd2eab1a7551116.tar.gz:group10 \
-		hashicorp_hcl_e51eabcdf801f663738fa12f4340fbad13062738.tar.gz:group11 \
-		hashicorp_logutils_23b0af5510a2d1442103ef83ffcf53eb82f3debc.tar.gz:group12 \
-		hashicorp_memberlist_16d947e2d4b3f1fe508ee1d9b6ec34b8fd2e96d8.tar.gz:group13 \
-		hashicorp_raft_cc9710ab540985954a67c108f414aa3152f5916f.tar.gz:group14 \
-		hashicorp_raft-mdb_6f52d0ce62a34e3f5bd29aa4d7068030d700d94a.tar.gz:group15 \
-		hashicorp_serf_0479bc1b942fd84205587f7e73867ac78809966b.tar.gz:group16 \
-		hashicorp_terraform_2d117326edb33b7155d1ec9d0ab9d3542ba1b230.tar.gz:group17 \
-		hashicorp_yamux_9feabe6854fadca1abec9cd3bd2a613fe9a34000.tar.gz:group18 \
-		inconshreveable_muxado_f693c7e88ba316d1a0ae3e205e22a01aa3ec2848.tar.gz:group19 \
-		miekg_dns_dc30c7cd4ed2fc8af73d49da4ee285404958b8bd.tar.gz:group20 \
-		mitchellh_cli_e3c2e3d39391e9beb9660ccd6b4bd9a2f38dd8a0.tar.gz:group21 \
-		mitchellh_mapstructure_740c764bc6149d3f1806231418adb9f52c11bcbf.tar.gz:group22 \
-		ryanuber_columnize_44cb4788b2ec3c3d158dd3d1b50aba7d66f4b59a.tar.gz:group23 \
-		ugorji_go_e906e395b9d45d3230e800c8ad1f92f99764e753.tar.gz:group24 \
-		0.4.1_web_ui.zip:group25
+		hashicorp_go-multierror_fcdddc395df1ddf4247c69bd436e84cfa0733f7e.tar.gz:group9 \
+		hashicorp_go-syslog_42a2b573b664dbf281bd48c3cc12c086b17a39ba.tar.gz:group10 \
+		hashicorp_golang-lru_f09f965649501e2ac1b0c310c632a7bebdbdc1d4.tar.gz:group11 \
+		hashicorp_hcl_513e04c400ee2e81e97f5e011c08fb42c6f69b84.tar.gz:group12 \
+		hashicorp_logutils_23b0af5510a2d1442103ef83ffcf53eb82f3debc.tar.gz:group13 \
+		hashicorp_memberlist_9a1e242e454d2443df330bdd51a436d5a9058fc4.tar.gz:group14 \
+		hashicorp_raft_a88bfa8385bc52c1f25d0fc02d1b55a2708d04ab.tar.gz:group15 \
+		hashicorp_raft-mdb_4ec3694ffbc74d34f7532e70ef2e9c3546a0c0b0.tar.gz:group16 \
+		hashicorp_serf_cc95df950d69acfd117128c98a3bc6b64c1da3fd.tar.gz:group17 \
+		hashicorp_scada-client_c26580cfe35393f6f4bf1b9ba55e6afe33176bae.tar.gz:group18 \
+		hashicorp_yamux_b4f943b3f25da97dec8e26bee1c3269019de070d.tar.gz:group19 \
+		inconshreveable_muxado_f693c7e88ba316d1a0ae3e205e22a01aa3ec2848.tar.gz:group20 \
+		miekg_dns_64fea017a260b4ccbfbb3f60ab027e0398cd8f6f.tar.gz:group21 \
+		mitchellh_cli_e3c2e3d39391e9beb9660ccd6b4bd9a2f38dd8a0.tar.gz:group22 \
+		mitchellh_mapstructure_740c764bc6149d3f1806231418adb9f52c11bcbf.tar.gz:group23 \
+		ryanuber_columnize_44cb4788b2ec3c3d158dd3d1b50aba7d66f4b59a.tar.gz:group24 \
+		ugorji_go_e906e395b9d45d3230e800c8ad1f92f99764e753.tar.gz:group25 \
+		net-rpc-msgpackrpc_d377902b7aba83dd3895837b902f6cf3f71edcb2.tar.gz:group26 \
+		golang_protobuf_extensions_ba7d65ac66e9da93a714ca18f6d1bc7a0c09100c.tar.gz:group27 \
+		prometheus_client_golang_38dbb2e26868d15db0275ddbaac0cbe450ec03de.tar.gz:group28 \
+		prometheus_client_model_fa8ad6fec33561be4280a8f0514318c79d7f6cb6.tar.gz:group29 \
+		prometheus_procfs_92faa308558161acab0ada1db048e9996ecec160.tar.gz:group30 \
+		${PORTVERSION}_web_ui.zip:group31
 
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Service discovery and configuration made easy
@@ -65,7 +77,6 @@ USES=		compiler
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	hashicorp
-GH_COMMIT=	aaddfa2
 GH_TAGNAME=	v${PORTVERSION}
 
 USE_RC_SUBR=	consul
@@ -79,10 +90,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 bench command commands.go consul demo deps \
-		main.go main_test.go scripts terraform test testutil ui \
-		version.go watch website
+.for src in .travis.yml CHANGELOG.md LICENSE Makefile README.md Vagrantfile \
+	api acl bench contrib command commands.go consul demo deps main.go \
+	main_test.go scripts terraform test testutil tlsutil ui version.go \
+	watch website
 	@${MV} ${WRKSRC}/${src} \
 		${WRKSRC}/src/github.com/hashicorp/consul
 .endfor
@@ -92,43 +103,48 @@ post-patch:
 	@${MKDIR} ${WRKSRC}/src/github.com/mitchellh
 	@${MKDIR} ${WRKSRC}/src/github.com/ryanuber
 	@${MKDIR} ${WRKSRC}/src/github.com/ugorji
+	@${MKDIR} ${WRKSRC}/src/github.com/golang
+	@${MKDIR} ${WRKSRC}/src/github.com/matttproud
+	@${MKDIR} ${WRKSRC}/src/github.com/prometheus
 	@${MV} ${WRKDIR}/circbuf-f092b4f207b6e5cce0569056fba9e1a2735cb6cf \
 		${WRKSRC}/src/github.com/armon/circbuf
-	@${MV} ${WRKDIR}/consul-api-1b81c8e0c4cbf1d382310e4c0dc11221632e79d1 \
-		${WRKSRC}/src/github.com/armon/consul-api
-	@${MV} ${WRKDIR}/go-metrics-2b75159ce5d3641fb35b5a159cff309ac3cf4177 \
+	@${MV} ${WRKDIR}/go-metrics-88b7658f24511c4b885942b26e9ea7a61ee37ebc \
 		${WRKSRC}/src/github.com/armon/go-metrics
-	@${MV} ${WRKDIR}/go-radix-b045fc0ad3587e8620fb42a0dea882cf8c08aef9 \
+	@${MV} ${WRKDIR}/go-radix-e39d623f12e8e41c7b5529e9a9dd67a1e2261f80 \
 		${WRKSRC}/src/github.com/armon/go-radix
-	@${MV} ${WRKDIR}/gomdb-a8e036c4dabe7437014ecf9dbc03c6f6f0766ef8 \
+	@${MV} ${WRKDIR}/gomdb-151f2e08ef45cb0e57d694b2562f351955dff572 \
 		${WRKSRC}/src/github.com/armon/gomdb
+	@${MV} ${WRKDIR}/protobuf-5677a0e3d5e89854c9974e1256839ee23f8233ca \
+		${WRKSRC}/src/github.com/golang/protobuf
 	@${MV} ${WRKDIR}/go-msgpack-71c2886f5a673a35f909803f38ece5810165097b \
 		${WRKSRC}/src/github.com/hashicorp/go-msgpack
-	@${MV} ${WRKDIR}/go-checkpoint-89ef2a697dd8cdb4623097d5bb9acdb19a470767 \
+	@${MV} ${WRKDIR}/go-multierror-fcdddc395df1ddf4247c69bd436e84cfa0733f7e \
+		${WRKSRC}/src/github.com/hashicorp/go-multierror
+	@${MV} ${WRKDIR}/go-checkpoint-88326f6851319068e7b34981032128c0b1a6524d \
 		${WRKSRC}/src/github.com/hashicorp/go-checkpoint
-	@${MV} ${WRKDIR}/go-syslog-ac3963b72ac367e48b1e68a831e62b93fb69091c \
+	@${MV} ${WRKDIR}/go-syslog-42a2b573b664dbf281bd48c3cc12c086b17a39ba \
 		${WRKSRC}/src/github.com/hashicorp/go-syslog
-	@${MV} ${WRKDIR}/golang-lru-253b2dc1ca8bae42c3b5b6e53dd2eab1a7551116 \
+	@${MV} ${WRKDIR}/golang-lru-f09f965649501e2ac1b0c310c632a7bebdbdc1d4 \
 		${WRKSRC}/src/github.com/hashicorp/golang-lru
-	@${MV} ${WRKDIR}/hcl-e51eabcdf801f663738fa12f4340fbad13062738 \
+	@${MV} ${WRKDIR}/hcl-513e04c400ee2e81e97f5e011c08fb42c6f69b84 \
 		${WRKSRC}/src/github.com/hashicorp/hcl
 	@${MV} ${WRKDIR}/logutils-23b0af5510a2d1442103ef83ffcf53eb82f3debc \
 		${WRKSRC}/src/github.com/hashicorp/logutils
-	@${MV} ${WRKDIR}/memberlist-16d947e2d4b3f1fe508ee1d9b6ec34b8fd2e96d8 \
+	@${MV} ${WRKDIR}/memberlist-9a1e242e454d2443df330bdd51a436d5a9058fc4 \
 		${WRKSRC}/src/github.com/hashicorp/memberlist
-	@${MV} ${WRKDIR}/raft-cc9710ab540985954a67c108f414aa3152f5916f \
+	@${MV} ${WRKDIR}/raft-a88bfa8385bc52c1f25d0fc02d1b55a2708d04ab \
 		${WRKSRC}/src/github.com/hashicorp/raft
-	@${MV} ${WRKDIR}/raft-mdb-6f52d0ce62a34e3f5bd29aa4d7068030d700d94a \
+	@${MV} ${WRKDIR}/raft-mdb-4ec3694ffbc74d34f7532e70ef2e9c3546a0c0b0 \
 		${WRKSRC}/src/github.com/hashicorp/raft-mdb
-	@${MV} ${WRKDIR}/serf-0479bc1b942fd84205587f7e73867ac78809966b \
+	@${MV} ${WRKDIR}/serf-cc95df950d69acfd117128c98a3bc6b64c1da3fd \
 		${WRKSRC}/src/github.com/hashicorp/serf
-	@${MV} ${WRKDIR}/terraform-2d117326edb33b7155d1ec9d0ab9d3542ba1b230 \
-		${WRKSRC}/src/github.com/hashicorp/terraform
-	@${MV} ${WRKDIR}/yamux-9feabe6854fadca1abec9cd3bd2a613fe9a34000 \
+	@${MV} ${WRKDIR}/scada-client-c26580cfe35393f6f4bf1b9ba55e6afe33176bae \
+		${WRKSRC}/src/github.com/hashicorp/scada-client
+	@${MV} ${WRKDIR}/yamux-b4f943b3f25da97dec8e26bee1c3269019de070d \
 		${WRKSRC}/src/github.com/hashicorp/yamux
 	@${MV} ${WRKDIR}/muxado-f693c7e88ba316d1a0ae3e205e22a01aa3ec2848 \
 		${WRKSRC}/src/github.com/inconshreveable/muxado
-	@${MV} ${WRKDIR}/dns-dc30c7cd4ed2fc8af73d49da4ee285404958b8bd \
+	@${MV} ${WRKDIR}/dns-64fea017a260b4ccbfbb3f60ab027e0398cd8f6f \
 		${WRKSRC}/src/github.com/miekg/dns
 	@${MV} ${WRKDIR}/cli-e3c2e3d39391e9beb9660ccd6b4bd9a2f38dd8a0 \
 		${WRKSRC}/src/github.com/mitchellh/cli
@@ -136,6 +152,16 @@ post-patch:
 		${WRKSRC}/src/github.com/mitchellh/mapstructure
 	@${MV} ${WRKDIR}/columnize-44cb4788b2ec3c3d158dd3d1b50aba7d66f4b59a \
 		${WRKSRC}/src/github.com/ryanuber/columnize
+	@${MV} ${WRKDIR}/net-rpc-msgpackrpc-d377902b7aba83dd3895837b902f6cf3f71edcb2 \
+		${WRKSRC}/src/github.com/hashicorp/net-rpc-msgpackrpc
+	@${MV} ${WRKDIR}/golang_protobuf_extensions-ba7d65ac66e9da93a714ca18f6d1bc7a0c09100c \
+		${WRKSRC}/src/github.com/matttproud/golang_protobuf_extensions
+	@${MV} ${WRKDIR}/client_golang-38dbb2e26868d15db0275ddbaac0cbe450ec03de \
+		${WRKSRC}/src/github.com/prometheus/client_golang
+	@${MV} ${WRKDIR}/client_model-fa8ad6fec33561be4280a8f0514318c79d7f6cb6 \
+		${WRKSRC}/src/github.com/prometheus/client_model
+	@${MV} ${WRKDIR}/procfs-92faa308558161acab0ada1db048e9996ecec160 \
+		${WRKSRC}/src/github.com/prometheus/procfs
 
 do-build:
 	@cd ${WRKSRC}/src/github.com/hashicorp/consul; ${SETENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build -o bin/consul
diff --git a/sysutils/consul/distinfo b/sysutils/consul/distinfo
index 8c483e5e649f..f96dc4d7d2f4 100644
--- a/sysutils/consul/distinfo
+++ b/sysutils/consul/distinfo
@@ -1,43 +1,45 @@
-SHA256 (consul-0.4.1.tar.gz) = 16e681a7d88b1aa7422767c7bb77caa4ec530b313058d7b2bfd896132b8b63c2
-SIZE (consul-0.4.1.tar.gz) = 1517746
+SHA256 (consul-0.5.0.tar.gz) = 282f561c814fdb1f61106f3bb64b881c8eabc71f79f70f581509714e96f0449a
+SIZE (consul-0.5.0.tar.gz) = 1608079
 SHA256 (armon_circbuf_f092b4f207b6e5cce0569056fba9e1a2735cb6cf.tar.gz) = b67d2ffc0a725b6844895680d52ba4a63757987637c8dabbb2c3e4d836512d52
 SIZE (armon_circbuf_f092b4f207b6e5cce0569056fba9e1a2735cb6cf.tar.gz) = 2748
-SHA256 (armon_consul-api_1b81c8e0c4cbf1d382310e4c0dc11221632e79d1.tar.gz) = 2df35d5b7c181139969d2334edfea50921b3579b9df2759851e4675b260c1493
-SIZE (armon_consul-api_1b81c8e0c4cbf1d382310e4c0dc11221632e79d1.tar.gz) = 17545
-SHA256 (armon_go-metrics_2b75159ce5d3641fb35b5a159cff309ac3cf4177.tar.gz) = 67ab87905e967eae7a9275ddbe3e7ad64b6ce76285e8ae012df347e82cfe512e
-SIZE (armon_go-metrics_2b75159ce5d3641fb35b5a159cff309ac3cf4177.tar.gz) = 10438
-SHA256 (armon_go-radix_b045fc0ad3587e8620fb42a0dea882cf8c08aef9.tar.gz) = 028fa454dbb84f6ff6114d46064dedb1ecc83a337e8712f32fe64100267ddd78
-SIZE (armon_go-radix_b045fc0ad3587e8620fb42a0dea882cf8c08aef9.tar.gz) = 5013
-SHA256 (armon_gomdb_a8e036c4dabe7437014ecf9dbc03c6f6f0766ef8.tar.gz) = 46dbe630e9d3032f44ed94c86f271056fa908f84b733075598ed62a1c2e09345
-SIZE (armon_gomdb_a8e036c4dabe7437014ecf9dbc03c6f6f0766ef8.tar.gz) = 93349
-SHA256 (hashicorp_go-checkpoint_89ef2a697dd8cdb4623097d5bb9acdb19a470767.tar.gz) = 6a2e3d8c78ee937b60e6c8c1a25f3aefc299a948def58287425b1fdda22b243b
-SIZE (hashicorp_go-checkpoint_89ef2a697dd8cdb4623097d5bb9acdb19a470767.tar.gz) = 4437
+SHA256 (golang_protobuf_5677a0e3d5e89854c9974e1256839ee23f8233ca.tar.gz) = 683d5562625ed05baaffc265bfda73a6f9afa04fc1436c98df2c9bba2f3667f1
+SIZE (golang_protobuf_5677a0e3d5e89854c9974e1256839ee23f8233ca.tar.gz) = 133649
+SHA256 (armon_go-metrics_88b7658f24511c4b885942b26e9ea7a61ee37ebc.tar.gz) = 6410bc676927b92b5c01e87255724dd83f92c1a7994a586466d6d781fbc71e33
+SIZE (armon_go-metrics_88b7658f24511c4b885942b26e9ea7a61ee37ebc.tar.gz) = 11059
+SHA256 (armon_go-radix_e39d623f12e8e41c7b5529e9a9dd67a1e2261f80.tar.gz) = f7278ebcd73b9ffcbf7ef52ae42153ad6bc81c6fa91bb4d93eaa4bab86289411
+SIZE (armon_go-radix_e39d623f12e8e41c7b5529e9a9dd67a1e2261f80.tar.gz) = 5177
+SHA256 (armon_gomdb_151f2e08ef45cb0e57d694b2562f351955dff572.tar.gz) = de5119016d4e12885c474f4f1e682c80984b464a0ae2809f28699aeba1badc68
+SIZE (armon_gomdb_151f2e08ef45cb0e57d694b2562f351955dff572.tar.gz) = 100298
+SHA256 (hashicorp_go-checkpoint_88326f6851319068e7b34981032128c0b1a6524d.tar.gz) = ea62599bfbe3ec9b616a8b75a14013ccfc288b8b0ccdcac4dac93c82503d41ae
+SIZE (hashicorp_go-checkpoint_88326f6851319068e7b34981032128c0b1a6524d.tar.gz) = 9830
 SHA256 (hashicorp_go-msgpack_71c2886f5a673a35f909803f38ece5810165097b.tar.gz) = c32b90e67762a375981b38154cae65222bb1aaa7722727d0225d5f8de773e4c8
 SIZE (hashicorp_go-msgpack_71c2886f5a673a35f909803f38ece5810165097b.tar.gz) = 49485
-SHA256 (hashicorp_go-syslog_ac3963b72ac367e48b1e68a831e62b93fb69091c.tar.gz) = 089a6bda3f17d3a4c0545325581da29572d522a934fa601ff872709d1f2a7304
-SIZE (hashicorp_go-syslog_ac3963b72ac367e48b1e68a831e62b93fb69091c.tar.gz) = 4389
-SHA256 (hashicorp_golang-lru_253b2dc1ca8bae42c3b5b6e53dd2eab1a7551116.tar.gz) = 3afb52d3f8255b5db742bc39d223600a1614b8698142836000c7959da21bf0ab
-SIZE (hashicorp_golang-lru_253b2dc1ca8bae42c3b5b6e53dd2eab1a7551116.tar.gz) = 7181
-SHA256 (hashicorp_hcl_e51eabcdf801f663738fa12f4340fbad13062738.tar.gz) = e85880c71414fde6e3eeea887a9cdb4eae40e4c7e0a7b4d4e769f35d35bfd70e
-SIZE (hashicorp_hcl_e51eabcdf801f663738fa12f4340fbad13062738.tar.gz) = 27209
+SHA256 (hashicorp_go-multierror_fcdddc395df1ddf4247c69bd436e84cfa0733f7e.tar.gz) = af90f9be029c091eb011ff25d270772fdb51edf3c6396cf99f224c4e7ad724c3
+SIZE (hashicorp_go-multierror_fcdddc395df1ddf4247c69bd436e84cfa0733f7e.tar.gz) = 8058
+SHA256 (hashicorp_go-syslog_42a2b573b664dbf281bd48c3cc12c086b17a39ba.tar.gz) = 378f5249729661db9d0c65030fbf636f6ec1d60ee926e67abf8c6dd7921d3907
+SIZE (hashicorp_go-syslog_42a2b573b664dbf281bd48c3cc12c086b17a39ba.tar.gz) = 4397
+SHA256 (hashicorp_golang-lru_f09f965649501e2ac1b0c310c632a7bebdbdc1d4.tar.gz) = fa569f45059b204bef6fc8f816be1ac17dd0e2d12eae9a7712bd657596f75b13
+SIZE (hashicorp_golang-lru_f09f965649501e2ac1b0c310c632a7bebdbdc1d4.tar.gz) = 7201
+SHA256 (hashicorp_hcl_513e04c400ee2e81e97f5e011c08fb42c6f69b84.tar.gz) = 109ec067ff8ff7f30538e0d2ba1384c1fe25694c99d56972003b1c669d19d0b2
+SIZE (hashicorp_hcl_513e04c400ee2e81e97f5e011c08fb42c6f69b84.tar.gz) = 28692
 SHA256 (hashicorp_logutils_23b0af5510a2d1442103ef83ffcf53eb82f3debc.tar.gz) = d07a719321f39c5095f7922888cd798c78bf0268499562de8de3fa30acd8cbb2
 SIZE (hashicorp_logutils_23b0af5510a2d1442103ef83ffcf53eb82f3debc.tar.gz) = 7686
-SHA256 (hashicorp_memberlist_16d947e2d4b3f1fe508ee1d9b6ec34b8fd2e96d8.tar.gz) = fdd57e3fadcc37b0b0a5f782d34d9ecf89f0fe6d69107c8c3f48c0c97007114c
-SIZE (hashicorp_memberlist_16d947e2d4b3f1fe508ee1d9b6ec34b8fd2e96d8.tar.gz) = 48996
-SHA256 (hashicorp_raft_cc9710ab540985954a67c108f414aa3152f5916f.tar.gz) = e5c297871e67ce6bbcda26b731f797f2f84275552aeaf37527d6c9a7bfefb3fc
-SIZE (hashicorp_raft_cc9710ab540985954a67c108f414aa3152f5916f.tar.gz) = 54145
-SHA256 (hashicorp_raft-mdb_6f52d0ce62a34e3f5bd29aa4d7068030d700d94a.tar.gz) = bc11b9093692c19c7ee756dc17ca88f20e33cf686b0f31ebb5c74445540fb447
-SIZE (hashicorp_raft-mdb_6f52d0ce62a34e3f5bd29aa4d7068030d700d94a.tar.gz) = 9648
-SHA256 (hashicorp_serf_0479bc1b942fd84205587f7e73867ac78809966b.tar.gz) = 3f1d3b4d14ab033da5a64795261c6f7512d25304cf2eb149ea4c42c0d87912a3
-SIZE (hashicorp_serf_0479bc1b942fd84205587f7e73867ac78809966b.tar.gz) = 570942
-SHA256 (hashicorp_terraform_2d117326edb33b7155d1ec9d0ab9d3542ba1b230.tar.gz) = 3f409a932281010a01a7d7e752decd73fd21a2ac7bae00717b6beab5f069722f
-SIZE (hashicorp_terraform_2d117326edb33b7155d1ec9d0ab9d3542ba1b230.tar.gz) = 3245510
-SHA256 (hashicorp_yamux_9feabe6854fadca1abec9cd3bd2a613fe9a34000.tar.gz) = ecb3f55add94710bc676ae580da78c64add15d34342f09d7f1496d50fa498542
-SIZE (hashicorp_yamux_9feabe6854fadca1abec9cd3bd2a613fe9a34000.tar.gz) = 18591
+SHA256 (hashicorp_memberlist_9a1e242e454d2443df330bdd51a436d5a9058fc4.tar.gz) = 5ea2bb19997bce12b1d67a19611535233a76f84714ec8ecf5efb7e7f2faee5d8
+SIZE (hashicorp_memberlist_9a1e242e454d2443df330bdd51a436d5a9058fc4.tar.gz) = 49719
+SHA256 (hashicorp_raft_a88bfa8385bc52c1f25d0fc02d1b55a2708d04ab.tar.gz) = 4085c391207244adca664c1f76437b4a2d5dd8da36e0172834328091b89c3871
+SIZE (hashicorp_raft_a88bfa8385bc52c1f25d0fc02d1b55a2708d04ab.tar.gz) = 57280
+SHA256 (hashicorp_raft-mdb_4ec3694ffbc74d34f7532e70ef2e9c3546a0c0b0.tar.gz) = 9873fa73d17174e0e7175216848a2a7c58a9c66701459ed4d4866ab063ef58c1
+SIZE (hashicorp_raft-mdb_4ec3694ffbc74d34f7532e70ef2e9c3546a0c0b0.tar.gz) = 9811
+SHA256 (hashicorp_serf_cc95df950d69acfd117128c98a3bc6b64c1da3fd.tar.gz) = 734c9eeef13f4d21fdb42c61d5bcf06ecff48887ce6d001f857e1a5741c4022f
+SIZE (hashicorp_serf_cc95df950d69acfd117128c98a3bc6b64c1da3fd.tar.gz) = 572134
+SHA256 (hashicorp_scada-client_c26580cfe35393f6f4bf1b9ba55e6afe33176bae.tar.gz) = 74d7195f4d7b213cb82278ed34c16808a79923be9009aab7e8f1267d5a6675f7
+SIZE (hashicorp_scada-client_c26580cfe35393f6f4bf1b9ba55e6afe33176bae.tar.gz) = 15805
+SHA256 (hashicorp_yamux_b4f943b3f25da97dec8e26bee1c3269019de070d.tar.gz) = 33f0cc2aeaf2fb2ca0dc87e030a5c7bb1932dff6865e15c3bac6ad9b02e30496
+SIZE (hashicorp_yamux_b4f943b3f25da97dec8e26bee1c3269019de070d.tar.gz) = 18680
 SHA256 (inconshreveable_muxado_f693c7e88ba316d1a0ae3e205e22a01aa3ec2848.tar.gz) = 237354d5acf550d05d20841e0ec6e88cea29ece70fdf8fc73a2d59884ea6be01
 SIZE (inconshreveable_muxado_f693c7e88ba316d1a0ae3e205e22a01aa3ec2848.tar.gz) = 25816
-SHA256 (miekg_dns_dc30c7cd4ed2fc8af73d49da4ee285404958b8bd.tar.gz) = e0e5905fb65b4ff3900de93e429e7cc1f07d3ad8ee0b7d81fa798320fa255c95
-SIZE (miekg_dns_dc30c7cd4ed2fc8af73d49da4ee285404958b8bd.tar.gz) = 109512
+SHA256 (miekg_dns_64fea017a260b4ccbfbb3f60ab027e0398cd8f6f.tar.gz) = 1c32a13a0326fa8646509580453d8464b36e55d3bc1e3d60e23b353cff253930
+SIZE (miekg_dns_64fea017a260b4ccbfbb3f60ab027e0398cd8f6f.tar.gz) = 113168
 SHA256 (mitchellh_cli_e3c2e3d39391e9beb9660ccd6b4bd9a2f38dd8a0.tar.gz) = 0a05aa6d4a4968c00689e6b28575140c3832812bfffe4e909ecbf05e7b7bce8a
 SIZE (mitchellh_cli_e3c2e3d39391e9beb9660ccd6b4bd9a2f38dd8a0.tar.gz) = 12189
 SHA256 (mitchellh_mapstructure_740c764bc6149d3f1806231418adb9f52c11bcbf.tar.gz) = 8cc486fb6ee94d4a5597906fa5ca1c934dcd96ab1e2df6a0923d33024c3dc6a5
@@ -46,5 +48,15 @@ SHA256 (ryanuber_columnize_44cb4788b2ec3c3d158dd3d1b50aba7d66f4b59a.tar.gz) = 50
 SIZE (ryanuber_columnize_44cb4788b2ec3c3d158dd3d1b50aba7d66f4b59a.tar.gz) = 3680
 SHA256 (ugorji_go_e906e395b9d45d3230e800c8ad1f92f99764e753.tar.gz) = 035386ecdb37ee268507890c627f222960839db2757b22a9e64c4947f9f06c4d
 SIZE (ugorji_go_e906e395b9d45d3230e800c8ad1f92f99764e753.tar.gz) = 58411
-SHA256 (0.4.1_web_ui.zip) = e02929ed44f5392cadd5513bdc60b7ab7363d1670d59e64d2422123229962fa0
-SIZE (0.4.1_web_ui.zip) = 248803
+SHA256 (net-rpc-msgpackrpc_d377902b7aba83dd3895837b902f6cf3f71edcb2.tar.gz) = 0eb8244654cf9e461ce6338cdb7c6ab28dc118d425497e5f6045808e24932a0f
+SIZE (net-rpc-msgpackrpc_d377902b7aba83dd3895837b902f6cf3f71edcb2.tar.gz) = 2805
+SHA256 (golang_protobuf_extensions_ba7d65ac66e9da93a714ca18f6d1bc7a0c09100c.tar.gz) = 9f44314e29e16bf598392f0815ea8d1ba4ba519c10cfa085330c41ea41b17da9
+SIZE (golang_protobuf_extensions_ba7d65ac66e9da93a714ca18f6d1bc7a0c09100c.tar.gz) = 9806
+SHA256 (prometheus_client_golang_38dbb2e26868d15db0275ddbaac0cbe450ec03de.tar.gz) = af20838f56cdfcbbd5e4d6989b28dad69ddd80682a2d0332b85093ffe36a1afb
+SIZE (prometheus_client_golang_38dbb2e26868d15db0275ddbaac0cbe450ec03de.tar.gz) = 103898
+SHA256 (prometheus_client_model_fa8ad6fec33561be4280a8f0514318c79d7f6cb6.tar.gz) = d29d75de6645bd67452df27cda2e4a09848161f9ecacc62b1c1818d0a701cff9
+SIZE (prometheus_client_model_fa8ad6fec33561be4280a8f0514318c79d7f6cb6.tar.gz) = 54855
+SHA256 (prometheus_procfs_92faa308558161acab0ada1db048e9996ecec160.tar.gz) = fafefa92613aec2aa2f411d98c7f677c7beb7cb3bc78f961a900ae5b49af061c
+SIZE (prometheus_procfs_92faa308558161acab0ada1db048e9996ecec160.tar.gz) = 11214
+SHA256 (0.5.0_web_ui.zip) = 0081d08be9c0b1172939e92af5a7cf9ba4f90e54fae24a353299503b24bb8be9
+SIZE (0.5.0_web_ui.zip) = 252567
diff --git a/sysutils/consul/files/patch-deps_v0-5-0.json b/sysutils/consul/files/patch-deps_v0-5-0.json
new file mode 100644
index 000000000000..5dcf6e45fee6
--- /dev/null
+++ b/sysutils/consul/files/patch-deps_v0-5-0.json
@@ -0,0 +1,145 @@
+--- deps/v0-5-0.json.orig	2015-04-05 04:09:06 UTC
++++ deps/v0-5-0.json
+@@ -0,0 +1,142 @@
++{
++	"ImportPath": "github.com/hashicorp/consul",
++	"GoVersion": "go1.4.2",
++	"Deps": [
++		{
++			"ImportPath": "github.com/armon/circbuf",
++			"Rev": "f092b4f207b6e5cce0569056fba9e1a2735cb6cf"
++		},
++		{
++			"ImportPath": "github.com/armon/go-metrics",
++			"Rev": "88b7658f24511c4b885942b26e9ea7a61ee37ebc"
++		},
++		{
++			"ImportPath": "github.com/armon/go-radix",
++			"Rev": "e39d623f12e8e41c7b5529e9a9dd67a1e2261f80"
++		},
++		{
++			"ImportPath": "github.com/armon/gomdb",
++			"Rev": "151f2e08ef45cb0e57d694b2562f351955dff572"
++		},
++		{
++			"ImportPath": "github.com/golang/protobuf/proto",
++			"Rev": "5677a0e3d5e89854c9974e1256839ee23f8233ca"
++		},
++		{
++			"ImportPath": "github.com/hashicorp/go-checkpoint",
++			"Rev": "88326f6851319068e7b34981032128c0b1a6524d"
++		},
++		{
++			"ImportPath": "github.com/hashicorp/go-msgpack/codec",
++			"Rev": "71c2886f5a673a35f909803f38ece5810165097b"
++		},
++		{
++			"ImportPath": "github.com/hashicorp/go-multierror",
++			"Rev": "fcdddc395df1ddf4247c69bd436e84cfa0733f7e"
++		},
++		{
++			"ImportPath": "github.com/hashicorp/go-syslog",
++			"Rev": "42a2b573b664dbf281bd48c3cc12c086b17a39ba"
++		},
++		{
++			"ImportPath": "github.com/hashicorp/golang-lru",
++			"Rev": "f09f965649501e2ac1b0c310c632a7bebdbdc1d4"
++		},
++		{
++			"ImportPath": "github.com/hashicorp/hcl",
++			"Rev": "513e04c400ee2e81e97f5e011c08fb42c6f69b84"
++		},
++		{
++			"ImportPath": "github.com/hashicorp/logutils",
++			"Rev": "23b0af5510a2d1442103ef83ffcf53eb82f3debc"
++		},
++		{
++			"ImportPath": "github.com/hashicorp/memberlist",
++			"Rev": "9a1e242e454d2443df330bdd51a436d5a9058fc4"
++		},
++		{
++			"ImportPath": "github.com/hashicorp/net-rpc-msgpackrpc",
++			"Rev": "d377902b7aba83dd3895837b902f6cf3f71edcb2"
++		},
++		{
++			"ImportPath": "github.com/hashicorp/raft",
++			"Rev": "a88bfa8385bc52c1f25d0fc02d1b55a2708d04ab"
++		},
++		{
++			"ImportPath": "github.com/hashicorp/raft-mdb",
++			"Rev": "4ec3694ffbc74d34f7532e70ef2e9c3546a0c0b0"
++		},
++		{
++			"ImportPath": "github.com/hashicorp/scada-client",
++			"Rev": "c26580cfe35393f6f4bf1b9ba55e6afe33176bae"
++		},
++		{
++			"ImportPath": "github.com/hashicorp/serf/serf",
++			"Comment": "v0.6.4-3-gcc95df9",
++			"Rev": "cc95df950d69acfd117128c98a3bc6b64c1da3fd"
++		},
++		{
++			"ImportPath": "github.com/hashicorp/yamux",
++			"Rev": "b4f943b3f25da97dec8e26bee1c3269019de070d"
++		},
++		{
++			"ImportPath": "github.com/inconshreveable/muxado",
++			"Rev": "f693c7e88ba316d1a0ae3e205e22a01aa3ec2848"
++		},
++		{
++			"ImportPath": "github.com/matttproud/golang_protobuf_extensions/ext",
++			"Rev": "ba7d65ac66e9da93a714ca18f6d1bc7a0c09100c"
++		},
++		{
++			"ImportPath": "github.com/miekg/dns",
++			"Rev": "64fea017a260b4ccbfbb3f60ab027e0398cd8f6f"
++		},
++		{
++			"ImportPath": "github.com/mitchellh/cli",
++			"Rev": "e3c2e3d39391e9beb9660ccd6b4bd9a2f38dd8a0"
++		},
++		{
++			"ImportPath": "github.com/mitchellh/mapstructure",
++			"Rev": "442e588f213303bec7936deba67901f8fc8f18b1"
++		},
++		{
++			"ImportPath": "github.com/prometheus/client_golang/_vendor/goautoneg",
++			"Comment": "0.1.0-33-g38dbb2e",
++			"Rev": "38dbb2e26868d15db0275ddbaac0cbe450ec03de"
++		},
++		{
++			"ImportPath": "github.com/prometheus/client_golang/_vendor/perks/quantile",
++			"Comment": "0.1.0-33-g38dbb2e",
++			"Rev": "38dbb2e26868d15db0275ddbaac0cbe450ec03de"
++		},
++		{
++			"ImportPath": "github.com/prometheus/client_golang/model",
++			"Comment": "0.1.0-33-g38dbb2e",
++			"Rev": "38dbb2e26868d15db0275ddbaac0cbe450ec03de"
++		},
++		{
++			"ImportPath": "github.com/prometheus/client_golang/prometheus",
++			"Comment": "0.1.0-33-g38dbb2e",
++			"Rev": "38dbb2e26868d15db0275ddbaac0cbe450ec03de"
++		},
++		{
++			"ImportPath": "github.com/prometheus/client_golang/text",
++			"Comment": "0.1.0-33-g38dbb2e",
++			"Rev": "38dbb2e26868d15db0275ddbaac0cbe450ec03de"
++		},
++		{
++			"ImportPath": "github.com/prometheus/client_model/go",
++			"Comment": "model-0.0.2-12-gfa8ad6f",
++			"Rev": "fa8ad6fec33561be4280a8f0514318c79d7f6cb6"
++		},
++		{
++			"ImportPath": "github.com/prometheus/procfs",
++			"Rev": "92faa308558161acab0ada1db048e9996ecec160"
++		},
++		{
++			"ImportPath": "github.com/ryanuber/columnize",
++			"Comment": "v2.0.1-6-g44cb478",
++			"Rev": "44cb4788b2ec3c3d158dd3d1b50aba7d66f4b59a"
++		}
++	]
++}
diff --git a/sysutils/consul/pkg-plist b/sysutils/consul/pkg-plist
index 06f0e53dc163..a50fee416eab 100644
--- a/sysutils/consul/pkg-plist
+++ b/sysutils/consul/pkg-plist
@@ -3,6 +3,7 @@ bin/consul
 %%DATADIR%%/index.html
 %%DATADIR%%/static/application.min.js
 %%DATADIR%%/static/base.css
+%%DATADIR%%/static/base.css.map
 %%DATADIR%%/static/bootstrap.min.css
 %%DATADIR%%/static/consul-logo.png
 %%DATADIR%%/static/favicon.png