From 104dac63f3a52550501bc0bbbb86c77e001d11e1 Mon Sep 17 00:00:00 2001
From: Glen Barber <gjb@FreeBSD.org>
Date: Tue, 1 Sep 2015 15:28:35 +0000
Subject: [PATCH] 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.

MFC after:	3 days
Sponsored by:	The FreeBSD Foundation
---
 release/Makefile.vagrant | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/release/Makefile.vagrant b/release/Makefile.vagrant
index 7ae64849e0c..3b53ba928b2 100644
--- a/release/Makefile.vagrant
+++ b/release/Makefile.vagrant
@@ -17,11 +17,11 @@ ATLAS${VAR}:=		${VAGRANT${VAR}}
 .endif
 
 .if ${BRANCH} == "STABLE" || ${BRANCH} == "CURRENT" || ${BRANCH} == "PRERELEASE"
-SNAPSHOT_DATE!=		date +%Y%m%d
+SNAPSHOT_DATE!=		date +-%Y%m%d
 .endif
 
 VAGRANT_VERSION!=	date +%Y.%m.%d
-VAGRANT_TARGET:=	${OSRELEASE}-${SNAPSHOT_DATE}
+VAGRANT_TARGET:=	${OSRELEASE}${SNAPSHOT_DATE}
 .if !empty(CLOUDWARE)
 . for _PROVIDER in ${CLOUDWARE}
 .  if ${_PROVIDER:MVAGRANT*}