From 85ca28c9001c72262e90fb4e859366528db4fcfc Mon Sep 17 00:00:00 2001
From: Randy McMurchy <randy@linuxfromscratch.org>
Date: Sun, 5 Oct 2008 17:04:28 +0000
Subject: Updated Tcl to 8.5.4

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@8569 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml |  3 +++
 chapter05/tcl.xml       | 24 ++++++++++++------------
 packages.ent            | 11 ++++++-----
 3 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 62d9928ec..41c01baca 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -40,6 +40,9 @@
     <listitem>
       <para>2008-10-05</para>
       <itemizedlist>
+        <listitem>
+          <para>[randy] - Updated Tcl to 8.5.4.</para>
+        </listitem>
         <listitem>
           <para>[randy] - Updated the Linux kernel to 2.6.26.5.</para>
         </listitem>
diff --git a/chapter05/tcl.xml b/chapter05/tcl.xml
index 7393709b9..97a1904d1 100644
--- a/chapter05/tcl.xml
+++ b/chapter05/tcl.xml
@@ -81,7 +81,7 @@
 
     <para>Now make a necessary symbolic link:</para>
 
-<screen><userinput remap="install">ln -sv tclsh8.4 /tools/bin/tclsh</userinput></screen>
+<screen><userinput remap="install">ln -sv tclsh&tcl-major-version; /tools/bin/tclsh</userinput></screen>
 
   </sect2>
 
@@ -93,8 +93,8 @@
       <segtitle>Installed library</segtitle>
 
       <seglistitem>
-        <seg>tclsh (link to tclsh8.4) and tclsh8.4</seg>
-        <seg>libtcl8.4.so</seg>
+        <seg>tclsh (link to tclsh&tcl-major-version;) and tclsh&tcl-major-version;</seg>
+        <seg>libtcl&tcl-major-version;.so</seg>
       </seglistitem>
     </segmentedlist>
 
@@ -103,12 +103,12 @@
       <?dbfo list-presentation="list"?>
       <?dbhtml list-presentation="table"?>
 
-      <varlistentry id="tclsh8.4">
-        <term><command>tclsh8.4</command></term>
+      <varlistentry id="tclsh&tcl-major-version;">
+        <term><command>tclsh&tcl-major-version;</command></term>
         <listitem>
           <para>The Tcl command shell</para>
-          <indexterm zone="ch-tools-tcl tclsh8.4">
-            <primary sortas="b-tclsh8.4">tclsh8.4</primary>
+          <indexterm zone="ch-tools-tcl tclsh&tcl-major-version;">
+            <primary sortas="b-tclsh&tcl-major-version;">tclsh&tcl-major-version;</primary>
           </indexterm>
         </listitem>
       </varlistentry>
@@ -116,19 +116,19 @@
       <varlistentry id="tclsh">
         <term><command>tclsh</command></term>
         <listitem>
-          <para>A link to tclsh8.4</para>
+          <para>A link to tclsh&tcl-major-version;</para>
           <indexterm zone="ch-tools-tcl tclsh">
             <primary sortas="b-tclsh">tclsh</primary>
           </indexterm>
         </listitem>
       </varlistentry>
 
-      <varlistentry id="libtcl8.4.so">
-        <term><filename class="libraryfile">libtcl8.4.so</filename></term>
+      <varlistentry id="libtcl&tcl-major-version;.so">
+        <term><filename class="libraryfile">libtcl&tcl-major-version;.so</filename></term>
         <listitem>
           <para>The Tcl library</para>
-          <indexterm zone="ch-tools-tcl libtcl8.4.so">
-            <primary sortas="c-libtcl8.4.so">libtcl8.4.so</primary>
+          <indexterm zone="ch-tools-tcl libtcl&tcl-major-version;.so">
+            <primary sortas="c-libtcl&tcl-major-version;.so">libtcl&tcl-major-version;.so</primary>
           </indexterm>
         </listitem>
       </varlistentry>
diff --git a/packages.ent b/packages.ent
index 7b6f80f2f..fcbe066d1 100644
--- a/packages.ent
+++ b/packages.ent
@@ -490,13 +490,14 @@
 <!ENTITY tar-ch6-du "19.9 MB">
 <!ENTITY tar-ch6-sbu "0.3 SBU">
 
-<!ENTITY tcl-version "8.4.18">
-<!ENTITY tcl-size "3,568 KB">
+<!ENTITY tcl-version "8.5.4">
+<!ENTITY tcl-major-version "8.5">
+<!ENTITY tcl-size "4,402 KB">
 <!ENTITY tcl-url "&sourceforge;tcl/tcl&tcl-version;-src.tar.gz">
-<!ENTITY tcl-md5 "7d8bc95036f797b1a2b62a5a382d2cc1">
+<!ENTITY tcl-md5 "15032a6a43f3bfbe9223b95186849472">
 <!ENTITY tcl-home "http://tcl.sourceforge.net/">
-<!ENTITY tcl-ch5-du "24 MB">
-<!ENTITY tcl-ch5-sbu "0.3 SBU">
+<!ENTITY tcl-ch5-du "36 MB">
+<!ENTITY tcl-ch5-sbu "0.6 SBU">
 
 <!ENTITY texinfo-version "4.11">
 <!ENTITY texinfo-size "1,621 KB">
-- 
cgit v1.2.3-54-g00ecf