* library/platform/platform.tcl: Fix cpu name for Solaris/Intel 64bit.

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

5 files changed, 21 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index e7a0574..e83dd5b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-05-07  Andreas Kupries  <andreask@activestate.com>
+
+	* library/platform/platform.tcl: Fix cpu name for Solaris/Intel 64bit.
+	* library/platform/pkgIndex.tcl: Package updated to version 1.0.8.
+	* unix/Makefile.in:		
+	* win/Makefile.in:
+
 2010-05-06  Jan Nijtmans  <nijtmans@users.sf.net>
 
 	* generic/tclPkg.c    Unnecessary type casts, See Tcl [Patch #2997087]
diff --git a/library/platform/pkgIndex.tcl b/library/platform/pkgIndex.tcl
index 69ca721..808f995 100644
--- a/library/platform/pkgIndex.tcl
+++ b/library/platform/pkgIndex.tcl
@@ -1,3 +1,3 @@
-package ifneeded platform        1.0.7 [list source [file join $dir platform.tcl]]
+package ifneeded platform        1.0.8 [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 838ceec..370c48a 100644
--- a/library/platform/platform.tcl
+++ b/library/platform/platform.tcl
@@ -103,7 +103,12 @@ proc ::platform::generic {} {
 	}
 	sunos {
 	    set plat solaris
-	    if {![string match "ia64*" $cpu]} {
+	    if {[string match "ix86" $cpu]} {
+		if {$tcl_platform(wordSize) == 8} {
+		    set cpu x86_64
+		}
+	    } elseif {![string match "ia64*" $cpu]} {
+		# sparc
 		if {$tcl_platform(wordSize) == 8} {
 		    append cpu 64
 		}
@@ -309,7 +314,7 @@ proc ::platform::patterns {id} {
 # ### ### ### ######### ######### #########
 ## Ready
 
-package provide platform 1.0.7
+package provide platform 1.0.8
 
 # ### ### ### ######### ######### #########
 ## Demo application
diff --git a/unix/Makefile.in b/unix/Makefile.in
index 9950896..cf34a71 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.298 2010/04/30 09:25:01 dkf Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.299 2010/05/07 20:16:50 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.7 as a Tcl Module";
-	@$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/platform-1.0.7.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::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 6f58dc7..9023bdf 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.178 2010/04/29 21:19:32 andreas_kupries Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.179 2010/05/07 20:16:50 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.7 as a Tcl Module";
-	@$(COPY) $(ROOT_DIR)/library/platform/platform.tcl $(SCRIPT_INSTALL_DIR)/../tcl8/8.4/platform-1.0.7.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::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";