CVS commit: pkgsrc/bootstrap

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Sun Mar 30 09:53:04 UTC 2025

Modified Files:
        pkgsrc/bootstrap: README README.UnixWare bootstrap
Removed Files:
        pkgsrc/bootstrap: README.OpenServer5

Log Message:
bootstrap: Improve support for SCO OpenServer 5 and 6.


To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 pkgsrc/bootstrap/README
cvs rdiff -u -r1.6 -r0 pkgsrc/bootstrap/README.OpenServer5
cvs rdiff -u -r1.3 -r1.4 pkgsrc/bootstrap/README.UnixWare
cvs rdiff -u -r1.329 -r1.330 pkgsrc/bootstrap/bootstrap

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.40 pkgsrc/bootstrap/README:1.41
--- pkgsrc/bootstrap/README:1.40        Sun Apr 21 14:04:41 2024
+++ pkgsrc/bootstrap/README     Sun Mar 30 09:53:04 2025
@@ -1,4 +1,4 @@
-$NetBSD: README,v 1.40 2024/04/21 14:04:41 nia Exp $
+$NetBSD: README,v 1.41 2025/03/30 09:53:04 nia Exp $
 
 To try to get pkgsrc working on your system, please try the following
 as root:
@@ -127,7 +127,7 @@ Platforms with at least a small number o
 
   HPUX
   Minix3 (platform/Minix.mk)
-  OpenServer5 (SCO OpenServer, platform/SCO_SV.mk)
+  SCO OpenServer (SCO_SV)
   SCO UnixWare
   QNX (no README)
 

Index: pkgsrc/bootstrap/README.UnixWare
diff -u pkgsrc/bootstrap/README.UnixWare:1.3 pkgsrc/bootstrap/README.UnixWare:1.4
--- pkgsrc/bootstrap/README.UnixWare:1.3        Wed Mar  5 11:44:42 2025
+++ pkgsrc/bootstrap/README.UnixWare    Sun Mar 30 09:53:04 2025
@@ -1,11 +1,26 @@
-$NetBSD: README.UnixWare,v 1.3 2025/03/05 11:44:42 nia Exp $
+$NetBSD: README.UnixWare,v 1.4 2025/03/30 09:53:04 nia Exp $
 
-See https://en.wikipedia.org/wiki/UnixWare
+Supported platforms
+===================
+- SCO UnixWare 7 Definitive 2018
 
-As of 2022-04, "SCO UnixWare 7 Definitive 2018" works.
+Interested developers can download evaluation ISOs from xinuos.com
+after registering an account.  SCO operating systems appear to run
+best in VirtualBox with multiple cores enabled and SATA disks.
+For UnixWare, QEMU with acceleration disabled also seems to work.
 
-UnixWare has a limit of 1000 files per directory.  When transferring
-the tree to UnixWare, you should delete unwanted packages to reduce
+Guidelines
+==========
+
+By default, UnixWare has a limit of 1000 files per directory.
+This should be increased before transferring the package tree:
+
+# /etc/conf/bin/idtune -m FLCKREC 16000
+# /etc/conf/bin/idtune -m MAXLINK 32767
+# /etc/conf/bin/idbuild
+# reboot
+
+Alternatively, you can delete unwanted packages to reduce
 the size of categories such as "devel".
 
 The default install of UnixWare 7 lacks a modern toolchain
@@ -33,4 +48,7 @@ Extract them with gunzip/unxz, then inst
 Note that the pkgadd tool does _not_ support relative
 paths!
 
-Add /usr/sysv5/bin to your $PATH before bootstrap.
+Add /usr/sysv5/bin to your $PATH before bootstrap:
+
+# PATH=/usr/sysv5/bin:$PATH
+# export PATH

Index: pkgsrc/bootstrap/bootstrap
diff -u pkgsrc/bootstrap/bootstrap:1.329 pkgsrc/bootstrap/bootstrap:1.330
--- pkgsrc/bootstrap/bootstrap:1.329    Wed Mar  5 11:44:42 2025
+++ pkgsrc/bootstrap/bootstrap  Sun Mar 30 09:53:04 2025
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# $NetBSD: bootstrap,v 1.329 2025/03/05 11:44:42 nia Exp $
+# $NetBSD: bootstrap,v 1.330 2025/03/30 09:53:04 nia Exp $
 #
 # Copyright (c) 2001-2011 Alistair Crooks <agc%NetBSD.org@localhost>
 # All rights reserved.
@@ -828,9 +828,7 @@ QNX)
        ;;
 SCO_SV)
        root_group=root
-       need_awk=yes
        need_bsd_install=yes
-       need_sed=yes
        if [ -x "/usr/bin/bash" ]; then
                bootstrap_sh=${SH:-/usr/bin/bash}
                bootstrap_sh_set=set
@@ -838,8 +836,20 @@ SCO_SV)
        else
                need_mksh=yes
        fi
+       if [ -e "/usr/lib/libpthread.so" ]; then
+               # Currently libarchive tries to use pthread_mutex_lock
+               # unconditionally if it finds the header.  We could also
+               # hide the header somehow.
+               LDFLAGS="${LDFLAGS} -lpthread -lsocket"
+               export LDFLAGS
+       fi
+       # For some reason, the uname command shipped with xdev has
+       # a broken -p option.
+       machine_arch=`uname -m`
        whoamiprog='id -u'
        groupsprog='id -g'
+       opsys=SCO_SV
+       set_opsys=yes
        # /bin/sh under OpenServer 5.0.7/3.2 breaks bmake tests.
        #bmakexargs="$bmakexargs --with-defshell=/bin/ksh"
        ;;