Index: general/graphlib/libpng.xml
===================================================================
--- general/graphlib/libpng.xml	(revision 1ab1ad6a9998b8e6191e159873b119494747871c)
+++ general/graphlib/libpng.xml	(revision ea97e13f37e881ee6d93ffa04e96abca26586c15)
@@ -9,7 +9,6 @@
 <!ENTITY libpng-md5 "00cea4539bea4bd34cbf8b82ff9589cd">
 <!ENTITY libpng-size "376 KB">
-<!ENTITY libpng-buildsize "5.6 MB">
-<!ENTITY libpng-time "0.14 SBU">
-
+<!ENTITY libpng-buildsize "5.75 MB">
+<!ENTITY libpng-time "0.13 SBU">
 ]>
 
@@ -20,6 +19,7 @@
 </sect1info>
 <?dbhtml filename="libpng.html"?>
-
 <title>libpng-&libpng-version;</title>
+<indexterm zone="libpng">
+<primary sortas="a-Libpng">Libpng</primary></indexterm>
 
 <sect2>
@@ -45,6 +45,8 @@
 <sect3><title>Additional downloads</title>
 <itemizedlist spacing='compact'>
-<listitem><para>Required Patch to explicitly link libpng against system libraries: <ulink
-url="&patch-root;/libpng-&libpng-version;-link_to_proper_libs-1.patch"/></para></listitem>
+<listitem><para>Required Patch to explicitly link 
+<application>libpng</application> against system libraries: <ulink 
+url="&patch-root;/libpng-&libpng-version;-link_to_proper_libs-1.patch"/></para>
+</listitem>
 </itemizedlist></sect3>
 
@@ -59,6 +61,9 @@
 <screen><userinput><command>patch -Np1 -i ../libpng-&libpng-version;-link_to_proper_libs-1.patch &amp;&amp;
 make prefix=/usr ZLIBINC=/usr/include \
-    ZLIBLIB=/usr/lib -f scripts/makefile.linux &amp;&amp;
-make prefix=/usr install -f scripts/makefile.linux</command></userinput></screen>
+    ZLIBLIB=/usr/lib -f scripts/makefile.linux</command></userinput></screen>
+
+<para>Now, as the root user:</para>
+
+<screen><userinput role='root'><command>make prefix=/usr install -f scripts/makefile.linux</command></userinput></screen>
 
 </sect2>
@@ -75,5 +80,5 @@
 <command>make</command> at the <application>Linux</application> version of the 
 <filename>Makefile</filename> as <application>libpng</application> doesn't use 
-an <application>autoconf</application> routine. Instead it has various 
+an <application>autoconf</application> routine. Instead, it has various 
 <filename>Makefile</filename>s for different platforms.</para>
 
@@ -94,24 +99,50 @@
 <title>Contents</title>
 
-<para>The <application>libpng</application> package contains 
-<filename class="libraryfile">libpng</filename> libraries and 
-<command>libpng-config</command>.</para>
+<segmentedlist>
+<segtitle>Installed Programs</segtitle>
+<segtitle>Installed Libraries</segtitle>
+<segtitle>Installed Directory</segtitle>
 
-</sect2>
+<seglistitem>
+<seg>libpng-config and libpng12-config</seg>
+<seg>libpng.[so,a] and libpng12.[so,a]</seg>
+<seg>/usr/include/libpng12</seg>
+</seglistitem>
+</segmentedlist>
 
-<sect2><title>Description</title>
+<variablelist>
+<bridgehead renderas="sect3">Short Descriptions</bridgehead>
+<?dbfo list-presentation="list"?>
 
-<sect3><title>libpng libraries</title>
-<para>The <filename class="libraryfile">libpng</filename> libraries are
-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>
+<varlistentry id="libpng-config">
+<term><command>libpng-config</command></term>
+<listitem><para>is a symlink to <command>libpng12-config</command>.</para>
+<indexterm zone="libpng libpng-config">
+<primary sortas="g-libpng-config">libpng-config</primary>
+</indexterm></listitem>
+</varlistentry>
 
-<sect3><title>libpng-config</title>
-<para><command>libpng-config</command> provides configuration info for
-<application>libpng</application>.</para></sect3>
+<varlistentry id="libpng12-config">
+<term><command>libpng12-config</command></term>
+<listitem><para>provides configuration information for 
+<application>libpng</application>.</para>
+<indexterm zone="libpng libpng12-config">
+<primary sortas="b-libpng12-config">libpng12-config</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="libpng12">
+<term><filename class='libraryfile'>libpng.[so,a] and 
+libpng12.[so,a]</filename></term>
+<listitem><para>libraries are 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>
+<indexterm zone="libpng libpng12">
+<primary sortas="c-libpng">libpng.[so,a]</primary>
+</indexterm></listitem>
+</varlistentry>
+</variablelist>
 
 </sect2>
