upgrade to latest OSSP platform script for Darwin 6.6 and Solaris 10 support; read from /dev/null on 'as --version' to circumvent brain-dead GNU as 1.x on OpenDarwin

openpkg/HISTORY

@@ -2,6 +2,7 @@
 2003
 ====
 
+20031028 upgrade to latest OSSP platform script for Darwin 6.6 and Solaris 10 support
 20031027 port RPM to OpenDarwin 6.6.2
 20031027 try to cleanup glob(3) replacement hacks in RPM
 20031021 fix RPM GCC building on Unixware by using Linux i386 assembly specific stuff on Linux only.

openpkg/platform

@@ -231,7 +231,7 @@ if [ ".$opt_t" != . ]; then
             ;;
         web )
             #   non-whitespace HTTP Server-header id
-            opt_F="%<ap>-%<sp>"
+            opt_F="%<sp>-%<ap>"
             opt_S="/"
             opt_C="+"
             ;;
@@ -383,6 +383,9 @@ case "${UNAME}" in
     *:Linux:* )
         #   determine architecture
         AT="${UNAME_MACHINE}"
+        case "${AT}" in
+           x86_64 ) AT='AMD64' ;;
+        esac
         AP="${AT}"
         case "${AP}" in
            i[3-6]86 ) AP='iX86' ;;
@@ -409,7 +412,7 @@ case "${UNAME}" in
                 [ ".${tagfile}" = .x ] && continue
                 [ ! -f "/etc/${tagfile}" ] && continue
                 n=`echo ${tagfile} | sed -e 's/[_-]release$//' -e 's/[_-]version$//'`
-                v=`cat /etc/${tagfile} | grep '[0-9]' | head -1 |\
+                v=`(grep VERSION /etc/${tagfile}; cat /etc/${tagfile}) | grep '[0-9]' | head -1 |\
                    sed -e 's/^/#/' \
                        -e 's/^#[^0-9]*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*$/\1/' \
                        -e 's/^#[^0-9]*\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/' \
@@ -439,7 +442,7 @@ case "${UNAME}" in
         #   determine architecture
         AT="${UNAME_MACHINE}"
         case "${AT}" in
-            i86pc ) AT="iX86" ;; 
+            i86pc ) AT="iX86" ;;
         esac
         AP="${AT}"
         case "${AP}" in
@@ -455,7 +458,7 @@ case "${UNAME}" in
         ST="[Sun ]SunOS ${UNAME_RELEASE}"
         v=`echo "${UNAME_RELEASE}" |\
            sed -e 's;^4\.;1.;' \
-               -e 's;^5\.\([0-6]\).*;2.\1;' \
+               -e 's;^5\.\([0-6]\)[^0-9]*$;2.\1;' \
                -e 's;^5\.\([0-9][0-9]*\).*;\1;'`
         SP="[Sun ]Solaris $v"
         case "${UNAME_RELEASE}" in
@@ -469,7 +472,7 @@ case "${UNAME}" in
         #   determine architecture
         AT="${UNAME_MACHINE}"
         case "${AT}" in
-            i[3-6]86 | ix86at ) AT="iX86" ;; 
+            i[3-6]86 | ix86at ) AT="iX86" ;;
         esac
         AP="${AT}"
         #   determine system
@@ -484,7 +487,7 @@ case "${UNAME}" in
         #   determine architecture
         AT="${UNAME_MACHINE}"
         case "${AT}" in
-            x86pc ) AT="iX86" ;; 
+            x86pc ) AT="iX86" ;;
         esac
         AP="${AT}"
         #   determine system
@@ -501,8 +504,8 @@ case "${UNAME}" in
         AT="${UNAME_MACHINE}"
         AP="${AT}"
         case "${AP}:${UNAME_SYSTEM}" in
-            IP*:IRIX64 ) AP="MIPS64" ;; 
-            IP*:*      ) AP="MIPS"   ;; 
+            IP*:IRIX64 ) AP="MIPS64" ;;
+            IP*:*      ) AP="MIPS"   ;;
         esac
         AC="${AP}"
         #   determine system
@@ -520,7 +523,7 @@ case "${UNAME}" in
         case "${AT}" in
             ia64 ) AT="IA64" ;;
             9000/[34]?? ) AT=M68K ;;
-            9000/[678][0-9][0-9]) 
+            9000/[678][0-9][0-9])
                 sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
                 sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
                 case "${sc_cpu_version}" in
@@ -581,6 +584,22 @@ case "${UNAME}" in
         esac
         ;;
 
+    #   Apple MacOS X Darwin
+    *:Darwin:* )
+        AT=`uname -p`
+        case "${AT}" in
+            powerpc ) AT="PPC" ;;
+        esac
+        AP="${AT}"
+        AC="${AP}"
+        case "${AC}" in
+            i?86 ) AC="iX86" ;;
+        esac
+        ST="[Apple ]${UNAME_SYSTEM} ${UNAME_RELEASE}"
+        SP="${ST}"
+        SC="4.4BSD${opt_C}Mach3"
+        ;;
+
     #   TODO ...ADD YOUR NEW PLATFORM CHECK HERE... TODO
     # *:XXX:* )
     #   ...
@@ -588,10 +607,16 @@ case "${UNAME}" in
 
     #   ...A STILL UNKNOWN PLATFORM...
     * )
-        AT="${UNAME_MACHINE}"
+        AT=`echo "${UNAME_MACHINE}" | sed -e "s; ;${opt_C};g"`
         AP="${AT}"
         AC="${AP}"
-        ST="${UNAME_SYSTEM} ${UNAME_RELEASE}"
+        v=`echo "${UNAME_RELEASE}" |\
+           sed -e 's/^/#/' \
+               -e 's/^#[^0-9]*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*$/\1/' \
+               -e 's/^#[^0-9]*\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/' \
+               -e 's/^#[^0-9]*\([0-9][0-9]*\).*$/\1/' \
+               -e 's/^#.*$/?/'`
+        ST="${UNAME_SYSTEM} ${v}"
         SP="${ST}"
         SC="${SP}"
         ;;

openpkg/rpmtool

@@ -433,7 +433,7 @@ case $tool in
             if [ ".$isgcc" = .yes ]; then
                 cflags="-O2"
                 if [ ".`$tool -v 2>/dev/null | grep 'with-gnu-as'`" != . ] || \
-                   [ ".`(as --version) 2>/dev/null | grep 'GNU'`" != . ]; then
+                   [ ".`(as --version </dev/null) 2>/dev/null | grep 'GNU'`" != . ]; then
                     cflags="$cflags -pipe"
                 fi
             else