[pkgsrc/trunk]: pkgsrc/bootstrap support NBPAX_PROGRAM_PREFIX variable in TOO...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/03abe90fc2c9
branches:  trunk
changeset: 544819:03abe90fc2c9
user:      dbj <dbj%pkgsrc.org@localhost>
date:      Sun Jul 20 23:54:48 2008 +0000

description:
support NBPAX_PROGRAM_PREFIX variable in TOOLS_PLATFORM.{pax,tar}
leave default value unset to preserve existing behavior.
you can now set NBPAX_PROGRAM_PREFIX=nb (for example) in your mk.conf
to have the bootstrap install and use nbpax/nbtar/nbcpio which don't conflict
with system provided tools.

diffstat:

 bootstrap/bootstrap |  11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diffs (34 lines):

diff -r 7b0df112a80e -r 03abe90fc2c9 bootstrap/bootstrap
--- a/bootstrap/bootstrap       Sun Jul 20 23:54:06 2008 +0000
+++ b/bootstrap/bootstrap       Sun Jul 20 23:54:48 2008 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# $NetBSD: bootstrap,v 1.132 2008/06/19 18:36:51 joerg Exp $
+# $NetBSD: bootstrap,v 1.133 2008/07/20 23:54:48 dbj Exp $
 #
 #
 # Copyright (c) 2001-2002 Alistair G. Crooks.  All rights reserved.
@@ -451,6 +451,7 @@
        need_awk=no
        need_sed=no
        set_opsys=no
+       [ -z "$fetch_cmd" ] && fetch_cmd="/usr/bin/ftp"
        machine_arch=`uname -p`
        CC="gcc -isystem /usr/include"; export CC
        osrev=`uname -r`
@@ -953,10 +954,10 @@
 
 case "$need_pax" in
 yes)
-       echo "TOOLS_PLATFORM.pax?=              $prefix/bin/pax" >> ${TARGET_MKCONF}
-       echo "TOOLS_PLATFORM.pax?=              $prefix/bin/pax" >> ${BOOTSTRAP_MKCONF}
-       echo "TOOLS_PLATFORM.tar?=              $prefix/bin/tar" >> ${TARGET_MKCONF}
-       echo "TOOLS_PLATFORM.tar?=              $prefix/bin/tar" >> ${BOOTSTRAP_MKCONF}
+       echo "TOOLS_PLATFORM.pax?=              $prefix/bin/\${NBPAX_PROGRAM_PREFIX}pax" >> ${TARGET_MKCONF}
+       echo "TOOLS_PLATFORM.pax?=              $prefix/bin/\${NBPAX_PROGRAM_PREFIX}pax" >> ${BOOTSTRAP_MKCONF}
+       echo "TOOLS_PLATFORM.tar?=              $prefix/bin/\${NBPAX_PROGRAM_PREFIX}tar" >> ${TARGET_MKCONF}
+       echo "TOOLS_PLATFORM.tar?=              $prefix/bin/\${NBPAX_PROGRAM_PREFIX}tar" >> ${BOOTSTRAP_MKCONF}
        ;;
 *)
        echo "TOOLS_PLATFORM.pax?=              $paxprog" >> ${TARGET_MKCONF}