svn commit: r311199 - stable/11/share/mk

[Bryan Drewery]

Author: bdrewery
Date: Tue Jan  3 23:22:48 2017
New Revision: 311199
URL: https://svnweb.freebsd.org/changeset/base/311199

Log:
  MFC r309477:
  
    Revert r296585.

Modified:
  stable/11/share/mk/bsd.confs.mk
  stable/11/share/mk/bsd.files.mk
  stable/11/share/mk/bsd.incs.mk
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/share/mk/bsd.confs.mk
==============================================================================
--- stable/11/share/mk/bsd.confs.mk	Tue Jan  3 23:21:33 2017	(r311198)
+++ stable/11/share/mk/bsd.confs.mk	Tue Jan  3 23:22:48 2017	(r311199)
@@ -6,10 +6,8 @@
 
 CONFGROUPS?=	CONFS
 
-_CONFGROUPS=	${CONFGROUPS:C,[/*],_,g}
-
 .if !target(buildconfig)
-.for group in ${_CONFGROUPS}
+.for group in ${CONFGROUPS}
 buildconfig: ${${group}}
 .endfor
 .endif
@@ -19,7 +17,7 @@ all: buildconfig
 .endif
 
 .if !target(installconfig)
-.for group in ${_CONFGROUPS}
+.for group in ${CONFGROUPS}
 .if defined(${group}) && !empty(${group})
 
 ${group}OWN?=	${SHAREOWN}

Modified: stable/11/share/mk/bsd.files.mk
==============================================================================
--- stable/11/share/mk/bsd.files.mk	Tue Jan  3 23:21:33 2017	(r311198)
+++ stable/11/share/mk/bsd.files.mk	Tue Jan  3 23:22:48 2017	(r311199)
@@ -9,9 +9,7 @@ __<bsd.files.mk>__:
 
 FILESGROUPS?=	FILES
 
-_FILESGROUPS=	${FILESGROUPS:C,[/*],_,g:u}
-
-.for group in ${_FILESGROUPS}
+.for group in ${FILESGROUPS}
 # Add in foo.yes and remove duplicates from all the groups
 ${${group}}:= ${${group}} ${${group}.yes}
 ${${group}}:= ${${group}:O:u}
@@ -22,7 +20,7 @@ buildfiles: ${${group}}
 all: buildfiles
 .endif
 
-.for group in ${_FILESGROUPS}
+.for group in ${FILESGROUPS}
 .if defined(${group}) && !empty(${group})
 installfiles: installfiles-${group}
 

Modified: stable/11/share/mk/bsd.incs.mk
==============================================================================
--- stable/11/share/mk/bsd.incs.mk	Tue Jan  3 23:21:33 2017	(r311198)
+++ stable/11/share/mk/bsd.incs.mk	Tue Jan  3 23:22:48 2017	(r311199)
@@ -8,8 +8,6 @@
 
 INCSGROUPS?=	INCS
 
-_INCSGROUPS=	${INCSGROUPS:C,[/*],_,g}
-
 .if defined(NO_ROOT)
 .if !defined(TAGS) || ! ${TAGS:Mpackage=*}
 TAGS+=		package=${PACKAGE:Uruntime}
@@ -18,7 +16,7 @@ TAG_ARGS=	-T ${TAGS:[*]:S/ /,/g}
 .endif
 
 .if !target(buildincludes)
-.for group in ${_INCSGROUPS}
+.for group in ${INCSGROUPS}
 buildincludes: ${${group}}
 .endfor
 .endif
@@ -28,7 +26,7 @@ all: buildincludes
 .endif
 
 .if !target(installincludes)
-.for group in ${_INCSGROUPS}
+.for group in ${INCSGROUPS}
 .if defined(${group}) && !empty(${group})
 
 ${group}OWN?=	${BINOWN}