[pkgsrc/trunk]: pkgsrc/mk Instead of wrapping the config.status script, edit ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5b5aa00898b8
branches:  trunk
changeset: 469733:5b5aa00898b8
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Fri Feb 27 16:50:48 2004 +0000

description:
Instead of wrapping the config.status script, edit it directly to prevent
--recheck from re-executing the configure script by inserting "exit 0"
judiciously.  This works with configure scripts generated by autoconf>=2.13
and fixes problems with running config.status on Solaris systems where
/bin/sh isn't POSIX enough.

diffstat:

 mk/bsd.pkg.mk |  24 ++++++++----------------
 1 files changed, 8 insertions(+), 16 deletions(-)

diffs (38 lines):

diff -r 616a3ac72624 -r 5b5aa00898b8 mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Fri Feb 27 15:45:12 2004 +0000
+++ b/mk/bsd.pkg.mk     Fri Feb 27 16:50:48 2004 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.1412 2004/02/25 09:24:52 grant Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.1413 2004/02/27 16:50:48 jlam Exp $
 #
 # This file is in the public domain.
 #
@@ -2474,21 +2474,13 @@
        for file in ${_pattern_}; do                                    \
                if [ -f "$$file" ]; then                                \
                        ${MV} -f $$file $$file.overridden;              \
-                       (${ECHO} '#!${CONFIG_SHELL}';                   \
-                        ${ECHO} '${ECHO} "$$0 $$@" >> ${WRKLOG}';      \
-                        ${ECHO} 'pkgsrc_override=no';                  \
-                        ${ECHO} 'for arg';                             \
-                        ${ECHO} 'do';                                  \
-                        ${ECHO} '      case $$arg in';                 \
-                        ${ECHO} '      --recheck) pkgsrc_override=yes ;;'; \
-                        ${ECHO} '      *) ;;';                         \
-                        ${ECHO} '      esac';                          \
-                        ${ECHO} 'done';                                \
-                        ${ECHO} 'case $$pkgsrc_override in';           \
-                        ${ECHO} 'yes) exit 0 ;;';                      \
-                        ${ECHO} 'esac';                                \
-                        ${ECHO} ". ${WRKSRC}/$$file.overridden";       \
-                       ) > $$file;                                     \
+                       ${AWK} '/ *-recheck *\| *--recheck.*)/ {        \
+                                       print;                          \
+                                       print "    exit 0";             \
+                                       next;                           \
+                               }                                       \
+                               { print }                               \
+                              ' $$file.overridden > $$file;            \
                        ${CHMOD} +x $$file;                             \
                fi;                                                     \
        done