From owner-svn-src-projects@FreeBSD.ORG Thu Mar 5 12:39:18 2015 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id EBD6EED2; Thu, 5 Mar 2015 12:39:18 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BED19F31; Thu, 5 Mar 2015 12:39:18 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t25CdIGQ027259; Thu, 5 Mar 2015 12:39:18 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t25CdIK3027258; Thu, 5 Mar 2015 12:39:18 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201503051239.t25CdIK3027258@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Thu, 5 Mar 2015 12:39:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r279655 - projects/release-pkg/share/mk X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Mar 2015 12:39:19 -0000 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