svn commit: r279655 - projects/release-pkg/share/mk

[Baptiste Daroussin]

Author: bapt
Date: Thu Mar  5 12:39:18 2015
New Revision: 279655
URL: https://svnweb.freebsd.org/changeset/base/279655

Log:
  Allow to tag the METALOG per file group

Modified:
  projects/release-pkg/share/mk/bsd.files.mk

Modified: projects/release-pkg/share/mk/bsd.files.mk
==============================================================================
--- projects/release-pkg/share/mk/bsd.files.mk	Thu Mar  5 12:21:12 2015	(r279654)
+++ projects/release-pkg/share/mk/bsd.files.mk	Thu Mar  5 12:39:18 2015	(r279655)
@@ -13,13 +13,6 @@ FILESGROUPS?=	FILES
 buildfiles: ${${group}}
 .endfor
 
-.if defined(NO_ROOT)
-.if !defined(TAGS) || ! ${TAGS:Mpackage=*}
-TAGS+=		package=${PACKAGE:Uruntime}
-.endif
-TAG_ARGS=	-T ${TAGS:[*]:S/ /,/g}
-.endif
-
 all: buildfiles
 
 .for group in ${FILESGROUPS}
@@ -31,6 +24,14 @@ ${group}GRP?=	${SHAREGRP}
 ${group}MODE?=	${SHAREMODE}
 ${group}DIR?=	${BINDIR}
 
+.if defined(NO_ROOT)
+.if !defined(${group}TAGS) || ! ${${group}TAGS:Mpackage=*}
+${group}TAGS+=		package=${${group}PACKAGE:Uruntime}
+.endif
+${group}TAG_ARGS=	-T ${${group}TAGS:[*]:S/ /,/g}
+.endif
+
+
 _${group}FILES=
 .for file in ${${group}}
 .if defined(${group}OWN_${file:T}) || defined(${group}GRP_${file:T}) || \
@@ -47,7 +48,7 @@ ${group}NAME_${file:T}?=	${file:T}
 .endif
 installfiles-${group}: _${group}INS_${file:T}
 _${group}INS_${file:T}: ${file}
-	${INSTALL} ${TAG_ARGS} -o ${${group}OWN_${.ALLSRC:T}} \
+	${INSTALL} ${${group}TAG_ARGS} -o ${${group}OWN_${.ALLSRC:T}} \
 	    -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \
 	    ${.ALLSRC} \
 	    ${DESTDIR}${${group}DIR_${.ALLSRC:T}}/${${group}NAME_${.ALLSRC:T}}
@@ -59,11 +60,11 @@ _${group}FILES+= ${file}
 installfiles-${group}: _${group}INS
 _${group}INS: ${_${group}FILES}
 .if defined(${group}NAME)
-	${INSTALL} ${TAG_ARGS} -o ${${group}OWN} -g ${${group}GRP} \
+	${INSTALL} ${${group}TAG_ARGS} -o ${${group}OWN} -g ${${group}GRP} \
 	    -m ${${group}MODE} ${.ALLSRC} \
 	    ${DESTDIR}${${group}DIR}/${${group}NAME}
 .else
-	${INSTALL} ${TAG_ARGS} -o ${${group}OWN} -g ${${group}GRP} \
+	${INSTALL} ${${group}TAG_ARGS} -o ${${group}OWN} -g ${${group}GRP} \
 	    -m ${${group}MODE} ${.ALLSRC} ${DESTDIR}${${group}DIR}
 .endif
 .endif