Index: general/general.ent
===================================================================
--- general/general.ent	(revision 5628618eb906041477db8da176602dc367caae76)
+++ general/general.ent	(revision a5ecb00a3001b74bfc130632072c970830b2ee1e)
@@ -20,5 +20,5 @@
 <!ENTITY % slib SYSTEM "genlib/slib/slib.ent">
 <!ENTITY % gwrap SYSTEM "genlib/gwrap/gwrap.ent">
-<!ENTITY % STLport SYSTEM "genlib/STLport/STLport.ent">
+<!ENTITY % STLport SYSTEM "genlib/stlport/stlport.ent">
 %openssl;
 %pcre;
Index: general/genlib/STLport.xml
===================================================================
--- general/genlib/STLport.xml	(revision 5628618eb906041477db8da176602dc367caae76)
+++ 	(revision )
@@ -1,12 +1,0 @@
-<sect1 id="STLport" xreflabel="STLport-&STLport-version;">
-<?dbhtml filename="STLport.html" dir="general"?>
-<title>STLport-&STLport-version;</title>
-
-&STLport-intro;
-&STLport-inst;
-&STLport-exp;
-&STLport-config;
-&STLport-desc;
-
-</sect1>
-
Index: general/genlib/stlport.xml
===================================================================
--- general/genlib/stlport.xml	(revision a5ecb00a3001b74bfc130632072c970830b2ee1e)
+++ general/genlib/stlport.xml	(revision a5ecb00a3001b74bfc130632072c970830b2ee1e)
@@ -0,0 +1,12 @@
+<sect1 id="STLport" xreflabel="STLport-&STLport-version;">
+<?dbhtml filename="stlport.html" dir="general"?>
+<title>STLport-&STLport-version;</title>
+
+&STLport-intro;
+&STLport-inst;
+&STLport-exp;
+&STLport-config;
+&STLport-desc;
+
+</sect1>
+
Index: general/genlib/stlport/stlport-config.xml
===================================================================
--- general/genlib/stlport/stlport-config.xml	(revision a5ecb00a3001b74bfc130632072c970830b2ee1e)
+++ general/genlib/stlport/stlport-config.xml	(revision a5ecb00a3001b74bfc130632072c970830b2ee1e)
@@ -0,0 +1,15 @@
+<sect2>
+<title>Configuring STLport</title>
+
+<sect3><title>Configuration Information</title>
+
+&library-config;
+
+<para>You will need to reinstall STLport whenever you upgrade gcc since the
+STLport include files have a hard coded reference to the location where gcc
+includes are installed.</para>
+
+</sect3>
+
+</sect2>
+
Index: general/genlib/stlport/stlport-desc.xml
===================================================================
--- general/genlib/stlport/stlport-desc.xml	(revision a5ecb00a3001b74bfc130632072c970830b2ee1e)
+++ general/genlib/stlport/stlport-desc.xml	(revision a5ecb00a3001b74bfc130632072c970830b2ee1e)
@@ -0,0 +1,8 @@
+<sect2>
+<title>Contents</title>
+
+<para>The STLport package contains STLport headers <userinput>/usr/include/stlport</userinput>
+and STLport dynamic and static libraries.</para>
+
+</sect2>
+
Index: general/genlib/stlport/stlport-exp.xml
===================================================================
--- general/genlib/stlport/stlport-exp.xml	(revision a5ecb00a3001b74bfc130632072c970830b2ee1e)
+++ general/genlib/stlport/stlport-exp.xml	(revision a5ecb00a3001b74bfc130632072c970830b2ee1e)
@@ -0,0 +1,14 @@
+<sect2>
+<title>Command explanations</title>
+
+<para><userinput>GCC_VERSION=...</userinput> : STLport needs the location of the c++ headers, which are installed in
+<userinput>/usr/include/c++/$GCC_VERSION</userinput>
+if installed as per the instructions in LFS.</para>
+<para><userinput>sed -e ...</userinput> : Replace the location where STLport
+looks for C++ headers.</para>
+<para><userinput>cd src</userinput> : Change to the source directory.</para>
+<para><userinput>ln -sf gcc-linux.mak Makefile</userinput> : Use the appropriate
+makefile for our environment.</para>
+
+</sect2>
+
Index: general/genlib/stlport/stlport-inst.xml
===================================================================
--- general/genlib/stlport/stlport-inst.xml	(revision a5ecb00a3001b74bfc130632072c970830b2ee1e)
+++ general/genlib/stlport/stlport-inst.xml	(revision a5ecb00a3001b74bfc130632072c970830b2ee1e)
@@ -0,0 +1,18 @@
+<sect2>
+<title>Installation of STLport</title>
+
+<para>Install STLport by running the following commands.</para>
+
+<para><screen><userinput>patch -Np1 -i ../STLport-&STLport-version;-gcc3.patch &amp;&amp;
+patch -Np1 -i ../STLport-&STLport-version;-g++-inc.patch &amp;&amp;
+GCC_VERSION=`gcc -v 2>&amp;1 | grep "gcc version " | sed -e "s:gcc version ::"` &amp;&amp;
+cp stlport/config/stl_gcc.h stlport/config/stl_gcc.h.orig &amp;&amp;
+sed -e "s:@GCC_VERSION@:$GCC_VERSION:" \
+stlport/config/stl_gcc.h.orig &gt; stlport/config/stl_gcc.h &amp;&amp;
+cd src &amp;&amp;
+ln -sf gcc-linux.mak Makefile &amp;&amp;
+make &amp;&amp;
+make INSTALLDIR=/usr install</userinput></screen></para>
+
+</sect2>
+
Index: general/genlib/stlport/stlport-intro.xml
===================================================================
--- general/genlib/stlport/stlport-intro.xml	(revision a5ecb00a3001b74bfc130632072c970830b2ee1e)
+++ general/genlib/stlport/stlport-intro.xml	(revision a5ecb00a3001b74bfc130632072c970830b2ee1e)
@@ -0,0 +1,17 @@
+<sect2>
+<title>Introduction to STLport-&STLport-version;</title>
+
+<screen>Download location (HTTP):      <ulink url="&STLport-download-http;"/>
+Download location (FTP):       <ulink url="&STLport-download-ftp;"/>
+Version used:                  &STLport-version;
+Package size:                  &STLport-size;
+Estimated Disk space required: &STLport-buildsize;</screen>
+
+<para>STLport is a multi-platform ANSI C++ Standard Library implementation
+featuring advanced techniques and optimizations for maximum efficiency,
+exception safety and thread safety, important extensions such as hash tables,
+and singly-linked list.</para>
+
+<para>Download the STLport patches from <ulink url="&hfile-root;"/>.</para>
+
+</sect2>
Index: general/genlib/stlport/stlport.ent
===================================================================
--- general/genlib/stlport/stlport.ent	(revision a5ecb00a3001b74bfc130632072c970830b2ee1e)
+++ general/genlib/stlport/stlport.ent	(revision a5ecb00a3001b74bfc130632072c970830b2ee1e)
@@ -0,0 +1,11 @@
+<!ENTITY STLport SYSTEM "../stlport.xml">
+<!ENTITY STLport-intro SYSTEM "stlport-intro.xml">
+<!ENTITY STLport-inst SYSTEM "stlport-inst.xml">
+<!ENTITY STLport-exp SYSTEM "stlport-exp.xml">
+<!ENTITY STLport-desc SYSTEM "stlport-desc.xml">
+<!ENTITY STLport-config SYSTEM "stlport-config.xml">
+<!ENTITY STLport-buildsize "56 MB">
+<!ENTITY STLport-version "4.5.3">
+<!ENTITY STLport-download-http "http://www.stlport.org/archive/STLport-&STLport-version;.tar.gz">
+<!ENTITY STLport-download-ftp "">
+<!ENTITY STLport-size "25 MB">
