CVS commit: pkgsrc

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Fri Nov 12 20:29:05 UTC 2021

Modified Files:
        pkgsrc/bootstrap: bootstrap
        pkgsrc/mk: bsd.prefs.mk

Log Message:
mk/bootstrap: Fix bits for SCO UnixWare 7.

Derived from a patch from Boyd Lynn Gerber.


To generate a diff of this commit:
cvs rdiff -u -r1.302 -r1.303 pkgsrc/bootstrap/bootstrap
cvs rdiff -u -r1.410 -r1.411 pkgsrc/mk/bsd.prefs.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/bootstrap
diff -u pkgsrc/bootstrap/bootstrap:1.302 pkgsrc/bootstrap/bootstrap:1.303
--- pkgsrc/bootstrap/bootstrap:1.302    Tue Jul 13 12:43:58 2021
+++ pkgsrc/bootstrap/bootstrap  Fri Nov 12 20:29:05 2021
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# $NetBSD: bootstrap,v 1.302 2021/07/13 12:43:58 schmonz Exp $
+# $NetBSD: bootstrap,v 1.303 2021/11/12 20:29:05 nia Exp $
 #
 # Copyright (c) 2001-2011 Alistair Crooks <agc%NetBSD.org@localhost>
 # All rights reserved.
@@ -835,6 +835,7 @@ UnixWare)
        need_awk=yes
        need_sed=yes
        whoamiprog=/usr/ucb/whoami
+       machine_arch=`uname -m`
        CC="gcc -DUNIXWARE"; export CC
        ;;
 *)

Index: pkgsrc/mk/bsd.prefs.mk
diff -u pkgsrc/mk/bsd.prefs.mk:1.410 pkgsrc/mk/bsd.prefs.mk:1.411
--- pkgsrc/mk/bsd.prefs.mk:1.410        Tue Nov  2 08:14:58 2021
+++ pkgsrc/mk/bsd.prefs.mk      Fri Nov 12 20:29:05 2021
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.410 2021/11/02 08:14:58 nia Exp $
+# $NetBSD: bsd.prefs.mk,v 1.411 2021/11/12 20:29:05 nia Exp $
 #
 # This file includes the mk.conf file, which contains the user settings.
 #
@@ -285,6 +285,12 @@ OS_VARIANT=                SCOOSR5
 OS_VARIANT=            SCOOSR6
 .  endif
 
+.elif ${OPSYS} == "UnixWare"
+SCO_RELEASE?=          sysv5${OPSYS}
+SCO_VERSION!=          ${UNAME} -v
+LOWER_VENDOR?=         unknown
+LOWER_OPSYS_VERSUFFIX= ${SCO_RELEASE}${SCO_VERSION}
+
 .elif ${OPSYS} == "Minix"
 LOWER_VENDOR?=         unknown
 LOWER_OPSYS:=          ${OPSYS:tl}
@@ -362,6 +368,8 @@ OBJECT_FMT= SOM
 OBJECT_FMT=    PE
 .elif ${OPSYS} == "SCO_SV"
 OBJECT_FMT=    ELF
+.elif ${OPSYS} == "UnixWare"
+OBJECT_FMT=    ELF
 .endif
 
 # Calculate depth