CVS commit: pkgsrc

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Tue May 20 09:49:24 UTC 2025

Modified Files:
        pkgsrc/bootstrap: README.OpenServer
        pkgsrc/mk/platform: SCO_SV.mk

Log Message:
mk: Always set ACCEPT_INFERIOR_RM_PROGRAM=yes on SCO_SV.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/bootstrap/README.OpenServer
cvs rdiff -u -r1.4 -r1.5 pkgsrc/mk/platform/SCO_SV.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.OpenServer
diff -u pkgsrc/bootstrap/README.OpenServer:1.1 pkgsrc/bootstrap/README.OpenServer:1.2
--- pkgsrc/bootstrap/README.OpenServer:1.1      Sun Mar 30 09:53:32 2025
+++ pkgsrc/bootstrap/README.OpenServer  Tue May 20 09:49:24 2025
@@ -1,4 +1,4 @@
-$NetBSD: README.OpenServer,v 1.1 2025/03/30 09:53:32 nia Exp $
+$NetBSD: README.OpenServer,v 1.2 2025/05/20 09:49:24 nia Exp $
 
 Supported platforms
 ===================
@@ -46,9 +46,6 @@ OpenServer 6 has greater similarity to U
 - There appears to be a bug in 6D2M2a where /usr/include/sys/mkdev.h
   incorrectly declares functions such as major() as non-static, fix them.
 
-- The rm binary is flawed and most autoconf scripts do not accept
-  it. Replace it with the one from /usr/gnu/bin.
-
 First, download the following packages:
 
 - https://download.xinuos.com/openserver6D/D2M1/security/Xinuosreadline-7.0p3a-UnixWare-i386.pkg.gz

Index: pkgsrc/mk/platform/SCO_SV.mk
diff -u pkgsrc/mk/platform/SCO_SV.mk:1.4 pkgsrc/mk/platform/SCO_SV.mk:1.5
--- pkgsrc/mk/platform/SCO_SV.mk:1.4    Sat Apr 12 08:36:36 2025
+++ pkgsrc/mk/platform/SCO_SV.mk        Tue May 20 09:49:24 2025
@@ -1,4 +1,4 @@
-# $NetBSD: SCO_SV.mk,v 1.4 2025/04/12 08:36:36 nia Exp $
+# $NetBSD: SCO_SV.mk,v 1.5 2025/05/20 09:49:24 nia Exp $
 #
 # Variable definitions for the OpenServer 5.0.7/3.2 and 6.0.0/5.
 
@@ -53,8 +53,6 @@ _OPSYS_CAN_CHECK_SHLIBS=      no # can't use 
 _OPSYS_PREFER.curses?=         native
 
 .if ${OS_VARIANT} == "SCOOSR5"
-# SCO OpenServer 5.0.7/3.2's /bin/rm cannot accepr "rm -f" (without arg).
-CONFIGURE_ENV+=                ACCEPT_INFERIOR_RM_PROGRAM=yes
 # pkgsrc does not support SCO OpenServer 5.0.7/3.2's native CC (yet).
 BUILDLINK_TRANSFORM+=  rm:-belf
 # SCO OpenServer 5.0.7/3.2's pthread is GNU pth and it requires -lsocket.
@@ -65,3 +63,6 @@ PTHREAD_TYPE= pth
 _OPSYS_MISSING_FEATURES=       inet6
 PKG_DEFAULT_OPTIONS=           -inet6
 .endif
+
+# SCO OpenServer 5.0.7/3.2's /bin/rm cannot accepr "rm -f" (without arg).
+CONFIGURE_ENV+=                ACCEPT_INFERIOR_RM_PROGRAM=yes