[pkgsrc/trunk]: pkgsrc/mk Move barrier to just after the depends phase. This...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e986f588e4ba
branches:  trunk
changeset: 516686:e986f588e4ba
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Tue Jul 25 18:04:25 2006 +0000

description:
Move barrier to just after the depends phase.  This allows both the
"tools" and "wrapper" phases to be able to expect all the dependencies
to be installed already.

diffstat:

 mk/bsd.pkg.barrier.mk |  7 ++++---
 mk/tools/bsd.tools.mk |  9 ++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diffs (57 lines):

diff -r 8929008af87e -r e986f588e4ba mk/bsd.pkg.barrier.mk
--- a/mk/bsd.pkg.barrier.mk     Tue Jul 25 17:47:36 2006 +0000
+++ b/mk/bsd.pkg.barrier.mk     Tue Jul 25 18:04:25 2006 +0000
@@ -1,18 +1,19 @@
-# $NetBSD: bsd.pkg.barrier.mk,v 1.9 2006/07/22 16:31:35 jlam Exp $
+# $NetBSD: bsd.pkg.barrier.mk,v 1.10 2006/07/25 18:04:25 jlam Exp $
 
 _COOKIE.barrier=       ${WRKDIR}/.barrier_cookie
 
 # _BARRIER_PRE_TARGETS is a list of the targets that must be built before
 #      the "barrier" target invokes a new make.
 #
-_BARRIER_PRE_TARGETS=  tools
+_BARRIER_PRE_TARGETS=  checksum makedirs depends
 
 # _BARRIER_POST_TARGETS is a list of the targets that must be built after
 #      the "barrier" target invokes a new make.  This list is specially
 #      ordered so that if more than one is specified on the command-line,
 #      then pkgsrc will still do the right thing.
 #
-_BARRIER_POST_TARGETS= wrapper
+_BARRIER_POST_TARGETS= tools
+_BARRIER_POST_TARGETS+=        wrapper
 _BARRIER_POST_TARGETS+=        extract
 _BARRIER_POST_TARGETS+=        patch
 _BARRIER_POST_TARGETS+=        configure
diff -r 8929008af87e -r e986f588e4ba mk/tools/bsd.tools.mk
--- a/mk/tools/bsd.tools.mk     Tue Jul 25 17:47:36 2006 +0000
+++ b/mk/tools/bsd.tools.mk     Tue Jul 25 18:04:25 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.tools.mk,v 1.44 2006/07/21 14:21:28 jlam Exp $
+# $NetBSD: bsd.tools.mk,v 1.45 2006/07/25 18:04:25 jlam Exp $
 #
 # Copyright (c) 2005, 2006 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -63,9 +63,6 @@
 ### specified by USE_TOOLS.
 ###
 _TOOLS_TARGETS+=       check-vulnerable
-_TOOLS_TARGETS+=       checksum
-_TOOLS_TARGETS+=       makedirs
-_TOOLS_TARGETS+=       depends
 _TOOLS_TARGETS+=       acquire-tools-lock
 _TOOLS_TARGETS+=       ${_COOKIE.tools}
 _TOOLS_TARGETS+=       release-tools-lock
@@ -75,8 +72,10 @@
 .  if exists(${_COOKIE.tools})
 tools:
        @${DO_NADA}
+.  elif defined(_PKGSRC_BARRIER)
+tools: ${_TOOLS_TARGETS}
 .  else
-tools: ${_TOOLS_TARGETS}
+tools: barrier
 .  endif
 .endif