Author: randy
Date: 2010-03-10 07:09:54 -0700 (Wed, 10 Mar 2010)
New Revision: 8321
Modified:
trunk/BOOK/general.ent
trunk/BOOK/general/prog/tcl.xml
trunk/BOOK/general/prog/tk.xml
trunk/BOOK/introduction/welcome/changelog.xml
Log:
Updated Tcl and Tk to version 8.5.8
Modified: trunk/BOOK/general/prog/tcl.xml
===================================================================
--- trunk/BOOK/general/prog/tcl.xml 2010-03-09 01:26:52 UTC (rev 8320)
+++ trunk/BOOK/general/prog/tcl.xml 2010-03-10 14:09:54 UTC (rev 8321)
@@ -6,16 +6,16 @@
<!ENTITY tcl-download-http
"&sourceforge-repo;/tcl/tcl&tcl-version;-src.tar.gz">
<!ENTITY tcl-download-ftp "&gentoo-ftp-repo;/tcl&tcl-version;-src.tar.gz">
- <!ENTITY tcl-md5sum "d0b0b3ff7600ff63135c710b575265cd">
- <!ENTITY tcl-size "4.2 MB">
- <!ENTITY tcl-buildsize "33 MB">
- <!ENTITY tcl-time "0.5 SBU (additional 2.0 SBU to run the test
suite)">
+ <!ENTITY tcl-md5sum "7f123e53b3daaaba2478d3af5a0752e3">
+ <!ENTITY tcl-size "4.4 MB">
+ <!ENTITY tcl-buildsize "62 MB (includes documentation installation)">
+ <!ENTITY tcl-time "0.5 SBU (additional 1.2 SBU to run the test
suite)">
<!ENTITY tcl-doc-download
"&sourceforge-repo;/tcl/tcl&tcl-version;-html.tar.gz">
- <!ENTITY tcl-doc-md5sum "e287dcb71b7e6ba9c7b1606a2020e61c">
+ <!ENTITY tcl-doc-md5sum "788cacd89d8cf97b23f53500ede910bc">
<!ENTITY tcl-doc-size "925 KB">
- <!-- Ensure this is updated when Tcl moves to the 8.5.x branch -->
+ <!-- Ensure this is updated when Tcl moves from the 8.5.x branch -->
<!ENTITY tcl-ver "8.5">
]>
@@ -103,7 +103,6 @@
sed -i \
-e "s...@^\(TCL_SRC_DIR='\)....@\1/usr/include'@" \
-e "/TCL_B/s...@='\(-L\)\?.*u...@='\1/usr/lib@" \
- -e "/SEARCH/s/=.*/=''/" \
tclConfig.sh</userinput></screen>
<para>To test the results, issue: <command>make test</command>.</para>
@@ -112,7 +111,8 @@
<screen role="root"><userinput>make install &&
make install-private-headers &&
-ln -v -sf tclsh&tcl-ver; /usr/bin/tclsh</userinput></screen>
+ln -v -sf tclsh&tcl-ver; /usr/bin/tclsh &&
+chmod -v 755 /usr/lib/libtcl&tcl-ver;.so</userinput></screen>
<para>If you downloaded the optional documentation, install it by issuing
the following commands as the
Modified: trunk/BOOK/general/prog/tk.xml
===================================================================
--- trunk/BOOK/general/prog/tk.xml 2010-03-09 01:26:52 UTC (rev 8320)
+++ trunk/BOOK/general/prog/tk.xml 2010-03-10 14:09:54 UTC (rev 8321)
@@ -6,12 +6,12 @@
<!ENTITY tk-download-http "&sourceforge-repo;/tcl/tk&tk-version;-src.tar.gz">
<!ENTITY tk-download-ftp "&gentoo-ftp-repo;/tk&tk-version;-src.tar.gz">
- <!ENTITY tk-md5sum "7da2e00adddc7eed6080df904579d94e">
- <!ENTITY tk-size "3.6 MB">
- <!ENTITY tk-buildsize "21 MB">
+ <!ENTITY tk-md5sum "13bf90602e16fc530e05196431021dc6">
+ <!ENTITY tk-size "3.7 MB">
+ <!ENTITY tk-buildsize "32 MB">
<!ENTITY tk-time "0.5 SBU">
- <!-- Ensure this is updated when Tk moves to the 8.5.x branch -->
+ <!-- Ensure this is updated when Tk moves from the 8.5.x branch -->
<!ENTITY tk-ver "8.5">
]>
@@ -82,7 +82,6 @@
sed -i \
-e "s...@^\(TK_SRC_DIR='\)....@\1/usr/include'@" \
-e "/TK_B/s...@='\(-L\)\?.*u...@='\1/usr/lib@" \
- -e "/SEARCH/s/=.*/=''/" \
tkConfig.sh</userinput></screen>
<para>Running the tests is not recommended. Some tests may crash your X
@@ -94,18 +93,9 @@
<screen role="root"><userinput>make install &&
make install-private-headers &&
-ln -v -sf wish&tk-ver; /usr/bin/wish</userinput></screen>
+ln -v -sf wish&tk-ver; /usr/bin/wish &&
+chmod -v 755 destdir/usr/lib/libtk8.5.so</userinput></screen>
-<!-- This is removed per discussion and fairly vigorous testing
-install -v -m755 -d /usr/include/tk&tk-ver;/{unix,generic} &&
-install -v -m644 *.h /usr/include/tk&tk-ver;/unix/ &&
-install -v -m644 ../generic/*.h /usr/include/tk&tk-ver;/generic/ &&
-rm -v -f /usr/include/tk&tk-ver;/generic/tk{,{,Plat}Decls}.h &&
-ln -v -nsf ../../include/tk&tk-ver; /usr/lib/tk&tk-ver;/include &&
-ln -v -sf libtk&tk-ver;.so /usr/lib/libtk.so &&
-ln -v -sf wish&tk-ver; /usr/bin/wish</userinput></screen>
--->
-
</sect2>
<sect2 role="commands">
@@ -130,14 +120,6 @@
can utilize it. This <command>sed</command> removes the references to the
build directory and replaces them with saner system-wide locations.</para>
- <!--
- <para><command>install ...</command>: These commands install the internal
- headers into a system-wide location.</para>
-
- <para><command>ln -v -sf ...</command>: These commands create compatibility
- symbolic links.</para>
- -->
-
</sect2>
<sect2 role="content">
Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent 2010-03-09 01:26:52 UTC (rev 8320)
+++ trunk/BOOK/general.ent 2010-03-10 14:09:54 UTC (rev 8321)
@@ -3,7 +3,7 @@
$Date$
-->
-<!ENTITY day "09"> <!-- Always 2 digits -->
+<!ENTITY day "10"> <!-- Always 2 digits -->
<!ENTITY month "03"> <!-- Always 2 digits -->
<!ENTITY year "2010">
<!ENTITY copyrightdate "2001-&year;">
@@ -277,8 +277,8 @@
<!ENTITY Python-version "2.6.4">
<!ENTITY python-majorver "2.6">
<!ENTITY ruby-version "1.8.7-p248">
-<!ENTITY tcl-version "8.5.6">
-<!ENTITY tk-version "8.5.6">
+<!ENTITY tcl-version "8.5.8">
+<!ENTITY tk-version "8.5.8">
<!-- Perl module versions used in the Perl Modules instructions -->
<!ENTITY Algorithm-Diff-version "1.1902">
Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml 2010-03-09 01:26:52 UTC
(rev 8320)
+++ trunk/BOOK/introduction/welcome/changelog.xml 2010-03-10 14:09:54 UTC
(rev 8321)
@@ -42,6 +42,15 @@
-->
<listitem>
+ <para>March 10th, 2010</para>
+ <itemizedlist>
+ <listitem>
+ <para>[randy] - Updated Tcl and Tk to version 8.5.8.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>March 9th, 2010</para>
<itemizedlist>
<listitem>
--
http://linuxfromscratch.org/mailman/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
