CVS commit: pkgsrc

["Charlotte Koch" <charlotte%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   charlotte
Date:           Thu Sep 29 02:25:16 UTC 2022

Modified Files:
        pkgsrc/bootstrap: README bootstrap
        pkgsrc/mk: bsd.prefs.mk
        pkgsrc/mk/defaults: mk.conf
Removed Files:
        pkgsrc/bootstrap: README.Bitrig
        pkgsrc/mk/platform: Bitrig.mk
        pkgsrc/mk/tools: tools.Bitrig.mk

Log Message:
Remove support for Bitrig.


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 pkgsrc/bootstrap/README
cvs rdiff -u -r1.2 -r0 pkgsrc/bootstrap/README.Bitrig
cvs rdiff -u -r1.315 -r1.316 pkgsrc/bootstrap/bootstrap
cvs rdiff -u -r1.427 -r1.428 pkgsrc/mk/bsd.prefs.mk
cvs rdiff -u -r1.336 -r1.337 pkgsrc/mk/defaults/mk.conf
cvs rdiff -u -r1.4 -r0 pkgsrc/mk/platform/Bitrig.mk
cvs rdiff -u -r1.2 -r0 pkgsrc/mk/tools/tools.Bitrig.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/bootstrap/README
diff -u pkgsrc/bootstrap/README:1.35 pkgsrc/bootstrap/README:1.36
--- pkgsrc/bootstrap/README:1.35        Tue Jun 28 23:37:09 2022
+++ pkgsrc/bootstrap/README     Thu Sep 29 02:25:15 2022
@@ -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

Index: pkgsrc/bootstrap/bootstrap
diff -u pkgsrc/bootstrap/bootstrap:1.315 pkgsrc/bootstrap/bootstrap:1.316
--- pkgsrc/bootstrap/bootstrap:1.315    Thu Sep 15 11:53:05 2022
+++ pkgsrc/bootstrap/bootstrap  Thu Sep 29 02:25:15 2022
@@ -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@localhost>
 # 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

Index: pkgsrc/mk/bsd.prefs.mk
diff -u pkgsrc/mk/bsd.prefs.mk:1.427 pkgsrc/mk/bsd.prefs.mk:1.428
--- pkgsrc/mk/bsd.prefs.mk:1.427        Tue Sep 27 08:46:32 2022
+++ pkgsrc/mk/bsd.prefs.mk      Thu Sep 29 02:25:16 2022
@@ -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

Index: pkgsrc/mk/defaults/mk.conf
diff -u pkgsrc/mk/defaults/mk.conf:1.336 pkgsrc/mk/defaults/mk.conf:1.337
--- pkgsrc/mk/defaults/mk.conf:1.336    Tue Sep 27 08:46:32 2022
+++ pkgsrc/mk/defaults/mk.conf  Thu Sep 29 02:25:16 2022
@@ -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))