svn commit: r289049 - stable/10/release

[Bryan Drewery]

Author: bdrewery
Date: Thu Oct  8 18:33:47 2015
New Revision: 289049
URL: https://svnweb.freebsd.org/changeset/base/289049

Log:
  Direct commit to fix warnings with fmake when building from top-level.
  
  The top-level Makefile.inc1 uses 'make -C release -V' to lookup revision
  information, which causes Makefile.vm and Makefile.vagrant to be included.
  
  fmake has 2 issues here:
  
    1. It doesn't like the empty result of .if ${VAR:Mfoo}
    2. It doesn't like .if ${loop_item} ==

Modified:
  stable/10/release/Makefile.vagrant

Modified: stable/10/release/Makefile.vagrant
==============================================================================
--- stable/10/release/Makefile.vagrant	Thu Oct  8 18:02:50 2015	(r289048)
+++ stable/10/release/Makefile.vagrant	Thu Oct  8 18:33:47 2015	(r289049)
@@ -24,7 +24,7 @@ VAGRANT_VERSION!=	date +%Y.%m.%d
 VAGRANT_TARGET:=	${OSRELEASE}${SNAPSHOT_DATE}
 .if !empty(CLOUDWARE)
 . for _PROVIDER in ${CLOUDWARE}
-.  if ${_PROVIDER:MVAGRANT*}
+.  if !empty(${_PROVIDER:MVAGRANT*})
 VAGRANT_PROVIDERS+=	${_PROVIDER:S/VAGRANT-//:tl}
 .  endif
 . endfor
@@ -61,19 +61,19 @@ ${PROVIDER}:
 ${VAGRANT_TARGET}.${PROVIDER}.box: ${PROVIDER} cw-vagrant-${PROVIDER} vagrant-create-${PROVIDER}-metadata
 	@echo "==> PACKAGING: ${VAGRANT_TARGET}.${PROVIDER}.box in `pwd`"
 	@cp vagrant-${PROVIDER}.vmdk ${PROVIDER}/vagrant.vmdk
-. if ${PROVIDER} == "virtualbox"
+. if !empty(${PROVIDER:Mvirtualbox})
 	@(cd ${.OBJDIR}/${PROVIDER} && echo '{"provider":"${PROVIDER}"}' > metadata.json)
 	@(cd ${.OBJDIR}/${PROVIDER} && tar -czf ../${VAGRANT_TARGET}.${PROVIDER}.box metadata.json box.ovf vagrant.vmdk)
-. elif ${PROVIDER} == "vmware"
+. elif !empty(${PROVIDER:Mvmware})
 	@(cd ${.OBJDIR}/${PROVIDER} && echo '{"provider":"${PROVIDER}_desktop"}' > metadata.json)
 	@(cd ${.OBJDIR}/${PROVIDER} && tar -czf ../${VAGRANT_TARGET}.${PROVIDER}.box metadata.json vagrant.vmx vagrant.vmdk)
 . endif
 
 CLEANFILES+=	vagrant-do-upload-${PROVIDER}
 vagrant-do-upload-${PROVIDER}: ${VAGRANT_TARGET}.${PROVIDER}.box
-. if ${PROVIDER} == "virtualbox"
+. if !empty(${PROVIDER:Mvirtualbox})
 	${.CURDIR}/scripts/atlas-upload.sh -b ${TYPE}-${REVISION}-${BRANCH} -f ${VAGRANT_TARGET}.${PROVIDER}.box -p ${PROVIDER} -k ${VAGRANT_KEY} -u ${VAGRANT_USERNAME} -v ${VAGRANT_VERSION}
-. elif ${PROVIDER} == "vmware"
+. elif !empty(${PROVIDER:Mvmware})
 	${.CURDIR}/scripts/atlas-upload.sh -b ${TYPE}-${REVISION}-${BRANCH} -f ${VAGRANT_TARGET}.${PROVIDER}.box -p ${PROVIDER}_desktop -k ${VAGRANT_KEY} -u ${VAGRANT_USERNAME} -v ${VAGRANT_VERSION}
 . endif
 	touch ${.OBJDIR}/${.TARGET}