Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 7725)
+++ introduction/welcome/changelog.xml	(working copy)
@@ -44,6 +44,18 @@
       <para>January 10th, 2009</para>
       <itemizedlist>
         <listitem>
+           <para>[willimm] - Added Jasper. Fixes #1551.</para>
+        </listitem>
+        <listitem>
+           <para>[willimm] - Upgraded GSView to 4.9. Fixes #2793.</para>
+        </listitem>
+        <listitem>
+           <para>[willimm] - Upgraded AFPL Ghostscript to GPL Ghostscript 8.63, and removed ESP Ghostscript, and also added a universal Ghostscript download site. Fixes #2629.</para>
+        </listitem>
+        <listitem>
+           <para>[willimm] - Fixed URW fonts link in kdelibs. Fixes #2804.</para>
+        </listitem>
+        <listitem>
           <para>[bdubbs] - Updated to doxygen-1.5.8.</para>
         </listitem>
         <listitem>
Index: basicnet/netprogs/cvs.xml
===================================================================
--- basicnet/netprogs/cvs.xml	(revision 7725)
+++ basicnet/netprogs/cvs.xml	(working copy)
@@ -74,8 +74,7 @@
     <ulink url="http://www.pdc.kth.se/kth-krb/">krb4</ulink>,
     <xref linkend="mitkrb"/> or <xref linkend="heimdal"/>
     (for the GSSAPI libraries),
-    <xref linkend="gs"/> or <xref linkend="espgs"/>, and
-    an <xref linkend="server-mail"/> (that provides a
+    <xref linkend="gs"/>, and an <xref linkend="server-mail"/> (that provides a
     <command>sendmail</command> command)</para>
 
     <para><application>CVS</application> will invoke a default text editor to
Index: multimedia/libdriv/gstreamer.xml
===================================================================
--- multimedia/libdriv/gstreamer.xml	(revision 7725)
+++ multimedia/libdriv/gstreamer.xml	(working copy)
@@ -87,8 +87,7 @@
     Manuals)</bridgehead>
     <para role="optional"><xref linkend="libxslt"/>,
     <xref linkend="tetex"/>,
-    <xref linkend="gs"/> or
-    <xref linkend="espgs"/>,
+    <xref linkend="gs"/>,
     <xref linkend="docbook-utils"/>,
     <ulink url="http://www.xfig.org/">Transfig</ulink>, and
     <ulink url="http://netpbm.sourceforge.net/">Netpbm</ulink></para>
Index: general.ent
===================================================================
--- general.ent	(revision 7725)
+++ general.ent	(working copy)
@@ -33,6 +33,7 @@
 <!ENTITY lfs-root             "../../../../lfs/view/&lfs-version;">
 <!ENTITY sourceforge-repo     "http://downloads.sourceforge.net">
 <!ENTITY gentoo-ftp-repo      "ftp://ftp.linux.ee/pub/gentoo/distfiles/distfiles">
+<!ENTITY ghostscript-repo     "http://mirror.cs.wisc.edu/pub/mirrors/ghost/">
 <!ENTITY publisher            "Unknown">
 
 <!-- These entities are used to identify versions of LFS
@@ -147,6 +148,7 @@
 <!ENTITY libpng-version               "1.2.34">
 <!ENTITY libtiff-version              "3.8.2">
 <!ENTITY giflib-version               "4.1.4">
+<!ENTITY jasper-version               "1.900.1">
 <!ENTITY lcms-version                 "1.17">
 <!ENTITY libmng-version               "1.0.10">
 <!ENTITY freetype2-version            "2.3.7">
@@ -685,12 +687,12 @@
 <!-- Chapter 42 -->
 <!ENTITY cups-version                 "1.2.12">
 <!ENTITY LPRng-version                "3.8.28">
-<!ENTITY gs-version                   "8.53">
-<!ENTITY espgs-version                "8.15.4">
+<!ENTITY gs-version                   "8.63">
 <!ENTITY gutenprint-version           "5.0.1">
 
 <!-- Obsolete
 <!ENTITY gimp-print-version           "4.2.7">
+<!ENTITY espgs-version                "8.15.4">
 -->
 
 <!-- Chapter 43 -->
@@ -714,7 +716,7 @@
 <!ENTITY a2ps-version                 "4.14">
 <!ENTITY enscript-version             "1.6.4">
 <!ENTITY psutils-version              "p17">
-<!ENTITY gsview-version               "4.8">
+<!ENTITY gsview-version               "4.9">
 <!ENTITY xpdf-version                 "3.02">
 <!ENTITY fop-version                  "0.95">
 <!ENTITY paps-version                 "0.6.8">
Index: kde/add/kdegraphics.xml
===================================================================
--- kde/add/kdegraphics.xml	(revision 7725)
+++ kde/add/kdegraphics.xml	(working copy)
@@ -120,8 +120,7 @@
     and partial support using the <ulink
     url="https://savannah.gnu.org/projects/ocrad/">Ocrad</ulink> engine.</para>
 
-    <para>The <command>kghostview</command> program requires a ghostscript
-    interpreter from <xref linkend="gs"/> or <xref linkend="espgs"/> to
+    <para>The <command>kghostview</command> program requires <xref linkend="gs"/> to
     process PS or PDF files.</para>
 
     <para>The <command>kpovmodeler</command> program requires
Index: kde/core/kdelibs.xml
===================================================================
--- kde/core/kdelibs.xml	(revision 7725)
+++ kde/core/kdelibs.xml	(working copy)
@@ -86,8 +86,8 @@
     <xref linkend="cups"/>,
     <xref linkend="alsa"/>,
     <xref linkend="heimdal"/> or <xref linkend="mitkrb"/>,
+    <xref linkend="jasper"/>,
     <ulink url="http://www.openexr.com/">OpenEXR</ulink>,
-    <ulink url="http://www.ece.uvic.ca/~mdadams/jasper/">JasPer</ulink>,
     <ulink url="http://www.lua.org/">Lua</ulink> (version &lt; 5.1),
     <ulink url="http://www.opensource.apple.com/darwinsource/tarballs/apsl/">mDNSResponder</ulink>,
     <ulink url="http://sourceforge.net/projects/libthai">LibThai</ulink>,
@@ -158,7 +158,7 @@
       errors and warnings.  In some cases it complains that Helvetica fonts are
       missing and substitutes a font that does not fit boxes properly.  You can
       add the font by downloading the <ulink
-      url="ftp://ftp.gnome.ru/fonts/urw/release/">URW Fonts </ulink> and
+      url="&ghostscript-repo;AFPL/GhostPCL/urwfonts-1.41.tar.bz2">URW Fonts </ulink> and
       unpacking them into <filename class='directory'>~/.fonts</filename>.
       <command>fc-cache</command> should also be run to update the font
       properties on your system.</para>
Index: gnome/add/evince.xml
===================================================================
--- gnome/add/evince.xml	(revision 7725)
+++ gnome/add/evince.xml	(working copy)
@@ -88,8 +88,7 @@
       (required to build the <application>Nautilus</application> plugin),
     <xref linkend="poppler"/> (required for PDF support and must be built
       with <application>GTK+</application> support),
-    <xref linkend="espgs"/> or <xref linkend="gs"/>
-    (required for Postscript ability from <application>Evince</application>),
+    <xref linkend="gs"/> (required for Postscript ability from <application>Evince</application>),
     <ulink url="http://djvulibre.djvuzone.org/">DjVuLibre</ulink>
     (required for DjVu graphics from <application>Evince</application>), and
     <ulink url="ftp://sunsite.unc.edu/pub/Linux/libs/graphics/">t1lib</ulink>
Index: server/mail/courier.xml
===================================================================
--- server/mail/courier.xml	(revision 7725)
+++ server/mail/courier.xml	(working copy)
@@ -86,7 +86,7 @@
     <xref linkend="aspell"/>,
     <xref linkend="gnupg"/>,
     <xref linkend="expect"/>,
-    <xref linkend="gs"/> or <xref linkend="espgs"/>,
+    <xref linkend="gs"/>, 
     <ulink url="http://netpbm.sourceforge.net/">Netpbm</ulink> and
     <ulink url="http://alpha.greenie.net/mgetty/">Mgetty+Sendfax</ulink></para>
 
Index: server/mail/sendmail.xml
===================================================================
--- server/mail/sendmail.xml	(revision 7725)
+++ server/mail/sendmail.xml	(working copy)
@@ -66,8 +66,7 @@
     <xref linkend="tcpwrappers"/>,
     <xref linkend="cyrus-sasl"/>,
     <ulink url="http://www.feep.net/nph/">nph</ulink>, and
-    <xref linkend="gs"/> or <xref linkend="espgs"/> (for creating
-    PDF documentation)</para>
+    <xref linkend="gs"/> (for creating PDF documentation)</para>
 
     <para condition="html" role="usernotes">User Notes:
     <ulink url="&blfs-wiki;/sendmail"/></para>
Index: pst/ps/xpdf.xml
===================================================================
--- pst/ps/xpdf.xml	(revision 7725)
+++ pst/ps/xpdf.xml	(working copy)
@@ -69,8 +69,7 @@
     <para role="required"><xref linkend="lesstif"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="gs"/> or <xref linkend="espgs"/>
-    (just the fonts), <ulink
+    <para role="optional"><xref linkend="gs"/> (just the fonts), <ulink
     url="http://gd.tuwien.ac.at/visual/ibiblio/libs/graphics/t1lib-5.1.0.tar.gz">
     t1lib</ulink>, and <ulink
     url="http://packages.debian.org/unstable/source/libpaper">libpaper</ulink></para>
Index: pst/ps/gsview.xml
===================================================================
--- pst/ps/gsview.xml	(revision 7725)
+++ pst/ps/gsview.xml	(working copy)
@@ -4,9 +4,7 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!ENTITY gsview-download-http "http://gd.tuwien.ac.at/publishing/ghostscript/ghostgum/gsview-&gsview-version;.tar.gz">
-  <!ENTITY gsview-download-ftp  " ">
-  <!-- <!ENTITY gsview-download-ftp  "ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/ghostgum/gsview-&gsview-version;.tar.gz"> -->
+  <!ENTITY gsview-download-http "&ghostscript-repo;ghostgum/gsview-&gsview-version;.tar.gz">
   <!ENTITY gsview-md5sum        "21c81819af0eeb42ac5ee6499f4a7116">
   <!ENTITY gsview-size          "931 KB">
   <!ENTITY gsview-buildsize     "11.4 MB">
@@ -39,9 +37,6 @@
         <para>Download (HTTP): <ulink url="&gsview-download-http;"/></para>
       </listitem>
       <listitem>
-        <para>Download (FTP): <ulink url="&gsview-download-ftp;"/></para>
-      </listitem>
-      <listitem>
         <para>Download MD5 sum: &gsview-md5sum;</para>
       </listitem>
       <listitem>
@@ -55,19 +50,11 @@
       </listitem>
     </itemizedlist>
 
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Required Patch: <ulink
-        url="&patch-root;/gsview-&gsview-version;-pstotext-1.patch"/></para>
-      </listitem>
-    </itemizedlist>
-
     <bridgehead renderas="sect3">GSview Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required"><xref linkend="GTK"/>, and
-    <xref linkend="gs"/> or <xref linkend="espgs"/></para>
+    <xref linkend="gs"/></para>
 
     <para>Note that you must build the shared
     <filename class="libraryfile">libgs.so</filename> library during the
@@ -93,20 +80,10 @@
 
 <screen><userinput>sed -i 's:netscape:<replaceable>&lt;browser&gt;</replaceable>:' srcunx/gvxreg.c</userinput></screen>
 
-    <para>The <application>GSview</application> package has not been updated in
-    quite a while and does not accomodate the recent versions of the
-    <application>ESP Ghostscript</application> package. If you installed
-    <xref linkend="espgs"/> as your Ghostscript application, you must modify
-    the maximum version of Ghostscript allowed. Make the modification using
-    the following command: </para>
-
-<screen><userinput>sed -i 's:999:99999:' src/gvcver.h</userinput></screen>
-
     <para>Install <application>GSview</application> by running the following
     commands:</para>
 
-<screen><userinput>patch -Np1 -i ../gsview-&gsview-version;-pstotext-1.patch &amp;&amp;
-sed 's:/local::' srcunx/unx.mak &gt; Makefile &amp;&amp;
+<screen><userinput>sed 's:/local::' srcunx/unx.mak &gt; Makefile &amp;&amp;
 make</userinput></screen>
 
     <para>This package does not come with a test suite.</para>
Index: pst/ps/a2ps.xml
===================================================================
--- pst/ps/a2ps.xml	(revision 7725)
+++ pst/ps/a2ps.xml	(working copy)
@@ -88,7 +88,7 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional"><xref linkend="x-window-system"/>,
     <xref linkend="tetex"/>,
-    <xref linkend="gs"/> or <xref linkend="espgs"/>,
+    <xref linkend="gs"/>, 
     <ulink
     url="http://packages.debian.org/unstable/source/libpaper">libpaper</ulink>,
     <ulink url="http://www.adobe.com/products/acrobat/readstep2.html">Adobe
Index: pst/printing/gimp-print.xml
===================================================================
--- pst/printing/gimp-print.xml	(revision 7725)
+++ pst/printing/gimp-print.xml	(working copy)
@@ -31,15 +31,13 @@
 
     <para>The <application>Gimp-Print</application> package contains
     high quality drivers for Canon, Epson, Lexmark and PCL
-    printers for use with <xref linkend="espgs"/>, <xref linkend="cups"/>,
+    printers for use with <xref linkend="gs"/>, <xref linkend="cups"/>,
     <ulink url="http://www.linuxprinting.org/foomatic.html">Foomatic</ulink>,
     <xref linkend="LPRng"/>, <command>lpr</command> and the
     <application>GIMP-1.2</application>. See a list of supported printers at
     <ulink url="http://gimp-print.sourceforge.net/p_Supported_Printers.php3"/>.
     </para>
 
-<!-- FIXME: APFL Ghostscript is not tested. Don't forget to check the license. -->
-
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
@@ -70,7 +68,7 @@
     <ulink url="http://www.linuxprinting.org/ijs/">IJS</ulink>,
     <xref linkend="tetex"/>,
     <xref linkend="docbook-utils"/> and
-    <xref linkend="espgs"/> or <xref linkend="gs"/></para>
+    <xref linkend="gs"/></para>
 
     <para condition="html" role="usernotes">User Notes:
     <ulink url="&blfs-wiki;/gimp-print"/></para>
Index: pst/printing/gs.xml
===================================================================
--- pst/printing/gs.xml	(revision 7725)
+++ pst/printing/gs.xml	(working copy)
@@ -4,24 +4,22 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!ENTITY gs-download-http "&sourceforge-repo;/ghostscript/ghostscript-&gs-version;.tar.bz2">
-  <!-- <!ENTITY gs-download-ftp  "ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/AFPL/gs851/ghostscript-&gs-version;.tar.bz2"> -->
-  <!ENTITY gs-download-ftp  " ">
+  <!ENTITY gs-download-http "&ghostscript-repo;GPL/gs863/ghostscript-&gs-version;.tar.gz">
   <!ENTITY gs-md5sum        "e65e0c40213a616174572faa639e04d6">
   <!ENTITY gs-size          "9.3 MB">
   <!ENTITY gs-buildsize     "104 MB (includes installing libgs.so and both font tarballs)">
   <!ENTITY gs-time          "2.4 SBU (includes building and installing libgs.so)">
 
-  <!ENTITY gs-standard-fonts-download "ftp://ftp.imagemagick.org/pub/ImageMagick/delegates/ghostscript-fonts-std-8.11.tar.gz">
+  <!ENTITY gs-standard-fonts-download "&ghostscript-repo;fonts/ghostscript-fonts-std-8.11.tar.gz">
   <!ENTITY gs-standard-fonts-md5sum   "6865682b095f8c4500c54b285ff05ef6">
   <!ENTITY gs-standard-fonts-size     "3.7 MB">
 
-  <!ENTITY gs-other-fonts-download "http://ftp.gnu.org/pub/gnu/ghostscript/gnu-gs-fonts-other-6.0.tar.gz">
+  <!ENTITY gs-other-fonts-download "&ghostscript-repo;gnu/fonts/gnu-gs-fonts-other-6.0.tar.gz">
   <!ENTITY gs-other-fonts-md5sum   "33457d3f37de7ef03d2eea05a9e6aa4f">
   <!ENTITY gs-other-fonts-size     "796 KB">
 ]>
 
-<sect1 id="gs" xreflabel="AFPL Ghostscript-&gs-version;">
+<sect1 id="gs" xreflabel="GPL Ghostscript-&gs-version;">
   <?dbhtml filename="gs.html"?>
 
   <sect1info>
@@ -29,10 +27,10 @@
     <date>$Date$</date>
   </sect1info>
 
-  <title>AFPL Ghostscript-&gs-version;</title>
+  <title>GPL Ghostscript-&gs-version;</title>
 
   <indexterm zone="gs">
-    <primary sortas="a-AFPL-Ghostscript">AFPL Ghostscript</primary>
+    <primary sortas="a-GPL-Ghostscript">GPL Ghostscript</primary>
   </indexterm>
 
   <sect2 role="package">
@@ -48,9 +46,6 @@
         <para>Download (HTTP): <ulink url="&gs-download-http;"/></para>
       </listitem>
       <listitem>
-        <para>Download (FTP): <ulink url="&gs-download-ftp;"/></para>
-      </listitem>
-      <listitem>
         <para>Download MD5 sum: &gs-md5sum;</para>
       </listitem>
       <listitem>
@@ -69,7 +64,7 @@
     <itemizedlist spacing='compact'>
       <title>Standard Fonts</title>
       <listitem>
-        <para>Download (FTP): <ulink url="&gs-standard-fonts-download;"/></para>
+        <para>Download (HTTP): <ulink url="&gs-standard-fonts-download;"/></para>
       </listitem>
       <listitem>
         <para>Download MD5 sum: &gs-standard-fonts-md5sum;</para>
@@ -92,21 +87,23 @@
       </listitem>
     </itemizedlist>
 
+    <itemizedlist spacing='compact'>
+       <title>Recommended patch:</title>
+       <listitem>
+          <para> Patch if you want to use system Jasper: <ulink url="&patch-root;/ghostscript-&gs-version;-system_jasper-1.patch" /></para>
+       </listitem>
+    </itemizedlist>
+
     <bridgehead renderas="sect3">Ghostscript Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional"><xref linkend="libjpeg"/>,
     <xref linkend="libpng"/>,
-    <xref linkend="GTK"/>, and
+    <xref linkend="GTK2"/>,
+    <xref linkend="jasper"/>,
+    <xref linkend="cups"/>, and
     <xref linkend="x-window-system"/></para>
 
-    <bridgehead renderas="sect3">Conflicts</bridgehead>
-    <para>This version of Ghostscript does not work with
-    <application>CUPS</application> due to missing generic "cups" raster
-    image driver. The necessary support cannot be patched in due to
-    incompatible licenses. Use <xref linkend="espgs"/> instead if you have
-    <application>CUPS</application>.</para>
-
     <para condition="html" role="usernotes">User Notes:
     <ulink url="&blfs-wiki;/gs"/></para>
 
@@ -209,7 +206,7 @@
 
    </variablelist>
 
-    <para><application>AFPL Ghostscript</application> provides many different
+    <para><application>GPL Ghostscript</application> provides many different
     scripts used to render PostScript/PDF files back and forth. Please refer
     to the HTML documentation or try <command>man gs</command> for information
     about the capabilities provided by the package.</para>
Index: pst/printing/cups.xml
===================================================================
--- pst/printing/cups.xml	(revision 7725)
+++ pst/printing/cups.xml	(working copy)
@@ -167,7 +167,7 @@
 
     <para>For non-PostScript printers to print with
     <application>CUPS</application>, you need to install
-    <xref linkend="espgs"/> to convert PostScript to raster images
+    <xref linkend="gs"/> to convert PostScript to raster images
     and a driver (e.g., from <xref linkend="gutenprint"/>) to convert
     the resulting raster images to a form that the printer understands.
     <ulink url="http://www.linuxprinting.org/foomatic.html">Foomatic</ulink>
Index: pst/printing/printing.xml
===================================================================
--- pst/printing/printing.xml	(revision 7725)
+++ pst/printing/printing.xml	(working copy)
@@ -22,11 +22,11 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="cups.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="lprng.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="espgs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gutenprint.xml"/>
 
   <!-- Obsolete
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gimp-print.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude  href="espgs.xml"/>
   -->
 
 </chapter>
Index: pst/printing/gutenprint.xml
===================================================================
--- pst/printing/gutenprint.xml	(revision 7725)
+++ pst/printing/gutenprint.xml	(working copy)
@@ -32,15 +32,13 @@
     <para>The <application>Gutenprint</application> (formerly
     <application>Gimp-Print</application>) package contains high
     quality drivers for many brands and models of printers for use with
-    <xref linkend="espgs"/>, <xref linkend="cups"/>,
+    <xref linkend="gs"/>, <xref linkend="cups"/>,
     <ulink url="http://www.linuxprinting.org/foomatic.html">Foomatic</ulink>,
     <xref linkend="LPRng"/>, <command>lpr</command> and the
     <application>GIMP-2.0</application>. See a list of supported printers at
     <ulink url="http://gutenprint.sourceforge.net/p_Supported_Printers.php3"/>.
     </para>
 
-<!-- FIXME: APFL Ghostscript is not tested. Don't forget to check the license. -->
-
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
Index: x/lib/gtk+2.xml
===================================================================
--- x/lib/gtk+2.xml	(revision 7725)
+++ x/lib/gtk+2.xml	(working copy)
@@ -64,7 +64,7 @@
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended"><xref linkend="libtiff"/>,
-    <ulink url="http://www.ece.uvic.ca/~mdadams/jasper/">libjasper</ulink>
+    <xref linkend="jasper"/>,
     and <xref linkend="libjpeg"/></para>
 
     <para>Though not required, the GTK developers expect
Index: general/prog/nasm.xml
===================================================================
--- general/prog/nasm.xml	(revision 7725)
+++ general/prog/nasm.xml	(working copy)
@@ -67,7 +67,7 @@
 
     <bridgehead renderas="sect4">Optional (for Building Documentation)</bridgehead>
     <para role="optional"><xref linkend="tetex"/>, and
-    <xref linkend="espgs"/> or <xref linkend="gs"/></para>
+    <xref linkend="gs"/></para>
 
     <para condition="html" role="usernotes">User Notes:
     <ulink url="&blfs-wiki;/nasm"/></para>
Index: general/prog/doxygen.xml
===================================================================
--- general/prog/doxygen.xml	(revision 7725)
+++ general/prog/doxygen.xml	(working copy)
@@ -75,7 +75,7 @@
     <xref linkend="graphviz"/>,
     <xref linkend="python"/>,
     <xref linkend="tetex"/>,
-    <xref linkend="espgs"/> or <xref linkend="gs"/></para>
+    <xref linkend="gs"/></para>
 
     <para condition="html" role="usernotes">User Notes:
     <ulink url="&blfs-wiki;/doxygen"/></para>
@@ -133,8 +133,7 @@
     <xref linkend="python"/> installed. If you require formulas to
     create PDF documentation, then you must have <xref linkend="tetex"/>
     installed. If you require formulas to convert PostScript files to bitmaps,
-    then you must have <xref linkend="gs"/> or <xref linkend="espgs"/>
-    installed.</para>
+    then you must have <xref linkend="gs"/> installed.</para>
 
   </sect2>
 
Index: general/graphlib/jasper.xml
===================================================================
--- general/graphlib/jasper.xml	(revision 0)
+++ general/graphlib/jasper.xml	(revision 0)
@@ -0,0 +1,178 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY jasper-download-http "http://www.ece.uvic.ca/~mdadams/jasper/software/jasper-&jasper-version;.zip">
+  <!ENTITY jasper-download-ftp  "&gentoo-ftp-repo;/jasper-&jasper-version;.zip">
+  <!ENTITY jasper-http-md5sum   "827d338961482a986f39c7f114531636">
+  <!ENTITY jasper-http-size     "483 KB">
+  <!ENTITY jasper-ftp-md5sum    "950943daa71350a558c3edf41c3f0f9f">
+  <!ENTITY jasper-ftp-size      "605 KB">
+  <!ENTITY jasper-buildsize     "6.8 MB">
+  <!ENTITY jasper-time          "0.2 SBU">
+]>
+
+<sect1 id="jasper" xreflabel="Jasper-&jasper-version;">
+  <?dbhtml filename="jasper.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy: willimm $</othername>
+    <date>$Date: 2009-01-10 21:33:14 -0600 (Sat, 13 Oct 2008) $</date>
+  </sect1info>
+
+  <title>Jasper-&jasper-version;</title>
+
+  <indexterm zone="jasper">
+    <primary sortas="a-Jasper">Jasper</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to jasper</title>
+
+    <para>The <application>jasper</application> package contains libraries
+    for reading and writing JPEG 2000 files as well as programs for converting and
+    working with JPEG 2000 files. The libraries are useful for any graphics program
+    wishing to deal with JPEG 2000 files while the programs are useful for conversion
+    purposes as well as cleaning up images.</para>
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&jasper-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&jasper-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (HTTP) MD5 sum: &jasper-http-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download (HTTP) size: &jasper-http-size;</para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP) MD5 sum: &jasper-ftp-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP) size: &jasper-ftp-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &jasper-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &jasper-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">jasper Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required"><xref linkend="unzip"/> (to unpack the .zip file)</para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional"><xref linkend="libjpeg"/> and
+    <xref linkend="freeglut"/> for jiv. (Note, you do not need FreeGLUT if you installed MesaGLUT.)</para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/jasper"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of jasper</title>
+
+    <para>Install <application>jasper</application> by running the following
+    commands:</para>
+
+<screen><userinput>./configure --prefix=/usr --enable-shared &amp;&amp;
+make</userinput></screen>
+
+    <para>This package does not come with a test suite.</para>
+
+    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>make install &amp;&amp;
+install -v -m644 -d /usr/share/doc/jasper-&jasper-version; &amp;&amp;
+install -v -m755 doc/* /usr/share/doc/jasper-&jasper-version;</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Dictionary</segtitle>
+
+      <seglistitem>
+        <seg>imgcmp, imginfo, jasper, jiv</seg>
+        <seg>libjasper.{so,a}</seg>
+        <seg>/usr/share/doc/jasper-&jasper-version;</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+
+      <varlistentry id="imgcmp">
+        <term><command>imgcmp</command></term>
+        <listitem>
+          <para>Compares  two JPG2000 images of the same geometry with respect to a given metric.</para>
+          <indexterm zone="jasper imgcmp">
+            <primary sortas="b-imgcmp">imgcmp</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="imginfo">
+        <term><command>imginfo</command></term>
+        <listitem>
+          <para>Displays information about an JPEG2000 image.</para>
+          <indexterm zone="jasper imginfo">
+            <primary sortas="b-imginfo">imginfo</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="jasper-prog">
+        <term><command>jasper</command></term>
+        <listitem>
+          <para>Converts to and from JPEG2000 images.</para>
+          <indexterm zone="jasper jasper-prog">
+            <primary sortas="b-jasper">jasper</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="jiv">
+         <term><command>jiv</command></term>
+         <listitem>
+            <para>An JPEG2000 image viewer. (Requires GLUT.)</para>
+            <indexterm zone="jasper jiv">
+               <primary sortas="b-jiv">jiv</primary>
+            </indexterm>
+         </listitem>
+      </varlistentry>
+
+      <varlistentry id="libjasper">
+        <term><filename class='libraryfile'>libjasper.{so,a}</filename></term>
+        <listitem>
+          <para>contains API functions required by the
+          <application>jasper</application> programs and any other programs needing
+          library functionality to read, write and manipulate JPEG2000 images.</para>
+          <indexterm zone="jasper libjasper">
+            <primary sortas="c-libjasper">libjasper.{so,a}</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: general/graphlib/graphlib.xml
===================================================================
--- general/graphlib/graphlib.xml	(revision 7725)
+++ general/graphlib/graphlib.xml	(working copy)
@@ -27,6 +27,7 @@
   <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="jasper.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="lcms.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="freetype2.xml"/>
Index: general/genutils/imagemagick.xml
===================================================================
--- general/genutils/imagemagick.xml	(revision 7725)
+++ general/genutils/imagemagick.xml	(working copy)
@@ -125,7 +125,7 @@
     <ulink url="ftp://ftp.imagemagick.org/pub/ImageMagick/delegates/libfpx-1.2.0.13.tar.bz2">
     FlashPIX library</ulink>),
     <xref linkend="freetype2"/>,
-    <ulink url="http://www.ece.uvic.ca/~mdadams/jasper/">Jasper</ulink>,
+    <xref linkend="jasper" />,
     <ulink url="http://www.cl.cam.ac.uk/~mgk25/jbigkit/">JBIG-KIT</ulink>,
     <xref linkend="lcms"/>,
     <xref linkend="libexif"/>,
@@ -140,7 +140,7 @@
     </para>
 
     <bridgehead renderas="sect4">Optional Graphics Utilities</bridgehead>
-    <para role="optional"><xref linkend="espgs"/> or <xref linkend="gs"/>,
+    <para role="optional"><xref linkend="gs"/>,
     <ulink url="http://www.artifex.com/downloads/">GhostPCL</ulink>,
     <xref linkend="gimp"/>,
     <ulink url="http://www.gnuplot.info/">Gnuplot</ulink>,
