svn commit: r284896 - head/release

[Glen Barber]

Author: gjb
Date: Sat Jun 27 22:59:29 2015
New Revision: 284896
URL: https://svnweb.freebsd.org/changeset/base/284896

Log:
  Remove _ACCOUNT and add _USERNAME, _NAME, _VERSION for the
  VAGRANT_${VAR} variables extracted from VAGRANT_UPLOAD_CONF.
  
  Set ATLAS_${VAR} to VAGRANT_${VAR} if VAGRANT_UPLOAD_CONF
  is set.  There is intent to intentionally have separate
  variants of configuration entries, but the defaults do not
  yet have any reason to be different.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/release/Makefile.vagrant

Modified: head/release/Makefile.vagrant
==============================================================================
--- head/release/Makefile.vagrant	Sat Jun 27 22:54:16 2015	(r284895)
+++ head/release/Makefile.vagrant	Sat Jun 27 22:59:29 2015	(r284896)
@@ -12,8 +12,9 @@ VAGRANT_UPLOAD_TGTS=	vagrant-check-depen
 CLEANFILES+=		${VAGRANT_UPLOAD_TGTS}
 
 .if defined(VAGRANT_UPLOAD_CONF) && !empty(VAGRANT_UPLOAD_CONF)
-. for VAR in _ACCOUNT _KEY
-VAGRANT${VAR}!=	grep -E ^VAGRANT${VAR} ${VAGRANT_UPLOAD_CONF} | awk -F'	' '{print $$2}'
+. for VAR in _KEY _USERNAME _NAME _VERSION
+VAGRANT${VAR}!=		grep -E ^VAGRANT${VAR} ${VAGRANT_UPLOAD_CONF} | awk -F'	' '{print $$2}'
+ATLAS${VAR}:=		${VAGRANT${VAR}}
 . endfor
 .endif
 
@@ -26,7 +27,7 @@ VAGRANT_TARGET:=	${OSRELEASE}${SNAPSHOT_
 vagrant-upload:		${VAGRANT_UPLOAD_TGTS}
 
 vagrant-check-depends:
-.for VAR in _ACCOUNT _KEY
+.for VAR in _KEY _USERNAME _NAME _VERSION
 . if !defined(VAGRANT${VAR}) || empty(VAGRANT${VAR})
 	@echo "Variable VAGRANT${VAR} cannot be empty."
 	@false