 @@ -1,39 +1,37 @@
-$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:
 # ./bootstrap
     [ --workdir <workdir> ]
     [ --prefix <prefix> ]
     [ --pkgdbdir <pkgdbdir> ]
     [ --sysconfdir <sysconfdir> ]
     [ --varbase <varbase> ]
     [ --ignore-case-check ]
     [ --ignore-user-check ]
     [ --preserve-path ]
     [ --help ]
 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.
 Make sure that you have a working C compiler and make(1) binary in
 your path.  Please note that on some systems (IRIX and SunOS, for example),
 the bootstrap script will look into a number of common directories for
 alternative implementations of some tools.  If they are found, these
 directories will be prepended to the PATH variable, unless the
 '--preserve-path' flag is given.
 See pkgsrc/doc/pkgsrc.txt or
 http://www.NetBSD.org/docs/software/packages.html for
 more information about bootstrapping and using pkgsrc.

 @@ -1,26 +1,21 @@
-$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:
-. Bitrig stores its ports pkg database in /var/db/pkg. Therefore, you must
+. If you do not intend to use the Bitrig ports tools, it's probably a
 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.
 . 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
 	mv pkg_create pkg_create.orig
 	mv pkg_delete pkg_delete.orig
 	mv pkg_info pkg_info.orig
 . 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.
 bootstrap-pkgsrc has been tested on Bitrig 1.0 (amd64).

 @@ -1,24 +1,19 @@
-$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.
-. FreeBSD stores its ports pkg database in /var/db/pkg. It is therefore
+If you do not intend to use the FreeBSD ports tools, it may be a
 recommended that you choose a different location (e.g. /usr/pkg/pkgdb) by
 using the --pkgdbdir option to the bootstrap script.
 . 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
 	mv pkg_create pkg_create.orig
 	mv pkg_delete pkg_delete.orig
 	mv pkg_info pkg_info.orig
 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).

 @@ -1,14 +1,14 @@
-$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
 Cygwin. It is part of the Windows Services for Unix package, available for free
 for any licensed copy of Windows 2000, XP (not including XP Home), or 2003. SFU
 can be downloaded from http://www.microsoft.com/windows/sfu/.
 Services for Unix 3.5 has been tested. 3.0 or 3.1 may work, but are not
 officially supported. (The main difference in 3.0/3.1 is lack of pthreads, but
 other parts of libc may also be lacking.)
 Services for Unix Applications (aka SUA) is an integrated component of Windows
 Server 2003 R2 (5.2), Windows Vista and Windows Server 2008 (6.0), Windows 7 and
 @@ -85,27 +85,27 @@ HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Se
 Set the DWORD value "EnableSetuidBinaries" to 1; then reboot.
 Important notes for using pkgsrc
 --------------------------------
 The package manager (either the pkgsrc "su" user, or the user running "pkg_add")
 must be a member of the local Administrators group. Such a user must also be
 used to run the bootstrap. This is slightly relaxed from the normal pkgsrc
 requirement of "root".
 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
 conjunction with pkgsrc. If you choose to use them at the same time as the
 pkgsrc packages, ensure that you use the proper pkg_* tools for each type of
 binary package.
 The TERM setting used for DOS-type console windows (including those invoked by
 the csh and ksh startup shortcuts) is "interix". Most systems don't have a
 termcap/terminfo entry for it, but the following .termcap entry provides
 adequate emulation in most cases:
 interix:kP=\E[S:kN=\E[T:kH=\E[U:dc@:DC@:tc=pcansi:

 @@ -1,36 +1,32 @@
-$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.
 pkgsrc will install the portable NetBSD make as "bmake". The standard
 make(1) from MirBSD is incompatible with pkgsrc.
 Unless you bootstrap pkgsrc with the --unprivileged option, sudo(8) will
 be used to gain root privileges.
 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
+choices of pkgsrc, which are /usr/pkg and /usr/pkg/pkgdb respectively.
 suggest however that you place the package database for pkgsrc below its
-prefix, for example by specifying the
+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
-	--pkgdbdir /usr/pkg/db
+behavior when building or installing packages if both frameworks are in
 your PATH.
 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.
 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
 already installed. Use a command like the following:
 	export PATH=${HOME}/.etc/bin:/usr/local/bin:/usr/pkg/bin:/usr/bin:/bin:/usr/X11R6/bin:/usr/sbin:/sbin:/usr/pkg/sbin:/usr/games
 Other environment variables that you may want to set are MANPATH,
 INFOPATH and XAPPLRESDIR. There should be no need to set the
 LD_LIBRARY_PATH environment variable.
 The default mk.conf will be installed in /usr/pkg/etc.  It mirrors the
 values for CFLAGS, CPPFLAGS, and LDFLAGS retrieved from the native

 @@ -1,27 +1,23 @@
-$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:
-. OpenBSD stores its ports pkg database in /var/db/pkg. It is therefore
+. If you do not intend to use the OpenBSD ports tools, it's probably a
 recommended that you choose a different location (e.g. /usr/pkgdb) by
 using the --pkgdbdir option to the bootstrap script.
 . 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
 	mv pkg_create pkg_create.orig
 	mv pkg_delete pkg_delete.orig
 	mv pkg_info pkg_info.orig
 . 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.
 bootstrap-pkgsrc has been tested on OpenBSD 3.2 and 3.5 (i386). Some testing has
 been done on 3.0 as well and 5.6 (amd64). It has been used successfully on 5.5
 and 5.6 (sparc64).

 @@ -1,16 +1,16 @@
 #! /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>
 # All rights reserved.
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 # 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
+#
 @@ -477,27 +477,27 @@ checkarg_sane_absolute_path "$varbase" "
 checkarg_sane_relative_path "$pkginfodir" "--pkginfodir"
 checkarg_sane_relative_path "$pkgmandir" "--pkgmandir"
 # set defaults for system locations if not already set by the user
 wrkobjdir=${wrkdir}/pkgsrc
 if [ "$unprivileged" = "yes" ]; then
 	[ -z "$prefix" ] && prefix=${HOME}/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
+[ -z "$pkgdbdir" ] && pkgdbdir=${prefix}/pkgdb
 if [ "$prefix" = "/usr" ]; then
 	[ -z "$pkginfodir" ] && pkginfodir=share/info
 	[ -z "$pkgmandir" ] && pkgmandir=share/man
 else
 	[ -z "$pkginfodir" ] && pkginfodir=info
 	[ -z "$pkgmandir" ] && pkgmandir=man
 fi
 infodir=${prefix}/${pkginfodir}
 mandir=${prefix}/${pkgmandir}
 [ -z "$sysconfdir" ] && sysconfdir=${prefix}/etc
 if [ "x$preserve_path" != "xyes" ]; then