4 files changed, 176 insertions, 139 deletions

diff --git a/sysutils/terraform/Makefile b/sysutils/terraform/Makefile
index 6055b44c94fe..b99312c03bf9 100644
--- a/sysutils/terraform/Makefile
+++ b/sysutils/terraform/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	terraform
-PORTVERSION=	0.5.3
-PORTREVISION=	1
+PORTVERSION=	0.6.1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	sysutils
 PKGNAMEPREFIX=	hashicorp-
@@ -13,39 +12,59 @@ COMMENT=	Provides a common configuration to launch infrastructure
 BUILD_DEPENDS=	${LOCALBASE}/bin/go:${PORTSDIR}/lang/go
 
 USE_GITHUB=	yes
-GH_ACCOUNT=	hashicorp:DEFAULT,atlasgo,consul,errwrap,gocheckpoint,gomultierror,goversion,hcl,yamux \
-		mitchellh:cli,colorstring,copystructure,gohomedir,mapstructure,osext,panicwrap,prefixedio,reflectwalk,golinereader,packer \
-		awslabs:awssdkgo vaughan0:goini golang:crypto,oauth2,net \
-		pearkes:cloudflare,digitalocean,dnsimple,mailgun xanzy:cloudstack \
-		soniah:dnsmadeeasy imdario:mergo fsouza:godocker google:apiclient GoogleCloudPlatform:gcloud \
-		cyberdelia:heroku pborman:uuid rackspace:gophercloud dylanmei:winrmtest,iso8601 masterzen:winrm,simplexml,xmlpath \
-		packer-community:winrmcp nu7hatch:gouuid satori:suuid armon:circbuf
+GH_ACCOUNT=	hashicorp:DEFAULT,atlasgo,consul,errwrap,gocheckpoint \
+		hashicorp:gomultierror,goversion,hcl,yamux \
+		mitchellh:cli,colorstring,copystructure,gohomedir \
+		mitchellh:mapstructure,osext,panicwrap,prefixedio \
+		mitchellh:reflectwalk,golinereader,packer \
+		google:apiclient Azure:asfg,gpkcs aws:awssdkgo armon:circbuf \
+		pearkes:cloudflare,digitalocean,dnsimple,mailgun \
+		xanzy:cloudstack golang:crypto,oauth2,net soniah:dnsmadeeasy \
+		GoogleCloudPlatform:gcloud fsouza:godocker vaughan0:goini \
+		rackspace:gophercloud nu7hatch:gouuid cyberdelia:heroku \
+		imdario:mergo satori:suuid pborman:uuid \
+		masterzen:winrm,simplexml,xmlpath packer-community:winrmcp \
+		dylanmei:winrmtest,iso8601
 GH_PROJECT=	atlas-go:atlasgo consul:consul errwrap:errwrap \
-		go-checkpoint:gocheckpoint go-multierror:gomultierror go-version:goversion \
-		hcl:hcl yamux:yamux cli:cli colorstring:colorstring copystructure:copystructure \
-		go-homedir:gohomedir mapstructure:mapstructure osext:osext panicwrap:panicwrap \
-		prefixedio:prefixedio reflectwalk:reflectwalk go-ini:goini aws-sdk-go:awssdkgo \
-		crypto:crypto cloudflare:cloudflare go-cloudstack:cloudstack digitalocean:digitalocean \
-		dnsmadeeasy:dnsmadeeasy mergo:mergo dnsimple:dnsimple go-dockerclient:godocker oauth2:oauth2 \
-		net:net google-api-go-client:apiclient gcloud-golang:gcloud heroku-go:heroku \
-		uuid:uuid mailgun:mailgun gophercloud:gophercloud winrmtest:winrmtest \
-		winrm:winrm winrmcp:winrmcp go-linereader:golinereader iso8601:iso8601 \
-		simplexml:simplexml packer:packer gouuid:gouuid go.uuid:suuid xmlpath:xmlpath circbuf:circbuf
-GH_TAGNAME=	6a87d5f:atlasgo 9417fd3:consul 7554cd9:errwrap 88326f6:gocheckpoint fcdddc3:gomultierror \
-		999359b:goversion 513e04c:hcl b2e5585:yamux 6cc8bc5:cli 61164e4:colorstring 6fc6626:copystructure \
-		1f6da4a:gohomedir 442e588:mapstructure 0dd3f91:osext 45cbfd3:panicwrap 89d9b53:prefixedio 242be0c:reflectwalk \
-		43d7c58:awssdkgo a98ad7e:goini c10c31b:crypto 19e280b:cloudflare f73f6ff:cloudstack e966f00:digitalocean \
-		5578a8c:dnsmadeeasy 2fcac99:mergo 1e0c2b0:dnsimple f95d189:godocker b5adcc2:oauth2 589db58:net \
-		d56f328:apiclient faa320c:gcloud 594d483:heroku ca53cad:uuid 5b02e7e:mailgun 9ad4137:gophercloud \
-		3e9661c:winrmtest 1323390:winrm 650a91d:winrmcp 07bab5f:golinereader 2075bf1:iso8601 \
-		95ba304:simplexml 350a5f8:packer 179d4d0:gouuid 7c7f202:suuid 13f4951:xmlpath f092b4f:circbuf
+		go-checkpoint:gocheckpoint go-multierror:gomultierror \
+		go-version:goversion hcl:hcl yamux:yamux cli:cli \
+		colorstring:colorstring copystructure:copystructure \
+		go-homedir:gohomedir mapstructure:mapstructure osext:osext \
+		panicwrap:panicwrap prefixedio:prefixedio \
+		reflectwalk:reflectwalk go-linereader:golinereader \
+		packer:packer google-api-go-client:apiclient \
+		azure-sdk-for-go:asfg go-pkcs12:gpkcs aws-sdk-go:awssdkgo \
+		circbuf:circbuf cloudflare:cloudflare digitalocean:digitalocean \
+		dnsimple:dnsimple mailgun:mailgun go-cloudstack:cloudstack \
+		crypto:crypto oauth2:oauth2 net:net dnsmadeeasy:dnsmadeeasy \
+		gcloud-golang:gcloud go-dockerclient:godocker go-ini:goini \
+		gophercloud:gophercloud gouuid:gouuid heroku-go:heroku \
+		mergo:mergo go.uuid:suuid uuid:uuid winrm:winrm \
+		simplexml:simplexml xmlpath:xmlpath winrmcp:winrmcp \
+		winrmtest:winrmtest iso8601:iso8601
+GH_TAGNAME=	785958f:atlasgo c34bcb4:consul 7554cd9:errwrap \
+		88326f6:gocheckpoint 56912fb:gomultierror 999359b:goversion \
+		5486421:hcl 8e00b30:yamux 8102d0e:cli 61164e4:colorstring \
+		6fc6626:copystructure 1f6da4a:gohomedir 281073e:mapstructure \
+		0dd3f91:osext 45cbfd3:panicwrap 89d9b53:prefixedio \
+		eecf4c7:reflectwalk 07bab5f:golinereader 2010a0c:packer \
+		18450f4:apiclient 9197765:asfg a635c06:gpkcs 2a6648c:awssdkgo \
+		f092b4f:circbuf 19e280b:cloudflare e966f00:digitalocean \
+		2a807d1:dnsimple 5b02e7e:mailgun 0031956:cloudstack \
+		7d5b0be:crypto 8914e50:oauth2 f0cf018:net 5578a8c:dnsmadeeasy \
+		522a8ce:gcloud f6e9f53:godocker a98ad7e:goini \
+		e83aa01:gophercloud 179d4d0:gouuid 594d483:heroku 61a5285:mergo \
+		afe1e2d:suuid ed3ca8a:uuid 23128e7:winrm 95ba304:simplexml \
+		13f4951:xmlpath 743b1af:winrmcp 3e9661c:winrmtest \
+		2075bf1:iso8601
 
 STRIP=		# stripping can break go binaries
 
-PLUGINS=	provider-atlas provider-aws provider-cloudflare provider-cloudstack \
-		provider-consul provider-digitalocean provider-dme provider-dnsimple \
-		provider-docker provider-google provider-heroku provider-mailgun \
-		provider-null provider-openstack provider-template provider-terraform \
+PLUGINS=	provider-atlas provider-aws provider-azure provider-cloudflare \
+		provider-cloudstack provider-consul provider-digitalocean \
+		provider-dme provider-dnsimple provider-docker provider-google \
+		provider-heroku provider-mailgun provider-null \
+		provider-openstack provider-template provider-terraform \
 		provisioner-chef provisioner-file provisioner-local-exec \
 		provisioner-remote-exec
 
@@ -60,73 +79,78 @@ post-extract:
 	@${MV} ${WRKSRC}/${src} \
 		${WRKSRC}/src/github.com/hashicorp/${PORTNAME}
 .endfor
-	@${MKDIR} ${WRKSRC}/src/github.com/mitchellh
+	@${MKDIR} ${WRKSRC}/src/code.google.com/p/go-uuid
+	@${MKDIR} ${WRKSRC}/src/github.com/Azure
+	@${MKDIR} ${WRKSRC}/src/github.com/armon
+	@${MKDIR} ${WRKSRC}/src/github.com/aws
 	@${MKDIR} ${WRKSRC}/src/github.com/awslabs
-	@${MKDIR} ${WRKSRC}/src/github.com/vaughan0
-	@${MKDIR} ${WRKSRC}/src/github.com/pearkes
-	@${MKDIR} ${WRKSRC}/src/github.com/xanzy
-	@${MKDIR} ${WRKSRC}/src/github.com/soniah
-	@${MKDIR} ${WRKSRC}/src/github.com/imdario
-	@${MKDIR} ${WRKSRC}/src/github.com/fsouza
-	@${MKDIR} ${WRKSRC}/src/github.com/golang
 	@${MKDIR} ${WRKSRC}/src/github.com/cyberdelia
-	@${MKDIR} ${WRKSRC}/src/github.com/rackspace
 	@${MKDIR} ${WRKSRC}/src/github.com/dylanmei
+	@${MKDIR} ${WRKSRC}/src/github.com/fsouza
+	@${MKDIR} ${WRKSRC}/src/github.com/golang
+	@${MKDIR} ${WRKSRC}/src/github.com/imdario
 	@${MKDIR} ${WRKSRC}/src/github.com/masterzen
-	@${MKDIR} ${WRKSRC}/src/github.com/packer-community
+	@${MKDIR} ${WRKSRC}/src/github.com/mitchellh
 	@${MKDIR} ${WRKSRC}/src/github.com/nu7hatch
+	@${MKDIR} ${WRKSRC}/src/github.com/packer-community
+	@${MKDIR} ${WRKSRC}/src/github.com/pearkes
+	@${MKDIR} ${WRKSRC}/src/github.com/rackspace
 	@${MKDIR} ${WRKSRC}/src/github.com/satori
-	@${MKDIR} ${WRKSRC}/src/github.com/armon
-	@${MKDIR} ${WRKSRC}/src/google.golang.org
+	@${MKDIR} ${WRKSRC}/src/github.com/soniah
+	@${MKDIR} ${WRKSRC}/src/github.com/vaughan0
+	@${MKDIR} ${WRKSRC}/src/github.com/xanzy
 	@${MKDIR} ${WRKSRC}/src/golang.org/x
-	@${MKDIR} ${WRKSRC}/src/code.google.com/p/go-uuid
+	@${MKDIR} ${WRKSRC}/src/google.golang.org
+	@${MV} ${WRKSRC_apiclient} ${WRKSRC}/src/google.golang.org/api
+	@${MV} ${WRKSRC_asfg} ${WRKSRC}/src/github.com/Azure/azure-sdk-for-go
 	@${MV} ${WRKSRC_atlasgo} ${WRKSRC}/src/github.com/hashicorp/atlas-go
-	@${MV} ${WRKSRC_osext} ${WRKSRC}/src/github.com/mitchellh/osext
-	@${MV} ${WRKSRC_panicwrap} ${WRKSRC}/src/github.com/mitchellh/panicwrap
-	@${MV} ${WRKSRC_prefixedio} ${WRKSRC}/src/github.com/mitchellh/prefixedio
-	@${MV} ${WRKSRC_reflectwalk} ${WRKSRC}/src/github.com/mitchellh/reflectwalk
-	@${MV} ${WRKSRC_mapstructure} ${WRKSRC}/src/github.com/mitchellh/mapstructure
-	@${MV} ${WRKSRC_gohomedir} ${WRKSRC}/src/github.com/mitchellh/go-homedir
-	@${MV} ${WRKSRC_copystructure} ${WRKSRC}/src/github.com/mitchellh/copystructure
-	@${MV} ${WRKSRC_colorstring} ${WRKSRC}/src/github.com/mitchellh/colorstring
+	@${CP} -r ${WRKSRC_awssdkgo} ${WRKSRC}/src/github.com/awslabs/aws-sdk-go
+	@${MV} ${WRKSRC_awssdkgo} ${WRKSRC}/src/github.com/aws/aws-sdk-go
+	@${MV} ${WRKSRC_circbuf} ${WRKSRC}/src/github.com/armon/circbuf
 	@${MV} ${WRKSRC_cli} ${WRKSRC}/src/github.com/mitchellh/cli
-	@${MV} ${WRKSRC_hcl} ${WRKSRC}/src/github.com/hashicorp/hcl
-	@${MV} ${WRKSRC_goversion} ${WRKSRC}/src/github.com/hashicorp/go-version
-	@${MV} ${WRKSRC_gomultierror} ${WRKSRC}/src/github.com/hashicorp/go-multierror
-	@${MV} ${WRKSRC_gocheckpoint} ${WRKSRC}/src/github.com/hashicorp/go-checkpoint
-	@${MV} ${WRKSRC_errwrap} ${WRKSRC}/src/github.com/hashicorp/errwrap
-	@${MV} ${WRKSRC_consul} ${WRKSRC}/src/github.com/hashicorp/consul
-	@${MV} ${WRKSRC_yamux} ${WRKSRC}/src/github.com/hashicorp/yamux
-	@${MV} ${WRKSRC_awssdkgo} ${WRKSRC}/src/github.com/awslabs/aws-sdk-go
-	@${MV} ${WRKSRC_goini} ${WRKSRC}/src/github.com/vaughan0/go-ini
-	@${MV} ${WRKSRC_crypto} ${WRKSRC}/src/golang.org/x/crypto
 	@${MV} ${WRKSRC_cloudflare} ${WRKSRC}/src/github.com/pearkes/cloudflare
 	@${MV} ${WRKSRC_cloudstack} ${WRKSRC}/src/github.com/xanzy/go-cloudstack
+	@${MV} ${WRKSRC_colorstring} ${WRKSRC}/src/github.com/mitchellh/colorstring
+	@${MV} ${WRKSRC_consul} ${WRKSRC}/src/github.com/hashicorp/consul
+	@${MV} ${WRKSRC_copystructure} ${WRKSRC}/src/github.com/mitchellh/copystructure
+	@${MV} ${WRKSRC_crypto} ${WRKSRC}/src/golang.org/x/crypto
 	@${MV} ${WRKSRC_digitalocean} ${WRKSRC}/src/github.com/pearkes/digitalocean
-	@${MV} ${WRKSRC_dnsmadeeasy} ${WRKSRC}/src/github.com/soniah/dnsmadeeasy
-	@${MV} ${WRKSRC_mergo} ${WRKSRC}/src/github.com/imdario/mergo
 	@${MV} ${WRKSRC_dnsimple} ${WRKSRC}/src/github.com/pearkes/dnsimple
-	@${MV} ${WRKSRC_godocker} ${WRKSRC}/src/github.com/fsouza/go-dockerclient
-	@${MV} ${WRKSRC_oauth2} ${WRKSRC}/src/golang.org/x/oauth2
-	@${CP} -r ${WRKSRC_net} ${WRKSRC}/src/golang.org/x/net
-	@${MV} ${WRKSRC_net} ${WRKSRC}/src/github.com/golang/net
-	@${MV} ${WRKSRC_apiclient} ${WRKSRC}/src/google.golang.org/api
+	@${MV} ${WRKSRC_dnsmadeeasy} ${WRKSRC}/src/github.com/soniah/dnsmadeeasy
+	@${MV} ${WRKSRC_errwrap} ${WRKSRC}/src/github.com/hashicorp/errwrap
 	@${MV} ${WRKSRC_gcloud} ${WRKSRC}/src/google.golang.org/cloud
-	@${MV} ${WRKSRC_heroku} ${WRKSRC}/src/github.com/cyberdelia/heroku-go
-	@${MV} ${WRKSRC_uuid} ${WRKSRC}/src/code.google.com/p/go-uuid/uuid
-	@${MV} ${WRKSRC_mailgun} ${WRKSRC}/src/github.com/pearkes/mailgun
-	@${MV} ${WRKSRC_gophercloud} ${WRKSRC}/src/github.com/rackspace/gophercloud
-	@${MV} ${WRKSRC_winrmtest} ${WRKSRC}/src/github.com/dylanmei/winrmtest
-	@${MV} ${WRKSRC_winrm} ${WRKSRC}/src/github.com/masterzen/winrm
-	@${MV} ${WRKSRC_winrmcp} ${WRKSRC}/src/github.com/packer-community/winrmcp
+	@${MV} ${WRKSRC_gocheckpoint} ${WRKSRC}/src/github.com/hashicorp/go-checkpoint
+	@${MV} ${WRKSRC_godocker} ${WRKSRC}/src/github.com/fsouza/go-dockerclient
+	@${MV} ${WRKSRC_gohomedir} ${WRKSRC}/src/github.com/mitchellh/go-homedir
+	@${MV} ${WRKSRC_goini} ${WRKSRC}/src/github.com/vaughan0/go-ini
 	@${MV} ${WRKSRC_golinereader} ${WRKSRC}/src/github.com/mitchellh/go-linereader
+	@${MV} ${WRKSRC_gomultierror} ${WRKSRC}/src/github.com/hashicorp/go-multierror
+	@${MV} ${WRKSRC_gophercloud} ${WRKSRC}/src/github.com/rackspace/gophercloud
+	@${MV} ${WRKSRC_gouuid} ${WRKSRC}/src/github.com/nu7hatch/gouuid
+	@${MV} ${WRKSRC_goversion} ${WRKSRC}/src/github.com/hashicorp/go-version
+	@${MV} ${WRKSRC_gpkcs} ${WRKSRC}/src/github.com/Azure/go-pkcs12
+	@${MV} ${WRKSRC_hcl} ${WRKSRC}/src/github.com/hashicorp/hcl
+	@${MV} ${WRKSRC_heroku} ${WRKSRC}/src/github.com/cyberdelia/heroku-go
 	@${MV} ${WRKSRC_iso8601} ${WRKSRC}/src/github.com/dylanmei/iso8601
-	@${MV} ${WRKSRC_simplexml} ${WRKSRC}/src/github.com/masterzen/simplexml
+	@${MV} ${WRKSRC_mailgun} ${WRKSRC}/src/github.com/pearkes/mailgun
+	@${MV} ${WRKSRC_mapstructure} ${WRKSRC}/src/github.com/mitchellh/mapstructure
+	@${MV} ${WRKSRC_mergo} ${WRKSRC}/src/github.com/imdario/mergo
+	@${CP} -r ${WRKSRC_net} ${WRKSRC}/src/golang.org/x/net
+	@${MV} ${WRKSRC_net} ${WRKSRC}/src/github.com/golang/net
+	@${MV} ${WRKSRC_oauth2} ${WRKSRC}/src/golang.org/x/oauth2
+	@${MV} ${WRKSRC_osext} ${WRKSRC}/src/github.com/mitchellh/osext
 	@${MV} ${WRKSRC_packer} ${WRKSRC}/src/github.com/mitchellh/packer
-	@${MV} ${WRKSRC_gouuid} ${WRKSRC}/src/github.com/nu7hatch/gouuid
+	@${MV} ${WRKSRC_panicwrap} ${WRKSRC}/src/github.com/mitchellh/panicwrap
+	@${MV} ${WRKSRC_prefixedio} ${WRKSRC}/src/github.com/mitchellh/prefixedio
+	@${MV} ${WRKSRC_reflectwalk} ${WRKSRC}/src/github.com/mitchellh/reflectwalk
+	@${MV} ${WRKSRC_simplexml} ${WRKSRC}/src/github.com/masterzen/simplexml
 	@${MV} ${WRKSRC_suuid} ${WRKSRC}/src/github.com/satori/go.uuid
+	@${MV} ${WRKSRC_uuid}/uuid ${WRKSRC}/src/code.google.com/p/go-uuid/uuid
+	@${MV} ${WRKSRC_winrmcp} ${WRKSRC}/src/github.com/packer-community/winrmcp
+	@${MV} ${WRKSRC_winrmtest} ${WRKSRC}/src/github.com/dylanmei/winrmtest
+	@${MV} ${WRKSRC_winrm} ${WRKSRC}/src/github.com/masterzen/winrm
 	@${MV} ${WRKSRC_xmlpath} ${WRKSRC}/src/github.com/masterzen/xmlpath
-	@${MV} ${WRKSRC_circbuf} ${WRKSRC}/src/github.com/armon/circbuf
+	@${MV} ${WRKSRC_yamux} ${WRKSRC}/src/github.com/hashicorp/yamux
 
 do-build:
 	@cd ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${PORTNAME}; ${SETENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build -o bin/${PORTNAME}
diff --git a/sysutils/terraform/distinfo b/sysutils/terraform/distinfo
index 0ce15a3a995f..fd86fdc97946 100644
--- a/sysutils/terraform/distinfo
+++ b/sysutils/terraform/distinfo
@@ -1,94 +1,98 @@
-SHA256 (hashicorp-terraform-v0.5.3_GH0.tar.gz) = be71d430df5b28deaff815ee775bbb4d8e240b145450d6c027baa6ef0860ca94
-SIZE (hashicorp-terraform-v0.5.3_GH0.tar.gz) = 3749136
-SHA256 (hashicorp-atlas-go-6a87d5f_GH0.tar.gz) = f7f45889f7ed3b0e2402d9cbc9d2b20719fe13c594d4ebbd1e4f60d60501af61
-SIZE (hashicorp-atlas-go-6a87d5f_GH0.tar.gz) = 36565
-SHA256 (hashicorp-consul-9417fd3_GH0.tar.gz) = 71409b84a41f97452a550abfb41f8050df919d2045836150c11acf75d9a2b7a2
-SIZE (hashicorp-consul-9417fd3_GH0.tar.gz) = 1821078
+SHA256 (hashicorp-terraform-v0.6.1_GH0.tar.gz) = dd1b3eebd680e23b0c4279226f3ef149a9e1fa36c905ab63da502c8557b719ab
+SIZE (hashicorp-terraform-v0.6.1_GH0.tar.gz) = 3878025
+SHA256 (hashicorp-atlas-go-785958f_GH0.tar.gz) = 90cfb00f4e50fcca584f87c54bd76d5ccace2017df1c61bb992f2e33bb606e90
+SIZE (hashicorp-atlas-go-785958f_GH0.tar.gz) = 37246
+SHA256 (hashicorp-consul-c34bcb4_GH0.tar.gz) = e289d36e7590da32ebbba76900ea50e0e7d486cd517536b89fca2f2d6e0ee759
+SIZE (hashicorp-consul-c34bcb4_GH0.tar.gz) = 1875310
 SHA256 (hashicorp-errwrap-7554cd9_GH0.tar.gz) = b800e361c15decd0ebb39a0ff02ad046a1fc81021267f8625232f3921617daa0
 SIZE (hashicorp-errwrap-7554cd9_GH0.tar.gz) = 8312
 SHA256 (hashicorp-go-checkpoint-88326f6_GH0.tar.gz) = 49133eeca2707d2c025219f261dd3ebd8155fe22907c412445b8ffc7a4137755
 SIZE (hashicorp-go-checkpoint-88326f6_GH0.tar.gz) = 9826
-SHA256 (hashicorp-go-multierror-fcdddc3_GH0.tar.gz) = e730020ed331e0fed430a5f725de4c5f61aa7f240258f797833d1689efb178b0
-SIZE (hashicorp-go-multierror-fcdddc3_GH0.tar.gz) = 8064
+SHA256 (hashicorp-go-multierror-56912fb_GH0.tar.gz) = de765913740311a2be5f9dd1267a79cfe79ed18c94039a905000acb56068c64a
+SIZE (hashicorp-go-multierror-56912fb_GH0.tar.gz) = 8432
 SHA256 (hashicorp-go-version-999359b_GH0.tar.gz) = 59ebc270b121626de3ccdd34f35b255961e7626876c854d9ddbe9070dc4ce7e6
 SIZE (hashicorp-go-version-999359b_GH0.tar.gz) = 10417
-SHA256 (hashicorp-hcl-513e04c_GH0.tar.gz) = 9cb1e4a7fb176da78d8e9d001faf4290ed3717659f663e37ee5937544f22ee3c
-SIZE (hashicorp-hcl-513e04c_GH0.tar.gz) = 28683
-SHA256 (hashicorp-yamux-b2e5585_GH0.tar.gz) = 38e3b567240898d870c5134cace538bfc7df9105d2d0cdd487fb1bd5e8e895f4
-SIZE (hashicorp-yamux-b2e5585_GH0.tar.gz) = 19245
-SHA256 (mitchellh-cli-6cc8bc5_GH0.tar.gz) = 548d9450e53b527aaa494d060769d91449f2daeeed4ae77e818117b169f19937
-SIZE (mitchellh-cli-6cc8bc5_GH0.tar.gz) = 12683
+SHA256 (hashicorp-hcl-5486421_GH0.tar.gz) = 5a9257d119d3b3be9ce4d432c21db916b140d12bbcafb78e873184895f3e6970
+SIZE (hashicorp-hcl-5486421_GH0.tar.gz) = 28868
+SHA256 (hashicorp-yamux-8e00b30_GH0.tar.gz) = 7d8a8620b710a1e00fa7cb0df889a8a82e0bd8074508cb7922429220163f529b
+SIZE (hashicorp-yamux-8e00b30_GH0.tar.gz) = 19340
+SHA256 (mitchellh-cli-8102d0e_GH0.tar.gz) = 673be64ba7e1e285db690e7c5dc15c416874c2ed135356ea808b5e11c364f380
+SIZE (mitchellh-cli-8102d0e_GH0.tar.gz) = 13045
 SHA256 (mitchellh-colorstring-61164e4_GH0.tar.gz) = aeeca255226de544908e5acf8b5218e5930b0caa16543e3ecd1c64dd74407578
 SIZE (mitchellh-colorstring-61164e4_GH0.tar.gz) = 4324
 SHA256 (mitchellh-copystructure-6fc6626_GH0.tar.gz) = b632b0536ab26766989d11287d798417b7583e4f55928ee2c1100d11a222d64a
 SIZE (mitchellh-copystructure-6fc6626_GH0.tar.gz) = 4029
 SHA256 (mitchellh-go-homedir-1f6da4a_GH0.tar.gz) = 833deeb737da785f28dce3dc349ab229224a1c9694e3636c3588c54171404b24
 SIZE (mitchellh-go-homedir-1f6da4a_GH0.tar.gz) = 2533
-SHA256 (mitchellh-mapstructure-442e588_GH0.tar.gz) = 5ca01f6ba1175733ae94a13e532e9465b11951519dcdcc6693651842ed1d6205
-SIZE (mitchellh-mapstructure-442e588_GH0.tar.gz) = 12216
+SHA256 (mitchellh-mapstructure-281073e_GH0.tar.gz) = e511fe333b7ce7cbe2b1d03e35f8a3d9ed1bf52eb3aca32859fe5f7acb54ea33
+SIZE (mitchellh-mapstructure-281073e_GH0.tar.gz) = 13968
 SHA256 (mitchellh-osext-0dd3f91_GH0.tar.gz) = 3e5374bf20fc761425a8845f05658f3219afd025a871de181ab28b5797a4b5fd
 SIZE (mitchellh-osext-0dd3f91_GH0.tar.gz) = 2787
 SHA256 (mitchellh-panicwrap-45cbfd3_GH0.tar.gz) = 20587733dbdc7623dbe0e8bec3ef0b62e39ce10fe464c6204a74153fc43edf44
 SIZE (mitchellh-panicwrap-45cbfd3_GH0.tar.gz) = 7231
 SHA256 (mitchellh-prefixedio-89d9b53_GH0.tar.gz) = 144419c3adcfe38a90fd18f2c4a156d7e1267430103301cf95363dfa8515dfda
 SIZE (mitchellh-prefixedio-89d9b53_GH0.tar.gz) = 3112
-SHA256 (mitchellh-reflectwalk-242be0c_GH0.tar.gz) = c45c6a1f86290d328970e94f9cd9f974b3509dbb287f93a5675ceae397353d3f
-SIZE (mitchellh-reflectwalk-242be0c_GH0.tar.gz) = 4286
+SHA256 (mitchellh-reflectwalk-eecf4c7_GH0.tar.gz) = a681b9f5f9a8c24d01d9e05a088dc2053fa637060cf4fa8a4232d5ef4f00ca11
+SIZE (mitchellh-reflectwalk-eecf4c7_GH0.tar.gz) = 4272
 SHA256 (mitchellh-go-linereader-07bab5f_GH0.tar.gz) = b95df1b72219bcc4a8e115648d35463eee05a7b0d2d529651866d20397df8ac9
 SIZE (mitchellh-go-linereader-07bab5f_GH0.tar.gz) = 2860
-SHA256 (mitchellh-packer-350a5f8_GH0.tar.gz) = 4e5b47de20290302104656c6953fc967a0cbc1351aafdeeed349d1055b424526
-SIZE (mitchellh-packer-350a5f8_GH0.tar.gz) = 1025095
-SHA256 (awslabs-aws-sdk-go-43d7c58_GH0.tar.gz) = c66520ab6eb956baaef035de4cedbe1bad99e12b6ab075db605b5890226b7a1e
-SIZE (awslabs-aws-sdk-go-43d7c58_GH0.tar.gz) = 1909433
-SHA256 (vaughan0-go-ini-a98ad7e_GH0.tar.gz) = f8daa0afa08af1fdce4747074602078c72f49fd60c7d8dc3d07b6b7e70cd5f82
-SIZE (vaughan0-go-ini-a98ad7e_GH0.tar.gz) = 3694
-SHA256 (golang-crypto-c10c31b_GH0.tar.gz) = 3cf2aac13968f251eabfb8b1201cfcb6c0ddb45c1c8b758f34810259a3870a86
-SIZE (golang-crypto-c10c31b_GH0.tar.gz) = 874020
-SHA256 (golang-oauth2-b5adcc2_GH0.tar.gz) = 5d8237207c887ae19c435ab763ffe2092af8bdd8112f7656ee24069d6cb74661
-SIZE (golang-oauth2-b5adcc2_GH0.tar.gz) = 32037
-SHA256 (golang-net-589db58_GH0.tar.gz) = 6ffe37c47a75d9f3857c79c6cc15a287427c0a1fc6b1a940846f55539d57140d
-SIZE (golang-net-589db58_GH0.tar.gz) = 451724
+SHA256 (mitchellh-packer-2010a0c_GH0.tar.gz) = fb7a50d70aef5df7d76accb2f2f2caa1840d6e3e36fa7ef41f40f6116e0b26fc
+SIZE (mitchellh-packer-2010a0c_GH0.tar.gz) = 1077083
+SHA256 (google-google-api-go-client-18450f4_GH0.tar.gz) = f3bf2d0025170b1ee2d69b5521980766134b3474dd07dbf3c5865767905ce83b
+SIZE (google-google-api-go-client-18450f4_GH0.tar.gz) = 2315879
+SHA256 (Azure-azure-sdk-for-go-9197765_GH0.tar.gz) = 6c2b6086de3adcd51867630423999856372903b5a40871963173fab523455c42
+SIZE (Azure-azure-sdk-for-go-9197765_GH0.tar.gz) = 359472
+SHA256 (Azure-go-pkcs12-a635c06_GH0.tar.gz) = 8a109c2f33fe70d19abf9c5b6d16385ba330b91d7925376efbdcb7f882a9b981
+SIZE (Azure-go-pkcs12-a635c06_GH0.tar.gz) = 18820
+SHA256 (aws-aws-sdk-go-2a6648c_GH0.tar.gz) = fe533313f61d75b9620b4d92c816eb9849719dc99a2f27d989cdab8ac779cc2e
+SIZE (aws-aws-sdk-go-2a6648c_GH0.tar.gz) = 2010207
+SHA256 (armon-circbuf-f092b4f_GH0.tar.gz) = e18e259eab192a3d820ed6d5a813268726ea80acd438d28f2a0cea92b7c94a6b
+SIZE (armon-circbuf-f092b4f_GH0.tar.gz) = 2744
 SHA256 (pearkes-cloudflare-19e280b_GH0.tar.gz) = 3bd369cb77aef6dc165243d3dd0155644a85da1e9a96e5ef1b4dff6c4f4f5f0f
 SIZE (pearkes-cloudflare-19e280b_GH0.tar.gz) = 11722
 SHA256 (pearkes-digitalocean-e966f00_GH0.tar.gz) = 5b51b6e3be95531a5e7cd1d28b09ea3c470d996a5c116fef20a44ef4701e6eed
 SIZE (pearkes-digitalocean-e966f00_GH0.tar.gz) = 14346
-SHA256 (pearkes-dnsimple-1e0c2b0_GH0.tar.gz) = 2b5ed50c91445fe70c506fa8a5b8bb26ce5815ff264ed7a34bd484095f20f4c1
-SIZE (pearkes-dnsimple-1e0c2b0_GH0.tar.gz) = 11285
+SHA256 (pearkes-dnsimple-2a807d1_GH0.tar.gz) = a3e6f459412b90310ab2dbfced366677cc9ae05a2e4fc22e2997b291d1cded88
+SIZE (pearkes-dnsimple-2a807d1_GH0.tar.gz) = 11496
 SHA256 (pearkes-mailgun-5b02e7e_GH0.tar.gz) = ccb1c6507c26a6fa31bc0c285a075a8545e81bc5428a77ebe8a1c6cb2043e2fe
 SIZE (pearkes-mailgun-5b02e7e_GH0.tar.gz) = 10438
-SHA256 (xanzy-go-cloudstack-f73f6ff_GH0.tar.gz) = 35914e88a98438acac408e0ceda520934888592daad938aafb32a2532358e651
-SIZE (xanzy-go-cloudstack-f73f6ff_GH0.tar.gz) = 433150
+SHA256 (xanzy-go-cloudstack-0031956_GH0.tar.gz) = 66d130f296d1c17c27731909e5f1259bcc573a5d760963467072c61b267bba75
+SIZE (xanzy-go-cloudstack-0031956_GH0.tar.gz) = 439984
+SHA256 (golang-crypto-7d5b0be_GH0.tar.gz) = 873c936455a17a83eb5ad94b2c9b5c6b5c593a9205f9fda8b44e57436db79d5f
+SIZE (golang-crypto-7d5b0be_GH0.tar.gz) = 874638
+SHA256 (golang-oauth2-8914e50_GH0.tar.gz) = 966a5e96103684ff98e2de76ab4115935ead5dd24e11cdd9f6f655bd95dbac0d
+SIZE (golang-oauth2-8914e50_GH0.tar.gz) = 32042
+SHA256 (golang-net-f0cf018_GH0.tar.gz) = 42c8f5f7846c359983925e3cffb91be92d9f2d48e36867a61b05be51e10edf65
+SIZE (golang-net-f0cf018_GH0.tar.gz) = 482653
 SHA256 (soniah-dnsmadeeasy-5578a8c_GH0.tar.gz) = 3eecf1e256b06fd8beab9c936e2fd0a8f56e1e296c6183ffcfae349d040d3433
 SIZE (soniah-dnsmadeeasy-5578a8c_GH0.tar.gz) = 12549
-SHA256 (imdario-mergo-2fcac99_GH0.tar.gz) = 7a13bb8d61e604637d972678a8175a3bd04f99b9898c86acce0695d7e0e5bdce
-SIZE (imdario-mergo-2fcac99_GH0.tar.gz) = 8557
-SHA256 (fsouza-go-dockerclient-f95d189_GH0.tar.gz) = 4ea388b57d278a8c90452bcf819889c023995bcdb9b6401758f520941c5195fc
-SIZE (fsouza-go-dockerclient-f95d189_GH0.tar.gz) = 149472
-SHA256 (google-google-api-go-client-d56f328_GH0.tar.gz) = 97dd77892d56ac160d8fbd06aca76ae81d80df943bd8bc7362c0e60fd42fc3ce
-SIZE (google-google-api-go-client-d56f328_GH0.tar.gz) = 2207915
-SHA256 (GoogleCloudPlatform-gcloud-golang-faa320c_GH0.tar.gz) = c8acb176a21f45216ea04bcf0c5a21f3be10a7d91b234ea29887b3ea912c96c6
-SIZE (GoogleCloudPlatform-gcloud-golang-faa320c_GH0.tar.gz) = 147501
+SHA256 (GoogleCloudPlatform-gcloud-golang-522a8ce_GH0.tar.gz) = 146b3ba89bf3ddf2558b359964fa7dcb251bb848f3c2996d4ec513de04066f40
+SIZE (GoogleCloudPlatform-gcloud-golang-522a8ce_GH0.tar.gz) = 164091
+SHA256 (fsouza-go-dockerclient-f6e9f53_GH0.tar.gz) = 027bef9370d64360a57f7a016fd61f1fe31c539ecafe6b11f75749affb3c4f1d
+SIZE (fsouza-go-dockerclient-f6e9f53_GH0.tar.gz) = 188778
+SHA256 (vaughan0-go-ini-a98ad7e_GH0.tar.gz) = f8daa0afa08af1fdce4747074602078c72f49fd60c7d8dc3d07b6b7e70cd5f82
+SIZE (vaughan0-go-ini-a98ad7e_GH0.tar.gz) = 3694
+SHA256 (rackspace-gophercloud-e83aa01_GH0.tar.gz) = 81b454a5b1f00bb5deae30d167eab5a8e940920c514ef1c21bf0cfa37fea9363
+SIZE (rackspace-gophercloud-e83aa01_GH0.tar.gz) = 334904
+SHA256 (nu7hatch-gouuid-179d4d0_GH0.tar.gz) = 8c910070e1acc74e66f727e0ff6a28f84009c941ace87be8766c13f964dab3fc
+SIZE (nu7hatch-gouuid-179d4d0_GH0.tar.gz) = 3737
 SHA256 (cyberdelia-heroku-go-594d483_GH0.tar.gz) = 1c85a72645c4a8bfe366a4bf1e220ce31215bb7b7546c6664b0b040124785804
 SIZE (cyberdelia-heroku-go-594d483_GH0.tar.gz) = 31181
-SHA256 (pborman-uuid-ca53cad_GH0.tar.gz) = def1d2a7acdd938fa87850a950d5f0c93b8a0818651ee756f77d4e63bf446675
-SIZE (pborman-uuid-ca53cad_GH0.tar.gz) = 10017
-SHA256 (rackspace-gophercloud-9ad4137_GH0.tar.gz) = a2bdba32974b7edb1b832ad3a2aa994d89ff3194cb7bdd1b788b10d3369b7bec
-SIZE (rackspace-gophercloud-9ad4137_GH0.tar.gz) = 332248
-SHA256 (dylanmei-winrmtest-3e9661c_GH0.tar.gz) = 1087fc4b04196981b7c1412556e88646619481c9b548caa5aaa9f54cdb4d93d5
-SIZE (dylanmei-winrmtest-3e9661c_GH0.tar.gz) = 3673
-SHA256 (dylanmei-iso8601-2075bf1_GH0.tar.gz) = c0bf90f3cbc2ff0c107f16e44fe5383de8972d6b3555f113e1ac7eeeaf769657
-SIZE (dylanmei-iso8601-2075bf1_GH0.tar.gz) = 2436
-SHA256 (masterzen-winrm-1323390_GH0.tar.gz) = 8d9a39562c4d3a6f9d615916d9ee7d2dbdd974943a31693d8dab9aa5f801cf0a
-SIZE (masterzen-winrm-1323390_GH0.tar.gz) = 22210
+SHA256 (imdario-mergo-61a5285_GH0.tar.gz) = 309d4842eb3bd734305058a92dc00749fa977940f3cd1e83c12427842256c1d3
+SIZE (imdario-mergo-61a5285_GH0.tar.gz) = 8584
+SHA256 (satori-go.uuid-afe1e2d_GH0.tar.gz) = 9a7230686a99098e50ced69108ff06f84e263756f63d38604b24732839f8e436
+SIZE (satori-go.uuid-afe1e2d_GH0.tar.gz) = 6550
+SHA256 (pborman-uuid-ed3ca8a_GH0.tar.gz) = 0030622ed5a677f6382d9cf28e69f40509855df88e82335ab589ce208ebeee58
+SIZE (pborman-uuid-ed3ca8a_GH0.tar.gz) = 41014
+SHA256 (masterzen-winrm-23128e7_GH0.tar.gz) = 8794416b430ea64a15c6c5b9d5b011c2766926d34ffbafc06859fa56f452b873
+SIZE (masterzen-winrm-23128e7_GH0.tar.gz) = 22059
 SHA256 (masterzen-simplexml-95ba304_GH0.tar.gz) = d18f8ed120db84d37772d95a5174b5c3078743074209eb9b08bed108e52a348f
 SIZE (masterzen-simplexml-95ba304_GH0.tar.gz) = 6731
 SHA256 (masterzen-xmlpath-13f4951_GH0.tar.gz) = 8f1b82a29d42616886c080a33dcc0884d5f2fd8579b7c4e8fc0e371b4f645e44
 SIZE (masterzen-xmlpath-13f4951_GH0.tar.gz) = 13320
-SHA256 (packer-community-winrmcp-650a91d_GH0.tar.gz) = f43ff5b87cd52483760d165548305e21c11e2bc3b63e4d6e4729f0515cd789f9
-SIZE (packer-community-winrmcp-650a91d_GH0.tar.gz) = 5968
-SHA256 (nu7hatch-gouuid-179d4d0_GH0.tar.gz) = 8c910070e1acc74e66f727e0ff6a28f84009c941ace87be8766c13f964dab3fc
-SIZE (nu7hatch-gouuid-179d4d0_GH0.tar.gz) = 3737
-SHA256 (satori-go.uuid-7c7f202_GH0.tar.gz) = 329a49c627bcae290a2a3d032e349444a87ff2243beb56d5f15aa64557ca0399
-SIZE (satori-go.uuid-7c7f202_GH0.tar.gz) = 6471
-SHA256 (armon-circbuf-f092b4f_GH0.tar.gz) = e18e259eab192a3d820ed6d5a813268726ea80acd438d28f2a0cea92b7c94a6b
-SIZE (armon-circbuf-f092b4f_GH0.tar.gz) = 2744
+SHA256 (packer-community-winrmcp-743b1af_GH0.tar.gz) = 012dc4d47fe091e7ba825b9ba7d03b0b34d8afb885284ba8396fb2d72a172e36
+SIZE (packer-community-winrmcp-743b1af_GH0.tar.gz) = 5957
+SHA256 (dylanmei-winrmtest-3e9661c_GH0.tar.gz) = 1087fc4b04196981b7c1412556e88646619481c9b548caa5aaa9f54cdb4d93d5
+SIZE (dylanmei-winrmtest-3e9661c_GH0.tar.gz) = 3673
+SHA256 (dylanmei-iso8601-2075bf1_GH0.tar.gz) = c0bf90f3cbc2ff0c107f16e44fe5383de8972d6b3555f113e1ac7eeeaf769657
+SIZE (dylanmei-iso8601-2075bf1_GH0.tar.gz) = 2436
diff --git a/sysutils/terraform/files/patch-src_github.com_fsouza_go-dockerclient_vendor_github.com_Sirupsen_logrus_terminal__bsd.go b/sysutils/terraform/files/patch-src_github.com_fsouza_go-dockerclient_vendor_github.com_Sirupsen_logrus_terminal__bsd.go
new file mode 100644
index 000000000000..9bf457f7f799
--- /dev/null
+++ b/sysutils/terraform/files/patch-src_github.com_fsouza_go-dockerclient_vendor_github.com_Sirupsen_logrus_terminal__bsd.go
@@ -0,0 +1,8 @@
+--- src/github.com/fsouza/go-dockerclient/vendor/github.com/Sirupsen/logrus/terminal_bsd.go.orig	2015-07-17 20:42:10 UTC
++++ src/github.com/fsouza/go-dockerclient/vendor/github.com/Sirupsen/logrus/terminal_bsd.go
+@@ -1,4 +1,4 @@
+-// +build darwin freebsd openbsd netbsd dragonfly
++// +build darwin openbsd netbsd dragonfly
+ 
+ package logrus
+ 
diff --git a/sysutils/terraform/pkg-plist b/sysutils/terraform/pkg-plist
index 0580086ea62a..1715caea8096 100644
--- a/sysutils/terraform/pkg-plist
+++ b/sysutils/terraform/pkg-plist
@@ -1,6 +1,7 @@
 bin/terraform
 bin/terraform-provider-atlas
 bin/terraform-provider-aws
+bin/terraform-provider-azure
 bin/terraform-provider-cloudflare
 bin/terraform-provider-cloudstack
 bin/terraform-provider-consul