[pkgsrc/trunk]: pkgsrc/mk Be less aggressive about overriding all of the func...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/787d2efd1020
branches:  trunk
changeset: 468760:787d2efd1020
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Mon Feb 16 20:25:18 2004 +0000

description:
Be less aggressive about overriding all of the functionality of
config.status.  Instead, only block "config.status --recheck", which
re-executes the GNU configure script.  This still allows config.status to
overwrite post-configure changes to Makefiles and config.h files, so those
changes should (properly) be applied to Makefile.in and config.h.in
instead.

diffstat:

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

diffs (34 lines):

diff -r 3ea02cb7c841 -r 787d2efd1020 mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Mon Feb 16 20:24:25 2004 +0000
+++ b/mk/bsd.pkg.mk     Mon Feb 16 20:25:18 2004 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.1407 2004/02/16 13:21:34 seb Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.1408 2004/02/16 20:25:18 jlam Exp $
 #
 # This file is in the public domain.
 #
@@ -2467,10 +2467,21 @@
        ${_PKG_SILENT}${_PKG_DEBUG}cd ${WRKSRC};                        \
        for file in ${_pattern_}; do                                    \
                if [ -f "$$file" ]; then                                \
-                       ${RM} -f $$file;                                \
-                       (${ECHO} '#!${SH}';                             \
+                       ${MV} -f $$file $$file.overridden;              \
+                       (${ECHO} '#!${CONFIG_SHELL}';                   \
                         ${ECHO} '${ECHO} "$$0 $$@" >> ${WRKLOG}';      \
-                        ${ECHO} 'exit 0';                              \
+                        ${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;                                     \
                        ${CHMOD} +x $$file;                             \
                fi;                                                     \