"BUILD_ENV" was misnamed. It's actually the environment that is passed

to all internal recursive make processes.  As such, rename it to
"PKGSRC_MAKE_ENV".

XXX Note, some of the usage of this variable in package Makefiles seems
XXX incorrect.  They probably want "MAKE_ENV", which is the environment
XXX passed to the make process when running "make" within ${WRKSRC}.

5 files changed, 13 insertions, 13 deletions

diff --git a/mk/bsd.pkg.barrier.mk b/mk/bsd.pkg.barrier.mk
index adde2cf3844..71df9548278 100644
--- a/mk/bsd.pkg.barrier.mk
+++ b/mk/bsd.pkg.barrier.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.barrier.mk,v 1.7 2006/07/21 14:21:28 jlam Exp $
+# $NetBSD: bsd.pkg.barrier.mk,v 1.8 2006/07/21 14:27:56 jlam Exp $
 
 _COOKIE.barrier=	${WRKDIR}/.barrier_cookie
 
@@ -56,7 +56,7 @@ barrier: ${_BARRIER_PRE_TARGETS} ${_COOKIE.barrier}
 .  if defined(PKG_VERBOSE)
 	@${PHASE_MSG} "Invoking \`\`"${_BARRIER_CMDLINE_TARGETS:Q}"'' after barrier for ${PKGNAME}"
 .  endif
-	${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${SETENV} ${BUILD_ENV} ${MAKE} ${MAKEFLAGS} ALLOW_VULNERABLE_PACKAGES= ${_BARRIER_CMDLINE_TARGETS}
+	${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${SETENV} ${PKGSRC_MAKE_ENV} ${MAKE} ${MAKEFLAGS} 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-vars.mk b/mk/build/bsd.build-vars.mk
index 5b70338890b..af23a9f8be5 100644
--- a/mk/build/bsd.build-vars.mk
+++ b/mk/build/bsd.build-vars.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.build-vars.mk,v 1.1 2006/07/05 06:09:15 jlam Exp $
+# $NetBSD: bsd.build-vars.mk,v 1.2 2006/07/21 14:27:56 jlam Exp $
 #
 # BUILD_DIRS is the list of directories in which to perform the build
 #	process.  If the directories are relative paths, then they
@@ -44,4 +44,4 @@ MAKE_ENV+=	${USETOOLS:DUSETOOLS=${USETOOLS:Q}}
 # Add these bits to the environment used when invoking the recursive make
 # processes for build-related phases.
 #
-BUILD_ENV+=	PATH=${PATH:Q}
+PKGSRC_MAKE_ENV+=	PATH=${PATH:Q}
diff --git a/mk/compiler/ccache.mk b/mk/compiler/ccache.mk
index 2bd70bd6f22..1487f60fee3 100644
--- a/mk/compiler/ccache.mk
+++ b/mk/compiler/ccache.mk
@@ -1,4 +1,4 @@
-# $NetBSD: ccache.mk,v 1.26 2005/01/24 18:20:57 tv Exp $
+# $NetBSD: ccache.mk,v 1.27 2006/07/21 14:27:56 jlam Exp $
 #
 # Copyright (c) 2004 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -98,10 +98,10 @@ BUILD_DEPENDS+=	ccache-[0-9]*:../../devel/ccache
 # Override the compiler-specific hash with the version string for the
 # compiler.
 #
-BUILD_ENV+=	CCACHE_HASHCC=${CC_VERSION_STRING:Q}
+PKGSRC_MAKE_ENV+=	CCACHE_HASHCC=${CC_VERSION_STRING:Q}
 
 .  if defined(CCACHE_DIR) && !empty(CCACHE_DIR)
-BUILD_ENV+=	CCACHE_DIR=${CCACHE_DIR:Q}
+PKGSRC_MAKE_ENV+=	CCACHE_DIR=${CCACHE_DIR:Q}
 .  endif
 
 # Create symlinks for the compiler into ${WRKDIR}.
diff --git a/mk/compiler/distcc.mk b/mk/compiler/distcc.mk
index 1bdd6b7436a..3ef33edfb14 100644
--- a/mk/compiler/distcc.mk
+++ b/mk/compiler/distcc.mk
@@ -1,4 +1,4 @@
-# $NetBSD: distcc.mk,v 1.27 2005/01/24 18:20:57 tv Exp $
+# $NetBSD: distcc.mk,v 1.28 2006/07/21 14:27:56 jlam Exp $
 #
 # Copyright (c) 2004 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -96,13 +96,13 @@ PREPEND_PATH+=	${_DISTCC_DIR}/bin
 BUILD_DEPENDS+=	distcc-[0-9]*:../../devel/distcc
 
 .  if defined(DISTCC_HOSTS) && !empty(DISTCC_HOSTS)
-BUILD_ENV+=	DISTCC_HOSTS=${DISTCC_HOSTS:Q}
+PKGSRC_MAKE_ENV+=	DISTCC_HOSTS=${DISTCC_HOSTS:Q}
 .  endif
 .  if defined(DISTCC_SSH) && !empty(DISTCC_SSH)
-BUILD_ENV+=	DISTCC_SSH=${DISTCC_SSH:Q}
+PKGSRC_MAKE_ENV+=	DISTCC_SSH=${DISTCC_SSH:Q}
 .  endif
 .  if defined(DISTCC_VERBOSE) && !empty(DISTCC_VERBOSE)
-BUILD_ENV+=	DISTCC_VERBOSE=${DISTCC_VERBOSE:Q}
+PKGSRC_MAKE_ENV+=	DISTCC_VERBOSE=${DISTCC_VERBOSE:Q}
 .  endif
 
 # Create symlinks for the compiler into ${WRKDIR}.
diff --git a/mk/compiler/f2c.mk b/mk/compiler/f2c.mk
index 18e22f59ddc..05fef1ccc4b 100644
--- a/mk/compiler/f2c.mk
+++ b/mk/compiler/f2c.mk
@@ -1,4 +1,4 @@
-# $NetBSD: f2c.mk,v 1.5 2005/03/24 17:46:01 tv Exp $
+# $NetBSD: f2c.mk,v 1.6 2006/07/21 14:27:56 jlam Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -99,7 +99,7 @@ PREPEND_PATH+=	${_F2C_DIR}/bin
 .  include "../../lang/f2c/buildlink3.mk"
 
 .  if defined(F2C_DIR) && !empty(F2C_DIR)
-BUILD_ENV+=	F2C_DIR=${F2C_DIR:Q}
+PKGSRC_MAKE_ENV+=	F2C_DIR=${F2C_DIR:Q}
 .  endif
 
 # Create symlinks for the compiler into ${WRKDIR}.