Index: head/release/Makefile.azure
===================================================================
--- head/release/Makefile.azure	(revision 285004)
+++ head/release/Makefile.azure	(revision 285005)
@@ -1,53 +1,53 @@
 #
 # $FreeBSD$
 #
 #
 # Makefile for uploading Microsoft Azure disk images.
 #
 
 AZURE_IMG?=		${.OBJDIR}/azure.vhdf
 AZURE_UPLOAD_TGTS=	azure-check-depends \
 			azure-do-upload
 CLEANFILES+=		${AZURE_UPLOAD_TGTS}
 
 .if defined(AZURE_UPLOAD_CONF) && !empty(AZURE_UPLOAD_CONF)
 . for VAR in _STORAGE _ACCOUNT _KEY
 AZURE${VAR}!=	grep -E ^AZURE${VAR} ${AZURE_UPLOAD_CONF} | awk -F'	' '{print $$2}'
 . endfor
 .endif
 
 .if ${BRANCH} == "STABLE" || ${BRANCH} == "CURRENT" || ${BRANCH} == "PRERELEASE"
-SNAPSHOT_DATE!=		date +-%Y-%m-%d-%H-%M
+SNAPSHOT_DATE!=		date +-%Y-%m-%d
 .endif
 
 AZURE_TARGET:=		${OSRELEASE}${SNAPSHOT_DATE}.vhd
 
 azure-upload:		${AZURE_UPLOAD_TGTS}
 
 azure-check-depends:
 .for VAR in _STORAGE _ACCOUNT _KEY
 . if !defined(AZURE${VAR}) || empty(AZURE${VAR})
 	@echo "Variable AZURE${VAR} cannot be empty."
 	@false
 . endif
 .endfor
 .if !exists(/usr/local/bin/azure)
 . if !exists(/usr/local/bin/npm)
 .  if !exists(${PORTSDIR}/www/npm/Makefile)
 .   if !exists(/usr/local/sbin/pkg-static)
 	env ASSUME_ALWAYS_YES=yes pkg bootstrap -yf
 .   endif
 	env ASSUME_ALWAYS_YES=yes pkg install -y www/npm
 .  else
 	make -C ${PORTSDIR}/www/npm BATCH=1 all install clean
 .  endif
 . endif
 	npm install -g azure-cli
 .endif
 
 azure-do-upload:
 	/usr/local/bin/azure storage blob upload \
 		${AZURE_IMG} ${AZURE_STORAGE} ${AZURE_TARGET} \
 		-t page -a ${AZURE_ACCOUNT} -k "${AZURE_KEY}"
 	touch ${.OBJDIR}/${.TARGET}
 
Index: head/release/Makefile.ec2
===================================================================
--- head/release/Makefile.ec2	(revision 285004)
+++ head/release/Makefile.ec2	(revision 285005)
@@ -1,59 +1,59 @@
 #
 # $FreeBSD$
 #
 #
 # Makefile for creating an EC2 AMI from a disk image.
 #
 
 .if ${BRANCH} == "CURRENT" || ${BRANCH} == "STABLE" || ${BRANCH} == "PRERELEASE"
-AMINAMESUFFIX!=	date +-%Y-%m-%d-%H-%M
+AMINAMESUFFIX!=	date +-%Y-%m-%d
 .endif
 .if defined(EC2PUBLIC)
 PUBLISH=	--public
 .endif
 
 CLEANFILES+=		ec2ami
 
 .if !exists(/usr/local/bin/bsdec2-image-upload)
 CW_EC2_PORTINSTALL=	cw-ec2-portinstall
 CLEANFILES+=		${CW_EC2_PORTINSTALL}
 .else
 CW_EC2_PORTINSTALL=
 .endif
 
 cw-ec2-portinstall:
 .if exists(${PORTSDIR}/net/bsdec2-image-upload/Makefile)
 	make -C ${PORTSDIR}/net/bsdec2-image-upload BATCH=1 all install clean
 .else
 . if !exists(/usr/local/sbin/pkg-static)
 	env ASSUME_ALWAYS_YES=yes pkg bootstrap -y
 . endif
 	env ASSUME_ALWAYS_YES=yes pkg install -y net/bsdec2-image-upload
 .endif
 	@touch ${.TARGET}
 
 ec2ami: cw-ec2 ${CW_EC2_PORTINSTALL}
 .if !defined(AWSKEYFILE) || !exists(${AWSKEYFILE})
 	@echo "--------------------------------------------------------------"
 	@echo ">>> AWSKEYFILE must point at AWS keys for EC2 AMI creation"
 	@echo "--------------------------------------------------------------"
 	@false
 .endif
 .if !defined(AWSREGION)
 	@echo "--------------------------------------------------------------"
 	@echo ">>> AWSREGION must be specified EC2 AMI creation"
 	@echo "--------------------------------------------------------------"
 	@false
 .endif
 .if !defined(AWSBUCKET)
 	@echo "--------------------------------------------------------------"
 	@echo ">>> AWSBUCKET must be specified for EC2 AMI creation"
 	@echo "--------------------------------------------------------------"
 	@false
 .endif
 	/usr/local/bin/bsdec2-image-upload ${PUBLISH} \
 	    ${.OBJDIR}/ec2.raw \
 	    "${TYPE} ${REVISION}-${BRANCH}-${TARGET}${AMINAMESUFFIX}" \
 	    "${TYPE} ${REVISION}-${BRANCH}-${TARGET}" \
 	    ${AWSREGION} ${AWSBUCKET} ${AWSKEYFILE}
 	@touch ${.TARGET}
Index: head/release/Makefile.gce
===================================================================
--- head/release/Makefile.gce	(revision 285004)
+++ head/release/Makefile.gce	(revision 285005)
@@ -1,69 +1,69 @@
 #
 # $FreeBSD$
 #
 #
 # Makefile for uploading Google Compute Engine disk images.
 #
 
 GCE_IMG?=		${.OBJDIR}/gce.raw
 GCE_UPLOAD_TGTS=	gce-check-depends \
 			gce-do-package \
 			gce-do-upload
 # I do not yet have a better way to deal with the "must be run interactively"
 # thing, so this is a fail-safe "do not do anything."
 .if !defined(GCE_LOGIN_SKIP) || empty(GCE_LOGIN_SKIP)
 GCE_UPLOAD_TGTS=	gce-do-login
 .endif
 CLEANFILES+=		${GCE_UPLOAD_TGTS}
 
 GCE_BUCKET?=
 
 .if ${BRANCH} == "STABLE" || ${BRANCH} == "CURRENT" || ${BRANCH} == "PRERELEASE"
-SNAPSHOT_DATE!=		date +-%Y-%m-%d-%H-%M
+SNAPSHOT_DATE!=		date +-%Y-%m-%d
 .endif
 
 # Really?  Uppercase characters are not allowed?  Sigh...
 # And don't even get me started on the '.'.
 GCE_TARGET:=		${OSRELEASE:S,.raw,,:tl:S,.,-,g}${SNAPSHOT_DATE}
 
 gce-upload:		${GCE_UPLOAD_TGTS}
 
 gce-check-depends:
 .for VAR in _BUCKET
 . if !defined(GCE${VAR}) || empty(GCE${VAR})
 	@echo "Variable GCE${VAR} cannot be empty."
 	@false
 . endif
 .endfor
 .if !exists(/usr/local/bin/gcutil)
 . if !exists(${PORTSDIR}/net/google-cloud-sdk/Makefile)
 .  if !exists(/usr/local/sbin/pkg-static)
 	env ASSUME_ALWAYS_YES=yes pkg bootstrap -yf
 .  endif
 	env ASSUME_ALWAYS_YES=yes pkg install -y net/google-cloud-sdk
 . else
 	make -C ${PORTSDIR}/net/google-cloud-sdk BATCH=1 all install clean
 . endif
 .endif
 
 gce-do-package:
 	@# Yes, really...  Sigh.
 	cd ${.OBJDIR} && mv gce.raw disk.raw
 	cd ${.OBJDIR} && tar --format=gnutar -zcf \
 		${GCE_TARGET:S,${.OBJDIR}/,,}.tar.gz disk.raw
 	cd ${.OBJDIR} && mv disk.raw gce.raw
 	touch ${.OBJDIR}/${.TARGET}
 
 gce-do-login:
 	@echo "This requires human interaction, which is not yet supported."
 	@true
 
 gce-do-upload:
 	@# Fallthrough in case the bucket already exists.
 	/usr/local/bin/gsutil mb gs://${GCE_BUCKET} || true
 	/usr/local/bin/gsutil cp ${.OBJDIR}/${GCE_TARGET}.tar.gz \
 		gs://${GCE_BUCKET}/
 	/usr/local/bin/gcutil addimage ${GCE_TARGET} \
 		gs://${GCE_BUCKET}/${GCE_TARGET}.tar.gz
 	touch ${.OBJDIR}/${.TARGET}
 
Index: head/release/Makefile.vagrant
===================================================================
--- head/release/Makefile.vagrant	(revision 285004)
+++ head/release/Makefile.vagrant	(revision 285005)
@@ -1,94 +1,94 @@
 #
 # $FreeBSD$
 #
 #
 # Makefile for uploading Vagrant boxes to Hashicorp Atlas
 #
 
 VAGRANT_IMG?=		${.OBJDIR}/vagrant.vmdk
 VAGRANT_UPLOAD_TGTS=	vagrant-check-depends \
 			atlas-do-upload
 CLEANFILES+=		${VAGRANT_UPLOAD_TGTS}
 
 .if defined(VAGRANT_UPLOAD_CONF) && !empty(VAGRANT_UPLOAD_CONF)
 . for VAR in _KEY _USERNAME
 VAGRANT${VAR}!=		grep -E ^VAGRANT${VAR} ${VAGRANT_UPLOAD_CONF} | awk -F'	' '{print $$2}'
 ATLAS${VAR}:=		${VAGRANT${VAR}}
 . endfor
 .endif
 
 .if ${BRANCH} == "STABLE" || ${BRANCH} == "CURRENT" || ${BRANCH} == "PRERELEASE"
-SNAPSHOT_DATE!=		date +-%Y-%m-%d-%H-%M
+SNAPSHOT_DATE!=		date +-%Y-%m-%d
 .endif
 
 VAGRANT_VERSION?=	${REVISION}-${BRANCH}${SNAPSHOT_DATE}
 
 VAGRANT_TARGET:=	${OSRELEASE}${SNAPSHOT_DATE}.box
 VAGRANT_PROVIDERS?=	vmware_desktop
 #VAGRANT_PROVIDERS+=	virtualbox
 
 vagrant-upload:		${VAGRANT_UPLOAD_TGTS}
 
 vagrant-check-depends:
 .for VAR in _KEY _USERNAME _VERSION
 . if !defined(VAGRANT${VAR}) || empty(VAGRANT${VAR})
 	@echo "Variable VAGRANT${VAR} cannot be empty."
 	@false
 . endif
 .endfor
 .if !exists(/usr/local/bin/curl)
 . if !exists(${PORTSDIR}/ftp/curl/Makefile)
 .  if !exists(/usr/local/sbin/pkg-static)
 	env ASSUME_ALWAYS_YES=yes pkg bootstrap -yf
 .  endif
 	env ASSUME_ALWAYS_YES=yes pkg install -y curl
 . else
 	make -C ${PORTSDIR}/ftp/curl BATCH=1 all install clean
 . endif
 .endif
 
 vagrant-do-package: cw-vagrant
 
 vagrant-do-package-vmware: vagrant-create-vmware-vmx vagrant-do-package
 	@cd ${.OBJDIR} && echo '{"provider":"vmware_desktop"}' > metadata.json
 	cd ${.OBJDIR} && tar -czf ${VAGRANT_TARGET} metadata.json vagrant.vmx vagrant.vmdk
 	touch ${.OBJDIR}/${.TARGET}
 
 atlas-do-upload: vagrant-do-package-vmware
 .for PROVIDER in ${VAGRANT_PROVIDERS}
 	${.CURDIR}/scripts/atlas-upload.sh -b FreeBSD-${REVISION}-${BRANCH} -f ${VAGRANT_TARGET} -p ${PROVIDER} -k ${VAGRANT_KEY} -u ${VAGRANT_USERNAME} -v ${VAGRANT_VERSION}
 .endfor
 	touch ${.OBJDIR}/${.TARGET}
 
 vagrant-create-vmware-vmx:
 	@cd ${.OBJDIR} && echo '.encoding = "UTF-8"' > vagrant.vmx
 	@cd ${.OBJDIR} && echo 'bios.bootorder = "hdd,CDROM"' >> vagrant.vmx
 	@cd ${.OBJDIR} && echo 'checkpoint.vmstate = ""' >> vagrant.vmx
 	@cd ${.OBJDIR} && echo 'cleanshutdown = "TRUE"' >> vagrant.vmx
 	@cd ${.OBJDIR} && echo 'config.version = "8"' >> vagrant.vmx
 	@cd ${.OBJDIR} && echo 'displayname = "${VAGRANT_TARGET}"' >> vagrant.vmx
 	@cd ${.OBJDIR} && echo 'ethernet0.addresstype = "generated"' >> vagrant.vmx
 	@cd ${.OBJDIR} && echo 'ethernet0.bsdname = "en0"' >> vagrant.vmx
 	@cd ${.OBJDIR} && echo 'ethernet0.connectiontype = "nat"' >> vagrant.vmx
 	@cd ${.OBJDIR} && echo 'ethernet0.displayname = "Ethernet"' >> vagrant.vmx
 	@cd ${.OBJDIR} && echo 'ethernet0.linkstatepropagation.enable = "FALSE"' >> vagrant.vmx
 	@cd ${.OBJDIR} && echo 'ethernet0.pcislotnumber = "33"' >> vagrant.vmx
 	@cd ${.OBJDIR} && echo 'ethernet0.present = "TRUE"' >> vagrant.vmx
 	@cd ${.OBJDIR} && echo 'ethernet0.virtualdev = "e1000"' >> vagrant.vmx
 	@cd ${.OBJDIR} && echo 'ethernet0.wakeonpcktrcv = "FALSE"' >> vagrant.vmx
 	@cd ${.OBJDIR} && echo 'floppy0.present = "FALSE"' >> vagrant.vmx
 	@cd ${.OBJDIR} && echo 'guestos = "freebsd-64"' >> vagrant.vmx
 	@cd ${.OBJDIR} && echo 'gui.fullscreenatpoweron = "FALSE"' >> vagrant.vmx
 	@cd ${.OBJDIR} && echo 'gui.viewmodeatpoweron = "windowed"' >> vagrant.vmx
 	@cd ${.OBJDIR} && echo 'memsize = "512"' >> vagrant.vmx
 	@cd ${.OBJDIR} && echo 'sound.startconnected = "FALSE"' >> vagrant.vmx
 	@cd ${.OBJDIR} && echo 'softpoweroff = "TRUE"' >> vagrant.vmx
 	@cd ${.OBJDIR} && echo 'scsi0.pcislotnumber = "16"' >> vagrant.vmx
 	@cd ${.OBJDIR} && echo 'scsi0.present = "TRUE"' >> vagrant.vmx
 	@cd ${.OBJDIR} && echo 'scsi0.virtualdev = "lsilogic"' >> vagrant.vmx
 	@cd ${.OBJDIR} && echo 'scsi0:0.filename = "vagrant.vmdk"' >> vagrant.vmx
 	@cd ${.OBJDIR} && echo 'scsi0:0.present = "TRUE"' >> vagrant.vmx
 	@cd ${.OBJDIR} && echo 'tools.synctime = "TRUE"' >> vagrant.vmx
 	@cd ${.OBJDIR} && echo 'usb.present = "FALSE"' >> vagrant.vmx
 	@cd ${.OBJDIR} && echo 'virtualhw.productcompatibility = "hosted"' >> vagrant.vmx
 	@cd ${.OBJDIR} && echo 'virtualhw.version = "9"' >> vagrant.vmx