Index: xsoft/suites/openoffice.xml
===================================================================
--- xsoft/suites/openoffice.xml	(revision de2551fb743816c800972d513a8a5128197bc1db)
+++ xsoft/suites/openoffice.xml	(revision cb612ee6eeae68522515b4b23ef753c072733211)
@@ -9,12 +9,12 @@
   <!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-md5sum          "4fa713fb796bc57e5eb9dfb0758adda0">
+  <!ENTITY openoffice-core-size            "205 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.2-4.8 GB (depending on configured options)">
-  <!ENTITY openoffice-time                 "75-100 SBU (depending on configured options)">
+  <!ENTITY openoffice-system-md5sum        "e6405c8108bdcf4cc2bf066d88aa5ae1">
+  <!ENTITY openoffice-system-size          "59 MB">
+  <!ENTITY openoffice-buildsize            "4.9-7.3 GB (depending on configured options)">
+  <!ENTITY openoffice-time                 "96-109 SBU (depending on configured options)">
 ]>
 
@@ -77,19 +77,10 @@
       <listitem>
         <para>Required patch:
-        <ulink url="&patch-root;/OOo_&openoffice-version;-use_bin_hsqldb-1.patch"/>
+        <ulink url="&patch-root;/OOo_&openoffice-version;-build_with_db5-1.patch"/>
         </para>
       </listitem>
       <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"/>
-        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>
+        <para>Required download:
+        <ulink url="ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/1.1.14/seamonkey-1.1.14.source.tar.bz2"/></para>
       </listitem>
       <listitem>
@@ -100,9 +91,18 @@
       <listitem>
         <para>Optional download if you need to support the old
-        <application>StarOffice-5.x</application> file formats:
+        <application>StarOffice-5.2</application> file formats:
         <ulink url="ftp://ftp.osuosl.org/pub/openoffice/stable/&openoffice-version;/OOo_&openoffice-version;_src_binfilter.tar.bz2"/></para>
       </listitem>
+      <listitem>
+        <para>Optional download if you want to build additional extensions
+        for <application>OpenOffice</application>:
+        <ulink url="ftp://ftp.osuosl.org/pub/openoffice/stable/&openoffice-version;/OOo_&openoffice-version;_src_extensions.tar.bz2"/></para>
+      </listitem>
+      <listitem>
+        <para>Optional download if you want to build the office development kit
+        (cross platform requirement is not optional):
+        <ulink url="http://tools.openoffice.org/unowinreg_prebuild/680/unowinreg.dll"/></para>
+      </listitem>
     </itemizedlist>
-
     <bridgehead renderas="sect3">OpenOffice Dependencies</bridgehead>
 
@@ -118,8 +118,4 @@
     <xref linkend="zip"/></para>
 
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended"><xref linkend="libart_lgpl"/> and
-    <xref linkend="libxslt"/></para>
-
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional"><ulink
@@ -132,6 +128,5 @@
     <ulink url="http://www.easysw.com/epm/">EPM</ulink>,
     <xref linkend="evolution"/>,
-    <xref linkend="gnome-vfs"/>,
-    <ulink url="http://www.cs.man.ac.uk/~toby/alan/software/">GPC</ulink>,
+    <xref linkend="gnome-vfs"/> (should use --enable-gio instead),
     <xref linkend="kde"/>,
     <xref linkend="libjpeg"/>,
@@ -139,17 +134,14 @@
     <xref linkend="libtiff"/>,
     <ulink url="http://freshmeat.net/projects/libwpd/">libwpd</ulink>,
+    <xref linkend="libxslt"/>,
+    <xref linkend="libxml2"/>,
     <xref linkend="linux-pam"/>,
-    <xref linkend="firefox"/> (with ldap support),
     <ulink url="http://lingucomponent.openoffice.org/MySpell-3.zip">MySpell</ulink>,
     <ulink url="http://lingucomponent.openoffice.org/thesaurus.html">MyThes</ulink>,
-    <xref linkend="nas"/>,
     <ulink url="http://www.webdav.org/neon/">neon</ulink>,
     <xref linkend="openldap"/>,
-    <ulink url="http://www.portaudio.com/">PortAudio</ulink>,
     <xref linkend="python"/>,
-    <ulink url="http://www.gingerall.com/charlie/ga/xml/p_sab.xml">Sablotron</ulink>,
     <xref linkend="sane"/>,
-    <xref linkend="startup-notification"/>,
-    <ulink url="http://sourceforge.net/projects/stlport/">STLPort</ulink>, and
+    <xref linkend="startup-notification"/>, and
     <xref linkend="unixodbc"/></para>
 
@@ -162,5 +154,5 @@
     <title>Installation of OpenOffice</title>
 
-    <para>The <application>OpenOffice</application> source code is now
+    <para>The <application>OpenOffice</application> source code is
     distributed in several tarballs.  You should extract each from the
     same top-level directory before entering the build directory.  At
@@ -168,20 +160,23 @@
     <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>,
-    as opposed to using a system wide installation, copy the
-    <application>Mozilla</application> source tarball into the source
-    tree:</para>
-
-<screen><userinput>cp ../mozilla-source-1.7.5.tar.gz moz/download/</userinput></screen>
+    <filename class='directory'>OOO320_m19</filename>.</para>
+
+    <para>It is possible to build with a system-installed
+    <application>Mozilla</application>, however, it requires a very intrusive
+    patch, and is version specific.  Additionally, you'll need to build against
+    <xref linkend="seamonkey"/> or <xref linkend="thunderbird"/> for full
+    LDAP and address book functionality.  Instead, use the in-tree
+    <application>Seamonkey</application> build.  Copy the tarball into
+    the source tree with the following command:</para>
+
+<screen><userinput>cp ../seamonkey-1.1.14-source.tar.bz2 moz/download/</userinput></screen>
 
     <para>If you want to optimize the build, edit the appropriate makefile in
     <filename>solenv/inc/</filename> and add the desired optimization
     flags to the <envar>CFLAGSOPT</envar> variable. The makefiles are arch
-    specific, for instance edit <filename>solenv/inc/unxlngi6.mk</filename>
-    for i686.  Some users have reported problems with
-    <option>-fomit-frame-pointer</option>. The best option is to not use any
-    custom optimizations.</para>
+    specific, for instance edit <filename>unxlngi6.mk</filename> for i686, or
+    <filename>unxlngx6.mk</filename> for x86_64.  Some users have reported
+    problems with <option>-fomit-frame-pointer</option>. The best option is to
+    not use any custom optimizations.</para>
 
     <note>
@@ -189,13 +184,9 @@
       <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>
+      the output of <command>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, and provide any
+      additional environment variables needed.</para>
     </note>
 
@@ -212,36 +203,32 @@
     following commands:</para>
 
-<screen><userinput>patch -Np1 -i ../OOo_&openoffice-version;-use_bin_hsqldb-1.patch &amp;&amp;
-
+<!-- uudecode didn't fuss...but left in for reference
 sed -i 's@..$/dist$/configure@uudecode="no" &amp;@' \
     berkeleydb/makefile.mk &amp;&amp;
-
-pushd config_office &amp;&amp;
-./configure --prefix=/opt/openoffice-&openoffice-version; \
-            --enable-libart                \
+-->
+
+<screen><userinput>patch -Np1 -i ../OOo_&openoffice-version;-with-system-db5-1.patch &amp;&amp;
+autoreconf &amp;&amp;
+PKG_CONFIG=/usr/bin/pkg-config ./configure \
+            --disable-binfilter            \
             --disable-fontooo              \
             --disable-gnome-vfs            \
+            --disable-odk                  \
+            --disable-qadevooo             \
+            --enable-cairo                 \
+            --without-afms                 \
             --without-fonts                \
-            --without-system-jars          \
+            --without-ppds                 \
             --without-pam                  \
             --with-system-stdlibs          \
-            --with-system-freetype         \
+            --with-system-cairo            \
             --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-vendor="BLFS"           \
             --with-use-shell=bash &amp;&amp;
-popd &amp;&amp;
-
+source LinuxX86Env.Set.sh &amp;&amp;
 ./bootstrap &amp;&amp;
-source LinuxX86Env.Set.sh &amp;&amp;
-dmake</userinput></screen>
+make</userinput></screen>
 
     <para>This package does not come with a test suite.</para>
@@ -250,7 +237,9 @@
      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;
+<screen role="root"><userinput>pushd instsetoo_native/unxlng?6.pro/OpenOffice/\
+native/install/en-US/linux-2.6-*/buildroot/opt &amp;&amp;
+cp -r -v openoffice.org3 /opt/openoffice-&openoffice-version; &amp;&amp;
+cp -r -v openoffice.org/* /opt/openoffice-&openoffice-version; &amp;&amp;
+ln -sf basis3.2 /opt/openoffice-&openoffice-version;/basis-link &amp;&amp;
 popd &amp;&amp;
 
@@ -261,8 +250,7 @@
 
 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 &amp;&amp;
+install -v -m755 -d /usr/share/icons/{hicolor,locolor} &amp;&amp;
+cp -r -v hicolor/* /usr/share/icons/hicolor &amp;&amp;
+cp -r -v locolor/* /usr/share/icons/locolor &amp;&amp;
 popd</userinput></screen>
 
@@ -301,43 +289,7 @@
     <title>Command Explanations</title>
 
-    <para><command>sed 's@..\$dist\$/configure@uudecode="no"...'</command>:
-    This command corrects a build failure if a faulty
-    <command>uudecode</command> program provided by the <xref linkend="gmime"/>
-    package is installed.</para>
-
-    <para><parameter>--enable-*</parameter>: The switches listed in the
-    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 the FontOOo.</para>
-
-    <para><parameter>--disable-gnome-vfs</parameter>: Disable the use of
-    <application>Gnome Virtual File System</application> libraries.  Omit
-    this switch if you have Gnome installed.</para>
-
-    <para><parameter>--without-fonts</parameter>: Do not install Bitstream
-    Vera fonts since they are already included in the
-    <application>X</application> Window System Environment.</para>
-
-    <para><parameter>--with{,out}-system-*</parameter>: Determines
-    whether to use the system libraries and programs or to build
-    the source packages included in the build tree.</para>
-
-    <para><parameter>--without-pam</parameter>: Disable the use of
-    <application>Linux-PAM</application> functions.  Omit this switch if
-    <application>Linux-PAM</application> is installed.</para>
-
-    <para><parameter>--enable-build-mozilla</parameter>: Build the in-tree
-    <application>Mozilla</application> suite.</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
-    forces the build to skip the packaging process, leaving only the
-    temporary installation that would be used for packaging.  This temporary
-    installation is later copied directly to the final destination.</para>
+    <para><envar>PKG_CONFIG=/usr/bin/pkg-config</envar>:
+    This variable must be set as the version check in
+    <filename>configure</filename> is broken.</para>
 
     <para><parameter>--disable-binfilter</parameter>: This switch disables
@@ -350,4 +302,11 @@
     <application>OpenOffice</application>.</para>
 
+    <para><parameter>--disable-fontooo</parameter>: Use
+    <application>Fontconfig</application> instead of the FontOOo.</para>
+
+    <para><parameter>--disable-gnome-vfs</parameter>: Disable the use of
+    <application>Gnome Virtual File System</application> libraries.  Omit
+    this switch only if gio is not available.</para>
+
     <para><parameter>--disable-odk</parameter>: This switch disables the build
     of the <application>OpenOffice</application> SDK.  Omit this switch if
@@ -359,17 +318,39 @@
     <application>OpenOffice</application> development teams.</para>
 
-    <para>
-    <parameter>--with-system-mozilla=<replaceable>&lt;type&gt;</replaceable>
-    </parameter>: Enables the use of a system installed
-    <application>gecko</application> or <application>XULRunner</application>
-    engine in place of the full <application>Mozilla</application> suite.
-    This will disable the use of a <application>Thunderbird</application>
-    address book as a data source.  If you omit the type of installation,
-    <command>configure</command> defaults to and searches for a working
-    <application>XULRunner</application> installation and will fail if
-    one is not found.</para>
-
-    <para><parameter>--disable-cups</parameter>: Disable the use of
-    <application>CUPS</application> for printing.</para>
+    <para><parameter>--enable-cairo</parameter>: This switch listed in the
+    example <command>configure</command> command above forces the use of the
+    system installed cairo.</para>
+
+    <para><parameter>--without-afms</parameter>: Do not install afm font types
+    as system installed TrueType fonts are already available.</para>
+
+    <para><parameter>--without-fonts</parameter>: Do not install Bitstream
+    Vera fonts since they are already included in the
+    <application>X</application> Window System Environment.</para>
+
+    <para><parameter>--without-ppds</parameter>: Do not install printer
+    description files as these should be handled by your print system.</para>
+
+    <para><parameter>--without-pam</parameter>: Disable the use of
+    <application>Linux-PAM</application> functions.  Omit this switch if
+    <application>Linux-PAM</application> is installed.</para>
+
+    <para><parameter>--with{,out}-system-*</parameter>: Determines
+    whether to use the system libraries and programs or to build
+    the source packages included in the build tree.</para>
+
+    <para><parameter>--with-build-version="3.2.1-1"</parameter>: Changes the
+    build version to append "-1" to the default version string.</para>
+
+    <para><parameter>--with-vendor="BLFS"</parameter>: Changed the vendor
+    string to "BLFS" in the help->about dialog.</para>
+
+    <para><parameter>--with-use-shell=bash</parameter>: Tells the
+    <application>OpenOffice</application> build system to use
+    <command>bash</command> instead of <command>tcsh</command>.</para>
+
+    <para><command>./bootstrap</command>: Build the
+    <command>dmake</command> utility required to complete the
+    build.</para>
 
     <para>
@@ -392,6 +373,4 @@
     <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
