svn commit: r309478 - head/share/mk

[Bryan Drewery]

Author: bdrewery
Date: Sat Dec  3 05:29:35 2016
New Revision: 309478
URL: https://svnweb.freebsd.org/changeset/base/309478

Log:
  DIRDEPS_BUILD: Fix '/' in group names creating a bad cookie.
  
  This is reworking the change in r296585 but to still properly install
  the files.  This limits the change to only the DIRDEPS_BUILD logic
  for what it considers the name of the staging set, which is what the
  cookie name is based off of.
  
  Sponsored by:	Dell EMC Isilon
  MFC after:	1 week

Modified:
  head/share/mk/bsd.confs.mk
  head/share/mk/bsd.files.mk
  head/share/mk/bsd.incs.mk

Modified: head/share/mk/bsd.confs.mk
==============================================================================
--- head/share/mk/bsd.confs.mk	Sat Dec  3 05:29:31 2016	(r309477)
+++ head/share/mk/bsd.confs.mk	Sat Dec  3 05:29:35 2016	(r309478)
@@ -24,8 +24,8 @@ ${group}OWN?=	${SHAREOWN}
 ${group}GRP?=	${SHAREGRP}
 ${group}MODE?=	${CONFMODE}
 ${group}DIR?=	${CONFDIR}
-STAGE_SETS+=	${group}
-STAGE_DIR.${group}= ${STAGE_OBJTOP}${${group}DIR}
+STAGE_SETS+=	${group:C,[/*],_,g}
+STAGE_DIR.${group:C,[/*],_,g}= ${STAGE_OBJTOP}${${group}DIR}
 
 _${group}CONFS=
 .for cnf in ${${group}}

Modified: head/share/mk/bsd.files.mk
==============================================================================
--- head/share/mk/bsd.files.mk	Sat Dec  3 05:29:31 2016	(r309477)
+++ head/share/mk/bsd.files.mk	Sat Dec  3 05:29:35 2016	(r309478)
@@ -28,8 +28,8 @@ ${group}OWN?=	${SHAREOWN}
 ${group}GRP?=	${SHAREGRP}
 ${group}MODE?=	${SHAREMODE}
 ${group}DIR?=	${BINDIR}
-STAGE_SETS+=	${group}
-STAGE_DIR.${group}= ${STAGE_OBJTOP}${${group}DIR}
+STAGE_SETS+=	${group:C,[/*],_,g}
+STAGE_DIR.${group:C,[/*],_,g}= ${STAGE_OBJTOP}${${group}DIR}
 
 .if defined(NO_ROOT)
 .if !defined(${group}TAGS) || ! ${${group}TAGS:Mpackage=*}

Modified: head/share/mk/bsd.incs.mk
==============================================================================
--- head/share/mk/bsd.incs.mk	Sat Dec  3 05:29:31 2016	(r309477)
+++ head/share/mk/bsd.incs.mk	Sat Dec  3 05:29:35 2016	(r309478)
@@ -33,9 +33,9 @@ ${group}OWN?=	${BINOWN}
 ${group}GRP?=	${BINGRP}
 ${group}MODE?=	${NOBINMODE}
 ${group}DIR?=	${INCLUDEDIR}${PRIVATELIB:D/private/${LIB}}
-STAGE_SETS+=	${group}
-STAGE_DIR.${group}= ${STAGE_OBJTOP}${${group}DIR}
-STAGE_SYMLINKS_DIR.${group}= ${STAGE_OBJTOP}
+STAGE_SETS+=	${group:C,[/*],_,g}
+STAGE_DIR.${group:C,[/*],_,g}= ${STAGE_OBJTOP}${${group}DIR}
+STAGE_SYMLINKS_DIR.${group:C,[/*],_,g}= ${STAGE_OBJTOP}
 
 _${group}INCS=
 .for header in ${${group}}