Index: basicnet/netprogs/cvs.xml
===================================================================
--- basicnet/netprogs/cvs.xml	(revision 7727)
+++ 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 7727)
+++ 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 7727)
+++ general.ent	(working copy)
@@ -3,7 +3,7 @@
 $Date$
 -->
 
-<!ENTITY day          "14">                   <!-- Always 2 digits -->
+<!ENTITY day          "15">                   <!-- Always 2 digits -->
 <!ENTITY month        "01">                   <!-- Always 2 digits -->
 <!ENTITY year         "2009">
 <!ENTITY copyrightdate "2001-&year;">
@@ -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
@@ -686,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 -->
@@ -715,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 7727)
+++ kde/add/kdegraphics.xml	(working copy)
@@ -120,9 +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
-    process PS or PDF files.</para>
+    <para>The <command>kghostview</command> program requires <xref linkend="gs"/> to process PS or PDF files.</para>
 
     <para>The <command>kpovmodeler</command> program requires
     <ulink url="http://www.povray.org/">POV-Ray</ulink> to render 3D scenes.</para>
Index: gnome/add/evince.xml
===================================================================
--- gnome/add/evince.xml	(revision 7727)
+++ 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 7727)
+++ 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 7727)
+++ 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 7727)
+++ 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 7727)
+++ pst/ps/gsview.xml	(working copy)
@@ -4,9 +4,8 @@
   <!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-http "&ghostscript-repo;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-md5sum        "21c81819af0eeb42ac5ee6499f4a7116">
   <!ENTITY gsview-size          "931 KB">
   <!ENTITY gsview-buildsize     "11.4 MB">
@@ -66,8 +65,7 @@
     <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>
+    <para role="required"><xref linkend="GTK"/>, and <xref linkend="gs"/> </para>
 
     <para>Note that you must build the shared
     <filename class="libraryfile">libgs.so</filename> library during the
@@ -93,6 +91,7 @@
 
 <screen><userinput>sed -i 's:netscape:<replaceable>&lt;browser&gt;</replaceable>:' srcunx/gvxreg.c</userinput></screen>
 
+    <!-- ESP Ghostscript is obslete, commenting out.
     <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
@@ -100,7 +99,7 @@
     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>
+<screen><userinput>sed -i 's:999:99999:' src/gvcver.h</userinput></screen> -->
 
     <para>Install <application>GSview</application> by running the following
     commands:</para>
Index: pst/ps/a2ps.xml
===================================================================
--- pst/ps/a2ps.xml	(revision 7727)
+++ 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 7727)
+++ 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 7727)
+++ pst/printing/gs.xml	(working copy)
@@ -4,24 +4,23 @@
   <!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-http "&ghostscript-repo;GPL/gs863/ghostscript-&gs-version;.tar.gz">
   <!ENTITY gs-download-ftp  " ">
   <!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 +28,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">
@@ -69,7 +68,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,20 +91,29 @@
       </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"/>, and
     <xref linkend="x-window-system"/></para>
 
+    <!-- GPL Ghostscript does not have these comflicts anymore.
     <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>
+    <application>CUPS</application>.</para> -->
 
     <para condition="html" role="usernotes">User Notes:
     <ulink url="&blfs-wiki;/gs"/></para>
@@ -142,7 +150,7 @@
 ln -v -s ps /usr/include/ghostscript</userinput></screen>
 
     <note>
-      <para>The shared library depends on <xref linkend="GTK"/>. It is
+      <para>The shared library depends on <xref linkend="gtk2"/>. It is
       only used in external programs like <xref linkend="gsview"/> and
       <xref linkend="imagemagick"/>.</para>
     </note>
@@ -209,7 +217,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 7727)
+++ 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 7727)
+++ 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 7727)
+++ 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: general/prog/nasm.xml
===================================================================
--- general/prog/nasm.xml	(revision 7727)
+++ general/prog/nasm.xml	(working copy)
@@ -66,8 +66,7 @@
     <bridgehead renderas="sect3">NASM Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Optional (for Building Documentation)</bridgehead>
-    <para role="optional"><xref linkend="tetex"/>, and
-    <xref linkend="espgs"/> or <xref linkend="gs"/></para>
+    <para role="optional"><xref linkend="tetex"/>, and <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 7727)
+++ general/prog/doxygen.xml	(working copy)
@@ -74,8 +74,8 @@
     <para role="optional"><xref linkend="qt4"/> (for doxywizard),
     <xref linkend="graphviz"/>,
     <xref linkend="python"/>,
-    <xref linkend="tetex"/>,
-    <xref linkend="espgs"/> or <xref linkend="gs"/></para>
+    <xref linkend="tetex"/>, and
+    <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/genutils/imagemagick.xml
===================================================================
--- general/genutils/imagemagick.xml	(revision 7727)
+++ general/genutils/imagemagick.xml	(working copy)
@@ -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>,
