Rename MAKE_VARS to MAKEVARS so that it more closely resembles

"MAKEFLAGS".  Both "MAKEVARS" and "MAKEFLAGS" affect the package-level
make process, not the software's own make process.

11 files changed, 37 insertions, 35 deletions

diff --git a/databases/openldap/buildlink3.mk b/databases/openldap/buildlink3.mk
index 33dc4858e90..341ec3b0f55 100644
--- a/databases/openldap/buildlink3.mk
+++ b/databases/openldap/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.19 2005/05/11 22:03:52 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.20 2005/05/11 22:08:18 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 OPENLDAP_BUILDLINK3_MK:=	${OPENLDAP_BUILDLINK3_MK}+
@@ -24,7 +24,7 @@ PKG_BUILD_OPTIONS.openldap!=						\
 	${MAKE} show-var ${MAKEFLAGS} VARNAME=PKG_OPTIONS
 MAKEFLAGS+=	PKG_BUILD_OPTIONS.openldap=${PKG_BUILD_OPTIONS.openldap:Q}
 .endif
-MAKE_VARS+=	PKG_BUILD_OPTIONS.openldap
+MAKEVARS+=	PKG_BUILD_OPTIONS.openldap
 
 .if !empty(PKG_BUILD_OPTIONS.openldap:Mkerberos) || \
     !empty(PKG_BUILD_OPTIONS.openldap:Msasl)
diff --git a/devel/apr/buildlink3.mk b/devel/apr/buildlink3.mk
index 0d320a403cc..aca0bc24531 100644
--- a/devel/apr/buildlink3.mk
+++ b/devel/apr/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2005/05/11 22:03:52 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2005/05/11 22:08:18 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 APR_BUILDLINK3_MK:=	${APR_BUILDLINK3_MK}+
@@ -29,7 +29,7 @@ PKG_BUILD_OPTIONS.apr!=	cd ${BUILDLINK_PKGSRCDIR.apr} && \
 			${MAKE} show-var ${MAKEFLAGS} VARNAME=PKG_OPTIONS
 MAKEFLAGS+=	PKG_BUILD_OPTIONS.apr=${PKG_BUILD_OPTIONS.apr:Q}
 .endif
-MAKE_VARS+=	PKG_BUILD_OPTIONS.apr
+MAKEVARS+=	PKG_BUILD_OPTIONS.apr
 
 .if !empty(PKG_BUILD_OPTIONS.apr:Mdb4)
 .  include "../../databases/db4/buildlink3.mk"
diff --git a/misc/kdepim3/buildlink3.mk b/misc/kdepim3/buildlink3.mk
index 39b5f49f680..eecb4336f4d 100644
--- a/misc/kdepim3/buildlink3.mk
+++ b/misc/kdepim3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2005/05/11 22:03:52 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2005/05/11 22:08:18 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 KDEPIM_BUILDLINK3_MK:=	${KDEPIM_BUILDLINK3_MK}+
@@ -22,7 +22,7 @@ PKG_BUILD_OPTIONS.kdepim!=						\
 	${MAKE} show-var ${MAKEFLAGS} VARNAME=PKG_OPTIONS
 MAKEFLAGS+=	PKG_BUILD_OPTIONS.kdepim=${PKG_BUILD_OPTIONS.kdepim:Q}
 .endif
-MAKE_VARS+=	PKG_BUILD_OPTIONS.kdepim
+MAKEVARS+=	PKG_BUILD_OPTIONS.kdepim
 
 .include "../../comms/libmal/buildlink3.mk"
 .include "../../comms/pilot-link-libs/buildlink3.mk"
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 75692be2515..792c8fb28da 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.mk,v 1.1637 2005/05/11 04:01:49 jlam Exp $
+#	$NetBSD: bsd.pkg.mk,v 1.1638 2005/05/11 22:08:18 jlam Exp $
 #
 # This file is in the public domain.
 #
@@ -28,16 +28,16 @@ _REV_ALL_PHASES:=	${_phase_} ${_REV_ALL_PHASES}
 .  endfor
 .  undef _phase_
 .endif
-MAKE_VARS+=		_REV_ALL_PHASES
+MAKEVARS+=		_REV_ALL_PHASES
 
 # Try including the .makevars.mk.* files in reverse order so that the
 # latest file is included and no more.
 #
 .for _phase_ in ${_REV_ALL_PHASES}
-_MAKE_VARS_MK.${_phase_}=	${WRKDIR}/.${_phase_}_makevars.mk
-${_phase_}-vars: ${_MAKE_VARS_MK.${_phase_}}
-.  if !defined(_MAKE_VARS_MK)
-.    sinclude "${_MAKE_VARS_MK.${_phase_}}"
+_MAKEVARS_MK.${_phase_}=	${WRKDIR}/.${_phase_}_makevars.mk
+${_phase_}-vars: ${_MAKEVARS_MK.${_phase_}}
+.  if !defined(_MAKEVARS_MK)
+.    sinclude "${_MAKEVARS_MK.${_phase_}}"
 .  endif
 .endfor
 .undef _phase_
@@ -447,7 +447,9 @@ SHCOMMENT?=		${ECHO_MSG} >/dev/null '***'
 
 LIBABISUFFIX?=
 
+.if empty(_USE_NEW_TOOLS:M[yY][eE][sS])
 CONFIGURE_ENV+=		M4="${M4}" YACC="${YACC}"
+.endif
 
 TOUCH_FLAGS?=		-f
 
@@ -465,7 +467,7 @@ _PKGSRC_USE_PATCH!=	\
 	fi
 .  endif
 .endif
-MAKE_VARS+=	_PKGSRC_USE_PATCH
+MAKEVARS+=	_PKGSRC_USE_PATCH
 
 .if !empty(_PKGSRC_USE_PATCH:M[yY][eE][sS])
 .  if empty(_USE_NEW_TOOLS:M[yY][eE][sS])
@@ -5014,26 +5016,26 @@ PKG_ERROR_HANDLER.${_class_}?=	{					\
 	}
 .endfor
 
-# Cache variables listed in MAKE_VARS in a phase-specific "makevars.mk"
+# Cache variables listed in MAKEVARS in a phase-specific "makevars.mk"
 # file.  These variables are effectively passed to sub-make processes
 # that are invoked on the same Makefile.
 #
 .for _phase_ in ${ALL_PHASES}
-${_MAKE_VARS_MK.${_phase_}}: ${WRKDIR}
+${_MAKEVARS_MK.${_phase_}}: ${WRKDIR}
 .  if !empty(PKG_PHASE:M${_phase_})
 	${_PKG_SILENT}${_PKG_DEBUG}${RM} -f ${.TARGET}.tmp
-.    for _var_ in ${MAKE_VARS:O:u}
+.    for _var_ in ${MAKEVARS:O:u}
 	${_PKG_SILENT}${_PKG_DEBUG}					\
 	${ECHO} ${_var_}"=	"${${_var_}:Q} >> ${.TARGET}.tmp
 .    endfor
 	${_PKG_SILENT}${_PKG_DEBUG}					\
 	if ${TEST} -f ${.TARGET}.tmp; then				\
-		( ${ECHO} ".if !defined(_MAKE_VARS_MK)";		\
-		  ${ECHO} "_MAKE_VARS_MK=	defined";		\
+		( ${ECHO} ".if !defined(_MAKEVARS_MK)";			\
+		  ${ECHO} "_MAKEVARS_MK=	defined";		\
 		  ${ECHO} "";						\
 		  ${CAT} ${.TARGET}.tmp;				\
 		  ${ECHO} "";						\
-		  ${ECHO} ".endif # _MAKE_VARS_MK";			\
+		  ${ECHO} ".endif # _MAKEVARS_MK";			\
 		) > ${.TARGET};						\
 		${RM} -f ${.TARGET}.tmp;				\
 	fi
diff --git a/mk/buildlink3/bsd.buildlink3.mk b/mk/buildlink3/bsd.buildlink3.mk
index 4d47c72ea5b..f5ea9fce213 100644
--- a/mk/buildlink3/bsd.buildlink3.mk
+++ b/mk/buildlink3/bsd.buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.buildlink3.mk,v 1.169 2005/05/09 05:06:55 jlam Exp $
+# $NetBSD: bsd.buildlink3.mk,v 1.170 2005/05/11 22:08:18 jlam Exp $
 #
 # Copyright (c) 2004 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -315,7 +315,7 @@ _BLNK_PKG_DBDIR.${_pkg_}!=	\
 .    endfor
 .  endif
 .  if empty(_BLNK_PKG_DBDIR.${_pkg_}:M*not_found)
-MAKE_VARS+=	_BLNK_PKG_DBDIR.${_pkg_}
+MAKEVARS+=	_BLNK_PKG_DBDIR.${_pkg_}
 .  endif
 
 .  if empty(_BLNK_PKG_DBDIR.${_pkg_}:M*not_found)
@@ -346,7 +346,7 @@ BUILDLINK_PREFIX.${_pkg_}=	BUILDLINK_PREFIX.${_pkg_}_not_found
 .    endif
 .  endif
 .  if empty(BUILDLINK_PREFIX.${_pkg_}:M*not_found)
-MAKE_VARS+=	BUILDLINK_PREFIX.${_pkg_}
+MAKEVARS+=	BUILDLINK_PREFIX.${_pkg_}
 .  endif
 
 BUILDLINK_AUTO_VARS.${_pkg_}?=	yes
@@ -866,7 +866,7 @@ _BLNK_PHYSICAL_PATH.${_var_}!=						\
 		${ECHO} ${${_var_}};					\
 	fi
 .  endif
-MAKE_VARS+=	_BLNK_PHYSICAL_PATH.${_var_}
+MAKEVARS+=	_BLNK_PHYSICAL_PATH.${_var_}
 .endfor
 
 # Transform all references to the physical paths to some important
diff --git a/mk/tools/replace.mk b/mk/tools/replace.mk
index 0adab7b7502..884cb8c08ba 100644
--- a/mk/tools/replace.mk
+++ b/mk/tools/replace.mk
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.67 2005/05/11 19:42:17 jlam Exp $
+# $NetBSD: replace.mk,v 1.68 2005/05/11 22:08:18 jlam Exp $
 #
 # This Makefile fragment handles "replacements" of system-supplied
 # tools with pkgsrc versions.
@@ -77,7 +77,7 @@ _USE_TOOLS:=	${_USE_TOOLS:Nm4}
 _USE_TOOLS:=	${_USE_TOOLS:Nsed}
 .  endif
 .endif
-MAKE_VARS+=	_USE_TOOLS
+MAKEVARS+=	_USE_TOOLS
 
 ######################################################################
 
diff --git a/mk/wrapper/bsd.wrapper.mk b/mk/wrapper/bsd.wrapper.mk
index bbcb337b72e..aae9a54e3ef 100644
--- a/mk/wrapper/bsd.wrapper.mk
+++ b/mk/wrapper/bsd.wrapper.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.wrapper.mk,v 1.29 2005/05/09 05:06:56 jlam Exp $
+# $NetBSD: bsd.wrapper.mk,v 1.30 2005/05/11 22:08:19 jlam Exp $
 #
 # Copyright (c) 2004 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -103,7 +103,7 @@ _WRAP_TRANSFORM_CMDS+=	${WRAPPER_TRANSFORM_CMDS}
 .if !defined(_WRAP_PATH)
 _WRAP_PATH=	${PATH:S/${WRAPPER_BINDIR}://:S/:${WRAPPER_BINDIR}//}
 .endif
-MAKE_VARS+=	_WRAP_PATH
+MAKEVARS+=	_WRAP_PATH
 
 # Generate wrapper scripts for the compiler tools.  These wrapper
 # scripts are to be used instead of the actual compiler tools when
diff --git a/security/heimdal/buildlink3.mk b/security/heimdal/buildlink3.mk
index 3f78ebf15db..2ea31252182 100644
--- a/security/heimdal/buildlink3.mk
+++ b/security/heimdal/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.24 2005/05/11 22:03:52 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.25 2005/05/11 22:08:19 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 HEIMDAL_BUILDLINK3_MK:=	${HEIMDAL_BUILDLINK3_MK}+
@@ -25,7 +25,7 @@ PKG_BUILD_OPTIONS.heimdal!=						\
 	${MAKE} show-var ${MAKEFLAGS} VARNAME=PKG_OPTIONS
 MAKEFLAGS+=	PKG_BUILD_OPTIONS.heimdal=${PKG_BUILD_OPTIONS.heimdal:Q}
 .endif
-MAKE_VARS+=	PKG_BUILD_OPTIONS.heimdal
+MAKEVARS+=	PKG_BUILD_OPTIONS.heimdal
 
 .include "../../security/openssl/buildlink3.mk"
 .if !empty(PKG_BUILD_OPTIONS.heimdal:Mdb4)
diff --git a/security/openssl/buildlink3.mk b/security/openssl/buildlink3.mk
index 377b4924efe..91eb462f3fe 100644
--- a/security/openssl/buildlink3.mk
+++ b/security/openssl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.27 2005/05/11 22:03:52 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.28 2005/05/11 22:08:19 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 OPENSSL_BUILDLINK3_MK:=	${OPENSSL_BUILDLINK3_MK}+
@@ -32,7 +32,7 @@ PKG_BUILD_OPTIONS.openssl!=						\
 	${MAKE} show-var ${MAKEFLAGS} VARNAME=PKG_OPTIONS
 MAKEFLAGS+=	PKG_BUILD_OPTIONS.openssl=${PKG_BUILD_OPTIONS.openssl:Q}
 .endif
-MAKE_VARS+=	PKG_BUILD_OPTIONS.openssl
+MAKEVARS+=	PKG_BUILD_OPTIONS.openssl
 
 .if !empty(PKG_BUILD_OPTIONS.openssl:Mrsaref)
 .  include "../../security/rsaref/buildlink3.mk"
diff --git a/x11/kdebase3/buildlink3.mk b/x11/kdebase3/buildlink3.mk
index c77f80bd6f1..4cf663ea88f 100644
--- a/x11/kdebase3/buildlink3.mk
+++ b/x11/kdebase3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2005/05/11 22:03:52 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2005/05/11 22:08:19 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 KDEBASE_BUILDLINK3_MK:=	${KDEBASE_BUILDLINK3_MK}+
@@ -22,7 +22,7 @@ PKG_BUILD_OPTIONS.kdebase!=						\
 	${MAKE} show-var ${MAKEFLAGS} VARNAME=PKG_OPTIONS
 MAKEFLAGS+=	PKG_BUILD_OPTIONS.kdebase=${PKG_BUILD_OPTIONS.kdebase:Q}
 .endif
-MAKE_VARS+=	PKG_BUILD_OPTIONS.kdebase
+MAKEVARS+=	PKG_BUILD_OPTIONS.kdebase
 
 BUILDLINK_DEPENDS.Xrandr+=      Xrandr>=1.0
 
diff --git a/x11/kdelibs3/buildlink3.mk b/x11/kdelibs3/buildlink3.mk
index c34646b4b18..2e38dd78dc6 100644
--- a/x11/kdelibs3/buildlink3.mk
+++ b/x11/kdelibs3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2005/05/11 22:03:53 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2005/05/11 22:08:19 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 KDELIBS_BUILDLINK3_MK:=	${KDELIBS_BUILDLINK3_MK}+
@@ -26,7 +26,7 @@ PKG_BUILD_OPTIONS.kdelibs!=						\
 	${MAKE} show-var ${MAKEFLAGS} VARNAME=PKG_OPTIONS
 MAKEFLAGS+=	PKG_BUILD_OPTIONS.kdelibs=${PKG_BUILD_OPTIONS.kdelibs:Q}
 .endif
-MAKE_VARS+=	PKG_BUILD_OPTIONS.kdelibs
+MAKEVARS+=	PKG_BUILD_OPTIONS.kdelibs
 
 .if !empty(PKG_BUILD_OPTIONS.kdelibs:Mcups)
 .  include "../../print/cups/buildlink3.mk"