summaryrefslogtreecommitdiff
path: root/bootstrap
diff options
context:
space:
mode:
authorschmonz <schmonz@pkgsrc.org>2004-05-11 02:19:48 +0000
committerschmonz <schmonz@pkgsrc.org>2004-05-11 02:19:48 +0000
commit21a83360cff46f30da1814340e7ea644fc01bf14 (patch)
treeedab875423d681b1d3f49cae45f5fd00b3708ea1 /bootstrap
parent7ecc421fab3d0443b18daf66cd377112e25d5482 (diff)
downloadpkgsrc-21a83360cff46f30da1814340e7ea644fc01bf14.tar.gz
--pkgsrcdir is no more.
Diffstat (limited to 'bootstrap')
-rw-r--r--bootstrap/README6
-rw-r--r--bootstrap/README.Darwin5
-rwxr-xr-xbootstrap/mkbinarykit7
3 files changed, 6 insertions, 12 deletions
diff --git a/bootstrap/README b/bootstrap/README
index e01489f4c9c..42d1639ab45 100644
--- a/bootstrap/README
+++ b/bootstrap/README
@@ -1,18 +1,16 @@
-$NetBSD: README,v 1.2 2004/04/12 00:38:55 heinz Exp $
+$NetBSD: README,v 1.3 2004/05/11 02:19:48 schmonz Exp $
To try to get pkgsrc working on your system, please try the following
as root:
# ./bootstrap [ --prefix=${PREFIX} ] [ --pkgdbdir=${PKGDBDIR} ] \
- [ --pkgsrcdir=${PKGSRCDIR} ] [ --sysconfdir=${PKG_SYSCONFBASE} ] \
- [ --workdir=working directory] \
+ [ --sysconfdir=${PKG_SYSCONFBASE} ] [ --workdir=working directory] \
[ --ignore-case-check ] [ --ignore-user-check ] [ --help ]
The defaults for the arguments are as follows:
--prefix /usr/pkg
--pkgdbdir /var/db/pkg
- --pkgsrcdir /usr/pkgsrc
--sysconfdir /usr/pkg/etc
--workdir work
diff --git a/bootstrap/README.Darwin b/bootstrap/README.Darwin
index 673ed25046a..003d4781b5a 100644
--- a/bootstrap/README.Darwin
+++ b/bootstrap/README.Darwin
@@ -1,4 +1,4 @@
-$NetBSD: README.Darwin,v 1.2 2004/04/24 19:22:41 danw Exp $
+$NetBSD: README.Darwin,v 1.3 2004/05/11 02:19:48 schmonz Exp $
If you are using Mac OS X, please read "README.MacOSX" as well.
@@ -12,8 +12,7 @@ $ curl -O \
$ tar -C /Volumes/NetBSD -zxvf pkgsrc.tar.gz && rm pkgsrc.tar.gz
$ sudo ./bootstrap \
--prefix=/Volumes/NetBSD/pkg \
- --pkgdbdir=/Volumes/NetBSD/pkgdb \
- --pkgsrcdir=/Volumes/NetBSD/pkgsrc
+ --pkgdbdir=/Volumes/NetBSD/pkgdb
Note: if you already have a UFS partition, or have a spare partition
that you can format as UFS, use that instead of the UFS disk image.
diff --git a/bootstrap/mkbinarykit b/bootstrap/mkbinarykit
index fdac760ddd7..8f72b7439dc 100755
--- a/bootstrap/mkbinarykit
+++ b/bootstrap/mkbinarykit
@@ -1,6 +1,6 @@
#!/bin/sh
-# $NetBSD: mkbinarykit,v 1.7 2004/04/21 20:34:52 tv Exp $
+# $NetBSD: mkbinarykit,v 1.8 2004/05/11 02:19:48 schmonz Exp $
#
# Make a binary bootstrap kit and place it in targetdir (or current
# working directory if not specified). The mk.conf.example file is
@@ -20,7 +20,6 @@ date=`date +%Y%m%d`
prefix=/usr/pkg
pkgdbdir=/var/db/pkg
-pkgsrcdir=/usr/pkgsrc
mkfile=/etc/mk.conf
ignorecasecheck=no
force=no
@@ -70,7 +69,6 @@ while [ $# -gt 0 ]; do
--prefix=*) prefix=`echo $1 | $sedprog -e 's|--prefix=||'` ;;
--mkconf=*) mkfile=`echo $1 | $sedprog -e 's|--mkconf=||'` ;;
--pkgdbdir=*) pkgdbdir=`echo $1 | $sedprog -e 's|--pkgdbdir=||'` ;;
- --pkgsrcdir=*) pkgsrcdir=`echo $1 | $sedprog -e 's|--pkgsrcdir=||'` ;;
--ignore-case-check) ignorecasecheck=yes ;;
--workdir=*) wrkdir=`echo $1 | $sedprog -e 's|--workdir=||'` ;;
--*) echo "$usage"; exit 1 ;;
@@ -93,14 +91,13 @@ fi
if [ "$build" != "no" ]; then
# Bootstrap
- bootstrap_flags="--prefix=$prefix --pkgsrcdir=$pkgsrcdir --pkgdbdir=$pkgdbdir --workdir=$wrkdir"
+ bootstrap_flags="--prefix=$prefix --pkgdbdir=$pkgdbdir --workdir=$wrkdir"
if [ "$ignorecasecheck" = "yes" ]; then
bootstrap_flags="$bootstrap_flags --ignore-case-check"
fi
echo "Making bootstrap kit with"
echo "prefix = $prefix"
- echo "pkgsrcdir = $pkgsrcdir"
echo "pkgdbdir = $pkgdbdir"
echo "mk.conf.example will be copied to $mkfile"
echo ""