From owner-svn-src-stable@freebsd.org Tue Jan 3 23:25:57 2017 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0F439C9DC01; Tue, 3 Jan 2017 23:25:57 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 B9EA71BF2; Tue, 3 Jan 2017 23:25:56 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v03NPt9A055887; Tue, 3 Jan 2017 23:25:55 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v03NPtfs055884; Tue, 3 Jan 2017 23:25:55 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201701032325.v03NPtfs055884@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Tue, 3 Jan 2017 23:25:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r311201 - stable/11/share/mk X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Jan 2017 23:25:57 -0000 Author: bdrewery Date: Tue Jan 3 23:25:55 2017 New Revision: 311201 URL: https://svnweb.freebsd.org/changeset/base/311201 Log: MFC r309478: DIRDEPS_BUILD: Fix '/' in group names creating a bad cookie. 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:23:25 2017 (r311200) +++ stable/11/share/mk/bsd.confs.mk Tue Jan 3 23:25:55 2017 (r311201) @@ -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: stable/11/share/mk/bsd.files.mk ============================================================================== --- stable/11/share/mk/bsd.files.mk Tue Jan 3 23:23:25 2017 (r311200) +++ stable/11/share/mk/bsd.files.mk Tue Jan 3 23:25:55 2017 (r311201) @@ -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: stable/11/share/mk/bsd.incs.mk ============================================================================== --- stable/11/share/mk/bsd.incs.mk Tue Jan 3 23:23:25 2017 (r311200) +++ stable/11/share/mk/bsd.incs.mk Tue Jan 3 23:25:55 2017 (r311201) @@ -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}}