Index: xsoft/office/abiword.xml
===================================================================
--- xsoft/office/abiword.xml	(revision b675eff3d151734ad595c64f4ac7795787db706c)
+++ xsoft/office/abiword.xml	(revision d19e2c6e83463a0d2ca30072115bf79d0ed8dc5c)
@@ -8,11 +8,11 @@
   "http://www.abisource.com/downloads/abiword/&AbiWord-version;/source/abiword-&AbiWord-version;.tar.gz">
   <!ENTITY AbiWord-download-ftp  " ">
-  <!ENTITY AbiWord-md5sum        "f883b0a7f26229a9c66fd6a1a94381aa">
-  <!ENTITY AbiWord-size          "9 MB">
-  <!ENTITY AbiWord-buildsize     "684 MB">
+  <!ENTITY AbiWord-md5sum        "cb9852ee7245eea41a290e8fe5e2dff2">
+  <!ENTITY AbiWord-size          "10 MB">
+  <!ENTITY AbiWord-buildsize     "484 MB">
   <!ENTITY AbiWord-time          "6.6 SBU">
   <!ENTITY AbiWordDocs-download-http
   "http://www.abisource.com/downloads/abiword/&AbiWord-version;/source/abiword-docs-&AbiWord-version;.tar.gz">
-  <!ENTITY AbiWord-minor-version "2.8">
+  <!ENTITY AbiWord-minor-version "2.9">
 ]>
 
@@ -85,5 +85,5 @@
           documentation on your machine, download
           <ulink url="&AbiWordDocs-download-http;"/> (size 1.4MB md5sum
-          197df94c1d9ed287903cb5aa0b60bbc1). The local files will not be
+          ca0b5bc27d20d542297bffd707b07d63). The local files will not be
           automatically referenced if you do not have a fairly complete gnome
           desktop (epiphany and yelp on their own are not enough), but you can
@@ -97,4 +97,5 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
+      <xref linkend="boost"/>,
       <xref linkend="fribidi"/>,
       <xref linkend="libjpeg"/>,
@@ -111,10 +112,12 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
+      <xref linkend="dbus-glib"/> (for the collab sugar backend),
+      <xref linkend="goffice"/>,
+      <xref linkend="empathy"/> and
+      <xref linkend="telepathy-glib"/> (for the collab telepathy backend),
+      <xref linkend="gnutls"/> and
+      <xref linkend="libsoup"/> (for the collab service),
       <ulink url="http://www.abisource.com/projects/link-grammar/">Link Grammar Parser</ulink>,
       <ulink url="http://aiksaurus.sourceforge.net/">Aiksaurus</ulink>,
-      <xref linkend="boost"/> (required for the collab and openxml/docx plugins,
-      but broken in at least LFS-7.2 with g++ scope errors),
-      <xref linkend="dbus-glib"/> (for the collab sugar backend),
-      <xref linkend="goffice"/>),
       <ulink url="http://helm.cs.unibo.it/mml-widget/">GtkMathView</ulink>
       (requires
@@ -123,10 +126,6 @@
       <ulink url="http://www.gnome-db.org/">libgda version &lt;1.3.0</ulink>),
       <ulink url="http://sourceforge.net/projects/mission-control/files/">libmissioncontrol</ulink>,
-      <xref linkend="empathy"/> and
-      <xref linkend="telepathy-glib"/> (for the collab telepathy backend),
       <ulink url="http://ftp.imendio.com/pub/imendio/loudmouth/src/">loudmouth</ulink>
       (for the collab xmpp backend),
-      <xref linkend="gnutls"/> and
-      <xref linkend="libsoup"/> (for the collab service),
       <ulink url="http://sourceforge.net/projects/wvware">libwmf</ulink>,
       <ulink url="http://helm.cs.unibo.it/mml-widget/">GtkMathView</ulink> (requires
@@ -166,14 +165,9 @@
     </para>
 
-<screen><userinput>sed -i '/#include &lt;glib\/gerror.h&gt;/d' src/af/util/xp/ut_go_file.h &amp;&amp;
-sed -i 's/ptr->jmpbuf/jmpbuf(png_ptr)/' src/af/util/xp/ut_png.cpp &amp;&amp;
-sed -i 's/\(m_pPNG\)->\(jmpbuf\)/png_\2(\1)/' \
-    src/wp/impexp/gtk/ie_impGraphic_GdkPixbuf.cpp &amp;&amp;
-sed -i 's/--no-undefined //' src/Makefile* &amp;&amp;
-./configure --prefix=/usr --disable-static &amp;&amp;
+<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
 make</userinput></screen>
 
     <para>
-      If you wish to run the tests, issue: <command>make check</command>.
+      This program does not come with a functional test suite.
     </para>
 
@@ -204,31 +198,4 @@
 
     <para>
-      <command>sed -i '/#include &lt;glib\/gerror.h&gt;/d'
-      src/af/util/xp/ut_go_file.h</command>: This sed fixes compiling
-      <application>Abiword</application> with
-      <application>Glib-2.32</application> installed.
-    </para>
-
-    <para>
-      <command>sed -i 's/ptr->jmpbuf/jmpbuf(png_ptr)/'
-      src/af/util/xp/ut_png.cpp</command> and
-      <command>sed -i 's/\(m_pPNG\)->\(jmpbuf\)/png_\2(\1)/'
-      src/wp/impexp/gtk/ie_impGraphic_GdkPixbuf.cpp</command>: These seds fix
-      compiling Abiword with libpng-1.5 installed.
-    </para>
-
-    <para>
-      <command>sed -i 's/--no-undefined...</command>: This sed fixes compiling
-      Abiword-2.8.6 with GCC-4.6.2.
-    </para>
-
-    <para>
-      <option>--without-inter7eps</option>: Some of the headers from the
-      <application>EPS</application> package are not compatible with
-      <application>GCC</application>-&gcc-version;. This parameter prevents
-      linking to the package and incurring a build failure.
-    </para>
-
-    <para>
       <option>--disable-static</option>: This switch prevents the static library
       being built.
@@ -238,6 +205,6 @@
       <option>--enable-plugins="collab openxml goffice grammar"</option>: Build
       some or all of the collab plugins. The openxml plugin enables
-      <application>Abiword</application> to open some .docx files (requires
-      <xref linkend="boost"/>). The grammar plugin requires
+      <application>Abiword</application> to open some .docx files.
+      The grammar plugin requires
       <ulink url="http://www.abisource.com/projects/link-grammar/">Link Grammar
       Parser</ulink>
