Index: xsoft/suites/openoffice.xml
===================================================================
--- xsoft/suites/openoffice.xml	(revision 6732c094603c9ccdbb03eaf2fc276a6b1077763b)
+++ xsoft/suites/openoffice.xml	(revision 66bdcaf6e4a53080f0300ce0b981addc696cb4ae)
@@ -7,10 +7,15 @@
   <!-- <!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-download-http "&sources-anduin-http;/o/OOo_&openoffice-version;_src.tar.gz">
-  <!ENTITY openoffice-download-ftp  "&sources-anduin-ftp;/o/OOo_&openoffice-version;_src.tar.gz">
-  <!ENTITY openoffice-md5sum        "f68832ff3458664ae2b741ec67d30104">
-  <!ENTITY openoffice-size          "294 MB">
-  <!ENTITY openoffice-buildsize     "6 GB">
-  <!ENTITY openoffice-time          "129 SBU">
+  <!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        "35d4037ce3a4d19bf52ba72c68ef6756">
+  <!ENTITY openoffice-core-size          "118 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-download-ftp " ">
+  <!ENTITY openoffice-system-md5sum "13967b9599333066466810569a86c366">
+  <!ENTITY openoffice-system-size "30">
+  <!ENTITY openoffice-buildsize     "5.1 GB">
+  <!ENTITY openoffice-time          "76 SBU">
 ]>
 
@@ -38,15 +43,28 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&openoffice-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&openoffice-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &openoffice-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &openoffice-size;</para>
-      </listitem>
+        <para>OpenOffice Core Download (HTTP): <ulink url="&openoffice-core-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>OpenOffice Core Download (FTP): <ulink url="&openoffice-core-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>OpenOffice Core Download MD5 sum: &openoffice-core-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>OpenOffice Core Download size: &openoffice-core-size;</para>
+      </listitem>
+      <listitem>
+        <para>OpenOffice System Download (HTTP): <ulink url="&openoffice-system-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>OpenOffice System Download (FTP): <ulink url="&openoffice-system-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>OpenOffice System Download MD5 sum: &openoffice-system-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>OpenOffice System Download size: &openoffice-system-size;</para>
+      </listitem>
+
       <listitem>
         <para>Estimated disk space required: &openoffice-buildsize;</para>
@@ -62,21 +80,5 @@
       <listitem>
         <para>Required patch:
-        <ulink url="&patch-root;/OOo_&openoffice-version;-xauth-1.patch"/>
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>Required patch if
-        <application>Linux-PAM</application>-&linux-pam-version; is not
-        installed:
-        <ulink url="&patch-root;/OOo_&openoffice-version;-no_pam-1.patch"/></para>
-      </listitem>
-
-      <listitem>
-        <para>Required patch if building against the system-installed
-        Mozilla products (<application>NSS</application>,
-        <application>Firefox</application>, or
-        <application>Seamonkey</application>):
-        <ulink url="&patch-root;/OOo_&openoffice-version;-system_mozilla_fixes-1.patch"/>
+        <ulink url="&patch-root;/OOo_&openoffice-version;-use_bin_hsqldb-1.patch"/>
         </para>
       </listitem>
@@ -87,4 +89,23 @@
         <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>
+
+      <listitem>
+        <para>Optional download if you would like to localize the
+        installation:
+        <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 
+        <application>StarOffice-5.x</application> file formats:
+        <ulink url="ftp://ftp.osuosl.org/pub/openoffice/stable/&openoffice-version;/OOo_&openoffice-version;_src_binfilter.tar.bz2"/></para>
+      </listitem>
+
     </itemizedlist>
 
@@ -99,5 +120,4 @@
     <xref linkend="perl-xml-parser"/> and
     <xref linkend="perl-archive-zip"/>,
-    <xref linkend="tcsh"/>,
     <xref linkend="unzip"/>,
     <xref linkend="which"/>, and
@@ -118,5 +138,6 @@
     xalan caching leading to OOM killing the process.  Experimental patches
     exist, but require that libxslt is used in place of xalan....big change,
-    not quite ready for the book. -->
+    not quite ready for the book, and apearently stil not for OOo devs either
+    on this update 2 minor versions later. -->
     <xref linkend="desktop-file-utils"/>,
     <ulink url="http://www.easysw.com/epm/">EPM</ulink>,
@@ -130,6 +151,5 @@
     <ulink url="http://freshmeat.net/projects/libwpd/">libwpd</ulink>,
     <xref linkend="linux-pam"/>,
-    <xref linkend="seamonkey"/> (must be built against the system
-    <xref linkend="nss"/>) or <xref linkend="firefox"/> (with ldap support),
+    <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>,
@@ -153,9 +173,10 @@
     <title>Installation of OpenOffice</title>
 
-    <para>Apply all of the downloaded patches:</para>
-
-<screen><userinput>for PATCH in ../OOo_&openoffice-version;-*.patch
-    do patch -Np1 -i ${PATCH}
-done</userinput></screen>
+    <para>Unlike other BLFS packages, <application>OpenOffice</application>
+    source code is now distributed in several tarballs.  You should extract
+    each from the same top-level directory before entering the build
+    direcotry.  At a minimum, you will need to extract the src and core
+    tarballs. Additionally, the source direcotry name is not consistent
+    with the tarball name amd will be called OOF680_m18.</para>
 
     <para>If you wish to build an in-tree <application>Mozilla</application>,
@@ -172,11 +193,5 @@
     for i686.  Some users have reported problems with
     <option>-fomit-frame-pointer</option>. The best option is to not use any
-    custom optimizations. The following command removes an incorrect
-    <option>-mcpu</option> option in several of the makefiles:</para>
-
-<screen><userinput>sed -i '/^ARCH_FLAGS\*=/d' solenv/inc/unx{lngi{4,5,6},fbsdi}.mk</userinput></screen>
-
-    <para>Configure <application>OpenOffice</application> using the following
-    commands:</para>
+    custom optimizations.</para>
 
     <note><para>Because of the complexity of the
@@ -185,19 +200,28 @@
     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.</para></note>
+    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>
 
     <warning><para>Do not use the <parameter>--with-system-db</parameter>
-    or <parameter>--disable-odk</parameter> switches.  Both are known to
-    cause build failures.</para></warning>
+    switch as it is known to cause build failures related to incompatibilities
+    between the internal and system versions.</para></warning>
+
+    <para>Configure <application>OpenOffice</application> using the following
+    commands:</para>
 
 <screen><userinput>cd config_office/ &amp;&amp;
-autoreconf &amp;&amp;
 ./configure --prefix=/opt/openoffice-&openoffice-version; \
     --enable-libart --disable-fontooo --disable-gnome-vfs \
-    --without-fonts --with-system-stdlibs --with-system-freetype \
-    --with-system-expat --with-system-libxml --with-system-zlib \
-    --enable-build-mozilla --with-build-version=BLFS \
-    --with-package-format=native --disable-binfilter &amp;&amp;
+    --without-fonts --with-system-stdlibs --without-system-jars \
+    --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>
 
@@ -214,6 +238,7 @@
     commands:</para>
 
-<screen><userinput>./bootstrap &amp;&amp;
-. LinuxIntelEnv.Set.sh &amp;&amp;
+<screen><userinput>patch -Np1 -i ../OOo_&openoffice-version;-use_bin_hsqldb-1.patch &amp;&amp;
+./bootstrap &amp;&amp;
+. LinuxX86Env.Set.sh &amp;&amp;
 dmake</userinput></screen>
 
@@ -224,7 +249,8 @@
     following commands:</para>
 
-<screen role="root"><userinput>cd instsetoo_native/unxlngi6.pro/OpenOffice/\
+<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.0 /opt/openoffice-&openoffice-version;</userinput></screen>
+cp -r -v openoffice.org2.2 /opt/openoffice-&openoffice-version; &amp;&amp;
+popd</userinput></screen>
 
     <para>Still as the <systemitem class="username">root</systemitem>
@@ -240,5 +266,5 @@
     with the following commands:</para>
 
-<screen role="root"><userinput>cd ../../../../../../../../../sysui/desktop/icons &amp;&amp;
+<screen role="root"><userinput>cd sysui/desktop/icons &amp;&amp;
 install -v -d /usr/share/icons/{HighContrast,hicolor,locolor} -m755 &amp;&amp;
 cp -r -v HighContrast/*x* /usr/share/icons/HighContrast &amp;&amp;
@@ -246,8 +272,6 @@
 cp -r -v locolor/*x* /usr/share/icons/locolor</userinput></screen>
 
-    <para>If you have installed <xref linkend="desktop-file-utils"/> and use
-    <application>KDE</application>, there is no further configuration
-    necessary.  If you use <application>Gnome</application>, you should copy
-    the <filename>*.desktop</filename> files to
+    <para>If you have installed <xref linkend="desktop-file-utils"/>, you
+    should copy the <filename>*.desktop</filename> files to
     <filename>/usr/share/applications</filename> with the following
     commands as the <systemitem class="username">root</systemitem> user:</para>
@@ -263,9 +287,10 @@
 done &amp;&amp;
 sed -i 's@bin/sprinteradmin@bin/spadmin@' printeradmin.desktop &amp;&amp;
-cp -v *.desktop /usr/share/applications</userinput></screen>
+cp -v *.desktop /usr/share/applications &amp;&amp;
+update-desktop-database</userinput></screen>
 
     <para>Finally, if you'd like to edit <application>OpenOffice</application>
-    documents directly from <application>Mozilla</application> or
-    <application>Firefox</application>, create a symbolic link in your
+    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>.
@@ -279,10 +304,8 @@
     <title>Command Explanations</title>
 
-    <para><parameter>--enable-libart</parameter>: This switch forces the use
-    of libart instead of <application>gpc</application> for polygon
-    clipping.</para>
-
-    <para><parameter>--enable-libsn</parameter>: This switch enables the use
-    of <application>startup-notification</application>.</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>
 
     <para><parameter>--disable-fontooo</parameter>: Use
@@ -297,7 +320,7 @@
     Environment.</para>
 
-    <para><parameter>--with-system-*</parameter>: Use the system libraries
-    and programs instead of building the source packages included in the build
-    tree.</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>--enable-build-mozilla</parameter>: Build the in-tree
@@ -312,5 +335,14 @@
     <para><parameter>--disable-binfilter</parameter>: This switch disables the
     build of legacy <application>StarOffice-5</application> import
-    filters.</para>
+    filters.  Omit this switch if you've downloaded the binfilter package
+    above.</para>
+
+    <para><parameter>--disable-odk</parameter>: This switch disables the build
+    of the <application>OpenOffice</application> SDK.  Ommit this switch if
+    you've downloaded the sdk package above.</para>
+
+    <para><parameter>--disable-qadevooo</parameter>: This switch skips
+    the building of the quality assurance components used by the OOo
+    dev team.</para>
 
     <para><parameter>--with-firefox</parameter>: Enables the use of
@@ -318,5 +350,6 @@
     <application>Mozilla</application> suite.  This will disable the use
     of a <application>Thunderbird</application> address book as a data
-    source.</para>
+    source and also requires that you include the 
+    <parameter>--with-system-mozilla</parameter> switch.</para>
 
     <para><parameter>--disable-cups</parameter>: Disable the use of
@@ -324,9 +357,13 @@
 
     <para><parameter>--with-lang=<replaceable>&lt;LANG&gt;</replaceable></parameter>:
-    Makes an install set for the desired language. ENUS is the default.</para>
+    Allows the use of additional languages in 
+    <application>OpenOffice</application>. ENUS is the default.</para>
 
     <para><parameter>--with-dict=<replaceable>&lt;LANG&gt;</replaceable></parameter>:
-    This switch installs dictionaries for the desired languages. ENUS is
-    the default.</para>
+    Allows the use of alternate dictionaries in
+    <application>OpenOffice</application>. ENUS is the default.</para>
+
+    <para><parameter>--with-use-shell=bash</parameter>: Tells the OOo build
+    system to use bash as opposed to tcsh.</para>
 
     <para><command>./bootstrap</command>: Build the
@@ -334,5 +371,5 @@
     build.</para>
 
-    <para><command>dmake</command>: Compile the package.</para>
+    <para><command>dmake</command>: Compiles the package.</para>
 
     <para><command>for appl in *.desktop...</command>: Edit the
