[pkgsrc/trunk]: pkgsrc When calling bootstrap-register from the bootstrap scr...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/29a50170501b
branches:  trunk
changeset: 527708:29a50170501b
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Thu Apr 12 14:36:40 2007 +0000

description:
When calling bootstrap-register from the bootstrap script for the
various packages, pass down PKG_PRESERVE. Remove the default setting of
PKG_PRESERVE, it makes perfect sense to install e.g. pkgtools/mtree
and be able to remove it again, if it is not an essientiel tool.

OK jlam@

diffstat:

 bootstrap/bootstrap                  |  6 +++---
 pkgtools/bootstrap-mk-files/Makefile |  3 +--
 pkgtools/mtree/Makefile              |  3 +--
 pkgtools/pax/Makefile                |  3 +--
 pkgtools/tnftp/Makefile              |  3 +--
 5 files changed, 7 insertions(+), 11 deletions(-)

diffs (93 lines):

diff -r 17f7b934e1b6 -r 29a50170501b bootstrap/bootstrap
--- a/bootstrap/bootstrap       Thu Apr 12 12:23:41 2007 +0000
+++ b/bootstrap/bootstrap       Thu Apr 12 14:36:40 2007 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# $NetBSD: bootstrap,v 1.92 2007/03/02 16:48:48 wiz Exp $
+# $NetBSD: bootstrap,v 1.93 2007/04/12 14:36:40 joerg Exp $
 #
 #
 # Copyright (c) 2001-2002 Alistair G. Crooks.  All rights reserved.
@@ -889,11 +889,11 @@
 # register packages
 # usage: register_package <packagedirectory> [additional arguments]
 register_package() {
-       run_cmd "(cd $pkgsrcdir/$1 && $bmake MAKECONF=${MKCONF_EXAMPLE} WRKOBJDIR=${wrkobjdir} ${2-} bootstrap-register)"
+       run_cmd "(cd $pkgsrcdir/$1 && $bmake -DPKG_PRESERVE MAKECONF=${MKCONF_EXAMPLE} WRKOBJDIR=${wrkobjdir} ${2-} bootstrap-register)"
 }
 
 echo_msg "Registering installed packages"
-run_cmd "(cd $pkgsrcdir/pkgtools/bootstrap-mk-files && $bmake MAKECONF=${MKCONF_EXAMPLE} WRKOBJDIR=$wrkobjdir bootstrap-register)"
+register_package "pkgtools/bootstrap-mk-files"
 case "$need_awk" in
 yes)   register_package "lang/nawk";;
 esac
diff -r 17f7b934e1b6 -r 29a50170501b pkgtools/bootstrap-mk-files/Makefile
--- a/pkgtools/bootstrap-mk-files/Makefile      Thu Apr 12 12:23:41 2007 +0000
+++ b/pkgtools/bootstrap-mk-files/Makefile      Thu Apr 12 14:36:40 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2006/11/11 18:24:52 jschauma Exp $
+# $NetBSD: Makefile,v 1.4 2007/04/12 14:36:40 joerg Exp $
 
 DISTNAME=      bootstrap-mk-files-20061111
 CATEGORIES=    pkgtools
@@ -12,7 +12,6 @@
 COMMENT=       *.mk files for the bootstrap bmake utility
 
 NO_PKGTOOLS_REQD_CHECK=        # defined
-PKG_PRESERVE=          # defined
 
 NO_CHECKSUM=   yes
 NO_MTREE=      yes
diff -r 17f7b934e1b6 -r 29a50170501b pkgtools/mtree/Makefile
--- a/pkgtools/mtree/Makefile   Thu Apr 12 12:23:41 2007 +0000
+++ b/pkgtools/mtree/Makefile   Thu Apr 12 14:36:40 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/07/14 20:11:10 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2007/04/12 14:36:40 joerg Exp $
 #
 # This version of mtree installs into ${PKG_TOOLS_BIN}.
 #
@@ -8,7 +8,6 @@
 CATEGORIES=    pkgtools
 
 NO_PKGTOOLS_REQD_CHECK=        # defined
-PKG_PRESERVE=          # defined
 
 PKG_TOOLS_PREFIX=      ${PKG_TOOLS_BIN:C|/[^/]?bin$||}
 
diff -r 17f7b934e1b6 -r 29a50170501b pkgtools/pax/Makefile
--- a/pkgtools/pax/Makefile     Thu Apr 12 12:23:41 2007 +0000
+++ b/pkgtools/pax/Makefile     Thu Apr 12 14:36:40 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/07/14 20:11:10 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2007/04/12 14:36:40 joerg Exp $
 #
 # This version of pax installs into ${PKG_TOOLS_BIN}.
 #
@@ -8,7 +8,6 @@
 CATEGORIES=    pkgtools
 
 NO_PKGTOOLS_REQD_CHECK=        yes
-PKG_PRESERVE=          yes
 
 PKG_TOOLS_PREFIX=      ${PKG_TOOLS_BIN:C|/[^/]?bin$||}
 
diff -r 17f7b934e1b6 -r 29a50170501b pkgtools/tnftp/Makefile
--- a/pkgtools/tnftp/Makefile   Thu Apr 12 12:23:41 2007 +0000
+++ b/pkgtools/tnftp/Makefile   Thu Apr 12 14:36:40 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2006/07/14 21:41:42 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2007/04/12 14:36:41 joerg Exp $
 #
 # This version of tnftp installs into ${PKG_TOOLS_BIN}.
 #
@@ -8,7 +8,6 @@
 CATEGORIES=    pkgtools
 
 NO_PKGTOOLS_REQD_CHECK=        yes
-PKG_PRESERVE=          yes
 
 PKG_TOOLS_PREFIX=      ${PKG_TOOLS_BIN:C|/[^/]?bin$||}