Index: general/graphlib/giflib.xml
===================================================================
--- general/graphlib/giflib.xml	(revision 2217b13c757cd71d9e04ce3d3b52393980680e6d)
+++ general/graphlib/giflib.xml	(revision b9982eaa41529080f3685484ccf5264d157ad937)
@@ -6,8 +6,8 @@
 
   <!ENTITY giflib-download-http "&sourceforge-repo;/giflib/giflib-&giflib-version;.tar.bz2">
-  <!--<!ENTITY giflib-download-ftp  "&gentoo-ftp-repo;/giflib-&giflib-version;.tar.gz">-->
-  <!ENTITY giflib-http-md5sum   "bbd3324af24156d5d7e66ab1cee8508d">
-  <!ENTITY giflib-http-size     "516 KB">
-  <!ENTITY giflib-buildsize     "11 MB">
+  <!ENTITY giflib-download-ftp  " ">
+  <!ENTITY giflib-http-md5sum   "da60935d07374de00a78c2f6f720c8f5">
+  <!ENTITY giflib-http-size     "616 KB">
+  <!ENTITY giflib-buildsize     "7.5 MB">
   <!ENTITY giflib-time          "0.2 SBU">
 ]>
@@ -24,5 +24,5 @@
 
   <indexterm zone="giflib">
-    <primary sortas="a-Giflib">Giflib</primary>
+    <primary sortas="a-giflib">giflib</primary>
   </indexterm>
 
@@ -32,7 +32,5 @@
     <para>The <application>giflib</application> package contains libraries
     for reading and writing GIFs as well as programs for converting and
-    working with GIF files. The libraries are useful for any graphics program
-    wishing to deal with GIF files while the programs are useful for conversion
-    purposes as well as cleaning up images.</para>
+    working with GIF files.</para>
 
     &lfs73_checked;
@@ -61,12 +59,10 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="x-window-system"/>,
-      <xref linkend="xmlto"/> (for html documentation), and 
-      <ulink url="http://www.cs.utah.edu/gdc/projects/urt/">Utah Raster Toolkit</ulink> (or 
-      <ulink url="http://www.mcmurchy.com/urt/urt-3.1b.tar.gz">URT-3.1b</ulink>)</para>
+      <xref linkend="xmlto"/> (for html documentation)
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/giflib"/></para>
-
+      <ulink url="&blfs-wiki;/giflib"/>
+    </para>
   </sect2>
 
@@ -74,9 +70,4 @@
     <title>Installation of giflib</title>
 
-    <para>If you don't have the optional <xref linkend="xmlto"/> package installed, disable
-    building the html documentation:</para>
-
-<screen><userinput>sed -i "s/all: allhtml/all:/" doc/Makefile.in</userinput></screen>
-
     <para>Install <application>giflib</application> by running the following
     commands:</para>
@@ -85,5 +76,5 @@
 make</userinput></screen>
 
-    <para>This package does not come with a test suite.</para>
+    <para>This package does not have a working test suite.</para>
 
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
@@ -94,5 +85,5 @@
     <systemitem class="username">root</systemitem> user:</para>
 
-<screen role="root"><userinput>install -v -m755 -d         /usr/share/doc/giflib-&giflib-version;/html &amp;&amp;
+<screen role="root"><userinput>install -v -dm755           /usr/share/doc/giflib-&giflib-version;/html &amp;&amp;
 install -v -m644 doc/*.html /usr/share/doc/giflib-&giflib-version;/html</userinput></screen>
 
@@ -116,8 +107,6 @@
 
       <seglistitem>
-        <seg>gif2rgb, gif2x11, gifasm, gifbg, gifburst, gifclip,
-        gifclrmp, gifcolor, gifcomb, gifcompose, giffiltr, giffix, gifflip, gifhisto,
-        gifinfo, gifinter, gifinto, gifovly, gifpos, gifrotat, gifrsize, gifspnge,
-        giftext, gifwedge, icon2gif, raw2gif, rgb2gif, and text2gif</seg>
+        <seg>gif2raw, gif2rgb, gifbuild, gifclrmp, gifecho, giffix, gifinto,
+        giftext and giftool</seg>
         <seg>libgif.so</seg>
         <seg>/usr/share/doc/giflib-&giflib-version;</seg>
@@ -130,4 +119,14 @@
       <?dbhtml list-presentation="table"?>
 
+      <varlistentry id="gif2raw">
+        <term><command>gif2raw</command></term>
+        <listitem>
+          <para>converts images saved as GIF to raw pixel data.</para>
+          <indexterm zone="giflib gif2raw">
+            <primary sortas="b-gif2raw">gif2raw</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="gif2rgb">
         <term><command>gif2rgb</command></term>
@@ -140,50 +139,10 @@
       </varlistentry>
 
-      <varlistentry id="gif2x11">
-        <term><command>gif2x11</command></term>
-        <listitem>
-          <para>displays images saved as GIF files under X Window System.</para>
-          <indexterm zone="giflib gif2x11">
-            <primary sortas="b-gif2x11">gif2x11</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gifasm">
-        <term><command>gifasm</command></term>
-        <listitem>
-          <para>assembles multiple GIFs into one, or burst a multiple-image GIF.</para>
-          <indexterm zone="giflib gifasm">
-            <primary sortas="b-gifasm">gifasm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gifbg">
-        <term><command>gifbg</command></term>
-        <listitem>
-          <para>generates a single-color test pattern GIF.</para>
-          <indexterm zone="giflib gifbg">
-            <primary sortas="b-gifbg">gifbg</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gifburst">
-        <term><command>gifburst</command></term>
-        <listitem>
-          <para>bursts a GIF image into subrectangles.</para>
-          <indexterm zone="giflib gifburst">
-            <primary sortas="b-gifburst">gifburst</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gifclip">
-        <term><command>gifclip</command></term>
-        <listitem>
-          <para>clips or crops a GIF image.</para>
-          <indexterm zone="giflib gifclip">
-            <primary sortas="b-gifclip">gifclip</primary>
+      <varlistentry id="gifbuild">
+        <term><command>gifbuild</command></term>
+        <listitem>
+          <para>dumps GIF data in a textual format, or undumps it to a GIF.</para>
+          <indexterm zone="giflib gifbuild">
+            <primary sortas="b-gifbuild">gifbuild</primary>
           </indexterm>
         </listitem>
@@ -200,40 +159,10 @@
       </varlistentry>
 
-      <varlistentry id="gifcolor">
-        <term><command>gifcolor</command></term>
-        <listitem>
-          <para>generates color test patterns.</para>
-          <indexterm zone="giflib gifcolor">
-            <primary sortas="b-gifcolor">gifcolor</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gifcomb">
-        <term><command>gifcomb</command></term>
-        <listitem>
-          <para>combines two GIF images of exactly the same size into one.</para>
-          <indexterm zone="giflib gifcomb">
-            <primary sortas="b-gifcomb">gifcomb</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gifcompose">
-        <term><command>gifcompose</command></term>
-        <listitem>
-          <para>uses giflib tools to compose images.</para>
-          <indexterm zone="giflib gifcompose">
-            <primary sortas="b-gifcompose">gifcompose</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="giffiltr">
-        <term><command>giffiltr</command></term>
-        <listitem>
-          <para>is a template for filtering a GIF sequentially.</para>
-          <indexterm zone="giflib giffiltr">
-            <primary sortas="b-giffiltr">giffiltr</primary>
+      <varlistentry id="gifecho">
+        <term><command>gifecho</command></term>
+        <listitem>
+          <para>generates a GIF from ASCII text.</para>
+          <indexterm zone="giflib gifecho">
+            <primary sortas="b-gifecho">gifecho</primary>
           </indexterm>
         </listitem>
@@ -250,45 +179,4 @@
       </varlistentry>
 
-      <varlistentry id="gifflip">
-        <term><command>gifflip</command></term>
-        <listitem>
-          <para>flips a GIF image along the X or Y axis or
-          rotates an image by 90 degrees.</para>
-          <indexterm zone="giflib gifflip">
-            <primary sortas="b-gifflip">gifflip</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gifhisto">
-        <term><command>gifhisto</command></term>
-        <listitem>
-          <para>generate a color-frequency histogram from a GIF.</para>
-          <indexterm zone="giflib gifhisto">
-            <primary sortas="b-gifhisto">gifhisto</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gifinfo">
-        <term><command>gifinfo</command></term>
-        <listitem>
-          <para>gives information about a GIF file.</para>
-          <indexterm zone="giflib gifinfo">
-            <primary sortas="b-gifinfo">gifinfo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gifinter">
-        <term><command>gifinter</command></term>
-        <listitem>
-          <para>converts between interlaced and non-interlaced images.</para>
-          <indexterm zone="giflib gifinter">
-            <primary sortas="b-gifinter">gifinter</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="gifinto">
         <term><command>gifinto</command></term>
@@ -301,54 +189,4 @@
       </varlistentry>
 
-      <varlistentry id="gifovly">
-        <term><command>gifovly</command></term>
-        <listitem>
-          <para>generates one composite GIF from a multiple-image GIF.</para>
-          <indexterm zone="giflib gifovly">
-            <primary sortas="b-gifovly">gifovly</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gifpos">
-        <term><command>gifpos</command></term>
-        <listitem>
-          <para>changes a GIF's screen size or reconditions it.</para>
-          <indexterm zone="giflib gifpos">
-            <primary sortas="b-gifpos">gifpos</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gifrotat">
-        <term><command>gifrotat</command></term>
-        <listitem>
-          <para>rotates a GIF through any desired angle.</para>
-          <indexterm zone="giflib gifrotat">
-            <primary sortas="b-gifrotat">gifrotat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gifrsize">
-        <term><command>gifrsize</command></term>
-        <listitem>
-          <para>resizes a GIF by deletion or duplication of bits.</para>
-          <indexterm zone="giflib gifrsize">
-            <primary sortas="b-gifrsize">gifrsize</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gifspnge">
-        <term><command>gifspnge</command></term>
-        <listitem>
-          <para>is a template for filtering a GIF with in-core operations.</para>
-          <indexterm zone="giflib gifspnge">
-            <primary sortas="b-gifspnge">gifspnge</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="giftext">
         <term><command>giftext</command></term>
@@ -361,51 +199,10 @@
       </varlistentry>
 
-      <varlistentry id="gifwedge">
-        <term><command>gifwedge</command></term>
-        <listitem>
-          <para>creates a test GIF image resembling a color monitor test pattern.</para>
-          <indexterm zone="giflib gifwedge">
-            <primary sortas="b-gifwedge">gifwedge</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="icon2gif">
-        <term><command>icon2gif</command></term>
-        <listitem>
-          <para>is a converter/deconverter to/from an editable text format.</para>
-          <indexterm zone="giflib icon2gif">
-            <primary sortas="b-icon2gif">icon2gif</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="raw2gif">
-        <term><command>raw2gif</command></term>
-        <listitem>
-          <para>converts raw 8-bit image data into GIF files.</para>
-          <indexterm zone="giflib raw2gif">
-            <primary sortas="b-raw2gif">raw2gif</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rgb2gif">
-        <term><command>rgb2gif</command></term>
-        <listitem>
-          <para>converts 24 bit images to a GIF image using
-          color quantization.</para>
-          <indexterm zone="giflib rgb2gif">
-            <primary sortas="b-rgb2gif">rgb2gif</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="text2gif">
-        <term><command>text2gif</command></term>
-        <listitem>
-          <para>generates GIF images out of regular text in 8x8 font.</para>
-          <indexterm zone="giflib text2gif">
-            <primary sortas="b-text2gif">text2gif</primary>
+      <varlistentry id="giftool">
+        <term><command>giftool</command></term>
+        <listitem>
+          <para>is a GIF transformation tool.</para>
+          <indexterm zone="giflib giftool">
+            <primary sortas="b-giftool">giftool</primary>
           </indexterm>
         </listitem>
@@ -413,5 +210,5 @@
 
       <varlistentry id="libgif">
-        <term><filename class='libraryfile'>libgif.so</filename></term>
+        <term><filename class="libraryfile">libgif.so</filename></term>
         <listitem>
           <para>contains API functions required by the
Index: general/graphlib/imlib2.xml
===================================================================
--- general/graphlib/imlib2.xml	(revision 2217b13c757cd71d9e04ce3d3b52393980680e6d)
+++ general/graphlib/imlib2.xml	(revision b9982eaa41529080f3685484ccf5264d157ad937)
@@ -83,5 +83,6 @@
     following commands:</para>
 
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
+<screen><userinput>sed -i "/DGifOpen/s:fd:&amp;, NULL:" src/modules/loaders/loader_gif.c &amp;&amp;
+./configure --prefix=/usr --disable-static &amp;&amp;
 make</userinput></screen>
 
@@ -99,4 +100,10 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
+
+    <para>
+      <command>sed -i "/DGifOpen/s:fd:&amp;, NULL:" ...</command>:
+      This sed fixes building with recent versions of
+      <application>Giflib</application>.
+    </para>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
