Index: general.ent
===================================================================
--- general.ent	(revision 54b4a3eb7f2d0e76d01ac2c8d7c90bf012d604d1)
+++ general.ent	(revision d4e57f7699ef85273f1066e12608f2d0f642c47a)
@@ -83,10 +83,11 @@
 <!ENTITY libpng-version               "1.2.7">
 <!ENTITY libtiff-version              "3.7.0">
-<!ENTITY libungif-version             "4.1.0b1">
+<!ENTITY libungif-version             "4.1.3">
+<!ENTITY giflib-version               "4.1.3">
 <!ENTITY libmng-version               "1.0.8">
 <!ENTITY lcms-version                 "1.13">
 <!ENTITY freetype2-version            "2.1.9">
 <!ENTITY fontconfig-version           "2.2.3">
-<!ENTITY imlib-version                "1.9.14">
+<!ENTITY imlib-version                "1.9.15">
 <!ENTITY aalib-version                "1.4rc5">
 <!ENTITY SVGAlib-version              "1.4.3">
Index: general/graphlib/giflib.xml
===================================================================
--- general/graphlib/giflib.xml	(revision d4e57f7699ef85273f1066e12608f2d0f642c47a)
+++ general/graphlib/giflib.xml	(revision d4e57f7699ef85273f1066e12608f2d0f642c47a)
@@ -0,0 +1,214 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+<!ENTITY giflib-download-http "http://prdownloads.sourceforge.net/libungif/giflib-&giflib-version;.tar.bz2">
+<!ENTITY giflib-download-ftp " ">
+<!ENTITY giflib-size "431 KB">
+<!ENTITY giflib-buildsize "5.8 MB">
+<!ENTITY giflib-time "0.11 SBU">
+
+]>
+
+<sect1 id="giflib" xreflabel="giflib-&giflib-version;">
+<sect1info>
+<othername>$LastChangedBy:$</othername>
+<date>$Date:$</date>
+</sect1info>
+<?dbhtml filename="giflib.html"?>
+<title>giflib-&giflib-version;</title>
+
+<sect2>
+<title>Introduction to <application>giflib</application></title>
+
+<para>The <application>giflib</application> package contains libraries for 
+reading and writing <acronym>GIF</acronym>s as well as 
+programs for converting and working with <acronym>GIF</acronym> files. The 
+libraries are useful for any graphics program wishing to deal with 
+<acronym>GIF</acronym> files while the programs are useful for conversion 
+purposes as well as cleaning up images.</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink url="&giflib-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink url="&giflib-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &giflib-size;</para></listitem>
+<listitem><para>Estimated disk space required: &giflib-buildsize;</para></listitem>
+<listitem><para>Estimated build time: &giflib-time;</para></listitem></itemizedlist>
+</sect3>
+
+<sect3><title><application>giflib</application> dependencies</title>
+<sect4><title>Optional</title>
+<para>X (<xref linkend="xfree86"/> or <xref linkend="xorg"/>)</para></sect4>
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Installation of <application>giflib</application></title>
+
+<para>Install <application>giflib</application> by running the following
+commands:</para>
+
+<screen><userinput><command>./configure --prefix=/usr &amp;&amp;
+make &amp;&amp;
+make install</command></userinput></screen>
+
+</sect2>
+
+<sect2>
+<title>Contents</title>
+
+<para>The giflib package contains
+<command>gif2epsn</command>,
+<command>gif2ps</command>,
+<command>gif2rgb</command>,
+<command>gif2x11</command>,
+<command>gifasm</command>,
+<command>gifbg</command>,
+<command>gifburst</command>,
+<command>gifclip</command>,
+<command>gifclrmp</command>,
+<command>gifcolor</command>,
+<command>gifcomb</command>,
+<command>gifcompose</command>,
+<command>giffiltr</command>,
+<command>giffix</command>,
+<command>gifflip</command>, 
+<command>gifhisto</command>,
+<command>gifinfo</command>, 
+<command>gifinter</command>,
+<command>gifinto</command>,
+<command>gifovly</command>,
+<command>gifpos</command>,
+<command>gifrotat</command>,
+<command>gifrsize</command>,
+<command>gifspnge</command>,
+<command>giftext</command>,
+<command>gifwedge</command>,
+<command>icon2gif</command>,
+<command>raw2gif</command>,
+<command>rgb2gif</command>,
+<command>text2gif</command> and
+<filename class="libraryfile">libgif</filename> libraries.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>gif2epsn</title>
+<para>Dumps images saved as <acronym>GIF</acronym> files on Epson type 
+printers.</para></sect3>
+
+<sect3><title>gif2ps</title>
+<para>Print <acronym>GIF</acronym> files on laser printers supporting PostScript.
+</para></sect3>
+
+<sect3><title>gif2rgb</title>
+<para>Convert images saved as <acronym>GIF</acronym> to 24-bit 
+<acronym>RGB</acronym> image(s).</para></sect3>
+
+<sect3><title>gif2x11</title>
+<para>Display images saved as <acronym>GIF</acronym> files
+under X Window System.</para></sect3>
+
+<sect3><title>gifasm</title>
+<para>Assemble multiple <acronym>GIF</acronym>s into one, or burst a
+multiple-image <acronym>GIF</acronym>.</para></sect3>
+
+<sect3><title>gifbg</title>
+<para>Generate a single-color test pattern <acronym>GIF</acronym>.</para>
+</sect3>
+
+<sect3><title>gifburst</title>
+<para>Burst a <acronym>GIF</acronym> image into subrectangles.</para></sect3>
+
+<sect3><title>gifclip</title>
+<para>Clip or crop a <acronym>GIF</acronym> image.</para></sect3>
+
+<sect3><title>gifclrmp</title>
+<para>Modify <acronym>GIF</acronym> image colormaps.</para></sect3>
+
+<sect3><title>gifcolor</title>
+<para>Generate color test patterns.</para></sect3>
+
+<sect3><title>gifcomb</title>
+<para>Combine 2 <acronym>GIF</acronym> images of exactly the same size into one.
+</para></sect3>
+
+<sect3><title>gifcompose</title>
+<para>Use (un)giflib tools to compose images.</para></sect3>
+
+<sect3><title>giffiltr</title>
+<para>Template code for filtering a <acronym>GIF</acronym> 
+sequentially.</para></sect3>
+
+<sect3><title>giffix</title>
+<para>Clumsily attempts to fix truncated <acronym>GIF</acronym> images.</para>
+</sect3>
+
+<sect3><title>gifflip</title>
+<para>Flip <acronym>GIF</acronym> image along X or Y axis or rotate by 90
+degrees.</para></sect3>
+
+<sect3><title>gifhisto</title>
+<para>Generate color-frequency histogram from a <acronym>GIF</acronym>.</para>
+</sect3>
+
+<sect3><title>gifinfo</title>
+<para>Gives information on a <acronym>GIF</acronym> file.</para></sect3>
+
+<sect3><title>gifinter</title>
+<para>Convert between interlaced and non-interlaced images.</para></sect3>
+
+<sect3><title>gifinto</title>
+<para>End-of-pipe fitting for <acronym>GIF</acronym>-processing 
+pipelines.</para></sect3>
+
+<sect3><title>gifovly</title>
+<para>Generate one composite <acronym>GIF</acronym> from a multiple-image
+<acronym>GIF</acronym>.</para></sect3>
+
+<sect3><title>gifpos</title>
+<para>Change a <acronym>GIF</acronym>'s screen size or recondition 
+it.</para></sect3>
+
+<sect3><title>gifrotat</title>
+<para>Rotate a <acronym>GIF</acronym> through any desired angle.</para></sect3>
+
+<sect3><title>gifrsize</title>
+<para>Resize a <acronym>GIF</acronym> by deletion or duplication of bits.</para>
+</sect3>
+
+<sect3><title>gifspnge</title>
+<para>Template code for filtering a <acronym>GIF</acronym> with in-core
+operations.</para></sect3>
+
+<sect3><title>giftext</title>
+<para>Print (text only) general information about a <acronym>GIF</acronym>.
+</para></sect3>
+
+<sect3><title>gifwedge</title>
+<para>Create a test <acronym>GIF</acronym> image resembling a color monitor
+test pattern.</para></sect3>
+
+<sect3><title>icon2gif</title>
+<para>Converter/deconverter to/from an editable text format.</para></sect3>
+
+<sect3><title>raw2gif</title>
+<para>Convert raw 8-bit image data into <acronym>GIF</acronym> files.</para>
+</sect3>
+
+<sect3><title>rgb2gif</title>
+<para>Convert 24 bit images to a <acronym>GIF</acronym> image using color
+quantization.</para></sect3>
+
+<sect3><title>text2gif</title>
+<para>Generate <acronym>GIF</acronym> images out of regular text in 8x8 font.
+</para></sect3>
+
+</sect2>
+
+</sect1>
Index: general/graphlib/graphlib.xml
===================================================================
--- general/graphlib/graphlib.xml	(revision 54b4a3eb7f2d0e76d01ac2c8d7c90bf012d604d1)
+++ general/graphlib/graphlib.xml	(revision d4e57f7699ef85273f1066e12608f2d0f642c47a)
@@ -19,4 +19,5 @@
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libtiff.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libungif.xml"/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="giflib.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libmng.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="lcms.xml"/>
Index: general/graphlib/imlib.xml
===================================================================
--- general/graphlib/imlib.xml	(revision 54b4a3eb7f2d0e76d01ac2c8d7c90bf012d604d1)
+++ general/graphlib/imlib.xml	(revision d4e57f7699ef85273f1066e12608f2d0f642c47a)
@@ -7,6 +7,6 @@
 <!ENTITY imlib-download-http "http://ftp.gnome.org/pub/GNOME/sources/imlib/1.9/imlib-&imlib-version;.tar.bz2">
 <!ENTITY imlib-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/imlib/1.9/imlib-&imlib-version;.tar.bz2">
-<!ENTITY imlib-size "580 KB">
-<!ENTITY imlib-buildsize "16.4 MB">
+<!ENTITY imlib-size "668 KB">
+<!ENTITY imlib-buildsize "12 MB">
 <!ENTITY imlib-time "0.43 SBU">
 ]>
@@ -34,5 +34,5 @@
 url="&imlib-download-ftp;"/></para></listitem>
 <listitem><para>Download size: &imlib-size;</para></listitem>
-<listitem><para>Estimated Disk space required:
+<listitem><para>Estimated disk space required:
 &imlib-buildsize;</para></listitem>
 <listitem><para>Estimated build time:
@@ -42,5 +42,8 @@
 <sect3><title><application>Imlib</application> dependencies</title>
 <sect4><title>Required</title>
-<para><xref linkend="GTK"/> and <xref linkend="libungif"/></para></sect4>
+<para>
+<xref linkend="GTK"/> and
+<xref linkend="libungif"/> or <xref linkend="giflib"/>
+</para></sect4>
 </sect3>
 
@@ -62,10 +65,7 @@
 <title>Command explanations</title>
 
-<!--<para><userinput>CPPFLAGS=-w</userinput>: This disables gcc-&gcc-version;
-warnings that confuse configure.</para>-->
-
 <para><parameter>--sysconfdir=/etc/imlib</parameter>: This installs and
-combines the configurations files into 
-<filename class="directory">/etc</filename> instead
+combines the configuration files into 
+<filename class="directory">/etc/imlib</filename> instead
 of <filename class="directory">/usr/etc</filename>.</para>
 </sect2>
@@ -73,5 +73,5 @@
 <sect2><title>Configuring <application>Imlib</application></title>
 <sect3><title>Config files</title>
-<para><filename>/etc/imlib/imrc</filename></para>
+    <para><filename>/etc/imlib/imrc</filename></para>
 </sect3>
 
@@ -82,5 +82,7 @@
 
 <para>The <application>Imlib</application> package contains 
-<filename>libimlib</filename> libraries.</para>
+<filename class="libraryfile">libImlib</filename>,
+<filename class="libraryfile">libgdk_imlib</filename> and
+<filename class="libraryfile">libimlib-*</filename> libraries.</para>
 
 </sect2>
@@ -89,5 +91,5 @@
 
 <sect3><title>imlib libraries</title>
-<para><filename>libimlib</filename> libraries provide the functions for
+<para><filename class="libraryfile">libimlib-*</filename> libraries provide the functions for
 programs to display and edit a wide variety of image data formats.</para>
 </sect3>
Index: general/graphlib/imlib2.xml
===================================================================
--- general/graphlib/imlib2.xml	(revision 54b4a3eb7f2d0e76d01ac2c8d7c90bf012d604d1)
+++ general/graphlib/imlib2.xml	(revision d4e57f7699ef85273f1066e12608f2d0f642c47a)
@@ -31,5 +31,5 @@
 <listitem><para>Download (FTP): <ulink url="&imlib2-download-ftp;"/></para></listitem>
 <listitem><para>Download size: &imlib2-size;</para></listitem>
-<listitem><para>Estimated Disk space required: &imlib2-buildsize;</para></listitem>
+<listitem><para>Estimated disk space required: &imlib2-buildsize;</para></listitem>
 <listitem><para>Estimated build time: &imlib2-time;</para></listitem></itemizedlist>
 </sect3>
@@ -42,5 +42,8 @@
 
 <sect4><title>Optional</title>
-<para><xref linkend="libtiff"/> and <xref linkend="libungif"/></para>
+<para>
+<xref linkend="libtiff"/> and
+<xref linkend="libungif"/> or <xref linkend="giflib"/>
+</para>
 </sect4>
 </sect3>
Index: general/graphlib/libungif.xml
===================================================================
--- general/graphlib/libungif.xml	(revision 54b4a3eb7f2d0e76d01ac2c8d7c90bf012d604d1)
+++ general/graphlib/libungif.xml	(revision d4e57f7699ef85273f1066e12608f2d0f642c47a)
@@ -5,8 +5,8 @@
   %general-entities;
 
-<!ENTITY libungif-download-http "http://ftp.sunfreeware.com/ftp/pub/freeware/SOURCES/libungif-&libungif-version;.tar.gz">
-<!ENTITY libungif-download-ftp "ftp://sunfreeware.secsup.org/pub/solaris/freeware/SOURCES/libungif-&libungif-version;.tar.gz">
-<!ENTITY libungif-size "343 KB">
-<!ENTITY libungif-buildsize "3.1 MB">
+<!ENTITY libungif-download-http "http://prdownloads.sourceforge.net/libungif/libungif-&libungif-version;.tar.bz2">
+<!ENTITY libungif-download-ftp " ">
+<!ENTITY libungif-size "430 KB">
+<!ENTITY libungif-buildsize "5.7 MB">
 <!ENTITY libungif-time "0.11 SBU">
 
@@ -47,13 +47,6 @@
 <listitem><para>Download (FTP): <ulink url="&libungif-download-ftp;"/></para></listitem>
 <listitem><para>Download size: &libungif-size;</para></listitem>
-<listitem><para>Estimated Disk space required: &libungif-buildsize;</para></listitem>
+<listitem><para>Estimated disk space required: &libungif-buildsize;</para></listitem>
 <listitem><para>Estimated build time: &libungif-time;</para></listitem></itemizedlist>
-</sect3>
-
-<sect3><title>Additional downloads</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Required Patch: <ulink
-url="&patch-root;/libungif-&libungif-version;-va_start-1.patch"/></para></listitem>
-</itemizedlist>
 </sect3>
 
@@ -71,16 +64,8 @@
 commands:</para>
 
-<screen><userinput><command>patch -Np1 -i ../libungif-&libungif-version;-va_start-1.patch &amp;&amp;
-./configure --prefix=/usr &amp;&amp;
+<screen><userinput><command>./configure --prefix=/usr &amp;&amp;
 make &amp;&amp;
 make install</command></userinput></screen>
 
-<!--
-<note><para>If you get an error during the make portion compiling
-<filename>lib/qprintf.c</filename>,
-edit the file and comment out or remove line 14: #include &lt;config.h&gt;
-</para></note>
--->
-
 </sect2>
 
@@ -88,20 +73,36 @@
 <title>Contents</title>
 
-<para>The libungif package contains <command>gif2epsn</command>,
-<command>gif2ps</command>, <command>gif2rgb</command>,
-<command>gifasm</command>, <command>gifbg</command>,
-<command>gifburst</command>, <command>gifclip</command>,
-<command>gifclrmp</command>, <command>gifcolor</command>,
-<command>gifcomb</command>, <command>gifcompose</command>,
-<command>giffiltr</command>, <command>giffix</command>,
-<command>gifflip</command>, <command>gifhisto</command>,
-<command>gifinfo</command>, <command>gifinter</command>,
-<command>gifinto</command>, <command>gifovly</command>,
-<command>gifpos</command>, <command>gifrotat</command>,
-<command>gifrsize</command>, <command>gifspnge</command>,
-<command>giftext</command>, <command>gifwedge</command>,
-<command>icon2gif</command>, <command>raw2gif</command>,
-<command>rgb2gif</command>, <command>text2gif</command> and
-<filename>libungif</filename> libraries.</para>
+<para>The libungif package contains
+<command>gif2epsn</command>,
+<command>gif2ps</command>,
+<command>gif2rgb</command>,
+<command>gif2x11</command>,
+<command>gifasm</command>,
+<command>gifbg</command>,
+<command>gifburst</command>,
+<command>gifclip</command>,
+<command>gifclrmp</command>,
+<command>gifcolor</command>,
+<command>gifcomb</command>,
+<command>gifcompose</command>,
+<command>giffiltr</command>,
+<command>giffix</command>,
+<command>gifflip</command>, 
+<command>gifhisto</command>,
+<command>gifinfo</command>, 
+<command>gifinter</command>,
+<command>gifinto</command>,
+<command>gifovly</command>,
+<command>gifpos</command>,
+<command>gifrotat</command>,
+<command>gifrsize</command>,
+<command>gifspnge</command>,
+<command>giftext</command>,
+<command>gifwedge</command>,
+<command>icon2gif</command>,
+<command>raw2gif</command>,
+<command>rgb2gif</command>,
+<command>text2gif</command> and
+<filename class="libraryfile">libungif</filename> libraries.</para>
 
 </sect2>
@@ -121,4 +122,8 @@
 <acronym>RGB</acronym> image(s).</para></sect3>
 
+<sect3><title>gif2x11</title>
+<para>Display images saved as <acronym>GIF</acronym> files
+under X Window System.</para></sect3>
+
 <sect3><title>gifasm</title>
 <para>Assemble multiple <acronym>GIF</acronym>s into one, or burst a
@@ -219,3 +224,2 @@
 
 </sect1>
-
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 54b4a3eb7f2d0e76d01ac2c8d7c90bf012d604d1)
+++ introduction/welcome/changelog.xml	(revision d4e57f7699ef85273f1066e12608f2d0f642c47a)
@@ -22,4 +22,7 @@
 
 <itemizedlist>
+
+<listitem><para>October 20th, 2004 [igor]: Added giflib-4.1.3 and
+updated to libungif-4.1.3 and Imlib-1.9.15.</para></listitem>
 
 <listitem><para>October 20th, 2004 [randy]: Renamed libtiff patch as suggested 
Index: multimedia/videoutils/mplayer.xml
===================================================================
--- multimedia/videoutils/mplayer.xml	(revision 54b4a3eb7f2d0e76d01ac2c8d7c90bf012d604d1)
+++ multimedia/videoutils/mplayer.xml	(revision d4e57f7699ef85273f1066e12608f2d0f642c47a)
@@ -96,5 +96,5 @@
 <xref linkend="freetype2"/>,
 <xref linkend="fontconfig"/>,
-<xref linkend="libungif"/>,
+<xref linkend="libungif"/> or <xref linkend="giflib"/>,
 <xref linkend="libogg"/>
 <xref linkend="libvorbis"/>,
Index: postlfs/editors/emacs.xml
===================================================================
--- postlfs/editors/emacs.xml	(revision 54b4a3eb7f2d0e76d01ac2c8d7c90bf012d604d1)
+++ postlfs/editors/emacs.xml	(revision d4e57f7699ef85273f1066e12608f2d0f642c47a)
@@ -33,5 +33,5 @@
 url="&emacs-download-ftp;"/></para></listitem>
 <listitem><para>Download size: &emacs-size;</para></listitem>
-<listitem><para>Estimated Disk space required:
+<listitem><para>Estimated disk space required:
 &emacs-buildsize;</para></listitem>
 <listitem><para>Estimated build time:
@@ -43,5 +43,5 @@
 <para>X (<xref linkend="xfree86"/> or <xref linkend="xorg"/>), <xref linkend="libjpeg"/>, <xref
 linkend="libpng"/>, <xref linkend="libtiff"/> and <xref
-linkend="libungif"/></para></sect4>
+linkend="libungif"/> or <xref linkend="giflib"/></para></sect4>
 </sect3>
 
