Index: pst/ps/fop.xml
===================================================================
--- pst/ps/fop.xml	(revision f8d595181d84f88a18b542b6bb89c9f49e9b9f1a)
+++ pst/ps/fop.xml	(revision b822871f00ea1c0ba8061714c9043bb8e2ab96c1)
@@ -6,6 +6,5 @@
 
   <!ENTITY fop-download-http "http://archive.apache.org/dist/xmlgraphics/fop/source/fop-&fop-version;-src.tar.gz">
-  <!-- <!ENTITY fop-download-ftp  "ftp://apache.mirrors.pair.com/xmlgraphics/fop/fop-&fop-version;-src.tar.gz"> -->
-  <!ENTITY fop-download-ftp  "&sources-anduin-ftp;/f/fop-&fop-version;-src.tar.gz">
+  <!ENTITY fop-download-ftp  " ">
   <!ENTITY fop-md5sum        "95dcc4c2dd08b4bc88ce9ce1ee88c439">
   <!ENTITY fop-size          "16.1 MB">
@@ -14,7 +13,11 @@
 
   <!ENTITY jai-version       "1_1_3">
-  <!ENTITY jai-download      "http://download.java.net/media/jai/builds/release/&jai-version;/jai-&jai-version;-lib-linux-i586-jdk.bin">
-  <!ENTITY jai-md5sum        "a63b661c4940582aa1679233e5f518b2">
+  <!ENTITY jai-download      "http://download.java.net/media/jai/builds/release/&jai-version;/jai-&jai-version;-lib-linux-i586.tar.gz">
+  <!ENTITY jai-md5sum        "a2cbc155ef3899bcde9c74a8035764b3">
   <!ENTITY jai-size          "3.4 MB">
+
+  <!ENTITY jai64-download    "http://download.java.net/media/jai/builds/release/&jai-version;/jai-&jai-version;-lib-linux-amd64.tar.gz">
+  <!ENTITY jai64-md5sum      "4a906db35612f668aeef2c0606d7075b">
+  <!ENTITY jai64-size        "3.4 MB">
 
   <!ENTITY offo-download     "&sourceforge-repo;/offo/offo-hyphenation_v2.0.zip">
@@ -23,5 +26,5 @@
 ]>
 
-<sect1 id="fop" xreflabel="FOP-&fop-version;">
+<sect1 id="fop" xreflabel="fop-&fop-version;">
   <?dbhtml filename="fop.html"?>
 
@@ -31,12 +34,12 @@
   </sect1info>
 
-  <title>FOP-&fop-version;</title>
+  <title>fop-&fop-version;</title>
 
   <indexterm zone="fop">
-    <primary sortas="a-FOP">FOP</primary>
+    <primary sortas="a-fop">fop</primary>
   </indexterm>
 
   <sect2 role="package">
-    <title>Introduction to FOP</title>
+    <title>Introduction to fop</title>
 
     <para>The <application>FOP</application> (Formatting Objects Processor)
@@ -48,5 +51,5 @@
     primary output target is PDF.</para>
 
-    <para>&lfssvn_checked;20101029&lfssvn_checked2;</para>
+    &lfs70_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -86,5 +89,5 @@
       </listitem>
       <listitem>
-        <para>Java Advanced Imaging (JAI) API components:
+        <para>Java Advanced Imaging (JAI) API components (architecture dependent):
           <simplelist>
             <member><ulink url="&jai-download;"/></member>
@@ -92,33 +95,32 @@
             <member>&jai-size;</member>
           </simplelist>
+          <simplelist>
+            <member><ulink url="&jai64-download;"/></member>
+            <member>&jai64-md5sum;</member>
+            <member>&jai64-size;</member>
+          </simplelist>
         </para>
       </listitem>
     </itemizedlist>
 
-    <!-- <itemizedlist spacing='compact'>
-      <title>Required patch</title>
-      <listitem>
-        <para><ulink
-        url="&patch-root;/fop-&fop-version;-jdk_1.5.0-1.patch"/></para>
-      </listitem>
-    </itemizedlist> -->
-
-    <bridgehead renderas="sect3">FOP Dependencies</bridgehead>
+    <bridgehead renderas="sect3">fop Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="xorg7"/>,
-    <xref linkend="apache-ant"/>, and
-    <ulink url="http://java.sun.com/javase/technologies/desktop/media/jai/">Java
-    Advanced Imaging (JAI) API components</ulink></para>
+    <para role="required">
+      <xref linkend="xorg7"/> and 
+      <xref linkend="apache-ant"/>
+    </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><ulink url="http://java.sun.com/products/jimi/">JIMI SDK</ulink>,
-    <ulink url="http://xmlunit.sourceforge.net/">XMLUnit</ulink>,
-    <ulink url="https://jai-imageio.dev.java.net/">JAI Image I/O Tools</ulink>,
-    <ulink url="http://jeuclid.sourceforge.net/">JEuclid</ulink>,
-    <ulink url="http://pmd.sourceforge.net">PMD</ulink>
-    (requires <ulink url="http://jaxen.codehaus.org/">Jaxen</ulink>), and
-    <ulink url="http://forrest.apache.org/">Forrest</ulink> (Forrest used only
-    to rebuild the documentation)</para>
+    <para role="optional">
+      <ulink url="http://java.sun.com/products/jimi/">JIMI SDK</ulink>,
+      <ulink url="http://xmlunit.sourceforge.net/">XMLUnit</ulink>,
+      <ulink url="https://jai-imageio.dev.java.net/">JAI Image I/O Tools</ulink>,
+      <ulink url="http://jeuclid.sourceforge.net/">JEuclid</ulink>,
+      <ulink url="http://pmd.sourceforge.net">PMD</ulink>
+          (requires <ulink url="http://jaxen.codehaus.org/">Jaxen</ulink>), and
+      <ulink url="http://forrest.apache.org/">Forrest</ulink> (Forrest used only
+      to rebuild the documentation)
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -128,11 +130,10 @@
 
   <sect2 role="installation">
-    <title>Installation of FOP</title>
+    <title>Installation of fop</title>
 
     <important>
       <para>You must run this installation from an X-window using a GL-aware
       <application>Xorg</application> server or some of the
-      <application>JUnit</application> tests will hang. Using an X-window from
-      the console is the preferred method.</para>
+      <application>JUnit</application> tests will hang.</para>
     </important>
 
@@ -140,16 +141,15 @@
     the build. To build the <application>JIMI SDK</application> and/or
     <application>XMLUnit</application> extension classes, ensure the
-    corresponding <filename class='extension'>.jar</filename> files are
-    identified in the <envar>CLASSPATH</envar> environment variable.</para>
+    corresponding <filename class='extension'>.jar</filename> files can be
+    found via the <envar>CLASSPATH</envar> environment variable.</para>
 
     <sect3>
       <title>Installing OFFO Hyphenation Patterns</title>
 
-      <para>Before beginning the build, unpack the
-      <application>FOP</application> source tarball and the hyphenation zipfile
-      from the same directory, then change directories into the root of the
-      <application>FOP</application> source tree. Copy the XML hyphenation
-      patterns into the <application>FOP</application> source tree by
-      running the following commands:</para>
+      <para>First, unpack the <application>fop</application> source tarball and
+      the hyphenation zipfile from the same directory, then change directories
+      into the root of the <application>fop</application> source tree. Copy the
+      XML hyphenation patterns into the <application>fop</application> source
+      tree by running the following commands:</para>
 
 <screen><userinput>cp ../offo-hyphenation/hyph/* hyph &amp;&amp;
@@ -159,35 +159,27 @@
 
     <sect3>
-      <title>Installing JAI</title>
-
-      <tip>
-        <para>The <command>$FOP_PKG_DIR/jai-&jai-version;-lib-linux-i586-jdk.bin</command>
-        command below installs the JAI components in the JDK tree. You will be
-        required to view, and then accept (by entering a <keycap>y</keycap>
-        keypress), a license agreement before the installation will continue.
-        If you are scripting (automating) the build, you'll need to account for
-        this. There is information about automating build commands in the
-        <xref linkend="automating-builds"/> section of Chapter 2. Towards the
-        end of this section, specific information for automating this type of
-        installation is discussed.</para>
-      </tip>
-
-      <para>Install the JAI components by running the following commands as
-      the <systemitem class="username">root</systemitem> user while in the
-      root of the <application>FOP</application> source tree:</para>
-
-<!-- JAI make tail +nnn only for SunOS now
-<screen role="root"><userinput>install -m755 ../jai-&jai-version;-lib-linux-i586-jdk.bin JAI.bin &amp;&amp;
-sed -i 's/tail +122/tail -n +122/' JAI.bin &amp;&amp;
--->
-<screen role="root"><userinput>FOP_PKG_DIR=$(pwd)/.. &amp;&amp;
-pushd $JAVA_HOME &amp;&amp;
-sh $FOP_PKG_DIR/jai-&jai-version;-lib-linux-i586-jdk.bin &amp;&amp;
-popd</userinput></screen>
+      <title>Installing Java Advanced Imaging (JAI) API components</title>
+
+      <para>Next install the JAI API components. As the <systemitem
+      class="username">root</systemitem> user:</para>
+
+<screen><userinput>case `uname -m` in
+  i?86)   
+    tar -xf ../jai-&jai-version;-lib-linux-i586.tar.gz  
+    cp -v jai-&jai-version;/lib/{jai*,mlibwrapper_jai.jar} $JAVA_HOME/jre/lib/ext/
+    cp -v jai-&jai-version;/lib/libmlib_jai.so             $JAVA_HOME/jre/lib/i386/
+    ;;
+
+  x86_64) 
+    tar -xf ../jai-&jai-version;-lib-linux-amd64.tar.gz 
+    cp -v jai-&jai-version;/lib/{jai*,mlibwrapper_jai.jar} $JAVA_HOME/jre/lib/ext/
+    cp -v jai-&jai-version;/lib/libmlib_jai.so             $JAVA_HOME/jre/lib/amd64/
+    ;;
+esac</userinput></screen>
 
     </sect3>
 
     <sect3>
-      <title>Installing FOP Components</title>
+      <title>Installing fop Components</title>
 
       <para>If <application>Forrest</application> is not installed, remove
@@ -197,5 +189,5 @@
        -e '\#${dist.bin.result.dir}/docs#,\#&lt;/copy&gt;#d' build.xml</userinput></screen>
 
-      <para>Compile <application>FOP</application> by running the
+      <para>Compile <application>fop</application> by running the
       following commands:</para>
 
@@ -218,17 +210,4 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
-
-    <para><command>FOP_PKG_DIR=$(pwd)/..</command>: This assumes that the
-    source packages are stored one level above the current working directory.
-    This is always the default; but may be different because of personal
-    taste. If necessary, change this to match the directory where the
-    <application>FOP</application> tarball can be found.</para>
-
-    <para><command>sh
-    $FOP_PKG_DIR/jai-&jai-version;-lib-linux-i586-jdk.bin</command>: This
-    command installs the <application>JAI</application> components
-    into the <application>JDK</application> file structure.
-    <envar>$FOP_PKG_DIR</envar> is used as a reference point to the source
-    executable.</para>
 
     <para><command>ant dist</command>: This reads the
@@ -236,5 +215,5 @@
     builds the package and runs the unit regression tests. It also creates the
     Java API documentation and a directory where the newly created binaries
-    are placed. This directory is used to install <application>FOP</application>
+    are placed. This directory is used to install <application>fop</application>
     into its final place.</para>
 
@@ -246,5 +225,5 @@
 
   <sect2 role="configuration">
-    <title>Configuring FOP</title>
+    <title>Configuring fop</title>
 
     <sect3 id="fop-config">
@@ -262,5 +241,5 @@
       <title>Configuration Information</title>
 
-      <para>Using <application>FOP</application> to process some large FO's
+      <para>Using <application>fop</application> to process some large FO's
       (including the FO derived from the BLFS XML sources), can lead to memory
       errors. Unless you add a parameter to the <command>java</command> command
@@ -280,5 +259,5 @@
       <para>The <command>fop</command> script looks for a
       <envar>FOP_HOME</envar> environment variable to locate the
-      <application>FOP</application> class libraries. You can create this
+      <application>fop</application> class libraries. You can create this
       variable using the <filename>~/.foprc</filename> file as well. Create
       a <filename>~/.foprc</filename> file using the following commands:</para>
@@ -294,5 +273,5 @@
       megabytes). An example would be
       <userinput>FOP_OPTS="-Xmx768m"</userinput>. For more information about
-      memory issues running <application>FOP</application>, see
+      memory issues running <application>fop</application>, see
       <ulink url="http://xml.apache.org/fop/running.html#memory"/>.</para>
 
@@ -333,5 +312,5 @@
         <listitem>
           <para>is a wrapper script to the <command>java</command> command
-          which sets up the <application>FOP</application>
+          which sets up the <application>fop</application>
           environment and passes the required parameters.</para>
           <indexterm zone="fop fop-prog">
@@ -344,5 +323,5 @@
         <term><filename class='libraryfile'>fop.jar</filename></term>
         <listitem>
-          <para>contains all the <application>FOP</application>
+          <para>contains all the <application>fop</application>
           <application>Java</application> classes.</para>
           <indexterm zone="fop fop.jar">
