Index: general/general.ent
===================================================================
--- general/general.ent	(revision 503b39f5b19e81e6c5d44e854ab653420c1ef68d)
+++ general/general.ent	(revision 51d40ee87e7b692227f014a5bcd6d1c2cf3747b9)
@@ -117,5 +117,6 @@
 <!ENTITY % gnat SYSTEM "prog/gcc/gnat.ent">
 <!ENTITY % gcc2 SYSTEM "prog/gcc2/gcc2.ent">
-<!ENTITY % tcltk SYSTEM "prog/tcltk/tcltk.ent">
+<!ENTITY % tcl SYSTEM "prog/tcl/tcl.ent">
+<!ENTITY % tk SYSTEM "prog/tk/tk.ent">
 <!ENTITY % nasm SYSTEM "prog/nasm/nasm.ent">
 %python;
@@ -127,4 +128,5 @@
 %gcc;
 %gcc2;
-%tcltk;
+%tcl;
+%tk;
 %nasm;
Index: general/prog/tcl/tcl-exp.xml
===================================================================
--- general/prog/tcl/tcl-exp.xml	(revision 51d40ee87e7b692227f014a5bcd6d1c2cf3747b9)
+++ general/prog/tcl/tcl-exp.xml	(revision 51d40ee87e7b692227f014a5bcd6d1c2cf3747b9)
@@ -0,0 +1,18 @@
+<sect2>
+<title>Command explanations</title>
+
+<para><command>sed -i ...</command>: The <application>Tcl</application> 
+package assumes that the source that is used to build <application>Tcl
+</application> is always kept around for compiling packages that depend on 
+<application>Tcl</application>. These <command>sed</command>'s remove the 
+reference to the build directory and replace them by saner system wide 
+locations.</para>
+
+<para><command>install ...</command>: These commands install the internal 
+headers into a system-wide location.</para>
+
+<para><command>ln -sf ...</command>: These commands create compatibility 
+symbolic links.</para>
+
+</sect2>
+
Index: general/prog/tcl/tcl-inst.xml
===================================================================
--- general/prog/tcl/tcl-inst.xml	(revision 51d40ee87e7b692227f014a5bcd6d1c2cf3747b9)
+++ general/prog/tcl/tcl-inst.xml	(revision 51d40ee87e7b692227f014a5bcd6d1c2cf3747b9)
@@ -0,0 +1,26 @@
+<sect2>
+<title>Installation of <application>Tcl</application></title>
+
+<para>Install <application>Tcl</application> by running the following commands:
+</para>
+
+<screen><userinput><command>VERSION=&tcl-version; &amp;&amp;
+V=`echo $VERSION | cut -d "." -f 1,2` &amp;&amp;
+DIR=$PWD &amp;&amp;
+cd unix &amp;&amp;
+./configure --prefix=/usr &amp;&amp;
+make &amp;&amp;
+sed -i "s:${DIR}/unix:/usr/lib:" tclConfig.sh &amp;&amp;
+sed -i "s:${DIR}:/usr/include/tcl${V}:" tclConfig.sh &amp;&amp;
+sed -i "s,^TCL_LIB_FILE='libtcl${V}..TCL_DBGX..so',TCL_LIB_FILE=\"libtcl${V}\$\{TCL_DBGX\}.so\"," tclConfig.sh &amp;&amp;
+make install &amp;&amp;
+install -d /usr/include/tcl${V}/unix &amp;&amp;
+install -m644 *.h /usr/include/tcl${V}/unix/ &amp;&amp;
+install -d /usr/include/tcl${V}/generic &amp;&amp;
+install -c -m644 ../generic/*.h /usr/include/tcl${V}/generic/ &amp;&amp;
+rm -f /usr/include/tcl${V}/generic/{tcl,tclDecls,tclPlatDecls}.h &amp;&amp;
+ln -nsf /usr/include/tcl${V} /usr/lib/tcl${V}/include &amp;&amp;
+ln -sf libtcl${V}.so /usr/lib/libtcl.so &amp;&amp;
+ln -sf tclsh${V} /usr/bin/tclsh</command></userinput></screen>
+
+</sect2>
Index: general/prog/tcl/tcl-intro.xml
===================================================================
--- general/prog/tcl/tcl-intro.xml	(revision 51d40ee87e7b692227f014a5bcd6d1c2cf3747b9)
+++ general/prog/tcl/tcl-intro.xml	(revision 51d40ee87e7b692227f014a5bcd6d1c2cf3747b9)
@@ -0,0 +1,19 @@
+<sect2>
+<title>Introduction to <application>Tcl</application></title>
+
+<para>The <application>Tcl</application> package contains Tool Command Language.  </para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&tcl-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&tcl-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &tcl-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&tcl-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&tcl-time;</para></listitem></itemizedlist>
+</sect3>
+
+</sect2>
Index: general/prog/tcl/tcl.ent
===================================================================
--- general/prog/tcl/tcl.ent	(revision 51d40ee87e7b692227f014a5bcd6d1c2cf3747b9)
+++ general/prog/tcl/tcl.ent	(revision 51d40ee87e7b692227f014a5bcd6d1c2cf3747b9)
@@ -0,0 +1,10 @@
+<!ENTITY tcl SYSTEM "../tcl.xml">
+<!ENTITY tcl-intro SYSTEM "tcl-intro.xml">
+<!ENTITY tcl-inst SYSTEM "tcl-inst.xml">
+<!ENTITY tcl-exp SYSTEM "tcl-exp.xml">
+<!ENTITY tcl-version "8.4.4">
+<!ENTITY tcl-download-http "http://aleron.dl.sourceforge.net/sourceforge/tcl/tcl&tcl-version;-src.tar.gz">
+<!ENTITY tcl-download-ftp "">
+<!ENTITY tcl-size "3.2 MB">
+<!ENTITY tcl-buildsize "">
+<!ENTITY tcl-time "">
Index: general/prog/tk/tk-exp.xml
===================================================================
--- general/prog/tk/tk-exp.xml	(revision 51d40ee87e7b692227f014a5bcd6d1c2cf3747b9)
+++ general/prog/tk/tk-exp.xml	(revision 51d40ee87e7b692227f014a5bcd6d1c2cf3747b9)
@@ -0,0 +1,18 @@
+<sect2>
+<title>Command explanations</title>
+
+<para><command>sed -i ...</command>: The <application>Tk</application> package 
+assumes that the source that is used to build <application>Tk</application> is 
+always kept around for compiling packages that depend on
+<application>Tk</application>. These <command>sed</command>'s remove the 
+reference to the build directory and replace them by saner system wide 
+locations.</para>
+
+<para><command>install ...</command>: These commands install the internal 
+headers into a system-wide location.</para>
+
+<para><command>ln -sf ...</command>: These commands create compatibility 
+symbolic links.</para>
+
+</sect2>
+
Index: general/prog/tk/tk-inst.xml
===================================================================
--- general/prog/tk/tk-inst.xml	(revision 51d40ee87e7b692227f014a5bcd6d1c2cf3747b9)
+++ general/prog/tk/tk-inst.xml	(revision 51d40ee87e7b692227f014a5bcd6d1c2cf3747b9)
@@ -0,0 +1,24 @@
+<sect2>
+<title>Installation of <application>Tk</application></title>
+
+<para>Install <application>Tk</application> by running the following commands:</para>
+
+<screen><userinput><command>VERSION=&tk-version; &amp;&amp;
+V=`echo $VERSION | cut -d "." -f 1,2` &amp;&amp;
+DIR=$PWD &amp;&amp;
+cd unix &amp;&amp;
+./configure --prefix=/usr &amp;&amp;
+make &amp;&amp;
+sed -i "s:${DIR}/unix:/usr/lib:" tkConfig.sh &amp;&amp;
+sed -i "s:${DIR}:/usr/include/tk${V}:" tkConfig.sh &amp;&amp;
+make install &amp;&amp;
+install -d /usr/include/tk${V}/unix &amp;&amp;
+install -m644 *.h /usr/include/tk${V}/unix/ &amp;&amp;
+install -d /usr/include/tk${V}/generic &amp;&amp;
+install -m644 ../generic/*.h /usr/include/tk${V}/generic/ &amp;&amp;
+rm -f /usr/include/tk${V}/generic/{tk,tkDecls,tkPlatDecls}.h &amp;&amp;
+ln -nsf /usr/include/tk${V} /usr/lib/tk${V}/include &amp;&amp;
+ln -sf libtk${V}.so /usr/lib/libtk.so &amp;&amp;
+ln -sf wish${V} /usr/bin/wish</command></userinput></screen>
+
+</sect2>
Index: general/prog/tk/tk-intro.xml
===================================================================
--- general/prog/tk/tk-intro.xml	(revision 51d40ee87e7b692227f014a5bcd6d1c2cf3747b9)
+++ general/prog/tk/tk-intro.xml	(revision 51d40ee87e7b692227f014a5bcd6d1c2cf3747b9)
@@ -0,0 +1,25 @@
+<sect2>
+<title>Introduction to <application>Tk</application></title>
+
+<para>The <application>Tk</application> package contains
+<acronym>TCL</acronym> <acronym>GUI</acronym> Toolkit.</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&tk-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&tk-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &tk-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&tk-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&tk-time;</para></listitem></itemizedlist>
+</sect3>
+
+<sect3><title><application>Tk</application> dependencies</title>
+<sect4><title>Required</title>
+<para><xref linkend="xfree86"/> and <xref linkend="tcl"/></para></sect4>
+</sect3>
+
+</sect2>
Index: general/prog/tk/tk.ent
===================================================================
--- general/prog/tk/tk.ent	(revision 51d40ee87e7b692227f014a5bcd6d1c2cf3747b9)
+++ general/prog/tk/tk.ent	(revision 51d40ee87e7b692227f014a5bcd6d1c2cf3747b9)
@@ -0,0 +1,10 @@
+<!ENTITY tk SYSTEM "../tk.xml">
+<!ENTITY tk-intro SYSTEM "tk-intro.xml">
+<!ENTITY tk-inst SYSTEM "tk-inst.xml">
+<!ENTITY tk-exp SYSTEM "tk-exp.xml">
+<!ENTITY tk-version "8.4.4">
+<!ENTITY tk-download-http "http://aleron.dl.sourceforge.net/sourceforge/tcl/tk&tk-version;-src.tar.gz">
+<!ENTITY tk-download-ftp "">
+<!ENTITY tk-size "3.0 MB">
+<!ENTITY tk-buildsize "">
+<!ENTITY tk-time "">
