Remove support for Bitrig.

7 files changed, 5 insertions, 195 deletions

diff --git a/bootstrap/README b/bootstrap/README
index 232902e2074..361178ee79f 100644
--- a/bootstrap/README
+++ b/bootstrap/README
@@ -1,4 +1,4 @@
-$NetBSD: README,v 1.35 2022/06/28 23:37:09 gdt Exp $
+$NetBSD: README,v 1.36 2022/09/29 02:25:15 charlotte Exp $
 
 To try to get pkgsrc working on your system, please try the following
 as root:
@@ -144,7 +144,6 @@ Platforms believed to have no users
 -----------------------------------
 
   * AIX (no cwrappers)
-  Bitrig
   BSDOS (no README)
   Haiku
   IRIX
diff --git a/bootstrap/README.Bitrig b/bootstrap/README.Bitrig
deleted file mode 100644
index ddc1f65c4e6..00000000000
--- a/bootstrap/README.Bitrig
+++ /dev/null
@@ -1,21 +0,0 @@
-$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. 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
-
-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.
-
-bootstrap-pkgsrc has been tested on Bitrig 1.0 (amd64).
diff --git a/bootstrap/bootstrap b/bootstrap/bootstrap
index 417e09efd6a..edf95b10627 100755
--- a/bootstrap/bootstrap
+++ b/bootstrap/bootstrap
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# $NetBSD: bootstrap,v 1.315 2022/09/15 11:53:05 jperkin Exp $
+# $NetBSD: bootstrap,v 1.316 2022/09/29 02:25:15 charlotte Exp $
 #
 # Copyright (c) 2001-2011 Alistair Crooks <agc@NetBSD.org>
 # All rights reserved.
@@ -563,11 +563,6 @@ AIX)
 	need_fixed_strip=yes
 	machine_arch=`get_machine_arch_aix`
 	;;
-Bitrig)
-	root_group=wheel
-	machine_arch=`arch -s`
-	check_compiler=yes
-	;;
 CYGWIN_*)
 	is_root () {
 		if id -nG | grep -q 'Administrators'; then
diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk
index 8edd5b2e957..c28b8220d48 100644
--- a/mk/bsd.prefs.mk
+++ b/mk/bsd.prefs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.427 2022/09/27 08:46:32 jperkin Exp $
+# $NetBSD: bsd.prefs.mk,v 1.428 2022/09/29 02:25:16 charlotte Exp $
 #
 # This file includes the mk.conf file, which contains the user settings.
 #
@@ -172,10 +172,6 @@ LOWER_VENDOR?=		ibm
 .elif ${OPSYS} == "BSDOS"
 LOWER_OPSYS?=		bsdi
 
-.elif ${OPSYS} == "Bitrig"
-LOWER_OPSYS?= 		bitrig
-LOWER_VENDOR?= 		unknown
-
 .elif ${OPSYS} == "Cygwin"
 LOWER_OPSYS?=		cygwin
 LOWER_VENDOR?=		pc
diff --git a/mk/defaults/mk.conf b/mk/defaults/mk.conf
index a8ea578ceab..a94f686c0a9 100644
--- a/mk/defaults/mk.conf
+++ b/mk/defaults/mk.conf
@@ -1,4 +1,4 @@
-# $NetBSD: mk.conf,v 1.336 2022/09/27 08:46:32 jperkin Exp $
+# $NetBSD: mk.conf,v 1.337 2022/09/29 02:25:16 charlotte Exp $
 #
 
 # This file provides default values for variables that may be overridden
@@ -312,7 +312,7 @@ PKGSRC_USE_STACK_CHECK?= no
 
 # The default PREFER_PKGSRC should be empty, but due to historical reasons we have the list below.
 # Please add your platform here once you have confirmed it is correct
-.if ${OPSYS} == "OpenBSD" || ${OPSYS} == "Bitrig"
+.if ${OPSYS} == "OpenBSD"
 PREFER_PKGSRC?=
 .elif (!empty(MACHINE_PLATFORM:MNetBSD-*-*) && \
      exists(/usr/X11R7/lib/libX11.so))
diff --git a/mk/platform/Bitrig.mk b/mk/platform/Bitrig.mk
deleted file mode 100644
index 9577c18158f..00000000000
--- a/mk/platform/Bitrig.mk
+++ /dev/null
@@ -1,70 +0,0 @@
-# $NetBSD: Bitrig.mk,v 1.4 2021/11/09 12:04:43 nia Exp $
-#
-# Variable definitions for the Bitrig operating system.
-
-ECHO_N?=	${ECHO} -n
-LDD?=		/usr/bin/ldd
-LDD_ENV?=	LD_TRACE_LOADED_OBJECTS_FMT1='\t-l%o => %p\n' \
-		LD_TRACE_LOADED_OBJECTS_FMT2=
-IMAKE_MAKE?=	${MAKE}		# program which gets invoked by imake
-PKGLOCALEDIR?=	share
-PS?=		/bin/ps
-SU?=		/usr/bin/su
-TYPE?=		type				# Shell builtin
-
-USERADD?=	/usr/sbin/useradd
-GROUPADD?=	/usr/sbin/groupadd
-
-CPP_PRECOMP_FLAGS?=	# unset
-DEF_UMASK?=		0022
-EXPORT_SYMBOLS_LDFLAGS?=-Wl,-E	# add symbols to the dynamic symbol table
-MOTIF_TYPE_DEFAULT?=	motif	# default 2.0 compatible libs type
-NOLOGIN?=		/sbin/nologin
-PKG_TOOLS_BIN?=		${LOCALBASE}/sbin
-ROOT_CMD?=		${SU} - root -c
-ROOT_USER?=		root
-ROOT_GROUP?=	wheel
-ULIMIT_CMD_datasize?=	ulimit -d `ulimit -H -d`
-ULIMIT_CMD_stacksize?=	ulimit -s `ulimit -H -s`
-ULIMIT_CMD_memorysize?=	ulimit -m `ulimit -H -m`
-
-X11_TYPE?=		native
-
-_OPSYS_SYSTEM_RPATH?=	/usr/lib
-_OPSYS_LIB_DIRS?=	/usr/lib
-_OPSYS_INCLUDE_DIRS?=	/usr/include
-
-.if exists(/usr/include/netinet6)
-_OPSYS_HAS_INET6=	yes	# IPv6 is standard
-.else
-_OPSYS_HAS_INET6=	no	# IPv6 is not standard
-.endif
-_OPSYS_HAS_JAVA=	no	# Java is not standard
-_OPSYS_HAS_MANZ=	yes	# MANZ controls gzipping of man pages
-_OPSYS_HAS_OSSAUDIO=	yes	# libossaudio is available
-_OPSYS_PERL_REQD=		# no base version of perl required
-_OPSYS_PTHREAD_AUTO=	no	# -lpthread needed for pthreads
-_OPSYS_SHLIB_TYPE=	ELF	# shared lib type
-_PATCH_CAN_BACKUP=	yes	# native patch(1) can make backups
-_PATCH_BACKUP_ARG?=	-V simple -z 	# switch to patch(1) for backup suffix
-_USE_RPATH=		yes	# add rpath to LDFLAGS
-
-_STRIPFLAG_CC?=		${_INSTALL_UNSTRIPPED:D:U-s}	# cc(1) option to strip
-_STRIPFLAG_INSTALL?=	${_INSTALL_UNSTRIPPED:D:U-s}	# install(1) option to strip
-
-.if (${MACHINE_ARCH} == "x86_64") || (${MACHINE_ARCH} == "arm")
-DEFAULT_SERIAL_DEVICE?=	/dev/tty00
-SERIAL_DEVICES?=	/dev/tty00 \
-			/dev/tty01
-.else
-DEFAULT_SERIAL_DEVICE?=	/dev/null
-SERIAL_DEVICES?=	/dev/null
-.endif
-
-OPSYS_HAS_KQUEUE=	# defined
-
-_OPSYS_CAN_CHECK_SHLIBS=	no
-
-# check for maximum command line length and set it in configure's environment,
-# to avoid a test required by the libtool script that takes forever.
-_OPSYS_MAX_CMDLEN_CMD=	/sbin/sysctl -n kern.argmax
diff --git a/mk/tools/tools.Bitrig.mk b/mk/tools/tools.Bitrig.mk
deleted file mode 100644
index a0b53b9cb4e..00000000000
--- a/mk/tools/tools.Bitrig.mk
+++ /dev/null
@@ -1,89 +0,0 @@
-# $NetBSD: tools.Bitrig.mk,v 1.2 2018/11/12 13:34:39 jperkin Exp $
-#
-# System-supplied tools for the Bitrig operating system.
-
-TOOLS_PLATFORM.[?=		[			# shell builtin
-TOOLS_PLATFORM.awk?=		/usr/bin/awk
-TOOLS_PLATFORM.basename?=	/usr/bin/basename
-TOOLS_PLATFORM.byacc?=		/usr/bin/yacc
-TOOLS_PLATFORM.cat?=		/bin/cat
-TOOLS_PLATFORM.chgrp?=		/bin/chgrp
-TOOLS_PLATFORM.chmod?=		/bin/chmod
-TOOLS_PLATFORM.chown?=		/sbin/chown
-TOOLS_PLATFORM.cmp?=		/usr/bin/cmp
-TOOLS_PLATFORM.cp?=		/bin/cp
-TOOLS_PLATFORM.csh?=		/bin/csh
-TOOLS_PLATFORM.cut?=		/usr/bin/cut
-TOOLS_PLATFORM.date?=		/bin/date
-TOOLS_PLATFORM.diff?=		/usr/bin/diff
-TOOLS_PLATFORM.diff3?=		/usr/bin/diff3
-TOOLS_PLATFORM.dirname?=	/usr/bin/dirname
-TOOLS_PLATFORM.echo?=		echo			# shell builtin
-TOOLS_PLATFORM.egrep?=		/usr/bin/egrep
-TOOLS_PLATFORM.env?=		/usr/bin/env
-TOOLS_PLATFORM.expr?=		/bin/expr
-TOOLS_PLATFORM.false?=		false			# shell builtin
-TOOLS_PLATFORM.fgrep?=		/usr/bin/fgrep
-TOOLS_PLATFORM.file?=		/usr/bin/file
-TOOLS_PLATFORM.find?=		/usr/bin/find
-TOOLS_PLATFORM.flex?=		/usr/bin/flex
-TOOLS_PLATFORM.grep?=		/usr/bin/grep
-TOOLS_PLATFORM.gstrip?=		/usr/bin/strip
-TOOLS_PLATFORM.gunzip?=		/usr/bin/gunzip -f
-TOOLS_PLATFORM.gzcat?=		/usr/bin/gzcat
-TOOLS_PLATFORM.gzip?=		/usr/bin/gzip -nf ${GZIP}
-TOOLS_PLATFORM.head?=		/usr/bin/head
-TOOLS_PLATFORM.hostname?=	/bin/hostname
-TOOLS_PLATFORM.id?=		/usr/bin/id
-TOOLS_PLATFORM.ident?=		/usr/bin/ident
-TOOLS_PLATFORM.install?=	/usr/bin/install
-TOOLS_PLATFORM.install-info?=	/usr/bin/install-info
-TOOLS_PLATFORM.ldconfig?=	/sbin/ldconfig
-TOOLS_PLATFORM.ksh?=		/bin/ksh
-TOOLS_PLATFORM.lex?=		/usr/bin/lex
-TOOLS_PLATFORM.ln?=		/bin/ln
-TOOLS_PLATFORM.ls?=		/bin/ls
-TOOLS_PLATFORM.m4?=		/usr/bin/m4
-TOOLS_PLATFORM.mail?=		/usr/bin/mail
-TOOLS_PLATFORM.makeinfo?=	/usr/bin/makeinfo
-TOOLS_PLATFORM.mkdir?=		/bin/mkdir -p
-TOOLS_PLATFORM.mktemp?=		/usr/bin/mktemp
-TOOLS_PLATFORM.mtree?=		/usr/sbin/mtree
-TOOLS_PLATFORM.mv?=		/bin/mv
-TOOLS_PLATFORM.nice?=		/usr/bin/nice
-.if exists(/usr/bin/nroff)
-TOOLS_PLATFORM.nroff?=		/usr/bin/nroff
-.endif
-TOOLS_PLATFORM.openssl?=	/usr/sbin/openssl
-TOOLS_PLATFORM.patch?=		/usr/bin/patch
-TOOLS_PLATFORM.pax?=		/bin/pax
-TOOLS_PLATFORM.printf?=		/usr/bin/printf
-TOOLS_PLATFORM.pwd?=		/bin/pwd
-TOOLS_PLATFORM.readelf?=	/usr/bin/readelf
-TOOLS_PLATFORM.readlink?=	/usr/bin/readlink
-TOOLS_PLATFORM.rm?=		/bin/rm
-TOOLS_PLATFORM.rmdir?=		/bin/rmdir
-TOOLS_PLATFORM.sdiff?=		/usr/bin/sdiff
-TOOLS_PLATFORM.sed?=		/usr/bin/sed
-TOOLS_PLATFORM.sh?=		/bin/sh
-TOOLS_PLATFORM.sleep?=		/bin/sleep
-.if exists(/usr/bin/soelim)
-TOOLS_PLATFORM.soelim?=		/usr/bin/soelim
-.endif
-TOOLS_PLATFORM.sort?=		/usr/bin/sort
-TOOLS_PLATFORM.strip?=		/usr/bin/strip
-TOOLS_PLATFORM.tail?=		/usr/bin/tail
-TOOLS_PLATFORM.tar?=		/bin/tar
-.if exists(/usr/bin/tbl)
-TOOLS_PLATFORM.tbl?=		/usr/bin/tbl
-.endif
-TOOLS_PLATFORM.tee?=		/usr/bin/tee
-TOOLS_PLATFORM.test?=		test			# shell builtin
-TOOLS_PLATFORM.touch?=		/usr/bin/touch
-TOOLS_PLATFORM.tr?=		/usr/bin/tr
-TOOLS_PLATFORM.true?=		true			# shell builtin
-TOOLS_PLATFORM.tsort?=		/usr/bin/tsort
-TOOLS_PLATFORM.uniq?=		/usr/bin/uniq
-TOOLS_PLATFORM.wc?=		/usr/bin/wc
-TOOLS_PLATFORM.xargs?=		/usr/bin/xargs -r
-TOOLS_PLATFORM.yacc?=		/usr/bin/yacc