[pkgsrc/trunk]: pkgsrc/mk/wrapper Move @_WRAP_TRANSFORM_SED@ from the logic s...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/951b011a464f
branches:  trunk
changeset: 480975:951b011a464f
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Thu Sep 23 03:59:01 2004 +0000

description:
Move @_WRAP_TRANSFORM_SED@ from the logic script into wrapper.sh so that
it can be customized per wrappee.  This fixes the imake wrapper script to
not do any transformations to -I... options.

diffstat:

 mk/wrapper/bsd.wrapper.mk |  5 +++--
 mk/wrapper/logic          |  4 ++--
 mk/wrapper/wrapper.sh     |  3 ++-
 3 files changed, 7 insertions(+), 5 deletions(-)

diffs (70 lines):

diff -r 36eac8b17cf6 -r 951b011a464f mk/wrapper/bsd.wrapper.mk
--- a/mk/wrapper/bsd.wrapper.mk Wed Sep 22 23:17:47 2004 +0000
+++ b/mk/wrapper/bsd.wrapper.mk Thu Sep 23 03:59:01 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.wrapper.mk,v 1.1 2004/09/21 15:01:41 jlam Exp $
+# $NetBSD: bsd.wrapper.mk,v 1.2 2004/09/23 03:59:01 jlam Exp $
 #
 # Copyright (c) 2004 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -78,6 +78,7 @@
 WRAPPER_DEBUG?=                yes
 CONFIGURE_ENV+=                WRAPPER_DEBUG="${WRAPPER_DEBUG}"
 MAKE_ENV+=             WRAPPER_DEBUG="${WRAPPER_DEBUG}"
+SCRIPTS_ENV+=          WRAPPER_DEBUG="${WRAPPER_DEBUG}"
 
 # The caching code, which greatly speeds up the build process, doesn't
 # work correctly on certain platforms.
@@ -293,6 +294,7 @@
        -e "s|@_WRAP_SCAN@|${_WRAP_SCAN.${_wrappee_}:Q}|g"              \
        -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" \
        ${_WRAP_SUBST_SED}
 
 _WRAP_COOKIE.${_wrappee_}=     ${WRAPPER_DIR}/.wrapper_${_wrappee_}_done
@@ -532,7 +534,6 @@
 ${_WRAP_LOGIC.${_wrappee_}}: ${WRAPPER_SRCDIR}/logic
        ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H}
        ${_PKG_SILENT}${_PKG_DEBUG}${CAT} ${.ALLSRC}                    \
-               | ${SED} -e "s|@_WRAP_TRANSFORM_SED@|${_WRAP_TRANSFORM_SED.${_wrappee_}:Q}|g" \
                | ${_WRAP_SH_CRUNCH_FILTER} > ${.TARGET}
 .  endif
 .endfor        # _WRAPPEES
diff -r 36eac8b17cf6 -r 951b011a464f mk/wrapper/logic
--- a/mk/wrapper/logic  Wed Sep 22 23:17:47 2004 +0000
+++ b/mk/wrapper/logic  Thu Sep 23 03:59:01 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: logic,v 1.3 2004/09/22 23:17:47 jlam Exp $
+# $NetBSD: logic,v 1.4 2004/09/23 03:59:01 jlam Exp $
 #
 # Copyright (c) 2004 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -202,7 +202,7 @@
                                shquote "$arg"; cachearg="$shquoted"
                                case $arg in
                                -*|/*)
-                                       arg=`$echo "X$arg" | $Xsed @_WRAP_TRANSFORM_SED@`
+                                       arg=`$echo "X$arg" | $Xsed $transform_sed`
                                        $debug_log $wrapperlog "    (logic) to:   $arg"
                                        addtocache=yes
                                        ;;
diff -r 36eac8b17cf6 -r 951b011a464f mk/wrapper/wrapper.sh
--- a/mk/wrapper/wrapper.sh     Wed Sep 22 23:17:47 2004 +0000
+++ b/mk/wrapper/wrapper.sh     Thu Sep 23 03:59:01 2004 +0000
@@ -1,6 +1,6 @@
 #! @WRAPPER_SHELL@
 #
-# $NetBSD: wrapper.sh,v 1.2 2004/09/22 17:56:31 jlam Exp $
+# $NetBSD: wrapper.sh,v 1.3 2004/09/23 03:59:01 jlam Exp $
 #
 # Copyright (c) 2004 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -49,6 +49,7 @@
 shell_lib="@_WRAP_SHELL_LIB@"
 scan="@_WRAP_SCAN@"
 transform="@_WRAP_TRANSFORM@"
+transform_sed="@_WRAP_TRANSFORM_SED@"
 wrapperlog="${WRAPPER_LOG-@_WRAP_LOG@}"
 skip_transform="${WRAPPER_SKIP_TRANSFORM-@_WRAP_SKIP_TRANSFORM@}"
 debug="${WRAPPER_DEBUG-no}"