From 335ee9a8518a9d2bcd681acf1062b74d400db90a Mon Sep 17 00:00:00 2001
From: gjb <gjb@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Tue, 4 Nov 2014 23:02:16 +0000
Subject: [PATCH] MFC r274095:   Fix VOLUME_LABEL when BRANCH contains '-' and
 '.'   characters, in particular '-' and '.'.

Insta-MFC ok:	re (hrs)
Sponsored by:	The FreeBSD Foundation


git-svn-id: svn://svn.freebsd.org/base/stable/10@274102 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 release/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/release/Makefile b/release/Makefile
index 25fe033f3..6198b8e5c 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -56,10 +56,10 @@ ${_V}!=	eval $$(awk '/^${_V}=/{print}' ${.CURDIR}/../sys/conf/newvers.sh); echo
 .for _V in ${TARGET_ARCH}
 .if !empty(TARGET:M${_V})
 OSRELEASE=	${TYPE}-${REVISION}-${BRANCH}-${TARGET}
-VOLUME_LABEL=	${REVISION:C/\./_/g:}_${BRANCH}_${TARGET}
+VOLUME_LABEL=	${REVISION:C/[.-]/_/g}_${BRANCH:C/[.-]/_/g}_${TARGET}
 .else
 OSRELEASE=	${TYPE}-${REVISION}-${BRANCH}-${TARGET}-${TARGET_ARCH}
-VOLUME_LABEL=	${REVISION:C/\./_/g:}_${BRANCH}_${TARGET_ARCH}
+VOLUME_LABEL=	${REVISION:C/[.-]/_/g}_${BRANCH:C/[.-]/_/g}_${TARGET_ARCH}
 .endif
 .endfor
 .endif
-- 
2.45.0