[pkgsrc/trunk]: pkgsrc Add lang/nawk and sysutils/install-sh to the "don't bl...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/fd749d04f2b2
branches:  trunk
changeset: 521210:fd749d04f2b2
user:      tv <tv%pkgsrc.org@localhost>
date:      Mon Nov 06 21:08:42 2006 +0000

description:
Add lang/nawk and sysutils/install-sh to the "don't blow away" package
list for bulk builds.  (Revert previous on bootstrap; the PKG_PRESERVE
hack didn't work as expected.)

diffstat:

 bootstrap/bootstrap |  8 ++++----
 mk/bulk/pre-build   |  6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diffs (49 lines):

diff -r b0eaf242fca8 -r fd749d04f2b2 bootstrap/bootstrap
--- a/bootstrap/bootstrap       Mon Nov 06 21:01:42 2006 +0000
+++ b/bootstrap/bootstrap       Mon Nov 06 21:08:42 2006 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# $NetBSD: bootstrap,v 1.87 2006/11/06 21:01:42 tv Exp $
+# $NetBSD: bootstrap,v 1.88 2006/11/06 21:08:42 tv Exp $
 #
 #
 # Copyright (c) 2001-2002 Alistair G. Crooks.  All rights reserved.
@@ -883,13 +883,13 @@
 echo_msg "Registering installed packages"
 run_cmd "(cd $pkgsrcdir/pkgtools/bootstrap-mk-files && $bmake MAKECONF=${MKCONF_EXAMPLE} WRKOBJDIR=$wrkobjdir bootstrap-register)"
 case "$need_awk" in
-yes)   register_package "lang/nawk" "PKG_PRESERVE=yes";;
+yes)   register_package "lang/nawk";;
 esac
 case "$need_sed" in
-yes)   register_package "textproc/nbsed" "LIBNBCOMPAT_STYLE=inplace PKG_PRESERVE=yes";;
+yes)   register_package "textproc/nbsed" "LIBNBCOMPAT_STYLE=inplace";;
 esac
 case "$need_bsd_install" in
-yes)   register_package "sysutils/install-sh" "PKG_PRESERVE=yes";;
+yes)   register_package "sysutils/install-sh";;
 esac
 case "$need_extras" in
 yes)   register_package "pkgtools/bootstrap-extras";;
diff -r b0eaf242fca8 -r fd749d04f2b2 mk/bulk/pre-build
--- a/mk/bulk/pre-build Mon Nov 06 21:01:42 2006 +0000
+++ b/mk/bulk/pre-build Mon Nov 06 21:08:42 2006 +0000
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $NetBSD: pre-build,v 1.61 2006/10/02 16:37:22 dmcmahill Exp $
+# $NetBSD: pre-build,v 1.62 2006/11/06 21:08:43 tv Exp $
 #
 # Clean up system to be ready for bulk pkg build
 #
@@ -253,8 +253,8 @@
 # bootstrap-pkgsrc generated files and thus would break the following builds.
 
 if [ x"$BMAKE" = x"bmake" ]; then
-       for pkg in archivers/pax devel/bmake devel/mk-files net/tnftp \
-           textproc/nbsed; do
+       for pkg in archivers/pax devel/bmake devel/mk-files lang/nawk \
+           net/tnftp sysutils/install-sh textproc/nbsed; do
                mkdir -p "${BULKFILESDIR}/${pkg}"
                echo "Don't blow away bootstrap-pkgsrc stuff!" \
                > "${BULKFILESDIR}/${pkg}/${BROKENF}"