3 files changed, 63 insertions, 48 deletions

diff --git a/sysutils/packer/Makefile b/sysutils/packer/Makefile
index 3d750710e57c..04a4c221cb53 100644
--- a/sysutils/packer/Makefile
+++ b/sysutils/packer/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	packer
-PORTVERSION=	0.8.2
+PORTVERSION=	0.8.5
 DISTVERSIONPREFIX=	v
 CATEGORIES=	sysutils
 
@@ -15,11 +15,11 @@ GH_ACCOUNT=	mitchellh:DEFAULT,cli,gofs,govnc,iochan,mapstructure \
 		mitchellh:multistep,osext,panicwrap,prefixedio,reflectwalk \
 		hashicorp:atlas,checkpoint,gomultierror,msgpack,version,yamux \
 		google:apiclient,goquerystr aws:awssdkgo \
-		golang:crypto,net,oauth2 go-fsnotify:fsnotify \
+		golang:crypto,net,oauth2,tools go-fsnotify:fsnotify \
 		GoogleCloudPlatform:gcloud digitalocean:godo vaughan0:goini \
 		rackspace:gophercloud zoutaiqi:gosshold nu7hatch:gouuid \
-		tent:hlink pierrec:lz4,xxhash klauspost:pgzip satori:suuid \
-		ActiveState:tail go-tomb:tomb going:toolkit \
+		tent:hlink pierrec:lz4,xxhash klauspost:compress,cpuid,crc32,pgzip \
+		satori:suuid ActiveState:tail go-tomb:tomb going:toolkit \
 		masterzen:winrm,simplexml,xmlpath packer-community:winrmcp \
 		dylanmei:iso8601,winrmtest
 GH_PROJECT=	cli:cli go-fs:gofs go-vnc:govnc iochan:iochan \
@@ -34,19 +34,21 @@ GH_PROJECT=	cli:cli go-fs:gofs go-vnc:govnc iochan:iochan \
 		gosshold:gosshold gouuid:gouuid http-link-go:hlink lz4:lz4 \
 		xxHash:xxhash pgzip:pgzip go.uuid:suuid tail:tail tomb:tomb \
 		toolkit:toolkit winrm:winrm simplexml:simplexml xmlpath:xmlpath \
-		winrmcp:winrmcp iso8601:iso8601 winrmtest:winrmtest
+		winrmcp:winrmcp iso8601:iso8601 winrmtest:winrmtest \
+		compress:compress cpuid:cpuid crc32:crc32 tools:tools
 GH_TAGNAME=	8102d0e:cli a34c1b9:gofs 723ed98:govnc 87b45ff:iochan \
 		281073e:mapstructure 162146f:multistep 0dd3f91:osext \
 		45cbfd3:panicwrap 89d9b53:prefixedio eecf4c7:reflectwalk \
-		785958f:atlas 88326f6:checkpoint 56912fb:gomultierror \
-		fa3f638:msgpack 999359b:version 8e00b30:yamux 18450f4:apiclient \
-		547ef5a:goquerystr 2a6648c:awssdkgo 7d5b0be:crypto 446d52d:net \
-		8914e50:oauth2 ea925a0:fsnotify f925ac6:gcloud e2a34fa:godo \
-		a98ad7e:goini e83aa01:gophercloud 967f522:gosshold \
+		d1d08e8:atlas 88326f6:checkpoint 56912fb:gomultierror \
+		fa3f638:msgpack 999359b:version 4036a34:yamux e5bf1aa:apiclient \
+		547ef5a:goquerystr 8aa49b7:awssdkgo 173ce04:crypto b026840:net \
+		397fe76:oauth2 ea925a0:fsnotify e34a32f:gcloud 0d77b00:godo \
+		a98ad7e:goini 1d8b6f1:gophercloud 967f522:gosshold \
 		179d4d0:gouuid ac974c6:hlink 4bdd4b0:lz4 284d0fc:xxhash \
-		49eeca5:pgzip afe1e2d:suuid 4b368d1:tail dd63297:tomb \
-		5bff591:toolkit 1323390:winrm 95ba304:simplexml 13f4951:xmlpath \
-		743b1af:winrmcp 2075bf1:iso8601 3e9661c:winrmtest
+		eef48e2:pgzip 6b8e5b5:suuid 4b368d1:tail dd63297:tomb \
+		5bff591:toolkit 27e0cc8:winrm 95ba304:simplexml 13f4951:xmlpath \
+		743b1af:winrmcp 2075bf1:iso8601 3e9661c:winrmtest \
+		058815a:compress 3b0816b:cpuid 55bf046:crc32 4f50f44:tools
 
 STRIP=		# stripping can break go binaries
 
@@ -56,14 +58,15 @@ PLUGINS=	builder-amazon-chroot builder-amazon-ebs \
 	builder-parallels-iso builder-parallels-pvm builder-qemu \
 	builder-virtualbox-iso builder-virtualbox-ovf builder-vmware-iso \
 	builder-vmware-vmx post-processor-atlas post-processor-compress \
-	post-processor-docker-import post-processor-docker-push \
-	post-processor-docker-save post-processor-docker-tag \
-	post-processor-vagrant post-processor-vagrant-cloud \
-	post-processor-vsphere provisioner-ansible-local \
-	provisioner-chef-client provisioner-chef-solo provisioner-file \
-	provisioner-powershell provisioner-puppet-masterless \
+	post-processor-artifice post-processor-docker-import \
+	post-processor-docker-push post-processor-docker-save \
+	post-processor-docker-tag post-processor-vagrant \
+	post-processor-vagrant-cloud post-processor-vsphere \
+	provisioner-ansible-local provisioner-chef-client provisioner-chef-solo \
+	provisioner-file provisioner-powershell provisioner-puppet-masterless \
 	provisioner-puppet-server provisioner-salt-masterless provisioner-shell \
-	provisioner-shell-local provisioner-windows-restart provisioner-windows-shell
+	provisioner-shell-local provisioner-windows-restart \
+	provisioner-windows-shell
 
 post-extract:
 	@${MKDIR} ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${PORTNAME}
@@ -127,6 +130,9 @@ post-extract:
 	@${MV} ${WRKSRC_osext} ${WRKSRC}/src/github.com/mitchellh/osext
 	@${MV} ${WRKSRC_panicwrap} ${WRKSRC}/src/github.com/mitchellh/panicwrap
 	@${MV} ${WRKSRC_pgzip} ${WRKSRC}/src/github.com/klauspost/pgzip
+	@${MV} ${WRKSRC_compress} ${WRKSRC}/src/github.com/klauspost/compress
+	@${MV} ${WRKSRC_cpuid} ${WRKSRC}/src/github.com/klauspost/cpuid
+	@${MV} ${WRKSRC_crc32} ${WRKSRC}/src/github.com/klauspost/crc32
 	@${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
diff --git a/sysutils/packer/distinfo b/sysutils/packer/distinfo
index 4da374a3138d..1d3c6a156502 100644
--- a/sysutils/packer/distinfo
+++ b/sysutils/packer/distinfo
@@ -1,5 +1,5 @@
-SHA256 (mitchellh-packer-v0.8.2_GH0.tar.gz) = 2b594eeec63bbe636f81e5d8784a86920c0b4959bf678384b7d7b93720d52b47
-SIZE (mitchellh-packer-v0.8.2_GH0.tar.gz) = 1077040
+SHA256 (mitchellh-packer-v0.8.5_GH0.tar.gz) = 7bf8946d9a16be81dbdfe12c2f3ff2c714c9c551a9e9d45d1c25ccb37ec40bb6
+SIZE (mitchellh-packer-v0.8.5_GH0.tar.gz) = 1121745
 SHA256 (mitchellh-cli-8102d0e_GH0.tar.gz) = 673be64ba7e1e285db690e7c5dc15c416874c2ed135356ea808b5e11c364f380
 SIZE (mitchellh-cli-8102d0e_GH0.tar.gz) = 13045
 SHA256 (mitchellh-go-fs-a34c1b9_GH0.tar.gz) = 517c42182c0f8f7b5a0d929f488b224383011170855d7ff9f1cf977f519fe257
@@ -20,8 +20,8 @@ SHA256 (mitchellh-prefixedio-89d9b53_GH0.tar.gz) = 144419c3adcfe38a90fd18f2c4a15
 SIZE (mitchellh-prefixedio-89d9b53_GH0.tar.gz) = 3112
 SHA256 (mitchellh-reflectwalk-eecf4c7_GH0.tar.gz) = a681b9f5f9a8c24d01d9e05a088dc2053fa637060cf4fa8a4232d5ef4f00ca11
 SIZE (mitchellh-reflectwalk-eecf4c7_GH0.tar.gz) = 4272
-SHA256 (hashicorp-atlas-go-785958f_GH0.tar.gz) = 90cfb00f4e50fcca584f87c54bd76d5ccace2017df1c61bb992f2e33bb606e90
-SIZE (hashicorp-atlas-go-785958f_GH0.tar.gz) = 37246
+SHA256 (hashicorp-atlas-go-d1d08e8_GH0.tar.gz) = a7b0237a65f3ecfafb634446119ab37de9c7b511b199ccab51dc97e020cc4e57
+SIZE (hashicorp-atlas-go-d1d08e8_GH0.tar.gz) = 37499
 SHA256 (hashicorp-go-checkpoint-88326f6_GH0.tar.gz) = 49133eeca2707d2c025219f261dd3ebd8155fe22907c412445b8ffc7a4137755
 SIZE (hashicorp-go-checkpoint-88326f6_GH0.tar.gz) = 9826
 SHA256 (hashicorp-go-multierror-56912fb_GH0.tar.gz) = de765913740311a2be5f9dd1267a79cfe79ed18c94039a905000acb56068c64a
@@ -30,30 +30,32 @@ SHA256 (hashicorp-go-msgpack-fa3f638_GH0.tar.gz) = 6353c623d5d58c7ca03e2bdac63f9
 SIZE (hashicorp-go-msgpack-fa3f638_GH0.tar.gz) = 49496
 SHA256 (hashicorp-go-version-999359b_GH0.tar.gz) = 59ebc270b121626de3ccdd34f35b255961e7626876c854d9ddbe9070dc4ce7e6
 SIZE (hashicorp-go-version-999359b_GH0.tar.gz) = 10417
-SHA256 (hashicorp-yamux-8e00b30_GH0.tar.gz) = 7d8a8620b710a1e00fa7cb0df889a8a82e0bd8074508cb7922429220163f529b
-SIZE (hashicorp-yamux-8e00b30_GH0.tar.gz) = 19340
-SHA256 (google-google-api-go-client-18450f4_GH0.tar.gz) = f3bf2d0025170b1ee2d69b5521980766134b3474dd07dbf3c5865767905ce83b
-SIZE (google-google-api-go-client-18450f4_GH0.tar.gz) = 2315879
+SHA256 (hashicorp-yamux-4036a34_GH0.tar.gz) = 679b20298845f925b01696a7076359f8d1c42eeee9a863a5195a85e005a9de06
+SIZE (hashicorp-yamux-4036a34_GH0.tar.gz) = 20532
+SHA256 (google-google-api-go-client-e5bf1aa_GH0.tar.gz) = b0b3ee86622fa7a971179286dae061a27e8f612d1f2baa6d736103beb65bd35b
+SIZE (google-google-api-go-client-e5bf1aa_GH0.tar.gz) = 2534296
 SHA256 (google-go-querystring-547ef5a_GH0.tar.gz) = 949a780dfac94ce95521a1eb29d4f4bd4df20a02f8786cf817611b3e52ce0853
 SIZE (google-go-querystring-547ef5a_GH0.tar.gz) = 7228
-SHA256 (aws-aws-sdk-go-2a6648c_GH0.tar.gz) = fe533313f61d75b9620b4d92c816eb9849719dc99a2f27d989cdab8ac779cc2e
-SIZE (aws-aws-sdk-go-2a6648c_GH0.tar.gz) = 2010207
-SHA256 (golang-crypto-7d5b0be_GH0.tar.gz) = 873c936455a17a83eb5ad94b2c9b5c6b5c593a9205f9fda8b44e57436db79d5f
-SIZE (golang-crypto-7d5b0be_GH0.tar.gz) = 874638
-SHA256 (golang-net-446d52d_GH0.tar.gz) = b9ac2d53f4f3ac1fcc5ea88d80a73a69967cd0a301fd2e7edf4d4306f7feed83
-SIZE (golang-net-446d52d_GH0.tar.gz) = 482994
-SHA256 (golang-oauth2-8914e50_GH0.tar.gz) = 966a5e96103684ff98e2de76ab4115935ead5dd24e11cdd9f6f655bd95dbac0d
-SIZE (golang-oauth2-8914e50_GH0.tar.gz) = 32042
+SHA256 (aws-aws-sdk-go-8aa49b7_GH0.tar.gz) = d7eab11eecf94ab7452e953239a61e941b9130225520902e92032aa832e4a7ca
+SIZE (aws-aws-sdk-go-8aa49b7_GH0.tar.gz) = 2135228
+SHA256 (golang-crypto-173ce04_GH0.tar.gz) = 6615441679863f4ca10f3da8b81fcbf0b34f770acb794f0fbf9ac50fc5e71477
+SIZE (golang-crypto-173ce04_GH0.tar.gz) = 876800
+SHA256 (golang-net-b026840_GH0.tar.gz) = 363c55db0f34bfb93133b3c32da06e8b20c6665a200fc14607d6658799c23901
+SIZE (golang-net-b026840_GH0.tar.gz) = 544070
+SHA256 (golang-oauth2-397fe76_GH0.tar.gz) = 2e023cb7a92b8334a88b99737affbad2980f0088d40a51143e8bffd7964462e4
+SIZE (golang-oauth2-397fe76_GH0.tar.gz) = 32501
+SHA256 (golang-tools-4f50f44_GH0.tar.gz) = b588ea2d317557127b2011b11a33f111e067bc396445bdbc6d594ead951fc4dc
+SIZE (golang-tools-4f50f44_GH0.tar.gz) = 1632860
 SHA256 (go-fsnotify-fsnotify-ea925a0_GH0.tar.gz) = 8ceb939c0ac7c214b25f1aa4d5ba4233209af51cbd44941c1a689fd947bda872
 SIZE (go-fsnotify-fsnotify-ea925a0_GH0.tar.gz) = 19562
-SHA256 (GoogleCloudPlatform-gcloud-golang-f925ac6_GH0.tar.gz) = ca2b37b9351164afba715c00d5de91499e801453d8a83d91f8893b9f1ad6b02d
-SIZE (GoogleCloudPlatform-gcloud-golang-f925ac6_GH0.tar.gz) = 164043
-SHA256 (digitalocean-godo-e2a34fa_GH0.tar.gz) = 421e4541f5728c8322a3469e3cb067ffc6e7f69d3a932f444db67406f1b5b7a4
-SIZE (digitalocean-godo-e2a34fa_GH0.tar.gz) = 25495
+SHA256 (GoogleCloudPlatform-gcloud-golang-e34a32f_GH0.tar.gz) = 884f2d60f1d0528dce4382066f1b30ae5fb9457dfd2a8781af8da1cdc8956275
+SIZE (GoogleCloudPlatform-gcloud-golang-e34a32f_GH0.tar.gz) = 168341
+SHA256 (digitalocean-godo-0d77b00_GH0.tar.gz) = 248bb5f086ddbdc171ab9fe36161bbb33c9c08a681817b7b8b1a4529e3242fa7
+SIZE (digitalocean-godo-0d77b00_GH0.tar.gz) = 25521
 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 (rackspace-gophercloud-1d8b6f1_GH0.tar.gz) = 84c2593295151ac47eef6ff006c5085b6b0b62e198e31919b46394377cdfef0d
+SIZE (rackspace-gophercloud-1d8b6f1_GH0.tar.gz) = 338890
 SHA256 (zoutaiqi-gosshold-967f522_GH0.tar.gz) = 25592a2b7c8ac3b79c0701dc2af2786aee986799e1512e9848c415dbc4200868
 SIZE (zoutaiqi-gosshold-967f522_GH0.tar.gz) = 82109
 SHA256 (nu7hatch-gouuid-179d4d0_GH0.tar.gz) = 8c910070e1acc74e66f727e0ff6a28f84009c941ace87be8766c13f964dab3fc
@@ -64,18 +66,24 @@ SHA256 (pierrec-lz4-4bdd4b0_GH0.tar.gz) = cee8101858a3817729be800ed88639ec5b123c
 SIZE (pierrec-lz4-4bdd4b0_GH0.tar.gz) = 14920
 SHA256 (pierrec-xxHash-284d0fc_GH0.tar.gz) = aa1066ce7030b5f2077e07ae6195c6cdd34d6e2f7babfbc86fa83b69256d117c
 SIZE (pierrec-xxHash-284d0fc_GH0.tar.gz) = 5596
-SHA256 (klauspost-pgzip-49eeca5_GH0.tar.gz) = cda43f53e1785268d8d10dc2943564e4ae051ab110ed74e8f375064e9f165312
-SIZE (klauspost-pgzip-49eeca5_GH0.tar.gz) = 116117
-SHA256 (satori-go.uuid-afe1e2d_GH0.tar.gz) = 9a7230686a99098e50ced69108ff06f84e263756f63d38604b24732839f8e436
-SIZE (satori-go.uuid-afe1e2d_GH0.tar.gz) = 6550
+SHA256 (klauspost-compress-058815a_GH0.tar.gz) = 7d33639b9c36a2be4259d74999dd3eac2323391290f6c672973033773afdb91b
+SIZE (klauspost-compress-058815a_GH0.tar.gz) = 439293
+SHA256 (klauspost-cpuid-3b0816b_GH0.tar.gz) = bceb39a5ddf1a9df886332626b61eca03e517d5815b299b2b38c87015655774f
+SIZE (klauspost-cpuid-3b0816b_GH0.tar.gz) = 202229
+SHA256 (klauspost-crc32-55bf046_GH0.tar.gz) = 85eb89cbce12ec3851be34dd668781d5ebaf4290a67092efd882af26c9551e11
+SIZE (klauspost-crc32-55bf046_GH0.tar.gz) = 7177
+SHA256 (klauspost-pgzip-eef48e2_GH0.tar.gz) = 91031c7f2bb6e0628c696ee631e7db31329caa6fdee6e9b80f3883e2d1311e67
+SIZE (klauspost-pgzip-eef48e2_GH0.tar.gz) = 116240
+SHA256 (satori-go.uuid-6b8e5b5_GH0.tar.gz) = da25eef46cf1023f155a2ee171812f550b0f109ea495bb928a6b851aa3be1d78
+SIZE (satori-go.uuid-6b8e5b5_GH0.tar.gz) = 6679
 SHA256 (ActiveState-tail-4b368d1_GH0.tar.gz) = ed6a9870889ebe38d5a152657828aa03e773becb93e824aee633095d22c2b942
 SIZE (ActiveState-tail-4b368d1_GH0.tar.gz) = 13870
 SHA256 (go-tomb-tomb-dd63297_GH0.tar.gz) = 38f8b3d8b5f4ee0d7f48f0bd8fb5dad50afc23b1612c64f10bb711e70ad22235
 SIZE (go-tomb-tomb-dd63297_GH0.tar.gz) = 3627
 SHA256 (going-toolkit-5bff591_GH0.tar.gz) = 6d1775830d53198ddcbcea9f6073bebdf3f04f2c6b54497d6dc5931a4ebd97da
 SIZE (going-toolkit-5bff591_GH0.tar.gz) = 1297714
-SHA256 (masterzen-winrm-1323390_GH0.tar.gz) = 8d9a39562c4d3a6f9d615916d9ee7d2dbdd974943a31693d8dab9aa5f801cf0a
-SIZE (masterzen-winrm-1323390_GH0.tar.gz) = 22210
+SHA256 (masterzen-winrm-27e0cc8_GH0.tar.gz) = deacfb64610753656a355b51fe389febcf9eb47be062390146d967120cb1c8e8
+SIZE (masterzen-winrm-27e0cc8_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
diff --git a/sysutils/packer/pkg-plist b/sysutils/packer/pkg-plist
index 996eeea608c0..9e7e5c31a201 100644
--- a/sysutils/packer/pkg-plist
+++ b/sysutils/packer/pkg-plist
@@ -15,6 +15,7 @@ bin/packer-builder-virtualbox-iso
 bin/packer-builder-virtualbox-ovf
 bin/packer-builder-vmware-iso
 bin/packer-builder-vmware-vmx
+bin/packer-post-processor-artifice
 bin/packer-post-processor-atlas
 bin/packer-post-processor-compress
 bin/packer-post-processor-docker-import