Index: general/graphlib/libpng/libpng-config.xml
===================================================================
--- general/graphlib/libpng/libpng-config.xml	(revision 6e23722945315562324053c2191cf7ada9a0c6d5)
+++ general/graphlib/libpng/libpng-config.xml	(revision 3e5d1b05bf36eaba80881f022a584b0366b2e828)
@@ -1,4 +1,4 @@
 <sect2>
-<title>Configuring libpng</title>
+<title>Configuring <application>libpng</application></title>
 
 <sect3><title>Configuration Information</title>
Index: general/graphlib/libpng/libpng-desc.xml
===================================================================
--- general/graphlib/libpng/libpng-desc.xml	(revision 6e23722945315562324053c2191cf7ada9a0c6d5)
+++ general/graphlib/libpng/libpng-desc.xml	(revision 3e5d1b05bf36eaba80881f022a584b0366b2e828)
@@ -2,5 +2,6 @@
 <title>Contents</title>
 
-<para>The libpng package contains <filename>libpng</filename> libraries and <userinput>libpng-config</userinput>.</para>
+<para>The <application>libpng</application> package contains <filename>
+libpng</filename> libraries and <filename>libpng-config</filename>.</para>
 
 </sect2>
@@ -9,11 +10,14 @@
 
 <sect3><title>png libraries</title>
-<para>The PNG library is a collection of routines used to create and
-manipulate PNG format graphics files. The PNG format was designed as a
-replacement for GIF and, to a lesser extent, TIFF, with many
-improvements and extensions and lack of patent problems.</para></sect3>
+<para>The <acronym>PNG</acronym> library is a collection of routines used to 
+create and manipulate <acronym>PNG</acronym> format graphics files. The
+<acronym>PNG</acronym> format was designed as a
+replacement for <acronym>GIF</acronym> and, to a lesser extent,
+<acronym>TIFF</acronym>, with many improvements and extensions and lack of 
+patent problems.</para></sect3>
 
 <sect3><title>libpng-config</title>
-<para>libpng-config provides configuration info for libpng.</para></sect3>
+<para><filename>libpng-config</filename> provides configuration info for
+<application>libpng</application>.</para></sect3>
 
 </sect2>
Index: general/graphlib/libpng/libpng-exp.xml
===================================================================
--- general/graphlib/libpng/libpng-exp.xml	(revision 6e23722945315562324053c2191cf7ada9a0c6d5)
+++ general/graphlib/libpng/libpng-exp.xml	(revision 3e5d1b05bf36eaba80881f022a584b0366b2e828)
@@ -2,9 +2,9 @@
 <title>Command explanations</title>
 
-<para><userinput>ZLIBINC=/usr/include ZLIBLIB=/usr/lib</userinput> : This forces libpng to look for the zlib includes and
-libraries where we have them installed.</para>
+<para><command>ZLIBINC=/usr/include ZLIBLIB=/usr/lib</command> : This forces libpng to look for the zlib includes and libraries where we have them installed.</para>
 
-<para><userinput>-f scripts/makefile.linux</userinput> : This points
-make at the Linux version of the makefile as libpng doesn't use a
+<para><command>-f scripts/makefile.linux</command> : This points
+make at the Linux version of the makefile as
+<application>libpng</application> doesn't use a
 autoconf routine instead coming with various makefiles for different
 platforms.</para>
Index: general/graphlib/libpng/libpng-inst.xml
===================================================================
--- general/graphlib/libpng/libpng-inst.xml	(revision 6e23722945315562324053c2191cf7ada9a0c6d5)
+++ general/graphlib/libpng/libpng-inst.xml	(revision 3e5d1b05bf36eaba80881f022a584b0366b2e828)
@@ -1,11 +1,10 @@
 <sect2>
-<title>Installation of libpng</title>
+<title>Installation of <application>libpng</application></title>
 
-<para>Install libpng by running the following commands:</para>
+<para>Install <application>libpng</application> by running the following commands:</para>
 
-<para><screen><userinput>patch -Np0 -i ../libpng-1.2.5-lz.patch &amp;&amp;
-make prefix=/usr \
+<screen><userinput><command>make prefix=/usr \
    ZLIBINC=/usr/include ZLIBLIB=/usr/lib -f scripts/makefile.linux &amp;&amp;
-make prefix=/usr install -f scripts/makefile.linux</userinput></screen></para>
+make prefix=/usr install -f scripts/makefile.linux</command></userinput></screen>
 
 </sect2>
Index: general/graphlib/libpng/libpng-intro.xml
===================================================================
--- general/graphlib/libpng/libpng-intro.xml	(revision 6e23722945315562324053c2191cf7ada9a0c6d5)
+++ general/graphlib/libpng/libpng-intro.xml	(revision 3e5d1b05bf36eaba80881f022a584b0366b2e828)
@@ -1,15 +1,23 @@
 <sect2>
-<title>Introduction to libpng</title>
+<title>Introduction to <application>libpng</application></title>
 
-<screen>Download location (HTTP):       <ulink url="&libpng-download-http;"/>
-Download location (FTP):	<ulink url="&libpng-download-ftp;"/>
-Version used:                   &libpng-version;
-Package size:                   &libpng-size;
-Estimated Disk space required:  &libpng-buildsize;</screen>
-
-<para>The libpng package contains the libpng libraries.  These are used
+<para>The <application>libpng</application> package contains libraries used
 by other programs for reading and writing png files.</para>
 
-<para>Download the patch to force linking of libpng to libz from <ulink url="&hfile-root;"/>.</para>
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&libpng-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&libpng-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &libpng-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&libpng-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&libpng-time;</para></listitem></itemizedlist>
+</sect3>
+
+<!-- <para>Download the patch to force linking of libpng to libz from
+<ulink url="&hfile-root;"/>.</para> -->
 
 </sect2>
Index: general/graphlib/libpng/libpng.ent
===================================================================
--- general/graphlib/libpng/libpng.ent	(revision 6e23722945315562324053c2191cf7ada9a0c6d5)
+++ general/graphlib/libpng/libpng.ent	(revision 3e5d1b05bf36eaba80881f022a584b0366b2e828)
@@ -10,2 +10,3 @@
 <!ENTITY libpng-download-ftp "ftp://swrinde.nde.swri.edu/pub/png/src/libpng-1.2.5.tar.gz">
 <!ENTITY libpng-size "376 KB">
+<!ENTITY libpng-time "">
