[pkgsrc/trunk]: pkgsrc/bootstrap Retire the bootstrap script's --pkgsrcdir ar...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4263d0c282c2
branches:  trunk
changeset: 475153:4263d0c282c2
user:      schmonz <schmonz%pkgsrc.org@localhost>
date:      Tue May 11 02:07:19 2004 +0000

description:
Retire the bootstrap script's --pkgsrcdir argument. Now that we're
part of pkgsrc, we don't need to be told where it is.

diffstat:

 bootstrap/bootstrap |  6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diffs (41 lines):

diff -r 9ef5623a154e -r 4263d0c282c2 bootstrap/bootstrap
--- a/bootstrap/bootstrap       Mon May 10 23:20:30 2004 +0000
+++ b/bootstrap/bootstrap       Tue May 11 02:07:19 2004 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# $NetBSD: bootstrap,v 1.17 2004/05/05 14:39:45 tv Exp $
+# $NetBSD: bootstrap,v 1.18 2004/05/11 02:07:19 schmonz Exp $
 #
 #
 # Copyright (c) 2001-2002 Alistair G. Crooks.  All rights reserved.
@@ -40,7 +40,6 @@
 # set defaults for system locations
 prefix=/usr/pkg
 pkgdbdir=/var/db/pkg
-pkgsrcdir=/usr/pkgsrc
 sysconfdir=${prefix}/etc
 
 ignorecasecheck=no
@@ -49,12 +48,12 @@
 # where the building takes place
 wrkdir=work # default: relative to pkgsrc/bootstrap
 bootstrapdir=`pwd`
+pkgsrcdir=`dirname $bootstrapdir`
 
 usage="Usage: $0 "'
     [ --workdir=<workdir> ]
     [ --prefix=<prefix> ]
     [ --pkgdbdir=<pkgdbdir> ]
-    [ --pkgsrcdir=<pkgsrcdir> ]
     [ --sysconfdir=<sysconfdir> ]
     [ --ignore-case-check ]
     [ --ignore-user-check ]
@@ -369,7 +368,6 @@
        --prefix=*)     prefix=`echo $1 | $sedprog -e 's|--prefix=||'`
                        sysconfdir=${prefix}/etc ;;
        --pkgdbdir=*)   pkgdbdir=`echo $1 | $sedprog -e 's|--pkgdbdir=||'` ;;
-       --pkgsrcdir=*)  pkgsrcdir=`echo $1 | $sedprog -e 's|--pkgsrcdir=||'` ;;
        --sysconfdir=*) sysconfdir=`echo $1 | $sedprog -e 's|--sysconfdir=||'`;;
        --ignore-case-check) ignorecasecheck=yes ;;
        --ignore-user-check) ignoreusercheck=yes ;;