[pkgsrc/trunk]: pkgsrc/mk Back out revision 1.1684. MAKEFLAGS was being prop...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/959437e26f6a
branches:  trunk
changeset: 495177:959437e26f6a
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Fri Jun 03 20:22:59 2005 +0000

description:
Back out revision 1.1684.  MAKEFLAGS was being propagated incorrectly
through to dependencies, which caused dependencies to have improper
lists of tools required.

XXX This whole mess with MAKEFLAGS and which ones are passed along when
XXX running the install-depends target needs to be fixed for real.

diffstat:

 mk/bsd.pkg.mk |  15 +--------------
 1 files changed, 1 insertions(+), 14 deletions(-)

diffs (29 lines):

diff -r 8f85877c19b3 -r 959437e26f6a mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Fri Jun 03 20:09:29 2005 +0000
+++ b/mk/bsd.pkg.mk     Fri Jun 03 20:22:59 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.1685 2005/06/01 18:03:05 jlam Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.1686 2005/06/03 20:22:59 jlam Exp $
 #
 # This file is in the public domain.
 #
@@ -4832,19 +4832,6 @@
 .endfor
 .undef _phase_
 
-# *.makevars.mk doesn't exist until after ${WRKDIR} is created, which
-# doesn't happen until after the package is extracted.  Prior to
-# extraction, cache the variables named in MAKEVARS using MAKEFLAGS
-# instead.
-#
-.if !exists(${EXTRACT_COOKIE})
-.  for _var_ in ${MAKEVARS:O:u}
-.    if defined(${_var_})
-MAKEFLAGS+=    ${_var_}=${${_var_}:Q}
-.    endif
-.  endfor
-.endif
-
 # show-tools emits a /bin/sh shell script that defines all known tools
 # to the values they have in the pkgsrc infrastructure.
 #