SUA 6.0 support

["OBATA Akio" <obache%netbsd.org@localhost>]

Hi,

Today, I'm succeed to bootstrap on SUA 6.0 with some modifications.

% uname -a
Interix ponkan 6.0 10.0.6030.0 x86 Intel_x86_Family6_Model15_Stepping11

Before commit or more works, I want to ask some questions.

In mk/bsd.prefs.mk, OS_VERSION is defined if libc.so.3.5 exists, 3.5, 
otherwise, 3.0.
Should SUA 6.0 be interix-6.0 (and SUA 5.2 is interix-5.2)?
If so, how to detect 6.0 or 5.2? SUA 6.0 have libc.so.5.2 but not libc.so.6.0.
(now in my modification, treaterd as 6.0 if libc.so.5.2 exists)
Or abandon those detection? (per cvs log, it ssems that it is introduced for 
speed up).
Even if OS_VERSION is 6.0, LOWER_OPSYS_VERSUFFIX should be still 3?
In mk/gnu-config/config.rpath, only interix3* exists.

Index: mk/bsd.prefs.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/bsd.prefs.mk,v
retrieving revision 1.295
diff -u -r1.295 bsd.prefs.mk
--- mk/bsd.prefs.mk     13 Sep 2009 13:28:46 -0000      1.295
+++ mk/bsd.prefs.mk     16 Sep 2009 11:12:04 -0000
@@ -155,6 +155,11 @@

 .elif ${OPSYS} == "Interix"
 LOWER_OPSYS?=          interix
+.  if exists(/usr/lib/libc.so.5.2)
+LOWER_OPSYS_VERSUFFIX?=        6
+LOWER_VENDOR?=         pc
+OS_VERSION=            6.0
+.  else
 LOWER_OPSYS_VERSUFFIX?=        3
 LOWER_VENDOR?=         pc
 .  if exists(/usr/lib/libc.so.3.5)
@@ -164,6 +169,7 @@
 .  else
 OS_VERSION=            3.0
 .  endif
+.  endif

 .elif !empty(OPSYS:MIRIX*)
 LOWER_ARCH!=           ${UNAME} -p

How about following patch?
Tools in SUA 6.0 is newer than SFU 3.5 (I don't know about SUA 5.2, so treat 
same as SFU 3.5).

Index: bootstrap/bootstrap
===================================================================
RCS file: /cvsroot/pkgsrc/bootstrap/bootstrap,v
retrieving revision 1.150
diff -u -r1.150 bootstrap
--- bootstrap/bootstrap 1 Aug 2009 20:19:37 -0000       1.150
+++ bootstrap/bootstrap 16 Sep 2009 11:06:35 -0000
@@ -596,11 +596,22 @@
        default_install_mode=0775
        root_user=`id -u`
        root_group=131616
-       need_bsd_install=yes
-       need_awk=yes
-       need_sed=yes
-       set_opsys=no
-       need_xargs=yes
+       case `uname -r` in
+       3.* | 5.*)
+               need_bsd_install=yes
+               need_awk=yes
+               need_sed=yes
+               set_opsys=no
+               need_xargs=yes
+               ;;
+       *)
+               need_bsd_install=no
+               need_awk=no
+               need_sed=no
+               set_opsys=no
+               need_xargs=no
+               ;;
+       esac
        # only used for unprivileged builds
        groupsprog="id -gn"
        # for bootstrap only; pkgsrc uses CPPFLAGS
Index: mk/tools/tools.Interix.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/tools/tools.Interix.mk,v
retrieving revision 1.21
diff -u -r1.21 tools.Interix.mk
--- mk/tools/tools.Interix.mk   6 Nov 2006 19:18:42 -0000       1.21
+++ mk/tools/tools.Interix.mk   16 Sep 2009 11:06:35 -0000
@@ -3,7 +3,11 @@
 # System-supplied tools for the Interix operating system.

 TOOLS_PLATFORM.[?=             /bin/[
+.if !empty(MACHINE_PLATFORM:MInterix-[0-5].*-*)
 TOOLS_PLATFORM.awk?=           /bin/awk -mr 16384
+.else
+TOOLS_PLATFORM.awk?=           /bin/awk
+.endif
 TOOLS_PLATFORM.basename?=      /bin/basename
 TOOLS_PLATFORM.cat?=           /bin/cat
 TOOLS_PLATFORM.chgrp?=         /bin/chgrp
@@ -24,6 +28,9 @@
 TOOLS_PLATFORM.fgrep?=         /bin/fgrep
 TOOLS_PLATFORM.file?=          /bin/file
 TOOLS_PLATFORM.find?=          /bin/find
+.if empty(MACHINE_PLATFORM:MInterix-[0-5].*-*)
+TOOOLS_PLATFORM.gawk?=         /usr/contrib/bin/gawk
+.endif
 TOOLS_PLATFORM.grep?=          /bin/grep
 TOOLS_PLATFORM.gunzip?=                /usr/contrib/bin/gunzip -f
 TOOLS_PLATFORM.gzcat?=         /usr/contrib/bin/gunzip -c
@@ -31,9 +38,15 @@
 TOOLS_PLATFORM.head?=          /bin/head
 TOOLS_PLATFORM.hostname?=      /bin/hostname
 TOOLS_PLATFORM.id?=            /bin/id
+.if empty(MACHINE_PLATFORM:MInterix-[0-5].*-*)
+TOOLS_PLATFORM.install?=       /bin/install
+.endif
 .if exists(/bin/install-info)
 TOOLS_PLATFORM.install-info?=  /bin/install-info
 .endif
+.if empty(MACHINE_PLATFORM:MInterix-[0-5].*-*)
+TOOLS_PLATFORM.lex?=           /bin/lex
+.endif
 TOOLS_PLATFORM.ln?=            /bin/ln
 TOOLS_PLATFORM.ls?=            /bin/ls
 TOOLS_PLATFORM.m4?=            /bin/m4
@@ -48,6 +61,10 @@
 TOOLS_PLATFORM.pwd?=           /bin/pwd
 TOOLS_PLATFORM.rm?=            /bin/rm
 TOOLS_PLATFORM.rmdir?=         /bin/rmdir
+.if empty(MACHINE_PLATFORM:MInterix-[0-5].*-*)
+TOOLS_PLATFORM.pax?=           /bin/pax
+TOOLS_PLATFORM.sed?=           /bin/sed
+.endif
 TOOLS_PLATFORM.sh?=            /bin/sh
 TOOLS_PLATFORM.sleep?=         /bin/sleep
 TOOLS_PLATFORM.sort?=          /bin/sort
@@ -60,4 +77,14 @@
 TOOLS_PLATFORM.true?=          true                    # shell builtin
 TOOLS_PLATFORM.tsort?=         /bin/tsort
 TOOLS_PLATFORM.wc?=            /bin/wc
+.if !empty(MACHINE_PLATFORM:MInterix-[0-5].*-*)
 TOOLS_PLATFORM.xargs?=         /bin/xargs
+.else
+TOOLS_PLATFORM.xargs?=         /bin/xargs -r
+.endif
+.if exists(/usr/contrib/unzip)
+TOOLS_PLATFORM.unzip?=         /usr/contrib/unzip
+.endif
+.if empty(MACHINE_PLATFORM:MInterix-[0-5].*-*)
+TOOLS_PLATFORM.yacc?=          /bin/yacc
+.endif

--
"Of course I love NetBSD":-)
OBATA Akio / obache%NetBSD.org@localhost