[pkgsrc/trunk]: pkgsrc/mk/wrapper Insert the default values for WRAPPER_DEBUG...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f9fac7383496
branches:  trunk
changeset: 483471:f9fac7383496
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Fri Nov 12 16:27:57 2004 +0000

description:
Insert the default values for WRAPPER_DEBUG and WRAPPER_UPDATE_CACHE as
defaults within the wrapper script.  This avoids requiring those two
variables to be defined in the shell environment for the correct defaults
to take effect.

diffstat:

 mk/wrapper/bsd.wrapper.mk |  4 +++-
 mk/wrapper/wrapper.sh     |  6 +++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diffs (47 lines):

diff -r 44752a37dc36 -r f9fac7383496 mk/wrapper/bsd.wrapper.mk
--- a/mk/wrapper/bsd.wrapper.mk Fri Nov 12 15:39:22 2004 +0000
+++ b/mk/wrapper/bsd.wrapper.mk Fri Nov 12 16:27:57 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.wrapper.mk,v 1.10 2004/10/14 20:22:21 tv Exp $
+# $NetBSD: bsd.wrapper.mk,v 1.11 2004/11/12 16:27:57 jlam Exp $
 #
 # Copyright (c) 2004 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -310,6 +310,8 @@
        -e "s|@_WRAP_SKIP_TRANSFORM@|${_WRAP_SKIP_TRANSFORM.${_wrappee_}:Q}|g" \
        -e "s|@_WRAP_TRANSFORM@|${_WRAP_TRANSFORM.${_wrappee_}:Q}|g"    \
        -e "s|@_WRAP_TRANSFORM_SED@|${_WRAP_TRANSFORM_SED.${_wrappee_}:Q}|g" \
+       -e "s|@WRAPPER_DEBUG@|${WRAPPER_DEBUG}|g"                       \
+       -e "s|@WRAPPER_UPDATE_CACHE@|${WRAPPER_UPDATE_CACHE}|g"         \
        ${_WRAP_SUBST_SED}
 
 _WRAP_COOKIE.${_wrappee_}=     ${WRAPPER_DIR}/.wrapper_${_wrappee_}_done
diff -r 44752a37dc36 -r f9fac7383496 mk/wrapper/wrapper.sh
--- a/mk/wrapper/wrapper.sh     Fri Nov 12 15:39:22 2004 +0000
+++ b/mk/wrapper/wrapper.sh     Fri Nov 12 16:27:57 2004 +0000
@@ -1,6 +1,6 @@
 #! @WRAPPER_SHELL@
 #
-# $NetBSD: wrapper.sh,v 1.3 2004/09/23 03:59:01 jlam Exp $
+# $NetBSD: wrapper.sh,v 1.4 2004/11/12 16:27:57 jlam Exp $
 #
 # Copyright (c) 2004 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -52,7 +52,7 @@
 transform_sed="@_WRAP_TRANSFORM_SED@"
 wrapperlog="${WRAPPER_LOG-@_WRAP_LOG@}"
 skip_transform="${WRAPPER_SKIP_TRANSFORM-@_WRAP_SKIP_TRANSFORM@}"
-debug="${WRAPPER_DEBUG-no}"
+debug="${WRAPPER_DEBUG-@WRAPPER_DEBUG@}"
 append_extra_args=yes
 
 cat="@CAT@"  
@@ -64,7 +64,7 @@
 
 . $shell_lib
 
-updatecache=${WRAPPER_UPDATE_CACHE-yes}
+updatecache=${WRAPPER_UPDATE_CACHE-@WRAPPER_UPDATE_CACHE@}
 reorder=${WRAPPER_REORDER-no}
 
 case $debug in