Index: general/genlib/xapian.xml
===================================================================
--- general/genlib/xapian.xml	(revision 7ce4fef6afdee430b51a6f04fae30b77caeb302a)
+++ general/genlib/xapian.xml	(revision ed07746ec4326324bfd8972df81f54610a5a6449)
@@ -8,8 +8,8 @@
            "http://oligarchy.co.uk/xapian/&xapian-version;/xapian-core-&xapian-version;.tar.xz">
   <!ENTITY xapian-download-ftp  " ">
-  <!ENTITY xapian-md5sum        "e0361d7994287edf1248d320758e9f84">
-  <!ENTITY xapian-size          "2.7 MB">
-  <!ENTITY xapian-buildsize     "196 MB (add estimated 100 MB for tests)">
-  <!ENTITY xapian-time          "0.6 SBU (using parallelism=4; add estimated 180 SBU for tests)">
+  <!ENTITY xapian-md5sum        "96e92ccce4df53eb5654805ed3b442c0">
+  <!ENTITY xapian-size          "2.8 MB">
+  <!ENTITY xapian-buildsize     "264 MB (add estimated 100 MB for tests)">
+  <!ENTITY xapian-time          "0.7 SBU (using parallelism=4; add estimated 180 SBU for tests)">
 ]>
 
@@ -73,4 +73,8 @@
   <sect2 role="installation">
     <title>Installation of Xapian</title>
+    <!-- Interesting footnote - SSE support is only enabled on i686.
+    There seems to be some trickery involved in that. It's not essential
+    to operation on x86_64 though, so look into it at the next version of
+    xapian. -->
 
     <para>Install <application>Xapian</application> by
@@ -105,8 +109,8 @@
       <seglistitem>
         <seg>
-          copydatabase, delve, quest, simpleexpand, simpleindex, simplesearch,
+          copydatabase, quest, simpleexpand, simpleindex, simplesearch,
           xapian-check, xapian-chert-update, xapian-compact, xapian-config,
-          xapian-inspect, xapian-metadata, xapian-progsrv, xapian-replicate,
-          xapian-replicate-server and xapian-tcpsrv
+          xapian-delve, xapian-metadata, xapian-pos, xapian-progsrv, 
+          xapian-replicate, xapian-replicate-server and xapian-tcpsrv
         </seg>
         <seg>
@@ -139,6 +143,103 @@
       </varlistentry>
 
-      <varlistentry id="delve">
-        <term><command>delve</command></term>
+      <varlistentry id="quest">
+        <term><command>quest</command></term>
+        <listitem>
+          <para>
+            is a search command line tool.
+          </para>
+          <indexterm zone="xapian quest">
+            <primary sortas="b-quest">quest</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="simpleexpand">
+        <term><command>simpleexpand</command></term>
+        <listitem>
+          <para>
+            is a simple example program demonstrating query expansion.
+          </para>
+          <indexterm zone="xapian simpleexpand">
+            <primary sortas="b-simpleexpand">simpleexpand</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="simpleindex">
+        <term><command>simpleindex</command></term>
+        <listitem>
+          <para>
+            index each paragraph of a text file as a
+            <application>Xapian</application> document.
+          </para>
+          <indexterm zone="xapian simpleindex">
+            <primary sortas="b-simpleindex">simpleindex</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="simplesearch">
+        <term><command>simplesearch</command></term>
+        <listitem>
+          <para>
+            is a simple command line search utility.
+          </para>
+          <indexterm zone="xapian simplesearch">
+            <primary sortas="b-simplesearch">simplesearch</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="xapian-check">
+        <term><command>xapian-check</command></term>
+        <listitem>
+          <para>
+            check the consistency of a database or table.
+          </para>
+          <indexterm zone="xapian xapian-check">
+            <primary sortas="b-xapian-check">xapian-check</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="xapian-chert-update">
+        <term><command>xapian-chert-update</command></term>
+        <listitem>
+          <para>
+            update a chert database to the new format keys.
+          </para>
+          <indexterm zone="xapian xapian-chert-update">
+            <primary sortas="b-xapian-chert-update">xapian-chert-update</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="xapian-compact">
+        <term><command>xapian-compact</command></term>
+        <listitem>
+          <para>
+            compact a database, or merge and compact several.
+          </para>
+          <indexterm zone="xapian xapian-compact">
+            <primary sortas="b-xapian-compact">xapian-compact</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="xapian-config">
+        <term><command>xapian-config</command></term>
+        <listitem>
+          <para>
+            report information about the installed xapian.
+          </para>
+          <indexterm zone="xapian xapian-config">
+            <primary sortas="b-xapian-config">xapian-config</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="xapian-delve">
+        <term><command>xapian-delve</command></term>
         <listitem>
           <para>
@@ -146,115 +247,6 @@
             database.
           </para>
-          <indexterm zone="xapian delve">
-            <primary sortas="b-delve">delve</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="quest">
-        <term><command>quest</command></term>
-        <listitem>
-          <para>
-            is a search command line tool.
-          </para>
-          <indexterm zone="xapian quest">
-            <primary sortas="b-quest">quest</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="simpleexpand">
-        <term><command>simpleexpand</command></term>
-        <listitem>
-          <para>
-            is a simple example program demonstrating query expansion.
-          </para>
-          <indexterm zone="xapian simpleexpand">
-            <primary sortas="b-simpleexpand">simpleexpand</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="simpleindex">
-        <term><command>simpleindex</command></term>
-        <listitem>
-          <para>
-            index each paragraph of a text file as a
-            <application>Xapian</application> document.
-          </para>
-          <indexterm zone="xapian simpleindex">
-            <primary sortas="b-simpleindex">simpleindex</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="simplesearch">
-        <term><command>simplesearch</command></term>
-        <listitem>
-          <para>
-            is a simple command line search utility.
-          </para>
-          <indexterm zone="xapian simplesearch">
-            <primary sortas="b-simplesearch">simplesearch</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xapian-check">
-        <term><command>xapian-check</command></term>
-        <listitem>
-          <para>
-            check the consistency of a database or table.
-          </para>
-          <indexterm zone="xapian xapian-check">
-            <primary sortas="b-xapian-check">xapian-check</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xapian-chert-update">
-        <term><command>xapian-chert-update</command></term>
-        <listitem>
-          <para>
-            update a chert database to the new format keys.
-          </para>
-          <indexterm zone="xapian xapian-chert-update">
-            <primary sortas="b-xapian-chert-update">xapian-chert-update</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xapian-compact">
-        <term><command>xapian-compact</command></term>
-        <listitem>
-          <para>
-            compact a database, or merge and compact several.
-          </para>
-          <indexterm zone="xapian xapian-compact">
-            <primary sortas="b-xapian-compact">xapian-compact</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xapian-config">
-        <term><command>xapian-config</command></term>
-        <listitem>
-          <para>
-            report information about the installed xapian.
-          </para>
-          <indexterm zone="xapian xapian-config">
-            <primary sortas="b-xapian-config">xapian-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xapian-inspect">
-        <term><command>xapian-inspect</command></term>
-        <listitem>
-          <para>
-            inspect the contents of a flint table for development or debugging.
-          </para>
-          <indexterm zone="xapian xapian-inspect">
-            <primary sortas="b-xapian-inspect">xapian-inspect</primary>
+          <indexterm zone="xapian xapian-delve">
+            <primary sortas="b-xapian-delve">xapian-delve</primary>
           </indexterm>
         </listitem>
@@ -273,4 +265,16 @@
       </varlistentry>
 
+      <varlistentry id="xapian-pos">
+        <term><command>xapian-pos</command></term>
+        <listitem>
+          <para>
+            inspect the contents of a flint table for development or debugging.
+          </para>
+          <indexterm zone="xapian xapian-pos">
+            <primary sortas="b-xapian-pos">xapian-pos</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="xapian-progsrv">
         <term><command>xapian-progsrv</command></term>
