From c5391aab21e1ea6edb66a0164c92bc384e5be262 Mon Sep 17 00:00:00 2001
From: sevan <sevan>
Date: Thu, 4 Jun 2015 15:48:45 +0000
Subject: Introduce preliminary support for Bitrig to pkgsrc Initial patchset
 to add support by rodent@ Further adjustments made based on feedback by
 joerg@ Tested by myself with numerous bulkbuilds thanks to Patrick Wildt @
 Bitrig

Reviewed by bsiegert@ joerg@ wiz@
---
 bootstrap/README.Bitrig | 26 ++++++++++++++++++++++++++
 bootstrap/bootstrap     | 11 ++++++++++-
 2 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 bootstrap/README.Bitrig

(limited to 'bootstrap')

diff --git a/bootstrap/README.Bitrig b/bootstrap/README.Bitrig
new file mode 100644
index 00000000000..2c9178f6576
--- /dev/null
+++ b/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).
diff --git a/bootstrap/bootstrap b/bootstrap/bootstrap
index 3c601ae2492..712feb74c48 100755
--- a/bootstrap/bootstrap
+++ b/bootstrap/bootstrap
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# $NetBSD: bootstrap,v 1.216 2015/05/03 14:26:57 sevan Exp $
+# $NetBSD: bootstrap,v 1.217 2015/06/04 15:48:45 sevan Exp $
 #
 # Copyright (c) 2001-2011 Alistair Crooks <agc@NetBSD.org>
 # All rights reserved.
@@ -503,6 +503,15 @@ AIX)
 	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
-- 
cgit v1.2.3