Import of pkgsrc-2015Q2

bootstrap/README.Bitrig

@@ -0,0 +1,26 @@
+$NetBSD: README.Bitrig,v 1.1 2015/06/04 15:48:45 sevan 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
+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
+
+3. 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).

bootstrap/README.HPUX

@@ -1,20 +1,17 @@
-$NetBSD: README.HPUX,v 1.3 2008/01/14 21:32:29 tnn Exp $
+$NetBSD: README.HPUX,v 1.5 2015/04/19 19:29:44 tnn Exp $
 
 Prerequisite patches (downloadable from HP itrc)
 ------------------------------------------------
  * The latest HP-UX "quality pack" patch bundle (GOLDQPK)
  * ld(1) cumulative patch (might be included in the above)
 
-Recommended patches
--------------------
- * B3394BA Developer's Toolkit (for X11 headers)
- * HP C/aC++ compiler
-
 Compiler
 --------
 Prebuilt GCC toolchains suitable for use with pkgsrc can be downloaded from
 ftp://ftp.NetBSD.org/pub/pkgsrc/misc/tnn/ .
 
+Installation instructions can be found in the file "README.gcc".
+
 Selecting which ABI to use
 --------------------------
 HP-UX supports the ABIs and object formats listed in the table below.

bootstrap/README.OSF1

@@ -1,10 +1,12 @@
-$NetBSD: README.OSF1,v 1.3 2007/10/15 22:32:56 tnn Exp $
+$NetBSD: README.OSF1,v 1.4 2015/04/19 19:29:44 tnn Exp $
 
 Compiler
 --------
 Prebuilt GCC toolchains suitable for use with pkgsrc can be downloaded from
 	ftp://ftp.NetBSD.org/pub/pkgsrc/misc/tnn/ .
 
+Installation instructions can be found in the file "README.gcc".
+
 Bootstrapping pkgsrc
 --------------------
 To use the native compiler:

bootstrap/README.OpenBSD

@@ -1,4 +1,4 @@
-$NetBSD: README.OpenBSD,v 1.3 2007/10/09 19:19:08 martti Exp $
+$NetBSD: README.OpenBSD,v 1.4 2015/04/05 00:40:07 rodent Exp $
 
 Please read the general README file as well.
 
@@ -17,16 +17,11 @@ good idea to move them out of the way to avoid confusion, e.g.:
 	mv pkg_delete pkg_delete.orig
 	mv pkg_info pkg_info.orig
 
-3. An example /etc/mk.conf file will be placed in mk.conf.example file
-when you use the bootstrap script. OpenBSD's make program uses /etc/mk.conf
-as well. You can work around this by enclosing all the pkgsrc specific parts
-of the mk.conf file with:
-
-.ifdef BSD_PKG_MK
-# Pkgsrc stuff, e.g. insert mk.conf.example or similar here
-.else
-# OpenBSD stuff
-.endif
+3. 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.
+been done on 3.0 as well and 5.6 (amd64). It has been used successfully on 5.5
+and 5.6 (sparc64).

bootstrap/bootstrap

@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# $NetBSD: bootstrap,v 1.215 2014/12/04 10:36:02 jperkin Exp $
+# $NetBSD: bootstrap,v 1.218 2015/06/13 13:15:39 tron Exp $
 #
 # Copyright (c) 2001-2011 Alistair Crooks <agc@NetBSD.org>
 # All rights reserved.
@@ -498,10 +498,20 @@ AIX)
 	need_bsd_install=yes
 	need_awk=yes
 	need_sed=yes
+	need_ksh=yes
 	need_fixed_strip=yes
 	set_opsys=no
 	machine_arch=`get_machine_arch_aix`
 	;;
+Bitrig)
+	root_group=wheel
+	need_bsd_install=no
+	need_awk=no
+	need_sed=no
+	set_opsys=no
+	machine_arch=`uname -m`
+	check_compiler=yes
+	;;
 CYGWIN_*)
 	is_root () {
 		if id -nG | grep -q 'Administrators'; then
@@ -794,7 +804,7 @@ SunOS)
 	else
 		need_sed=yes
 	fi
-	if [ "`uname -r`" = "5.11" -a -x "/usr/bin/bash" ]; then
+	if [ -x "/usr/bin/bash" ]; then
 		bootstrap_sh=${SH:-/usr/bin/bash}
 		bootstrap_sh_set=set
 	else