pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc
Module Name: pkgsrc
Committed By: nia
Date: Wed Mar 5 11:44:42 UTC 2025
Modified Files:
pkgsrc/bootstrap: README.UnixWare bootstrap
pkgsrc/devel/bmake: Makefile
pkgsrc/mk/tools: tools.UnixWare.mk
Log Message:
bootstrap: Fixes and improved docs for UnixWare
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/bootstrap/README.UnixWare
cvs rdiff -u -r1.328 -r1.329 pkgsrc/bootstrap/bootstrap
cvs rdiff -u -r1.83 -r1.84 pkgsrc/devel/bmake/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/mk/tools/tools.UnixWare.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.UnixWare
diff -u pkgsrc/bootstrap/README.UnixWare:1.2 pkgsrc/bootstrap/README.UnixWare:1.3
--- pkgsrc/bootstrap/README.UnixWare:1.2 Fri Jun 10 13:27:24 2022
+++ pkgsrc/bootstrap/README.UnixWare Wed Mar 5 11:44:42 2025
@@ -1,5 +1,36 @@
-$NetBSD: README.UnixWare,v 1.2 2022/06/10 13:27:24 gdt Exp $
+$NetBSD: README.UnixWare,v 1.3 2025/03/05 11:44:42 nia Exp $
See https://en.wikipedia.org/wiki/UnixWare
As of 2022-04, "SCO UnixWare 7 Definitive 2018" works.
+
+UnixWare has a limit of 1000 files per directory. When transferring
+the tree to UnixWare, you should delete unwanted packages to reduce
+the size of categories such as "devel".
+
+The default install of UnixWare 7 lacks a modern toolchain
+and fetch tool. It helps to get some packages from Xinuos to
+help you bootstrap.
+
+https://download.xinuos.com/unixware7D/D2M1/patches/ptf9150d.image
+https://download.xinuos.com/unixware7D/D2M1/packages/Xinuosgmp-6.1.2-UnixWare-i386.pkg.gz
+https://download.xinuos.com/unixware7D/D2M1/packages/Xinuosisl-0.18-UnixWare-i386.pkg.gz
+https://download.xinuos.com/unixware7D/D2M1/packages/Xinuosmpfr-4.0.2-UnixWare-i386.pkg.gz
+https://download.xinuos.com/unixware7D/D2M1/packages/Xinuosmpc-1.1.0-UnixWare-i386.pkg.gz
+https://download.xinuos.com/unixware7D/D2M1/packages/Xinuosgcc-rtlibs-7.3.0d-UnixWare-i386.pkg.gz
+https://download.xinuos.com/unixware7D/D2M1/packages/Xinuosgcc-7.3.0d-UnixWare-i386.pkg.gz
+https://download.xinuos.com/unixware7D/D2M1MP/packages/Xinuosgettext-0.22.5-UnixWare-i386.pkg.xz
+https://download.xinuos.com/unixware7D/D2M1/packages/Xinuosbinutils-2.30a-UnixWare-i386.pkg.gz
+https://download.xinuos.com/unixware7D/D2M1MP/packages/Xinuosflex-2.6.4-UnixWare-i386.pkg.xz
+https://download.xinuos.com/unixware7D/D2M1MP/packages/Xinuospcre-8.45-UnixWare-i386.pkg.xz
+https://download.xinuos.com/unixware7D/D2M1MP/packages/Xinuoswget-1.20-UnixWare-i386.pkg.gz
+https://download.xinuos.com/unixware7D/D2M1MP/packages/Xinuosdiffutils-3.7-UnixWare-i386.pkg.gz
+
+Extract them with gunzip/unxz, then install them in order:
+
+# /usr/sbin/pkgadd -d /full/path/name.pkg all
+
+Note that the pkgadd tool does _not_ support relative
+paths!
+
+Add /usr/sysv5/bin to your $PATH before bootstrap.
Index: pkgsrc/bootstrap/bootstrap
diff -u pkgsrc/bootstrap/bootstrap:1.328 pkgsrc/bootstrap/bootstrap:1.329
--- pkgsrc/bootstrap/bootstrap:1.328 Tue Feb 18 13:45:57 2025
+++ pkgsrc/bootstrap/bootstrap Wed Mar 5 11:44:42 2025
@@ -1,6 +1,6 @@
#! /bin/sh
-# $NetBSD: bootstrap,v 1.328 2025/02/18 13:45:57 wiz Exp $
+# $NetBSD: bootstrap,v 1.329 2025/03/05 11:44:42 nia Exp $
#
# Copyright (c) 2001-2011 Alistair Crooks <agc%NetBSD.org@localhost>
# All rights reserved.
@@ -834,6 +834,7 @@ SCO_SV)
if [ -x "/usr/bin/bash" ]; then
bootstrap_sh=${SH:-/usr/bin/bash}
bootstrap_sh_set=set
+ shprog=$bootstrap_sh
else
need_mksh=yes
fi
@@ -881,17 +882,20 @@ UnixWare)
root_group=sys
BSTRAP_ENV="INSTALL=/usr/ucb/install $BSTRAP_ENV"
need_mkdir=yes
- need_awk=yes
- need_sed=yes
+ if [ -x "/usr/bin/nawk" ]; then
+ bootstrap_awk="/usr/bin/nawk"
+ else
+ need_awk=yes
+ fi
if [ -x "/usr/bin/bash" ]; then
bootstrap_sh=${SH:-/usr/bin/bash}
bootstrap_sh_set=set
+ shprog=$bootstrap_sh
else
need_mksh=yes
fi
whoamiprog=/usr/ucb/whoami
machine_arch=`uname -m`
- CC="gcc -DUNIXWARE"; export CC
;;
*)
echo "This platform ($opsys) is untried - good luck, and thanks for using pkgsrc"
Index: pkgsrc/devel/bmake/Makefile
diff -u pkgsrc/devel/bmake/Makefile:1.83 pkgsrc/devel/bmake/Makefile:1.84
--- pkgsrc/devel/bmake/Makefile:1.83 Mon Jan 13 11:24:46 2025
+++ pkgsrc/devel/bmake/Makefile Wed Mar 5 11:44:42 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.83 2025/01/13 11:24:46 jperkin Exp $
+# $NetBSD: Makefile,v 1.84 2025/03/05 11:44:42 nia Exp $
PKGNAME= bmake-20240909
CATEGORIES= devel
@@ -36,7 +36,7 @@ CONFIGURE_ARGS+= --with-defshell=${PREFI
.elif ${TOOLS_PLATFORM.sh:M?*/bin/pdksh}
DEPENDS+= pdksh-[0-9]*:../../shells/pdksh
CONFIGURE_ARGS+= --with-defshell=${PREFIX}/bin/pdksh
-.elif ${OPSYS} == "SunOS" && exists(/usr/bin/bash)
+.elif (${OPSYS} == "SunOS" || ${OPSYS} == "UnixWare") && exists(/usr/bin/bash)
CONFIGURE_ARGS+= --with-defshell=/usr/bin/bash
.endif
Index: pkgsrc/mk/tools/tools.UnixWare.mk
diff -u pkgsrc/mk/tools/tools.UnixWare.mk:1.15 pkgsrc/mk/tools/tools.UnixWare.mk:1.16
--- pkgsrc/mk/tools/tools.UnixWare.mk:1.15 Tue Jun 27 10:27:21 2023
+++ pkgsrc/mk/tools/tools.UnixWare.mk Wed Mar 5 11:44:42 2025
@@ -1,10 +1,15 @@
-# $NetBSD: tools.UnixWare.mk,v 1.15 2023/06/27 10:27:21 riastradh Exp $
+# $NetBSD: tools.UnixWare.mk,v 1.16 2025/03/05 11:44:42 nia Exp $
#
# System-supplied tools for the UnixWare 7 operating system.
TOOLS_PLATFORM.[?= [ # shell builtin
TOOLS_PLATFORM.awk?= /usr/bin/nawk
TOOLS_PLATFORM.basename?= /usr/bin/basename
+.if exists(/usr/bin/bash)
+TOOLS_PLATFORM.bash?= /usr/bin/bash
+.endif
+TOOLS_PLATFORM.bzcat?= /usr/bin/bzcat
+TOOLS_PLATFORM.bzip2?= /usr/bin/bzip2
TOOLS_PLATFORM.cat?= /usr/bin/cat
TOOLS_PLATFORM.chgrp?= /usr/bin/chgrp
TOOLS_PLATFORM.chmod?= /usr/bin/chmod
@@ -12,9 +17,19 @@ TOOLS_PLATFORM.chown?= /usr/bin/chown
TOOLS_PLATFORM.cmp?= /usr/bin/cmp
TOOLS_PLATFORM.cp?= /usr/bin/cp
TOOLS_PLATFORM.csh?= /bin/csh
+.if exists(/opt/xinuos/bin/curl)
+TOOLS_PLATFORM.curl?= /opt/xinuos/bin/curl
+.endif
TOOLS_PLATFORM.cut?= /usr/bin/cut
TOOLS_PLATFORM.date?= /usr/bin/date
-TOOLS_PLATFORM.diff?= /usr/bin/diff
+# stock uw7 diff doesn't support -u
+# you need Xinuosdiffutils
+.if exists(/opt/xinuos/bin/diff)
+TOOLS_PLATFORM.diff?= /opt/xinuos/bin/diff
+.endif
+.if exists(/opt/xinuos/bin/diff3)
+TOOLS_PLATFORM.diff3?= /opt/xinuos/bin/diff3
+.endif
TOOLS_PLATFORM.dirname?= /usr/bin/dirname
TOOLS_PLATFORM.echo?= /usr/ucb/echo
TOOLS_PLATFORM.egrep?= /usr/bin/grep -E
@@ -25,10 +40,15 @@ TOOLS_PLATFORM.fgrep?= /usr/bin/grep -F
TOOLS_PLATFORM.file?= /usr/bin/file
TOOLS_PLATFORM.find?= /usr/bin/find
TOOLS_PLATFORM.grep?= /usr/bin/grep
+TOOLS_PLATFORM.gunzip?= /usr/bin/gunzip
+TOOLS_PLATFORM.gzcat?= /usr/bin/gzcat
+TOOLS_PLATFORM.gzip?= /usr/bin/gzip
TOOLS_PLATFORM.head?= /usr/bin/head
TOOLS_PLATFORM.hostname?= /usr/bin/hostname
TOOLS_PLATFORM.id?= /usr/bin/id
TOOLS_PLATFORM.install?= /usr/ucb/install
+TOOLS_PLATFORM.ksh?= /usr/bin/ksh
+TOOLS_PLATFORM.lex?= /usr/bin/lex
TOOLS_PLATFORM.ln?= /usr/bin/ln
TOOLS_PLATFORM.ls?= /usr/bin/ls
TOOLS_PLATFORM.m4?= /usr/ccs/bin/m4
@@ -36,13 +56,23 @@ TOOLS_PLATFORM.mail?= /usr/bin/mailx
TOOLS_PLATFORM.mv?= /usr/bin/mv
TOOLS_PLATFORM.nice?= /usr/bin/nice
TOOLS_PLATFORM.nroff?= /usr/bin/nroff
+.if exists(/usr/bin/openssl)
+TOOLS_PLATFORM.openssl?= /usr/bin/openssl
+.endif
+TOOLS_PLATFORM.pax?= /usr/bin/pax
+TOOLS_PLATFORM.printf?= /usr/bin/printf
TOOLS_PLATFORM.pwd?= /usr/bin/pwd
TOOLS_PLATFORM.rm?= /usr/bin/rm
TOOLS_PLATFORM.rmdir?= /usr/bin/rmdir
+TOOLS_PLATFORM.sdiff?= /usr/bin/sdiff
TOOLS_PLATFORM.sed?= /usr/bin/sed
TOOLS_PLATFORM.sh?= /usr/bin/ksh
+TOOLS_PLATFORM.sleep?= /usr/bin/sleep
TOOLS_PLATFORM.sort?= /usr/bin/sort
+TOOLS_PLATFORM.strip?= /usr/ccs/bin/strip
TOOLS_PLATFORM.tail?= /usr/bin/tail
+TOOLS_PLATFORM.tar?= /usr/bin/tar
+TOOLS_PLATFORM.tbl?= /usr/ucb/tbl
TOOLS_PLATFORM.tee?= /usr/bin/tee
TOOLS_PLATFORM.test?= test # shell builtin
TOOLS_PLATFORM.touch?= /usr/bin/touch
@@ -50,8 +80,24 @@ TOOLS_PLATFORM.tr?= /usr/bin/tr
TOOLS_PLATFORM.true?= /usr/bin/true
TOOLS_PLATFORM.tsort?= /usr/ccs/bin/tsort
TOOLS_PLATFORM.uniq?= /usr/bin/uniq
+.if exists(/usr/bin/unzip)
+TOOLS_PLATFORM.unzip?= /usr/bin/unzip
+.endif
+.if exists(/opt/xinuos/bin/wget)
+TOOLS_PLATFORM.wget?= /opt/xinuos/bin/wget
+.endif
TOOLS_PLATFORM.wc?= /usr/bin/wc
TOOLS_PLATFORM.xargs?= /usr/bin/xargs
+.if exists(/usr/bin/xzcat)
+TOOLS_PLATFORM.xzcat?= /usr/bin/xzcat
+.endif
+.if exists(/usr/bin/xz)
+TOOLS_PLATFORM.xz?= /usr/bin/xz
+.endif
+TOOLS_PLATFORM.yacc?= /usr/bin/yacc
+.if exists(/usr/bin/zip)
+TOOLS_PLATFORM.zip?= /usr/bin/zip
+.endif
# Special bootstrap script
TOOLS_PLATFORM.mkdir?= ${TOOLBASE}/sbin/mkdir-sh -p
Home |
Main Index |
Thread Index |
Old Index