From dd14f2490d536a131f43866de3dbb598c72624c6 Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Thu, 19 Mar 2015 19:15:59 +0000
Subject: [PATCH] Update to tcl-8.6.4/tk-8.6.4

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@15668 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 general/prog/tcl.xml               | 28 +++++++++++++++-------------
 general/prog/tk.xml                |  4 ++--
 introduction/welcome/changelog.xml |  4 ++++
 packages.ent                       |  4 ++--
 4 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/general/prog/tcl.xml b/general/prog/tcl.xml
index 35a5ccecec..634bb7d459 100644
--- a/general/prog/tcl.xml
+++ b/general/prog/tcl.xml
@@ -6,17 +6,19 @@
 
   <!ENTITY tcl-download-http "&sourceforge-repo;/tcl/tcl&tcl-version;-src.tar.gz">
   <!ENTITY tcl-download-ftp  " ">
-  <!ENTITY tcl-md5sum        "db382feca91754b7f93da16dc4cdad1f">
+  <!ENTITY tcl-md5sum        "d7cbb91f1ded1919370a30edd1534304">
   <!ENTITY tcl-size          "8.5 MB">
-  <!ENTITY tcl-buildsize     "73 MB (includes documentation installation)(add 10MB for tests)">
-  <!ENTITY tcl-time          "0.9 SBU (adittional 2.2 SBU for the tests)">
+  <!ENTITY tcl-buildsize     "69 MB (includes documentation installation)(add 10MB for tests)">
+  <!ENTITY tcl-time          "0.4 SBU (using parallelism=8, additional 0.5 SBU for the tests)">
 
   <!ENTITY tcl-doc-download  "&sourceforge-repo;/tcl/tcl&tcl-version;-html.tar.gz">
-  <!ENTITY tcl-doc-md5sum    "912142f117a090e83e8ec3d771572191">
+  <!ENTITY tcl-doc-md5sum    "62647d87e9244a4d521c6547e097007c">
   <!ENTITY tcl-doc-size      "1.2 MB">
 
   <!-- Ensure this is updated when Tcl moves from the 8.6.x branch -->
   <!ENTITY tcl-ver           "8.6">
+  <!ENTITY tdbc-ver          "1.0.3">
+  <!ENTITY itcl-ver          "4.0.3">
 ]>
 
 <sect1 id="tcl" xreflabel="Tcl-&tcl-version;">
@@ -137,16 +139,16 @@ sed -e "s#$SRCDIR/unix#/usr/lib#" \
     -e "s#$SRCDIR#/usr/include#"  \
     -i tclConfig.sh               &amp;&amp;
 
-sed -e "s#$SRCDIR/unix/pkgs/tdbc1.0.2#/usr/lib/tdbc1.0.2#" \
-    -e "s#$SRCDIR/pkgs/tdbc1.0.2/generic#/usr/include#"    \
-    -e "s#$SRCDIR/pkgs/tdbc1.0.2/library#/usr/lib/tcl8.6#" \
-    -e "s#$SRCDIR/pkgs/tdbc1.0.2#/usr/include#"            \
-    -i pkgs/tdbc1.0.2/tdbcConfig.sh                        &amp;&amp;
+sed -e "s#$SRCDIR/unix/pkgs/tdbc&tdbc-ver;#/usr/lib/tdbc1.0.2#" \
+    -e "s#$SRCDIR/pkgs/tdbc&tdbc-ver;/generic#/usr/include#"    \
+    -e "s#$SRCDIR/pkgs/tdbc&tdbc-ver;/library#/usr/lib/tcl8.6#" \
+    -e "s#$SRCDIR/pkgs/&tdbc-ver;#/usr/include#"            \
+    -i pkgs/tdbc&tdbc-ver;/tdbcConfig.sh                        &amp;&amp;
 
-sed -e "s#$SRCDIR/unix/pkgs/itcl4.0.2#/usr/lib/itcl4.0.2#" \
-    -e "s#$SRCDIR/pkgs/itcl4.0.2/generic#/usr/include#"    \
-    -e "s#$SRCDIR/pkgs/itcl4.0.2#/usr/include#"            \
-    -i pkgs/itcl4.0.2/itclConfig.sh                        &amp;&amp;
+sed -e "s#$SRCDIR/unix/pkgs/itcl&itcl-ver;#/usr/lib/itcl&itcl-ver;#" \
+    -e "s#$SRCDIR/pkgs/itcl&itcl-ver;/generic#/usr/include#"    \
+    -e "s#$SRCDIR/pkgs/itcl&itcl-ver;#/usr/include#"            \
+    -i pkgs/itcl&itcl-ver;/itclConfig.sh                        &amp;&amp;
 
 unset SRCDIR</userinput></screen>
 
diff --git a/general/prog/tk.xml b/general/prog/tk.xml
index d0d38d2652..25de3ba673 100644
--- a/general/prog/tk.xml
+++ b/general/prog/tk.xml
@@ -6,9 +6,9 @@
 
   <!ENTITY tk-download-http "&sourceforge-repo;/tcl/tk&tk-version;-src.tar.gz">
   <!ENTITY tk-download-ftp  " ">
-  <!ENTITY tk-md5sum        "85ca4dbf4dcc19777fd456f6ee5d0221">
+  <!ENTITY tk-md5sum        "261754d7dc2a582f00e35547777e1fea">
   <!ENTITY tk-size          "4.1 MB">
-  <!ENTITY tk-buildsize     "25 MB">
+  <!ENTITY tk-buildsize     "24 MB">
   <!ENTITY tk-time          "0.3 SBU">
 
   <!-- Ensure this is updated when Tk moves from the 8.6.x branch -->
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 565be9404a..aef58239ff 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -47,6 +47,10 @@
     <listitem>
       <para>March 19th, 2015</para>
       <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to tcl-8.6.4/tk-8.6.4. Fixes
+          <ulink url="&blfs-ticket-root;6256">#6256</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[igor] - Update to ffmpeg-2.6.1.</para>
         </listitem>
diff --git a/packages.ent b/packages.ent
index e34a293456..22cfcad5ae 100644
--- a/packages.ent
+++ b/packages.ent
@@ -273,8 +273,8 @@
 <!ENTITY slang-version                "2.2.4">
 <!ENTITY subversion-version           "1.8.11">
 <!ENTITY swig-version                 "3.0.5">
-<!ENTITY tcl-version                  "8.6.3">
-<!ENTITY tk-version                   "8.6.3">
+<!ENTITY tcl-version                  "8.6.4">
+<!ENTITY tk-version                   "8.6.4">
 <!ENTITY vala-major-version           "0.26">  <!-- even minors only -->
 <!ENTITY vala-version                 "&vala-major-version;.2">
 <!ENTITY valgrind-version             "3.10.1">