Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 526148016fff4c6b0f3a8f7e3927ce9c76f5ed77)
+++ introduction/welcome/changelog.xml	(revision 34c58817565c0735a93efd255ab56dd502fec135)
@@ -45,4 +45,13 @@
       <para>April 9th, 2008</para>
       <itemizedlist>
+        <listitem>
+          <para>[dj] - Updated OpenOffice instructions with changes suggested
+          by Randy McMurchy and Chris Staub.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Corrected OpenOffice build failure when GMime is
+          installed.  Thanks to Alessandro Alocci for traking down the
+          cause of the build failure.</para>
+        </listitem>
         <listitem>
           <para>[randy] - Clarified the GMP documentation installation.</para>
Index: xsoft/suites/openoffice.xml
===================================================================
--- xsoft/suites/openoffice.xml	(revision 526148016fff4c6b0f3a8f7e3927ce9c76f5ed77)
+++ xsoft/suites/openoffice.xml	(revision 34c58817565c0735a93efd255ab56dd502fec135)
@@ -7,14 +7,14 @@
   <!-- <!ENTITY openoffice-download-http "http://download.openoffice.org/&openoffice-version;/source.html"> -->
   <!-- <!ENTITY openoffice-download-ftp  "ftp://ftp.ussg.iu.edu/pub/openoffice/stable/&openoffice-version;/OOo_&openoffice-version;_src.tar.gz"> -->
-  <!ENTITY openoffice-core-download-http "http://ftp.osuosl.org/pub/openoffice/stable/&openoffice-version;/OOo_&openoffice-version;_src_core.tar.bz2">
-  <!ENTITY openoffice-core-download-ftp  "ftp://ftp.osuosl.org/pub/openoffice/stable/&openoffice-version;/OOo_&openoffice-version;_src_core.tar.bz2">
-  <!ENTITY openoffice-core-md5sum        "9555a2d5fae9a25c788cc732921ef57a">
-  <!ENTITY openoffice-core-size          "138 MB">
+  <!ENTITY openoffice-core-download-http   "http://ftp.osuosl.org/pub/openoffice/stable/&openoffice-version;/OOo_&openoffice-version;_src_core.tar.bz2">
+  <!ENTITY openoffice-core-download-ftp    "ftp://ftp.osuosl.org/pub/openoffice/stable/&openoffice-version;/OOo_&openoffice-version;_src_core.tar.bz2">
+  <!ENTITY openoffice-core-md5sum          "9555a2d5fae9a25c788cc732921ef57a">
+  <!ENTITY openoffice-core-size            "138 MB">
   <!ENTITY openoffice-system-download-http "http://ftp.osuosl.org/pub/openoffice/stable/&openoffice-version;/OOo_&openoffice-version;_src_system.tar.bz2">
-  <!ENTITY openoffice-system-download-ftp "ftp://ftp.osuosl.org/pub/openoffice/stable/&openoffice-version;/OOo_&openoffice-version;_src_system.tar.bz2">
-  <!ENTITY openoffice-system-md5sum "1e20befe2fdb65c00be11f1f5d9ebdca">
-  <!ENTITY openoffice-system-size "36 MB">
-  <!ENTITY openoffice-buildsize     "4.3 GB">
-  <!ENTITY openoffice-time          "75 SBU">
+  <!ENTITY openoffice-system-download-ftp  "ftp://ftp.osuosl.org/pub/openoffice/stable/&openoffice-version;/OOo_&openoffice-version;_src_system.tar.bz2">
+  <!ENTITY openoffice-system-md5sum        "1e20befe2fdb65c00be11f1f5d9ebdca">
+  <!ENTITY openoffice-system-size          "36 MB">
+  <!ENTITY openoffice-buildsize            "4.2-4.8 GB (depending on configured options)">
+  <!ENTITY openoffice-time                 "75-100 SBU (depending on configured options)">
 ]>
 
@@ -65,5 +65,4 @@
         <para>OpenOffice System Download size: &openoffice-system-size;</para>
       </listitem>
-
       <listitem>
         <para>Estimated disk space required: &openoffice-buildsize;</para>
@@ -76,5 +75,4 @@
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing='compact'>
-
       <listitem>
         <para>Required patch:
@@ -82,17 +80,17 @@
         </para>
       </listitem>
-
-      <listitem>
-        <para>Required download if you wish to build the in-tree
+      <listitem>
+        <para>Optional download if you wish to build the in-tree
         <application>Mozilla</application> browser:
         <ulink url="ftp://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/mozilla1.7.5/source/mozilla-source-1.7.5.tar.gz"/></para>
       </listitem>
-
       <listitem>
         <para>Optional download if you wish to build the 
         <application>OpenOffice</application> SDK:
-        <ulink url="ftp://ftp.osuosl.org/pub/openoffice/stable/&openoffice-version;/OOo_&openoffice-version;_src_sdk.tar.bz2"/></para>
-      </listitem>
-
+        <ulink url="ftp://ftp.osuosl.org/pub/openoffice/stable/&openoffice-version;/OOo_&openoffice-version;_src_sdk.tar.bz2"/>
+        which also requires <ulink url="http://www.mingw.org/">MinGW</ulink>
+        or a precompiled <filename>unowinreg.dll</filename> for the
+        cross-platform <application>Java</application> components.</para>
+      </listitem>
       <listitem>
         <para>Optional download if you would like to localize the
@@ -100,5 +98,4 @@
         <ulink url="ftp://ftp.osuosl.org/pub/openoffice/stable/&openoffice-version;/OOo_&openoffice-version;_src_l10n.tar.bz2"/></para>
       </listitem>
-
       <listitem>
         <para>Optional download if you need to support the old 
@@ -106,5 +103,4 @@
         <ulink url="ftp://ftp.osuosl.org/pub/openoffice/stable/&openoffice-version;/OOo_&openoffice-version;_src_binfilter.tar.bz2"/></para>
       </listitem>
-
     </itemizedlist>
 
@@ -115,5 +111,4 @@
     <xref linkend="gtk2"/>,
     <xref linkend="libidl"/>,
-    <xref linkend="libxml2"/>,
     <application>Perl Modules</application>
     <xref linkend="perl-xml-parser"/> and
@@ -124,5 +119,6 @@
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended"><xref linkend="libart_lgpl"/></para>
+    <para role="recommended"><xref linkend="libart_lgpl"/> and
+    <xref linkend="libxslt"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
@@ -132,5 +128,5 @@
     <xref linkend="cups"/>,
     <xref linkend="curl"/>,
-    <xref linkend="db"/> (with Java support), 
+    <xref linkend="db"/> (built with Java support), 
     <xref linkend="desktop-file-utils"/>,
     <ulink url="http://www.easysw.com/epm/">EPM</ulink>,
@@ -169,7 +165,8 @@
     distributed in several tarballs.  You should extract each from the
     same top-level directory before entering the build directory.  At
-    a minimum, you will need to extract the src and core tarballs.
-    Additionally, the source directory name is not consistent with
-    the tarball name and will be named OOG680_m9.</para>
+    a minimum, you will need to extract the <quote>core</quote> and
+    <quote>system</quote> tarballs. Note that the source directory name
+    is not consistent with the tarball name and will be named
+    <filename class='directory'>OOG680_m9</filename>.</para>
 
     <para>If you wish to build an in-tree <application>Mozilla</application>,
@@ -188,31 +185,18 @@
     custom optimizations.</para>
 
-    <note><para>Because of the complexity of the
-    <application>OpenOffice</application> build system, it is not possible to
-    provide generic build instructions for all systems.  You should review
-    the output of <command>config_office/configure --help</command> and take
-    advantage of any system installed programs and libraries available using
-    the <parameter>--enable-*</parameter>, <parameter>--disable-*</parameter>,
-    and <parameter>--with-system-*</parameter> parameters.  Additionally, if
-    you have installed <application>KDE</application> in the
-    <filename>/opt</filename> prefix, and would like to use the
-    <parameter>--enable-kde</parameter> switch, you must set
-    <command>KDEDIR=$KDE_PREFIX</command> before running
-    configure.</para></note>
-
-    <para>Configure <application>OpenOffice</application> using the following
-    commands:</para>
-
-<screen><userinput>cd config_office/ &amp;&amp;
-./configure --prefix=/opt/openoffice-&openoffice-version; \
-    --enable-libart --disable-fontooo --disable-gnome-vfs \
-    --without-fonts --without-system-jars --without-pam \
-    --with-system-stdlibs --with-system-freetype \
-    --with-system-expat --with-system-libxml --with-system-zlib \
-    --enable-cairo --enable-build-mozilla \
-    --with-build-version=BLFS --with-package-format=native \
-    --disable-binfilter --disable-odk --disable-qadevooo \
-    --with-use-shell=bash &amp;&amp;
-cd ..</userinput></screen>
+    <note>
+      <para>Because of the complexity of the
+      <application>OpenOffice</application> build system, it is not possible to
+      provide generic build instructions for all systems.  You should review
+      the output of <command>config_office/configure --help</command> and take
+      advantage of any system installed programs and libraries available using
+      the <parameter>--enable-*</parameter>, <parameter>--disable-*</parameter>,
+      and <parameter>--with-system-*</parameter> parameters.  Additionally, if
+      you have installed <application>KDE</application> in the
+      <filename class='directory'>/opt</filename> prefix, and would like to use the
+      <parameter>--enable-kde</parameter> switch, you must set
+      <command>KDEDIR=$KDE_PREFIX</command> before running
+      <command>configure</command>.</para>
+    </note>
 
     <para><application>OpenOffice</application> fails to compile if
@@ -225,40 +209,61 @@
 unset LANG LC_ALL</userinput></screen>
 
-    <para>Compile <application>OpenOffice</application> using the following
-    commands:</para>
+    <para>Install <application>OpenOffice</application> by running the
+    following commands:</para>
 
 <screen><userinput>patch -Np1 -i ../OOo_&openoffice-version;-use_bin_hsqldb-1.patch &amp;&amp;
+
+sed 's@..\$/dist\$/configure@uudecode="no" ..\$/dist\$/configure@' \
+    -i berkeleydb/makefile.mk &amp;&amp;
+
+pushd config_office &amp;&amp;
+./configure --prefix=/opt/openoffice-&openoffice-version; \
+            --enable-libart                \
+            --disable-fontooo              \
+            --disable-gnome-vfs            \
+            --without-fonts                \
+            --without-system-jars          \
+            --without-pam                  \
+            --with-system-stdlibs          \
+            --with-system-freetype         \
+            --with-system-expat            \
+            --with-system-libxml           \
+            --with-system-libxslt          \
+            --with-system-zlib             \
+            --enable-cairo                 \
+            --enable-build-mozilla         \
+            --with-build-version=BLFS      \
+            --with-package-format=native   \
+            --disable-binfilter            \
+            --disable-odk                  \
+            --disable-qadevooo             \
+            --with-use-shell=bash &amp;&amp;
+popd &amp;&amp;
+
 ./bootstrap &amp;&amp;
-. LinuxX86Env.Set.sh &amp;&amp;
+source LinuxX86Env.Set.sh &amp;&amp;
 dmake</userinput></screen>
 
     <para>This package does not come with a test suite.</para>
 
-    <para>Install <application>OpenOffice</application> as the
-    <systemitem class="username">root</systemitem> user with the
-    following commands:</para>
+    <para>Now, as the <systemitem class="username">root</systemitem>
+     user:</para>
 
 <screen role="root"><userinput>pushd instsetoo_native/unxlngi6.pro/OpenOffice/\
 native/install/en-US/linux-2.6-intel/buildroot/opt &amp;&amp;
 cp -r -v openoffice.org2.3 /opt/openoffice-&openoffice-version; &amp;&amp;
-popd</userinput></screen>
-
-    <para>Still as the <systemitem class="username">root</systemitem>
-    user:</para>
-
-<screen role="root"><userinput>for appl in sbase scalc sdraw simpress smath soffice spadmin swriter
+popd &amp;&amp;
+
+for appl in sbase scalc sdraw simpress smath soffice spadmin swriter
 do
     ln -v -sf /opt/openoffice-&openoffice-version;/program/$appl /usr/bin/$appl
-done</userinput></screen>
-
-    <para>The icons are not installed by default.  While still the
-    <systemitem class="username">root</systemitem> user, install the icons
-    with the following commands:</para>
-
-<screen role="root"><userinput>cd sysui/desktop/icons &amp;&amp;
-install -v -d /usr/share/icons/{HighContrast,hicolor,locolor} -m755 &amp;&amp;
+done &amp;&amp;
+
+pushd sysui/desktop/icons &amp;&amp;
+install -v -m755 -d /usr/share/icons/{HighContrast,hicolor,locolor} &amp;&amp;
 cp -r -v HighContrast/*x* /usr/share/icons/HighContrast &amp;&amp;
-cp -r -v hicolor/*x* /usr/share/icons/hicolor &amp;&amp;
-cp -r -v locolor/*x* /usr/share/icons/locolor</userinput></screen>
+cp -r -v hicolor/*x*      /usr/share/icons/hicolor &amp;&amp;
+cp -r -v locolor/*x*      /usr/share/icons/locolor &amp;&amp;
+popd</userinput></screen>
 
     <para>If you have installed <xref linkend="desktop-file-utils"/>, you
@@ -267,22 +272,23 @@
     commands as the <systemitem class="username">root</systemitem> user:</para>
 
-<screen role="root"><userinput>install -v -d /usr/share/applications -m 755 &amp;&amp;
-cd /opt/openoffice-&openoffice-version;/share/xdg/ &amp;&amp;
+<screen role="root"><userinput>install -v -d -m755 /usr/share/applications &amp;&amp;
+pushd /opt/openoffice-&openoffice-version;/share/xdg/ &amp;&amp;
 for appl in *.desktop
 do
-    sed -i '/Exec/d' $appl
-    echo "Exec=/usr/bin/s`echo $appl | sed 's/.desktop//'`" >> $appl
-    sed -i '/Icon/d' $appl
+    sed -i '/Exec/d' $appl &amp;&amp;
+    echo "Exec=/usr/bin/s`echo $appl | sed 's/.desktop//'`" >> $appl &amp;&amp;
+    sed -i '/Icon/d' $appl &amp;&amp;
     echo "Icon=`echo $appl | sed 's/.desktop//'`" >> $appl
 done &amp;&amp;
 sed -i 's@bin/sprinteradmin@bin/spadmin@' printeradmin.desktop &amp;&amp;
 cp -v *.desktop /usr/share/applications &amp;&amp;
-update-desktop-database</userinput></screen>
+update-desktop-database &amp;&amp;
+popd</userinput></screen>
 
     <para>Finally, if you'd like to edit <application>OpenOffice</application>
     documents directly from <xref linkend="seamonkey"/> or
     <xref linkend="firefox"/>, create a symbolic link in your
-    plugins directory to
-    <filename>/opt/openoffice-&openoffice-version;/program/libnpsoplugin.so</filename>.
+    plugins directory to <filename
+    class='libraryfile'>/opt/openoffice-&openoffice-version;/program/libnpsoplugin.so</filename>.
     Additionally, you must enable the plugin from the
     <parameter>Internet Options</parameter> within any
@@ -294,11 +300,16 @@
     <title>Command Explanations</title>
 
+    <para><command>sed 's@..\$dist\$/configure@uudecode="no"...'</command>: 
+    This command corrects a build failure when a faulty
+    <command>uudecode</command>, provided by <xref linkend="gmime"/>, is 
+    installed.</para>
+
     <para><parameter>--enable-*</parameter>: The switches listed in the
-    example configure command above force the use of system installed
-    libraries that are known to be available on a BLFS system that meets
-    the required and recommended dependencies.</para>
+    example <command>configure</command> command above force the use of system
+    installed libraries that are known to be available on a BLFS system that
+    meets the required and recommended dependencies.</para>
 
     <para><parameter>--disable-fontooo</parameter>: Use
-    <application>Fontconfig</application> instead of FontOOo.</para>
+    <application>Fontconfig</application> instead of the FontOOo.</para>
 
     <para><parameter>--disable-gnome-vfs</parameter>: Disable the use of
@@ -307,6 +318,6 @@
 
     <para><parameter>--without-fonts</parameter>: Do not install Bitstream
-    Vera fonts since they are already included in X Window System
-    Environment.</para>
+    Vera fonts since they are already included in the
+    <application>X</application> Window System Environment.</para>
 
     <para><parameter>--with{,out}-system-*</parameter>: Determines
@@ -321,6 +332,6 @@
     <application>Mozilla</application> suite.</para>
 
-    <para><parameter>--with-build-version=BLFS</parameter>: Appends "BLFS"
-    to the end of the version string.</para>
+    <para><parameter>--with-build-version=BLFS</parameter>: Appends
+    <quote>BLFS</quote> to the end of the version string.</para>
 
     <para><parameter>--with-package-format=native</parameter>: This switch
@@ -331,5 +342,6 @@
     <para><parameter>--disable-binfilter</parameter>: This switch disables
     the build of legacy <application>StarOffice-5</application> import
-    filters.  Omit this switch if you've downloaded the binfilter package
+    filters.  Omit this switch if you've downloaded the
+    <application>binfilter</application> package
     above.  Warning: Installation of the legacy import filters increases the
     build time considerably.  Only install them if you have these old
@@ -339,5 +351,5 @@
     <para><parameter>--disable-odk</parameter>: This switch disables the build
     of the <application>OpenOffice</application> SDK.  Omit this switch if
-    you've downloaded the sdk package above.</para>
+    you've downloaded the SDK package above.</para>
 
     <para><parameter>--disable-qadevooo</parameter>: This switch skips
@@ -362,20 +374,26 @@
     <parameter>--with-lang=<replaceable>&lt;LANG&gt;</replaceable></parameter>:
     Allows the use of additional languages in 
-    <application>OpenOffice</application>. ENUS is the default.</para>
+    <application>OpenOffice</application>. US English (ENUS) is the
+    default.</para>
 
     <para>
     <parameter>--with-dict=<replaceable>&lt;LANG&gt;</replaceable></parameter>:
     Allows the use of alternate dictionaries in
-    <application>OpenOffice</application>. ENUS is the default.</para>
+    <application>OpenOffice</application>. US English (ENUS) is the
+    default.</para>
 
     <para><parameter>--with-use-shell=bash</parameter>: Tells the 
-    <application>OpenOffice</application> build system to use bash as opposed
-    to tcsh.</para>
+    <application>OpenOffice</application> build system to use
+    <command>bash</command> as opposed to <command>tcsh</command>.</para>
 
     <para><command>./bootstrap</command>: Build the
-    <application>dmake</application> utility required to complete the
+    <command>dmake</command> utility required to complete the
     build.</para>
 
     <para><command>dmake</command>: Compiles the package.</para>
+
+    <para><command>for appl in sbase scalc...</command>: Creates symlinks
+    for the applicatons in
+    <filename class="directory">/usr/bin</filename>.</para>
 
     <para><command>for appl in *.desktop...</command>: Edit the
