Index: general/genutils/xscreensaver.xml
===================================================================
--- general/genutils/xscreensaver.xml	(revision e4faed382c8db533bd09ab9dc6a1c0e7667cfeb8)
+++ general/genutils/xscreensaver.xml	(revision e36f9d9046b05fc1c66ca9bded82152c2f7c7dcd)
@@ -7,8 +7,8 @@
   <!ENTITY xscreensaver-download-http "http://www.jwz.org/xscreensaver/xscreensaver-&xscreensaver-version;.tar.gz">
   <!ENTITY xscreensaver-download-ftp  " ">
-  <!ENTITY xscreensaver-md5sum        "80f981b86734ccb31c5b3b24af3930ae">
-  <!ENTITY xscreensaver-size          "5.3 MB">
-  <!ENTITY xscreensaver-buildsize     "135 MB">
-  <!ENTITY xscreensaver-time          "1.1 SBU">
+  <!ENTITY xscreensaver-md5sum        "c0b8b2c817a9a7371f51a82e80602d10">
+  <!ENTITY xscreensaver-size          "5.7 MB">
+  <!ENTITY xscreensaver-buildsize     "173 MB">
+  <!ENTITY xscreensaver-time          "1.0 SBU">
 ]>
 
@@ -41,4 +41,6 @@
     away.</para>
 
+    &lfs70_checked;
+
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
@@ -66,19 +68,23 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="bc"/> and
-    <xref linkend="libglade"/> (alternatively
-    <xref linkend="lesstif"/> but not recommended)</para>
+    <para role="required">
+      <xref linkend="bc"/> and
+      <xref linkend="libglade"/> (alternatively
+      <xref linkend="lesstif"/> but not recommended)
+    </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="libjpeg"/>,
-    <xref linkend="libgnome"/>,
-    <ulink url="http://linas.org/gle/">GLE</ulink>,
-    <ulink url="http://netpbm.sourceforge.net/">Netpbm</ulink>,
-    <ulink url="http://www.jwz.org/xdaliclock/">XDaliClock</ulink>,
-    <xref linkend="linux-pam"/>,
-    <xref linkend="mitkrb"/> (built with Kerberos V4 backwards compatibility), and
-    <ulink url="http://www.pdc.kth.se/kth-krb/">krb4</ulink> and
-    <xref linkend="heimdal"/> (Kerberos authentication requires having Kerberos
-    V4 and V5 on the system)</para>
+    <para role="optional">
+      <xref linkend="libjpeg"/>,
+      <xref linkend="libgnome"/>,
+      <ulink url="http://linas.org/gle/">GLE</ulink>,
+      <ulink url="http://netpbm.sourceforge.net/">Netpbm</ulink>,
+      <ulink url="http://www.jwz.org/xdaliclock/">XDaliClock</ulink>,
+      <xref linkend="linux-pam"/>,
+      <xref linkend="mitkrb"/> (built with Kerberos V4 backwards compatibility), and
+      <ulink url="http://www.pdc.kth.se/kth-krb/">krb4</ulink> and
+      <xref linkend="heimdal"/> (Kerberos authentication requires having Kerberos
+        V4 and V5 on the system)
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -90,18 +96,7 @@
     <title>Installation of XScreenSaver</title>
 
-    <!-- Apparently, this issue is now fixed
-    <para><application>XScreenSaver</application> makes some poor choices
-    where to put all the files if <application>GNOME</application> is installed.
-    To get around this, run the following command and see an optional configure
-    switch described later below.</para>
-
-<screen><userinput>sed -i -e "s,@GNOME_DATADIR@,$GNOME_PREFIX/share," driver/Makefile.in</userinput></screen>
-    -->
-
     <para>Install <application>XScreenSaver</application> by running the following
     commands:</para>
 
-    <!-- sed -i 's,\xc3\xb6,oe,' hacks/flow.man -->
-
 <screen><userinput>./configure --prefix=/usr --libexecdir=/usr/lib &amp;&amp;
 make</userinput></screen>
@@ -117,11 +112,4 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
-
-    <!-- <para><command>sed -i 's,\xc3\xb6,oe,' hacks/flow.man</command>: This
-    command replaces the UTF-8 encoded character <quote>&ouml;</quote>
-    with its ASCII equivalent <quote>oe</quote> in one of the installed
-    manual pages. Without this, <application>Man-DB</application> would
-    interpret these two bytes as ISO-8859-1, resulting in
-    the wrong <quote>&Atilde;&para;</quote> characters.</para> -->
 
     <para><option>--with-setuid-hacks</option>: This switch allows some
@@ -131,11 +119,4 @@
     <para><option>--enable-locking</option>: This switch provides support for
     locking the display.</para>
-
-    <!-- Not required any longer
-    <para><option>-with-configdir=/usr/lib/xscreensaver/config</option>:
-    If <application>GNOME</application> is installed, you can use this
-    switch to put the configuration files in a single directory rather than
-    spreading them all over the disk.</para>
-    -->
 
   </sect2>
@@ -182,5 +163,5 @@
         and xscreensaver-text</seg>
         <seg>None</seg>
-        <seg>/usr/{lib/xscreensaver,share/xscreensaver/{config,glade}}</seg>
+        <seg>/usr/lib/xscreensaver, /usr/share/xscreensaver/{config,glade}</seg>
       </seglistitem>
     </segmentedlist>
