[pkgsrc/trunk]: pkgsrc/bootstrap Change the default PKG_DBDIR to be ${LOCALBA...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e3be9abcb8bc
branches:  trunk
changeset: 354923:e3be9abcb8bc
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Tue Nov 15 11:19:09 2016 +0000

description:
Change the default PKG_DBDIR to be ${LOCALBASE}/pkgdb.  Resolves issues on
other BSDs which already use /var/db/pkg for the native package manager.

diffstat:

 bootstrap/README         |   6 ++----
 bootstrap/README.Bitrig  |  11 +++--------
 bootstrap/README.FreeBSD |  11 +++--------
 bootstrap/README.Interix |   4 ++--
 bootstrap/README.MirBSD  |  16 ++++++----------
 bootstrap/README.OpenBSD |  10 +++-------
 bootstrap/bootstrap      |   4 ++--
 7 files changed, 21 insertions(+), 41 deletions(-)

diffs (183 lines):

diff -r 4c64803d764c -r e3be9abcb8bc bootstrap/README
--- a/bootstrap/README  Tue Nov 15 10:13:45 2016 +0000
+++ b/bootstrap/README  Tue Nov 15 11:19:09 2016 +0000
@@ -1,4 +1,4 @@
-$NetBSD: README,v 1.12 2012/01/11 01:15:17 riz Exp $
+$NetBSD: README,v 1.13 2016/11/15 11:19:09 jperkin Exp $
 
 To try to get pkgsrc working on your system, please try the following
 as root:
@@ -17,13 +17,11 @@
 The defaults for the arguments are as follows:
 
        --prefix        /usr/pkg
-       --pkgdbdir      /var/db/pkg
+       --pkgdbdir      /usr/pkg/pkgdb
        --sysconfdir    /usr/pkg/etc
        --varbase       /var
        --workdir       work
 
-It is perfectly acceptable to place 'pkgdbdir' under 'prefix'.
-
 The working directory will be created if it doesn't exist and has to be
 writable by the user executing ./bootstrap.
 
diff -r 4c64803d764c -r e3be9abcb8bc bootstrap/README.Bitrig
--- a/bootstrap/README.Bitrig   Tue Nov 15 10:13:45 2016 +0000
+++ b/bootstrap/README.Bitrig   Tue Nov 15 11:19:09 2016 +0000
@@ -1,16 +1,11 @@
-$NetBSD: README.Bitrig,v 1.1 2015/06/04 15:48:45 sevan Exp $
+$NetBSD: README.Bitrig,v 1.2 2016/11/15 11:19:09 jperkin Exp $
 
 Please read the general README file as well.
 
 Care should be taken so that the tools that this kit installs do not conflict
 with the Bitrig userland tools. There are several steps:
 
-1. Bitrig stores its ports pkg database in /var/db/pkg. Therefore, you must
-choose a different location (e.g. /var/db/pkgsrc) by using the --pkgdbdir
-option to the bootstrap script. If you don't do this, installing pkgsrc
-packages will result in numerous PLIST errors upon install.
-
-2. If you do not intend to use the Bitrig ports tools, it's probably a
+1. If you do not intend to use the Bitrig ports tools, it's probably a
 good idea to move them out of the way to avoid confusion, e.g.:
        cd /usr/sbin
        mv pkg_add pkg_add.orig
@@ -18,7 +13,7 @@
        mv pkg_delete pkg_delete.orig
        mv pkg_info pkg_info.orig
 
-3. The bootstrap script will create an example mk.conf file located in
+2. The bootstrap script will create an example mk.conf file located in
 pkgsrc/bootstrap/work/mk.conf.example. It contains the settings you provided to 
 bootstrap. Copy it to your $sysconfdir directory. If $sysconfdir/mk.conf doesn't
 exist, the example is copied into place.
diff -r 4c64803d764c -r e3be9abcb8bc bootstrap/README.FreeBSD
--- a/bootstrap/README.FreeBSD  Tue Nov 15 10:13:45 2016 +0000
+++ b/bootstrap/README.FreeBSD  Tue Nov 15 11:19:09 2016 +0000
@@ -1,15 +1,11 @@
-$NetBSD: README.FreeBSD,v 1.6 2013/12/16 10:43:09 asau Exp $
+$NetBSD: README.FreeBSD,v 1.7 2016/11/15 11:19:09 jperkin Exp $
 
 Please read the general README file as well.
 
 Care should be taken so that the tools that this kit installs do not conflict
-with the FreeBSD userland tools. There are several steps:
+with the FreeBSD userland tools.
 
-1. FreeBSD stores its ports pkg database in /var/db/pkg. It is therefore
-recommended that you choose a different location (e.g. /usr/pkg/pkgdb) by
-using the --pkgdbdir option to the bootstrap script.
-
-2. If you do not intend to use the FreeBSD ports tools, it may be a
+If you do not intend to use the FreeBSD ports tools, it may be a
 good idea to move them out of the way to avoid confusion, e.g.:
        cd /usr/sbin
        mv pkg_add pkg_add.orig
@@ -19,6 +15,5 @@
 
 Alternatively, take care to get pkgsrc tools first in PATH.
 
-
 bootstrap-pkgsrc has been tested on FreeBSD 4.x and 5.x (i386).
 pkgsrc works well on FreeBSD 6.2-6.4, 7.1-7.3 (i386), 9.0-9.1 (amd64).
diff -r 4c64803d764c -r e3be9abcb8bc bootstrap/README.Interix
--- a/bootstrap/README.Interix  Tue Nov 15 10:13:45 2016 +0000
+++ b/bootstrap/README.Interix  Tue Nov 15 11:19:09 2016 +0000
@@ -1,4 +1,4 @@
-$NetBSD: README.Interix,v 1.17 2016/07/10 01:25:16 sevan Exp $
+$NetBSD: README.Interix,v 1.18 2016/11/15 11:19:09 jperkin Exp $
 
 Interix is a POSIX-compatible subsystem for the Windows NT kernel, providing a
 Unix-like environment with a tighter kernel integration than available with
@@ -95,7 +95,7 @@
 
 The package manager should use a umask of 002. "make install" will automatically
 complain if this is not the case. This ensures that directories written in
-/var/db/pkg are Administrators-group writeable.
+/usr/pkg/pkgdb are Administrators-group writeable.
 
 The popular Interix binary packages from http://www.interopsystems.com/ use an
 older version of pkgsrc's pkg_* tools. Ideally, these should NOT be used in
diff -r 4c64803d764c -r e3be9abcb8bc bootstrap/README.MirBSD
--- a/bootstrap/README.MirBSD   Tue Nov 15 10:13:45 2016 +0000
+++ b/bootstrap/README.MirBSD   Tue Nov 15 11:19:09 2016 +0000
@@ -1,4 +1,4 @@
-$NetBSD: README.MirBSD,v 1.2 2016/07/03 14:47:05 sevan Exp $
+$NetBSD: README.MirBSD,v 1.3 2016/11/15 11:19:09 jperkin Exp $
 
 Please read the general README file as well.
 
@@ -11,16 +11,12 @@
 MirPorts and pkgsrc can be installed in parallel. The MirPorts framework
 uses /usr/mpkg as its default prefix and /usr/mpkg/db/pkg as its package
 database directory. Thus, its paths do not clash with the default
-choices of pkgsrc, which are /usr/pkg and /var/db/pkg respectively. We
-suggest however that you place the package database for pkgsrc below its
-prefix, for example by specifying the
+choices of pkgsrc, which are /usr/pkg and /usr/pkg/pkgdb respectively.
 
-       --pkgdbdir /usr/pkg/db
-
-option to bootstrap. Please note that the package tools from MirPorts
-and pkgsrc have the same names (e.g. pkg_add) but are incompatible. This
-leads to strage behavior when building or installing packages if both
-frameworks are in your PATH.
+Please note that the package tools from MirPorts and pkgsrc have the
+same names (e.g. pkg_add) but are incompatible. This leads to strage
+behavior when building or installing packages if both frameworks are in
+your PATH.
 
 Thus, before you start the bootstrap, you must make sure that
 /usr/mpkg/bin and /usr/mpkg/sbin are NOT in your PATH if MirPorts is
diff -r 4c64803d764c -r e3be9abcb8bc bootstrap/README.OpenBSD
--- a/bootstrap/README.OpenBSD  Tue Nov 15 10:13:45 2016 +0000
+++ b/bootstrap/README.OpenBSD  Tue Nov 15 11:19:09 2016 +0000
@@ -1,15 +1,11 @@
-$NetBSD: README.OpenBSD,v 1.4 2015/04/05 00:40:07 rodent Exp $
+$NetBSD: README.OpenBSD,v 1.5 2016/11/15 11:19:09 jperkin Exp $
 
 Please read the general README file as well.
 
 Care should be taken so that the tools that this kit installs do not conflict
 with the OpenBSD userland tools. There are several steps:
 
-1. OpenBSD stores its ports pkg database in /var/db/pkg. It is therefore
-recommended that you choose a different location (e.g. /usr/pkgdb) by
-using the --pkgdbdir option to the bootstrap script.
-
-2. If you do not intend to use the OpenBSD ports tools, it's probably a
+1. If you do not intend to use the OpenBSD ports tools, it's probably a
 good idea to move them out of the way to avoid confusion, e.g.:
        cd /usr/sbin
        mv pkg_add pkg_add.orig
@@ -17,7 +13,7 @@
        mv pkg_delete pkg_delete.orig
        mv pkg_info pkg_info.orig
 
-3. The bootstrap script will create an example mk.conf file located in
+2. The bootstrap script will create an example mk.conf file located in
 pkgsrc/bootstrap/work/mk.conf.example. It contains the settings you provided to 
 bootstrap. Copy it to your $sysconfdir directory. If $sysconfdir/mk.conf doesn't
 exist, the example is copied into place.
diff -r 4c64803d764c -r e3be9abcb8bc bootstrap/bootstrap
--- a/bootstrap/bootstrap       Tue Nov 15 10:13:45 2016 +0000
+++ b/bootstrap/bootstrap       Tue Nov 15 11:19:09 2016 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# $NetBSD: bootstrap,v 1.233 2016/11/01 20:44:22 jperkin Exp $
+# $NetBSD: bootstrap,v 1.234 2016/11/15 11:19:09 jperkin Exp $
 #
 # Copyright (c) 2001-2011 Alistair Crooks <agc%NetBSD.org@localhost>
 # All rights reserved.
@@ -487,7 +487,7 @@
 fi
 
 [ -z "$varbase" ] && varbase=${prefix}/var
-[ -z "$pkgdbdir" ] && pkgdbdir=${varbase}/db/pkg
+[ -z "$pkgdbdir" ] && pkgdbdir=${prefix}/pkgdb
 
 if [ "$prefix" = "/usr" ]; then
        [ -z "$pkginfodir" ] && pkginfodir=share/info