Modify the barrier so that we always invoke the recursive make process

when passing through the barrier.  This ensures the PATH (passed via
PKGSRC_MAKE_ENV) is correctly set for all phases after the barrier.

This fixes a bug in "interactive" pkgsrc use, where if you have no
work directory and type "make build && make install", then the "install"
step does not have a PATH set to include all the wrapper and tools
directories.

15 files changed, 32 insertions, 32 deletions

diff --git a/mk/bsd.pkg.barrier.mk b/mk/bsd.pkg.barrier.mk
index 71df9548278..9cbdeccb7a5 100644
--- a/mk/bsd.pkg.barrier.mk
+++ b/mk/bsd.pkg.barrier.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.barrier.mk,v 1.8 2006/07/21 14:27:56 jlam Exp $
+# $NetBSD: bsd.pkg.barrier.mk,v 1.9 2006/07/22 16:31:35 jlam Exp $
 
 _COOKIE.barrier=	${WRKDIR}/.barrier_cookie
 
@@ -40,7 +40,7 @@ _BARRIER_CMDLINE_TARGETS+=	${_target_}
 ### target invokes a new make should be listed in _BARRIER_POST_TARGETS,
 ### and should be of the form:
 ###
-###	.if !exists(${_COOKIE.barrier})
+###	.if !defined(_PKGSRC_BARRIER)
 ###	foo: barrier
 ###	.else
 ###	foo: foo's real source dependencies
@@ -52,11 +52,11 @@ _BARRIER_CMDLINE_TARGETS+=	${_target_}
 
 .PHONY: barrier
 barrier: ${_BARRIER_PRE_TARGETS} ${_COOKIE.barrier}
-.if !exists(${_COOKIE.barrier})
+.if !defined(_PKGSRC_BARRIER)
 .  if defined(PKG_VERBOSE)
 	@${PHASE_MSG} "Invoking \`\`"${_BARRIER_CMDLINE_TARGETS:Q}"'' after barrier for ${PKGNAME}"
 .  endif
-	${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${SETENV} ${PKGSRC_MAKE_ENV} ${MAKE} ${MAKEFLAGS} ALLOW_VULNERABLE_PACKAGES= ${_BARRIER_CMDLINE_TARGETS}
+	${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${SETENV} ${PKGSRC_MAKE_ENV} ${MAKE} ${MAKEFLAGS} _PKGSRC_BARRIER=yes ALLOW_VULNERABLE_PACKAGES= ${_BARRIER_CMDLINE_TARGETS}
 .  if defined(PKG_VERBOSE)
 	@${PHASE_MSG} "Leaving \`\`"${_BARRIER_CMDLINE_TARGETS:Q}"'' after barrier for ${PKGNAME}"
 .  endif
diff --git a/mk/build/bsd.build.mk b/mk/build/bsd.build.mk
index 7942c347faa..bed06cad624 100644
--- a/mk/build/bsd.build.mk
+++ b/mk/build/bsd.build.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.build.mk,v 1.7 2006/07/07 21:24:28 jlam Exp $
+# $NetBSD: bsd.build.mk,v 1.8 2006/07/22 16:31:35 jlam Exp $
 #
 # This Makefile fragment is included by bsd.pkg.mk and provides all
 # variables and targets related to building sources for a package.
@@ -28,7 +28,7 @@ _COOKIE.test=	${WRKDIR}/.test_done
 .  if exists(${_COOKIE.build})
 build:
 	@${DO_NADA}
-.  elif exists(${_COOKIE.barrier})
+.  elif defined(_PKGSRC_BARRIER)
 build: configure build-cookie pkginstall
 .  else
 build: barrier
diff --git a/mk/build/build.mk b/mk/build/build.mk
index ebab48b20fa..917d26a70bc 100644
--- a/mk/build/build.mk
+++ b/mk/build/build.mk
@@ -1,4 +1,4 @@
-# $NetBSD: build.mk,v 1.4 2006/07/07 21:24:28 jlam Exp $
+# $NetBSD: build.mk,v 1.5 2006/07/22 16:31:35 jlam Exp $
 #
 # BUILD_MAKE_FLAGS is the list of arguments that is passed to the make
 #	process.
@@ -26,7 +26,7 @@ _BUILD_TARGETS+=	pkginstall
 .  if exists(${_COOKIE.build})
 build:
 	@${DO_NADA}
-.  elif exists(${_COOKIE.barrier})
+.  elif defined(_PKGSRC_BARRIER)
 build: ${_BUILD_TARGETS}
 .  else
 build: barrier
diff --git a/mk/build/test.mk b/mk/build/test.mk
index d0476e9b7d5..66321409854 100644
--- a/mk/build/test.mk
+++ b/mk/build/test.mk
@@ -1,4 +1,4 @@
-# $NetBSD: test.mk,v 1.5 2006/07/07 21:24:28 jlam Exp $
+# $NetBSD: test.mk,v 1.6 2006/07/22 16:31:35 jlam Exp $
 #
 # TEST_DIRS is the list of directories in which to perform the build
 #	process.  If the directories are relative paths, then they
@@ -30,7 +30,7 @@ _TEST_TARGETS+=	release-test-lock
 .  if exists(${_COOKIE.test})
 test:
 	@${DO_NADA}
-.  elif exists(${_COOKIE.barrier})
+.  elif defined(_PKGSRC_BARRIER)
 test: ${_TEST_TARGETS}
 .  else
 test: barrier
diff --git a/mk/buildlink3/bsd.buildlink3.mk b/mk/buildlink3/bsd.buildlink3.mk
index 09dc48363e2..753f2f854c3 100644
--- a/mk/buildlink3/bsd.buildlink3.mk
+++ b/mk/buildlink3/bsd.buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.buildlink3.mk,v 1.184 2006/07/10 17:10:18 wiz Exp $
+# $NetBSD: bsd.buildlink3.mk,v 1.185 2006/07/22 16:31:35 jlam Exp $
 #
 # Copyright (c) 2004 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -197,7 +197,7 @@ ${_depmethod_}+=	${_BLNK_ADD_TO.${_depmethod_}}
 ###
 ### BEGIN: after the barrier
 ###
-.if exists(${_COOKIE.barrier})
+.if defined(_PKGSRC_BARRIER)
 
 # Generate default values for:
 #
diff --git a/mk/configure/bsd.configure.mk b/mk/configure/bsd.configure.mk
index ce752d3aefb..aa86290788a 100644
--- a/mk/configure/bsd.configure.mk
+++ b/mk/configure/bsd.configure.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.configure.mk,v 1.6 2006/07/07 21:24:28 jlam Exp $
+# $NetBSD: bsd.configure.mk,v 1.7 2006/07/22 16:31:35 jlam Exp $
 #
 # This Makefile fragment is included by bsd.pkg.mk and provides all
 # variables and targets related to configuring packages for building.
@@ -26,7 +26,7 @@ _COOKIE.configure=	${WRKDIR}/.configure_done
 .  if exists(${_COOKIE.configure})
 configure:
 	@${DO_NADA}
-.  elif exists(${_COOKIE.barrier})
+.  elif defined(_PKGSRC_BARRIER)
 configure: wrapper configure-cookie
 .  else
 configure: barrier
diff --git a/mk/configure/configure.mk b/mk/configure/configure.mk
index 42d079b17c0..6a9bc89df30 100644
--- a/mk/configure/configure.mk
+++ b/mk/configure/configure.mk
@@ -1,4 +1,4 @@
-# $NetBSD: configure.mk,v 1.7 2006/07/21 14:21:28 jlam Exp $
+# $NetBSD: configure.mk,v 1.8 2006/07/22 16:31:35 jlam Exp $
 #
 # CONFIGURE_SCRIPT is the path to the script to run in order to
 #	configure the software for building.  If the path is relative,
@@ -49,7 +49,7 @@ _CONFIGURE_TARGETS+=	release-configure-lock
 .  if exists(${_COOKIE.configure})
 configure:
 	@${DO_NADA}
-.  elif exists(${_COOKIE.barrier})
+.  elif defined(_PKGSRC_BARRIER)
 configure: ${_CONFIGURE_TARGETS}
 .  else
 configure: barrier
diff --git a/mk/extract/extract.mk b/mk/extract/extract.mk
index c1bdb852596..aeeb75974ea 100644
--- a/mk/extract/extract.mk
+++ b/mk/extract/extract.mk
@@ -1,4 +1,4 @@
-# $NetBSD: extract.mk,v 1.12 2006/07/21 14:21:28 jlam Exp $
+# $NetBSD: extract.mk,v 1.13 2006/07/22 16:31:35 jlam Exp $
 #
 # The following variables may be set by the package Makefile and
 # specify how extraction happens:
@@ -53,7 +53,7 @@ _EXTRACT_TARGETS+=	release-extract-lock
 .  if exists(${_COOKIE.extract})
 extract:
 	@${DO_NADA}
-.  elif exists(${_COOKIE.barrier})
+.  elif defined(_PKGSRC_BARRIER)
 extract: ${_EXTRACT_TARGETS}
 .  else
 extract: barrier
diff --git a/mk/install/bsd.install.mk b/mk/install/bsd.install.mk
index 1b9e5172cb4..23b39f2a28d 100644
--- a/mk/install/bsd.install.mk
+++ b/mk/install/bsd.install.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.install.mk,v 1.8 2006/07/07 21:24:28 jlam Exp $
+# $NetBSD: bsd.install.mk,v 1.9 2006/07/22 16:31:35 jlam Exp $
 #
 # This Makefile fragment is included by bsd.pkg.mk and provides all
 # variables and targets related to installing packages.
@@ -26,7 +26,7 @@ _COOKIE.install=	${WRKDIR}/.install_done
 .  if exists(${_COOKIE.install})
 install:
 	@${DO_NADA}
-.  elif exists(${_COOKIE.barrier})
+.  elif defined(_PKGSRC_BARRIER)
 install: ${_PKGSRC_BUILD_TARGETS} install-cookie
 .  else
 install: barrier
diff --git a/mk/install/install.mk b/mk/install/install.mk
index ee97069fff5..d3dfbe90c2b 100644
--- a/mk/install/install.mk
+++ b/mk/install/install.mk
@@ -1,4 +1,4 @@
-# $NetBSD: install.mk,v 1.13 2006/07/20 14:17:48 jlam Exp $
+# $NetBSD: install.mk,v 1.14 2006/07/22 16:31:35 jlam Exp $
 
 ######################################################################
 ### install (PUBLIC)
@@ -17,7 +17,7 @@ _INSTALL_TARGETS+=	release-install-lock
 .  if exists(${_COOKIE.install})
 install:
 	@${DO_NADA}
-.  elif exists(${_COOKIE.barrier})
+.  elif defined(_PKGSRC_BARRIER)
 install: ${_INSTALL_TARGETS}
 .  else
 install: barrier
diff --git a/mk/install/replace.mk b/mk/install/replace.mk
index d2ed28f9f38..4053a70fac3 100644
--- a/mk/install/replace.mk
+++ b/mk/install/replace.mk
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.6 2006/07/07 21:24:28 jlam Exp $
+# $NetBSD: replace.mk,v 1.7 2006/07/22 16:31:35 jlam Exp $
 
 ######################################################################
 ### replace (PUBLIC)
@@ -12,7 +12,7 @@ _REPLACE_TARGETS+=	unprivileged-install-hook
 
 .PHONY: replace su-replace
 .if !target(replace)
-.  if exists(${_COOKIE.barrier})
+.  if defined(_PKGSRC_BARRIER)
 replace: ${_REPLACE_TARGETS} su-target
 .  else
 replace: barrier
diff --git a/mk/package/bsd.package.mk b/mk/package/bsd.package.mk
index 16257ac4daf..4c1530f0c7b 100644
--- a/mk/package/bsd.package.mk
+++ b/mk/package/bsd.package.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.package.mk,v 1.6 2006/07/07 21:24:28 jlam Exp $
+# $NetBSD: bsd.package.mk,v 1.7 2006/07/22 16:31:35 jlam Exp $
 #
 # This Makefile fragment is included by bsd.pkg.mk and provides all
 # variables and targets related to binary packages.
@@ -22,7 +22,7 @@ _COOKIE.package=	${WRKDIR}/.package_done
 .  if exists(${_COOKIE.package})
 package:
 	@${DO_NADA}
-.  elif exists(${_COOKIE.barrier})
+.  elif defined(_PKGSRC_BARRIER)
 package: install
 .    if defined(SKIP_SILENT)
 	@${DO_NADA}
diff --git a/mk/package/package.mk b/mk/package/package.mk
index 7098dec3184..e956f751d37 100644
--- a/mk/package/package.mk
+++ b/mk/package/package.mk
@@ -1,4 +1,4 @@
-# $NetBSD: package.mk,v 1.14 2006/07/07 21:24:28 jlam Exp $
+# $NetBSD: package.mk,v 1.15 2006/07/22 16:31:35 jlam Exp $
 
 ######################################################################
 ### package (PUBLIC)
@@ -21,7 +21,7 @@ _PACKAGE_TARGETS+=	release-package-lock
 .  if exists(${_COOKIE.package})
 package:
 	@${DO_NADA}
-.  elif exists(${_COOKIE.barrier})
+.  elif defined(_PKGSRC_BARRIER)
 package: ${_PACKAGE_TARGETS}
 .  else
 package: barrier
diff --git a/mk/patch/patch.mk b/mk/patch/patch.mk
index b645ee61538..f7e6572cbb9 100644
--- a/mk/patch/patch.mk
+++ b/mk/patch/patch.mk
@@ -1,4 +1,4 @@
-# $NetBSD: patch.mk,v 1.10 2006/07/21 14:21:28 jlam Exp $
+# $NetBSD: patch.mk,v 1.11 2006/07/22 16:31:35 jlam Exp $
 #
 # The following variables may be set in a package Makefile and control
 # how pkgsrc patches are applied.
@@ -63,7 +63,7 @@ _PATCH_TARGETS+=	release-patch-lock
 .  if exists(${_COOKIE.patch})
 patch:
 	@${DO_NADA}
-.  elif exists(${_COOKIE.barrier})
+.  elif defined(_PKGSRC_BARRIER)
 patch: ${_PATCH_TARGETS}
 .  else
 patch: barrier
diff --git a/mk/wrapper/bsd.wrapper.mk b/mk/wrapper/bsd.wrapper.mk
index 42b90cc00e0..ba89a8f75b5 100644
--- a/mk/wrapper/bsd.wrapper.mk
+++ b/mk/wrapper/bsd.wrapper.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.wrapper.mk,v 1.49 2006/07/21 14:21:28 jlam Exp $
+# $NetBSD: bsd.wrapper.mk,v 1.50 2006/07/22 16:31:35 jlam Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -780,7 +780,7 @@ _COOKIE.wrapper=	${WRKDIR}/.wrapper_done
 .  if exists(${_COOKIE.wrapper})
 wrapper:
 	@${DO_NADA}
-.  elif exists(${_COOKIE.barrier})
+.  elif defined(_PKGSRC_BARRIER)
 wrapper: check-vulnerable tools acquire-wrapper-lock ${_COOKIE.wrapper} release-wrapper-lock
 .  else
 wrapper: barrier