The fmake fix in r289049 was wrong. Need to use a real variable for
.if checks rather than the iteration variable. Tested this pattern
more (rather than just looking for error) and found the right behavior.

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} ==

MFC r287368:
Remove '-' separating OSRELEASE and SNAPSHOT_DATE for vagrant
builds, and prepend it to SNAPSHOT_DATE to prevent a trailing '-'
in the final box name for a release build.

Sponsored by: The FreeBSD Foundation

MFC r285722, r285733:

r285722 (brd):
Add support for building VirtualBox Vagrant images.
Abstract the build, package and upload to handle building
either type.

r285733
Fix an out-of-order execution issue regarding pkg(8):
- pkg(8) cannot be removed before subsequent reinvocations
- The PKG_CACHEDIR cannot be cleaned after the repo*.sqlite
has been removed
- pkg(8) cannot be removed as a precursor to any of the other
steps involved here

Approved by: re (kib)
Sponsored by: The FreeBSD Foundation

MFC r284893, r284895-r284897, r284942, r284968, r284996, r285005:

r284893 (brd):
Add initial support for building Vagrant images for VMWare.
Next steps will be adding Virtualbox support and uploading
to Hashicorp Atlas for others to consume.

r284895:
Add default VAGRANT_IMG variable.

r284896:
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.

r284897:
Instead of hard-coding the PROVIDERS for upload, add the
VAGRANT_PROVIDERS variable. Right now, it defaults to only
vmware_desktop, virtualbox support is to follow at some point.

While here, fix the hashicorp URL: s/vagrant/atlas/, which
was result of a sed(1) replace (and my fault).

r284942 (brd):
Add Support for uploading Vagrant images to Hashicorp Atlas.

r284968:
Default the VAGRANT_VERSION to ${REVISION}-${BRANCH} if
not set, which expands to '11.0-CURRENT', for example.

If the branch is -CURRENT, -STABLE, or -PRERELEASE, suffix
the VAGRANT_VERSION with the snapshot date.

r284996:
Fix the gcloud port/package name.

r285005:
Remove the HH-MM suffix from the build date suffix.

It was useful when working out several kinks when testing
automated image uploading when retrying was necessary, but
now it is making things much too messy.

Sponsored by: The FreeBSD Foundation

MFC r287368:
Remove '-' separating OSRELEASE and SNAPSHOT_DATE for vagrant
builds, and prepend it to SNAPSHOT_DATE to prevent a trailing '-'
in the final box name for a release build.

Sponsored by: The FreeBSD Foundation

MFC r285722, r285733:

r285722 (brd):
Add support for building VirtualBox Vagrant images.
Abstract the build, package and upload to handle building
either type.

r285733
Fix an out-of-order execution issue regarding pkg(8):
- pkg(8) cannot be removed before subsequent reinvocations
- The PKG_CACHEDIR cannot be cleaned after the repo*.sqlite
has been removed
- pkg(8) cannot be removed as a precursor to any of the other
steps involved here

Approved by: re (kib)
Sponsored by: The FreeBSD Foundation

MFC r284893, r284895-r284897, r284942, r284968, r284996, r285005:

r284893 (brd):
Add initial support for building Vagrant images for VMWare.
Next steps will be adding Virtualbox support and uploading
to Hashicorp Atlas for others to consume.

r284895:
Add default VAGRANT_IMG variable.

r284896:
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.

r284897:
Instead of hard-coding the PROVIDERS for upload, add the
VAGRANT_PROVIDERS variable. Right now, it defaults to only
vmware_desktop, virtualbox support is to follow at some point.

While here, fix the hashicorp URL: s/vagrant/atlas/, which
was result of a sed(1) replace (and my fault).

r284942 (brd):
Add Support for uploading Vagrant images to Hashicorp Atlas.

r284968:
Default the VAGRANT_VERSION to ${REVISION}-${BRANCH} if
not set, which expands to '11.0-CURRENT', for example.

If the branch is -CURRENT, -STABLE, or -PRERELEASE, suffix
the VAGRANT_VERSION with the snapshot date.

r284996:
Fix the gcloud port/package name.

r285005:
Remove the HH-MM suffix from the build date suffix.

It was useful when working out several kinks when testing
automated image uploading when retrying was necessary, but
now it is making things much too messy.

Sponsored by: The FreeBSD Foundation