* library/platform/platform.tcl: Added OSX Intel 64bit

	* library/platform/pkgIndex.tcl: Package updated to version 1.0.9.
	* unix/Makefile.in:
	* win/Makefile.in:

6 files changed, 41 insertions, 12 deletions

diff --git a/ChangeLog b/ChangeLog
index 456b24d..dc812ac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-06-09  Andreas Kupries  <andreask@activestate.com>
+
+	* library/platform/platform.tcl: Added OSX Intel 64bit
+	* library/platform/pkgIndex.tcl: Package updated to version 1.0.9.
+	* unix/Makefile.in:
+	* win/Makefile.in:
+
 2010-06-09  Jan Nijtmans  <nijtmans@users.sf.net>
 
 	* tools/tsdPerf.c:    Fix export of symbol Tsdperf_Init, when
diff --git a/library/platform/pkgIndex.tcl b/library/platform/pkgIndex.tcl
index 808f995..35da3b7 100644
--- a/library/platform/pkgIndex.tcl
+++ b/library/platform/pkgIndex.tcl
@@ -1,3 +1,3 @@
-package ifneeded platform        1.0.8 [list source [file join $dir platform.tcl]]
+package ifneeded platform        1.0.9 [list source [file join $dir platform.tcl]]
 package ifneeded platform::shell 1.1.4 [list source [file join $dir shell.tcl]]
 
diff --git a/library/platform/platform.tcl b/library/platform/platform.tcl
index 370c48a..572a8b4 100644
--- a/library/platform/platform.tcl
+++ b/library/platform/platform.tcl
@@ -281,6 +281,13 @@ proc ::platform::patterns {id} {
 	macosx*-*    {
 	    # 10.5+ 
 	    if {[regexp {macosx([^-]*)-(.*)} $id -> v cpu]} {
+
+		switch -exact -- $cpu {
+		    ix86    -
+		    x86_64  { set alt i386-x86_64 }
+		    default { set alt {} }
+		}
+
 		if {$v ne ""} {
 		    foreach {major minor} [split $v .] break
 
@@ -289,22 +296,34 @@ proc ::platform::patterns {id} {
 		    for {set j $minor} {$j >= 5} {incr j -1} {
 			lappend res macosx${major}.${j}-${cpu}
 			lappend res macosx${major}.${j}-universal
+			if {$alt ne {}} {
+			    lappend res macosx${major}.${j}-$alt
+			}
 		    }
 
 		    # Add unversioned patterns for 10.3/10.4 builds.
 		    lappend res macosx-${cpu}
 		    lappend res macosx-universal
+		    if {$alt ne {}} {
+			lappend res macosx-$alt
+		    }
 		} else {
 		    lappend res macosx-universal
+		    if {$alt ne {}} {
+			lappend res macosx-$alt
+		    }
 		}
 	    } else {
 		lappend res macosx-universal
 	    }
 	}
-	macosx-powerpc -
-	macosx-ix86    {
+	macosx-powerpc {
 	    lappend res macosx-universal
 	}
+	macosx-x86_64 -
+	macosx-ix86 {
+	    lappend res macosx-universal macosx-i386-x86_64
+	}
     }
     lappend res tcl ; # Pure tcl packages are always compatible.
     return $res
@@ -314,7 +333,7 @@ proc ::platform::patterns {id} {
 # ### ### ### ######### ######### #########
 ## Ready
 
-package provide platform 1.0.8
+package provide platform 1.0.9
 
 # ### ### ### ######### ######### #########
 ## Demo application
diff --git a/library/platform/shell.tcl b/library/platform/shell.tcl
index 407e639..e0a129a 100644
--- a/library/platform/shell.tcl
+++ b/library/platform/shell.tcl
@@ -1,3 +1,4 @@
+
 # -*- tcl -*-
 # ### ### ### ######### ######### #########
 ## Overview
@@ -104,8 +105,10 @@ proc ::platform::shell::LOCATE {bv ov} {
     # here. If the found package is wrapped we copy the code somewhere
     # where the spawned shell will be able to read it.
 
-    # Note: This code depends on the form of the 'provide' command
-    # generated by tm.tcl. Keep them in sync. See Bug 2255235.
+    # This code is brittle, it needs has to adapt to whatever changes
+    # are made to the TM code, i.e. the provide statement generated by
+    # tm.tcl
+
     set pl [package ifneeded platform [package require platform]]
     set base [lindex $pl end]
 
diff --git a/unix/Makefile.in b/unix/Makefile.in
index cf34a71..1360908 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -4,7 +4,7 @@
 # "./configure", which is a configuration script generated by the "autoconf"
 # program (constructs like "@foo@" will get replaced in the actual Makefile.
 #
-# RCS: @(#) $Id: Makefile.in,v 1.299 2010/05/07 20:16:50 andreas_kupries Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.300 2010/06/09 20:11:34 andreas_kupries Exp $
 
 VERSION 		= @TCL_VERSION@
 MAJOR_VERSION		= @TCL_MAJOR_VERSION@
@@ -856,8 +856,8 @@ install-libraries: libraries $(INSTALL_TZDATA) install-msgs
 	@echo "Installing package tcltest 2.3.2 as a Tcl Module";
 	@$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/tcltest-2.3.2.tm;
 
-	@echo "Installing package platform 1.0.8 as a Tcl Module";
-	@$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/platform-1.0.8.tm;
+	@echo "Installing package platform 1.0.9 as a Tcl Module";
+	@$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/platform-1.0.9.tm;
 	@echo "Installing package platform::shell 1.1.4 as a Tcl Module";
 	@$(INSTALL_DATA) $(TOP_DIR)/library/platform/shell.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/platform/shell-1.1.4.tm;
 
diff --git a/win/Makefile.in b/win/Makefile.in
index 9023bdf..7df3357 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -4,7 +4,7 @@
 # "./configure", which is a configuration script generated by the "autoconf"
 # program (constructs like "@foo@" will get replaced in the actual Makefile.
 #
-# RCS: @(#) $Id: Makefile.in,v 1.179 2010/05/07 20:16:50 andreas_kupries Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.180 2010/06/09 20:11:34 andreas_kupries Exp $
 
 VERSION = @TCL_VERSION@
 
@@ -675,8 +675,8 @@ install-libraries: libraries install-tzdata install-msgs
 	@$(COPY) $(ROOT_DIR)/library/msgcat/msgcat.tcl $(SCRIPT_INSTALL_DIR)/../tcl8/8.5/msgcat-1.4.3.tm;
 	@echo "Installing package tcltest 2.3.2 as a Tcl Module";
 	@$(COPY) $(ROOT_DIR)/library/tcltest/tcltest.tcl $(SCRIPT_INSTALL_DIR)/../tcl8/8.5/tcltest-2.3.2.tm;
-	@echo "Installing package platform 1.0.8 as a Tcl Module";
-	@$(COPY) $(ROOT_DIR)/library/platform/platform.tcl $(SCRIPT_INSTALL_DIR)/../tcl8/8.4/platform-1.0.8.tm;
+	@echo "Installing package platform 1.0.9 as a Tcl Module";
+	@$(COPY) $(ROOT_DIR)/library/platform/platform.tcl $(SCRIPT_INSTALL_DIR)/../tcl8/8.4/platform-1.0.9.tm;
 	@echo "Installing package platform::shell 1.1.4 as a Tcl Module";
 	@$(COPY) $(ROOT_DIR)/library/platform/shell.tcl $(SCRIPT_INSTALL_DIR)/../tcl8/8.4/platform/shell-1.1.4.tm;
 	@echo "Installing encodings";