Index: ossp-pkg/shtool/ChangeLog
RCS File: /v/ossp/cvs/ossp-pkg/shtool/ChangeLog,v
rcsdiff -q -kk '-r1.213' '-r1.214' -u '/v/ossp/cvs/ossp-pkg/shtool/ChangeLog,v' 2>/dev/null
--- ChangeLog	2005/06/15 08:20:36	1.213
+++ ChangeLog	2005/07/05 19:05:40	1.214
@@ -9,6 +9,13 @@
 
  ChangeLog
 
+ Changes between 2.0.2 and 2.0.3 (15-Jun-2005 to xx-XXX-2005):
+
+   *) Improved FreeBSD/amd64 on iX86/EM64T detection within "shtool
+      platform" by treating this as a native AMD64 platform similar to
+      what the underlying OS does.
+      [Ralf S. Engelschall]
+
  Changes between 2.0.1 and 2.0.2 (11-Aug-2004 to 15-Jun-2005):
 
    *) Fix insecure temporary file handling (CAN-2005-1751, CAN-2005-1759).
Index: ossp-pkg/shtool/sh.platform
RCS File: /v/ossp/cvs/ossp-pkg/shtool/sh.platform,v
rcsdiff -q -kk '-r1.12' '-r1.13' -u '/v/ossp/cvs/ossp-pkg/shtool/sh.platform,v' 2>/dev/null
--- sh.platform	2005/06/15 08:14:35	1.12
+++ sh.platform	2005/07/05 19:05:40	1.13
@@ -128,13 +128,14 @@
             i386 ) AC="iX86" ;;
         esac
         AP="${AC}"
-        AT=`(/sbin/sysctl -n hw.model) 2>&1`
-        case "${AT}" in
-            *"Xeon"* | *"Pentium Pro"* | *"Cyrix 6x86MX"* | *"Pentium II"* | *"Pentium III"* | *"Pentium 4"* | *"Celeron"* ) AT="i686" ;;
-            *"Pentium"* ) AT="i586" ;; *"i486[SD]X"* | *"Cyrix 486"* | *"Cyrix [56]x86"* | *"Blue Lightning" | *"Cyrix 486S/DX" ) AT="i486" ;;
-            *"i386[SD]X"* | *"NexGen 586"* ) AT="i386" ;;
-            * ) AT="${AP}" ;;
-        esac
+        AT="${AP}"
+        if [ ".${AT}" = ".iX86" ]; then
+            case "`(/sbin/sysctl -n hw.model) 2>&1`" in
+                *"Xeon"* | *"Pentium Pro"* | *"Cyrix 6x86MX"* | *"Pentium II"* | *"Pentium III"* | *"Pentium 4"* | *"Celeron"* ) AT="i686" ;;
+                *"Pentium"* ) AT="i586" ;; *"i486[SD]X"* | *"Cyrix 486"* | *"Cyrix [56]x86"* | *"Blue Lightning" | *"Cyrix 486S/DX" ) AT="i486" ;;
+                *"i386[SD]X"* | *"NexGen 586"* ) AT="i386" ;;
+            esac
+        fi
         #   determine system
         r=`echo "${UNAME_RELEASE}" |\
            sed -e 's;[()];;' -e 's/\(-.*\)$/[\1]/'`