[pkgsrc/trunk]: pkgsrc/bootstrap Change default pathes to more sane values:

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/010e886a4589
branches:  trunk
changeset: 538011:010e886a4589
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Thu Jan 24 14:48:02 2008 +0000

description:
Change default pathes to more sane values:
- /var as varbase is only used for privileged builds without prefix
  or when prefix is explicitly set to /usr/pkg
- if prefix is set to a non-standard value, derive varbase from it
- derive pkgdbdir from varbase

Based on the discussion in PR 37796 and with jlam@.

diffstat:

 bootstrap/bootstrap |  13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diffs (31 lines):

diff -r c1e94bc411aa -r 010e886a4589 bootstrap/bootstrap
--- a/bootstrap/bootstrap       Thu Jan 24 11:55:42 2008 +0000
+++ b/bootstrap/bootstrap       Thu Jan 24 14:48:02 2008 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# $NetBSD: bootstrap,v 1.118 2008/01/23 21:12:41 joerg Exp $
+# $NetBSD: bootstrap,v 1.119 2008/01/24 14:48:02 joerg Exp $
 #
 #
 # Copyright (c) 2001-2002 Alistair G. Crooks.  All rights reserved.
@@ -407,13 +407,14 @@
 wrkobjdir=${wrkdir}/pkgsrc
 if [ "$unprivileged" = "yes" ]; then
        [ -z "$prefix" ] && prefix=${HOME}/pkg
-       [ -z "$pkgdbdir" ] && pkgdbdir=${prefix}/var/db/pkg
-       [ -z "$varbase" ] && varbase=${prefix}/var
-else
-       [ -z "$prefix" ] && prefix=/usr/pkg
-       [ -z "$pkgdbdir" ] && pkgdbdir=/var/db/pkg
+elif [ -z "$prefix" -o "$prefix" = "/usr/pkg" ]; then
+       prefix=/usr/pkg
        [ -z "$varbase" ] && varbase=/var
 fi
+
+[ -z "$varbase" ] && varbase=${prefix}/var
+[ -z "$pkgdbdir" ] && pkgdbdir=${varbase}/db/pkg
+
 if [ "$prefix" = "/usr" ]; then
        [ -z "$pkgmandir" ] && pkgmandir=share/man
 else