From owner-svn-src-projects@FreeBSD.ORG  Sat Oct 12 23:48:22 2013
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 410B861E;
 Sat, 12 Oct 2013 23:48:22 +0000 (UTC) (envelope-from sjg@FreeBSD.org)
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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 2EE9F26D6;
 Sat, 12 Oct 2013 23:48:22 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9CNmMc6045359;
 Sat, 12 Oct 2013 23:48:22 GMT (envelope-from sjg@svn.freebsd.org)
Received: (from sjg@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9CNmM5S045358;
 Sat, 12 Oct 2013 23:48:22 GMT (envelope-from sjg@svn.freebsd.org)
Message-Id: <201310122348.r9CNmM5S045358@svn.freebsd.org>
From: "Simon J. Gerraty" <sjg@FreeBSD.org>
Date: Sat, 12 Oct 2013 23:48:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r256409 - projects/bmake/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.14
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 12 Oct 2013 23:48:22 -0000

Author: sjg
Date: Sat Oct 12 23:48:21 2013
New Revision: 256409
URL: http://svnweb.freebsd.org/changeset/base/256409

Log:
  Add more vars we subst into DIRDEPS eg. BOOT_MACHINE_DIR and KERNEL_NAME.
  Make it easier to add more.

Modified:
  projects/bmake/share/mk/local.gendirdeps.mk

Modified: projects/bmake/share/mk/local.gendirdeps.mk
==============================================================================
--- projects/bmake/share/mk/local.gendirdeps.mk	Sat Oct 12 23:46:41 2013	(r256408)
+++ projects/bmake/share/mk/local.gendirdeps.mk	Sat Oct 12 23:48:21 2013	(r256409)
@@ -1,10 +1,26 @@
-# supress optional dependecies
+# supress optional/auto dependecies
 # local.dirdeps.mk will put them in if necessary
-GENDIRDEPS_FILTER+= Ngnu/lib/libssp/libssp_nonshared
+GENDIRDEPS_FILTER+= \
+	Ngnu/lib/libssp/libssp_nonshared \
+	Ncddl/usr.bin/ctf* \
+	Npkgs/pseudo/stage*
 
 # gendirdeps.mk will turn _{VAR} into ${VAR} which keeps this simple
-GENDIRDEPS_FILTER+= ${CSU_DIR:L:@v@S,/${$v},/_{${v}},@}
+# order of this list matters!
+GENDIRDEPS_FILTER_DIR_VARS+= \
+       CSU_DIR \
+       BOOT_MACHINE_DIR
 
-# this could easily get confused
-GENDIRDEPS_FILTER+= ${MACHINE_CPUARCH MACHINE_CPU MACHINE_ARCH MACHINE:L:@v@S,/${$v}/,/_{${v}}/,@:NS,//,*:u}
+# order of this list matters!
+GENDIRDEPS_FILTER_VARS+= \
+       KERNEL_NAME \
+       MACHINE_CPUARCH \
+       MACHINE_ARCH \
+       MACHINE
+
+GENDIRDEPS_FILTER+= ${GENDIRDEPS_FILTER_DIR_VARS:@v@S,${$v},_{${v}},@}
+GENDIRDEPS_FILTER+= ${GENDIRDEPS_FILTER_VARS:@v@S,/${$v}/,/_{${v}}/,@:NS,//,*:u}
+
+# handle the non-standard way that gnu/usr.bin/groff/tmac is staged
+GENDIRDEPS_FILTER+= C,.*usr/share/tmac.*stage,gnu/usr.bin/groff/tmac,