7202328 Upgrade TCL to 8.5.12
authorSrinivasa Sarva <Srinivasa.Sarva@oracle.com>
Tue, 16 Oct 2012 10:26:36 -0700
changeset 1017 6a775802d662
parent 1016 9e924589a6fd
child 1018 30454943b20b
7202328 Upgrade TCL to 8.5.12 7202330 Upgrade Tk to 8.5.12
components/tcl/tcl/Makefile
components/tcl/tcl/tcl.license
components/tcl/tcl/tcl.p5m
components/tcl/tk/Makefile
components/tcl/tk/patches/3.doc.manpages.patch
components/tcl/tk/tk.license
components/tcl/tk/tk.p5m
--- a/components/tcl/tcl/Makefile	Mon Oct 15 23:01:19 2012 -0700
+++ b/components/tcl/tcl/Makefile	Tue Oct 16 10:26:36 2012 -0700
@@ -26,12 +26,12 @@
 include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=         tcl
-COMPONENT_VERSION=      8.5.9
+COMPONENT_VERSION=      8.5.12
 COMPONENT_PROJECT_URL=	http://prdownloads.sourceforge.net/tcl/
 COMPONENT_SRC=          $(COMPONENT_NAME)$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=      $(COMPONENT_SRC)-src.tar.gz
 COMPONENT_ARCHIVE_HASH= \
-    sha256:3ab671b417e3eeb41b9cef626d742d8f7f57425101e83e5fcad1d552cd99237d
+    sha256:20ba7a10a30571983afd3599f19b441adb5222b21f1d2b27d0fba3ed8d4707c2
 COMPONENT_ARCHIVE_URL=  $(COMPONENT_PROJECT_URL)$(COMPONENT_ARCHIVE)
 
 include ../../../make-rules/prep.mk
--- a/components/tcl/tcl/tcl.license	Mon Oct 15 23:01:19 2012 -0700
+++ b/components/tcl/tcl/tcl.license	Tue Oct 16 10:26:36 2012 -0700
@@ -1,3 +1,8 @@
+--------------
+- TCL v8.5.12 -
+--------------
+Oracle Internal Tracking Number 9083
+
 This software is copyrighted by the Regents of the University of
 California, Sun Microsystems, Inc., Scriptics Corporation, ActiveState
 Corporation and other parties.  The following terms apply to all files
@@ -29,12 +34,12 @@
 
 GOVERNMENT USE: If you are acquiring this software on behalf of the
 U.S. government, the Government shall have only "Restricted Rights"
-in the software and related documentation as defined in the Federal 
+in the software and related documentation as defined in the Federal
 Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2).  If you
 are acquiring the software on behalf of the Department of Defense, the
 software shall be classified as "Commercial Computer Software" and the
 Government shall have only "Restricted Rights" as defined in Clause
-252.227-7013 (c) (1) of DFARs.  Notwithstanding the foregoing, the
+252.227-7013 (b) (3) of DFARs.  Notwithstanding the foregoing, the
 authors grant the U.S. Government and others acting in its behalf
 permission to use and distribute the software in accordance with the
-terms specified in this license. 
+terms specified in this license.
--- a/components/tcl/tcl/tcl.p5m	Mon Oct 15 23:01:19 2012 -0700
+++ b/components/tcl/tcl/tcl.p5m	Tue Oct 16 10:26:36 2012 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 set name=pkg.fmri \
@@ -288,11 +288,11 @@
 file path=usr/lib/tcl8.5/tclIndex
 file path=usr/lib/tcl8.5/tm.tcl
 file path=usr/lib/tcl8.5/word.tcl
-file path=usr/lib/tcl8/8.4/http-2.7.5.tm
-file path=usr/lib/tcl8/8.4/platform-1.0.9.tm
+file path=usr/lib/tcl8/8.4/http-2.7.9.tm
+file path=usr/lib/tcl8/8.4/platform-1.0.10.tm
 file path=usr/lib/tcl8/8.4/platform/shell-1.1.4.tm
-file path=usr/lib/tcl8/8.5/msgcat-1.4.3.tm
-file path=usr/lib/tcl8/8.5/tcltest-2.3.2.tm
+file path=usr/lib/tcl8/8.5/msgcat-1.4.5.tm
+file path=usr/lib/tcl8/8.5/tcltest-2.3.4.tm
 file path=usr/lib/tclConfig.sh
 file path=usr/share/man/man1/tclsh.1
 file path=usr/share/man/man3tcl/TCL_MEM_DEBUG.3tcl
--- a/components/tcl/tk/Makefile	Mon Oct 15 23:01:19 2012 -0700
+++ b/components/tcl/tk/Makefile	Tue Oct 16 10:26:36 2012 -0700
@@ -26,12 +26,12 @@
 include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		tk
-COMPONENT_VERSION=	8.5.9
+COMPONENT_VERSION=	8.5.12
 COMPONENT_PROJECT_URL=	http://prdownloads.sourceforge.net/tk/
 COMPONENT_SRC=		$(COMPONENT_NAME)$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC)-src.tar.gz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:f46b33d41e71ef533140f1814961f0dc22d62aac316df4a4fd3357e1fd788b83
+    sha256:c453d820925bf526bbe8a0d1c17ab3168b076fcb9844bea797ad75e3b9ad9291
 COMPONENT_ARCHIVE_URL=	http://sourceforge.net/projects/tcl/files/Tcl/$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)/download
 
 include ../../../make-rules/prep.mk
--- a/components/tcl/tk/patches/3.doc.manpages.patch	Mon Oct 15 23:01:19 2012 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,61 +0,0 @@
---- tk8.5.9/doc/label.n.orig	Tue Dec 20 08:29:11 2011
-+++ tk8.5.9/doc/label.n	Tue Dec 20 08:34:08 2011
[email protected]@ -114,7 +114,7 @@
- \fBlabel\fR .l \-text "Left\enHand\enSide"
- \fBlabel\fR .r \-text "Right\enHand\enSide"
- text .mid
--\.mid insert end "This layout is like Java's BorderLayout"
-+\&\.mid insert end "This layout is like Java's BorderLayout"
- # Lay them out
- pack .t   \-side top    \-fill x
- pack .b   \-side bottom \-fill x
---- tk8.5.9/doc/pack.n.orig	Tue Dec 20 08:28:56 2011
-+++ tk8.5.9/doc/pack.n	Tue Dec 20 08:28:00 2011
[email protected]@ -268,7 +268,7 @@
- label .l \-text "Left\enHand\enSide"
- label .r \-text "Right\enHand\enSide"
- text .mid
--\.mid insert end "This layout is like Java's BorderLayout"
-+\&\.mid insert end "This layout is like Java's BorderLayout"
- # Lay them out
- \fBpack\fR .t   \-side top    \-fill x
- \fBpack\fR .b   \-side bottom \-fill x
---- tk8.5.9/doc/text.n.orig	Tue Dec 20 08:29:19 2011
-+++ tk8.5.9/doc/text.n	Tue Dec 20 08:34:42 2011
[email protected]@ -2294,8 +2294,8 @@
- a rare problem, but it can occur, for example:
- .CS
- pack [text .t]
--\.t insert 1.0 "aaaa\enbbbb\encccc\enbbbb\enaaaa\en"
--\.t search \-regexp \-\- {(a+|b+\enc+\enb+)+\ena+} 1.0
-+\&\.t insert 1.0 "aaaa\enbbbb\encccc\enbbbb\enaaaa\en"
-+\&\.t search \-regexp \-\- {(a+|b+\enc+\enb+)+\ena+} 1.0
- .CE
- will not find a match when one exists of 19
- characters starting from the first
[email protected]@ -2312,8 +2312,8 @@
- For example:
- .CS
- pack [text .t]
--\.t insert 1.0 "aaaa\enbbbb\enbbbb\enbbbb\enbbbb\\n"
--\.t search \-regexp \-backward \-\- {b+\en|a+\en(b+\en)+} end
-+\&\.t insert 1.0 "aaaa\enbbbb\enbbbb\enbbbb\enbbbb\\n"
-+\&\.t search \-regexp \-backward \-\- {b+\en|a+\en(b+\en)+} end
- .CE
- matches at
- .QW 5.0
---- tk8.5.9/doc/ttk_notebook.n.orig	Tue Dec 20 08:29:25 2011
-+++ tk8.5.9/doc/ttk_notebook.n	Tue Dec 20 08:35:01 2011
[email protected]@ -201,9 +201,9 @@
- .SH "EXAMPLE"
- .CS
- pack [\fBttk::notebook\fR .nb]
--\.nb add [frame .nb.f1] \-text "First tab"
--\.nb add [frame .nb.f2] \-text "Second tab"
--\.nb select .nb.f2
-+\&\.nb add [frame .nb.f1] \-text "First tab"
-+\&\.nb add [frame .nb.f2] \-text "Second tab"
-+\&\.nb select .nb.f2
- ttk::notebook::enableTraversal .nb
- .CE
- .SH "SEE ALSO"
--- a/components/tcl/tk/tk.license	Mon Oct 15 23:01:19 2012 -0700
+++ b/components/tcl/tk/tk.license	Tue Oct 16 10:26:36 2012 -0700
@@ -1,3 +1,6 @@
+--------------
+- TK v8.5.12 -
+--------------
 
 This software is copyrighted by the Regents of the University of
 California, Sun Microsystems, Inc., and other parties.  The following
@@ -29,12 +32,12 @@
 
 GOVERNMENT USE: If you are acquiring this software on behalf of the
 U.S. government, the Government shall have only "Restricted Rights"
-in the software and related documentation as defined in the Federal 
+in the software and related documentation as defined in the Federal
 Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2).  If you
 are acquiring the software on behalf of the Department of Defense, the
 software shall be classified as "Commercial Computer Software" and the
 Government shall have only "Restricted Rights" as defined in Clause
-252.227-7013 (c) (1) of DFARs.  Notwithstanding the foregoing, the
+252.227-7013 (b) (3) of DFARs.  Notwithstanding the foregoing, the
 authors grant the U.S. Government and others acting in its behalf
 permission to use and distribute the software in accordance with the
 terms specified in this license.
--- a/components/tcl/tk/tk.p5m	Mon Oct 15 23:01:19 2012 -0700
+++ b/components/tcl/tk/tk.p5m	Tue Oct 16 10:26:36 2012 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 set name=pkg.fmri \
@@ -131,7 +131,6 @@
 file path=usr/lib/tk8.5/demos/sayings.tcl
 file path=usr/lib/tk8.5/demos/search.tcl
 file path=usr/lib/tk8.5/demos/spin.tcl
-file path=usr/lib/tk8.5/demos/square
 file path=usr/lib/tk8.5/demos/states.tcl
 file path=usr/lib/tk8.5/demos/style.tcl
 file path=usr/lib/tk8.5/demos/tclIndex