Index: general/genlib/gamin.xml
===================================================================
--- general/genlib/gamin.xml	(revision 4f304a0ad6c04a4bdc6ee436bba269d45c28c3fe)
+++ general/genlib/gamin.xml	(revision 692b244c3d4a29dadd50e5ca0c47b42c72a2e7c2)
@@ -5,10 +5,11 @@
   %general-entities;
 
-  <!ENTITY gamin-download-http "http://www.gnome.org/~veillard/gamin/sources/gamin-&gamin-version;.tar.gz">
+  <!ENTITY gamin-download-http
+    "http://www.gnome.org/~veillard/gamin/sources/gamin-&gamin-version;.tar.gz">
   <!ENTITY gamin-download-ftp  "&gentoo-ftp-repo;/gamin-&gamin-version;.tar.gz">
   <!ENTITY gamin-md5sum        "b4ec549e57da470c04edd5ec2876a028">
   <!ENTITY gamin-size          "639 KB">
   <!ENTITY gamin-buildsize     "6.7 MB">
-  <!ENTITY gamin-time          "0.1 SBU (up to 3 minutes, processor independent, to run the test suite)">
+  <!ENTITY gamin-time          "0.1 SBU">
 ]>
 
@@ -30,30 +31,44 @@
     <title>Introduction to Gamin</title>
 
-    <para>The <application>Gamin</application> package contains a
-    File Alteration Monitor which is useful for notifying applications of
-    changes to the file system. Gamin is compatible with <ulink
-    url="http://oss.sgi.com/projects/fam/">FAM</ulink>.</para>
-
-    <para>&lfssvn_built;20100803&lfssvn_built2;</para>
+    <para>
+      The <application>Gamin</application> package contains a File Alteration
+      Monitor which is useful for notifying applications of changes to the file
+      system. Gamin is compatible with
+      <ulink url="http://oss.sgi.com/projects/fam/">FAM</ulink>.
+    </para>
+
+    &lfs71_built;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&gamin-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&gamin-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &gamin-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &gamin-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &gamin-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &gamin-time;</para>
+        <para>
+          Download (HTTP): <ulink url="&gamin-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&gamin-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &gamin-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &gamin-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &gamin-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &gamin-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -62,19 +77,16 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="pkgconfig"/></para>
+    <para role="required">
+      <xref linkend="pkgconfig"/>
+    </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="python2"/></para>
-
-    <!-- Though configure mentions these two packages, the build
-         system can and does absolutely nothing with them. Commenting
-         them out for now, as they cannot be used
-    <xref linkend="gtk-doc"/> (for building API documentation),
-    <xref linkend="doxygen"/> (for building documentation),
-    -->
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/gamin"/></para>
-
+    <para role="optional">
+      <xref linkend="python2"/>
+    </para>
+
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/gamin"/>
+    </para>
   </sect2>
 
@@ -82,19 +94,25 @@
     <title>Installation of Gamin</title>
 
-    <para>Install <application>Gamin</application> by running the
-    following commands:</para>
-
-<screen><userinput>./configure --prefix=/usr --libexecdir=/usr/sbin &amp;&amp;
+    <para>
+      Install <application>Gamin</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>sed -i 's/G_CONST_RETURN/const/' server/gam_{node,subscription}.{c,h} &amp;&amp;
+./configure --prefix=/usr --libexecdir=/usr/sbin --disable-static &amp;&amp;
 make</userinput></screen>
 
-    <para>To test the results, issue: <command>make check</command>. Note
-    that some tests may display errors.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+    <para>
+      To test the results, issue: <command>make check</command>. Note that some
+      tests may display errors.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
 
 <screen role="root"><userinput>make install &amp;&amp;
 install -v -m755 -d /usr/share/doc/gamin-&gamin-version; &amp;&amp;
 install -v -m644 doc/*.{html,fig,gif,txt} /usr/share/doc/gamin-&gamin-version;</userinput></screen>
-
   </sect2>
 
@@ -102,7 +120,12 @@
     <title>Command Explanations</title>
 
-    <para><option>--disable-static</option>: This switch prevents most of the
-    static libraries being built.</para>
-
+    <para>
+      <command>sed -i 's/G_CONST_RETURN/const/'
+      server/gam_{node,subscription}.{c,h}</command>: This sed fixes compiling
+      with <application>Glib 2.32</application> or greater installed.
+    </para>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/static-libraries.xml"/>
   </sect2>
 
@@ -113,11 +136,11 @@
       <title>Configuration Information</title>
 
-      <para>No configuration is generally required and the default options
-      should work for most users. See
-      <ulink url="http://www.gnome.org/~veillard/gamin/config.html"/> for
-      details.</para>
-
+      <para>
+        No configuration is generally required and the default options should
+        work for most users. See
+        <ulink url="http://www.gnome.org/~veillard/gamin/config.html"/> for
+        details.
+      </para>
     </sect3>
-
   </sect2>
 
@@ -132,7 +155,8 @@
       <seglistitem>
         <seg>gam_server</seg>
-        <seg>libfam.{so,a}, libgamin-1.{so,a}, libgamin_shared.a and
-        optionally, <application>Python</application> _gamin.{so,a}
-        module</seg>
+        <seg>
+          libfam.so, libgamin-1.so, libgamin_shared.a and (if you've installed
+          <application>Python 2</application>) _gamin.so.
+        </seg>
         <seg>/usr/share/doc/gamin-&gamin-version;</seg>
       </seglistitem>
@@ -147,6 +171,8 @@
       <term><command>gam_server</command></term>
       <listitem>
-        <para>is the file alteration monitor daemon that is started on demand
-        for each user.</para>
+        <para>
+          is the file alteration monitor daemon that is started on demand for
+          each user.
+        </para>
         <indexterm zone="gamin gam_server">
           <primary sortas="b-gam_server">gam_server</primary>
@@ -156,9 +182,11 @@
 
     <varlistentry id="libgamin">
-      <term><filename class='libraryfile'>libgamin.{so,a}</filename></term>
-      <listitem>
-        <para>contains functions that support the file allocation monitor.</para>
+      <term><filename class='libraryfile'>libgamin.so</filename></term>
+      <listitem>
+        <para>
+          contains functions that support the file allocation monitor.
+        </para>
         <indexterm zone="gamin libgamin">
-          <primary sortas="c-libgamin">libgamin.{so,a}</primary>
+          <primary sortas="c-libgamin">libgamin.so</primary>
         </indexterm>
       </listitem>
@@ -166,16 +194,15 @@
 
     <varlistentry id="libfam">
-      <term><filename class='libraryfile'>libfam.{so,a}</filename></term>
-      <listitem>
-        <para>contains functions that provide compatibility with FAM.</para>
+      <term><filename class='libraryfile'>libfam.so</filename></term>
+      <listitem>
+        <para>
+          contains functions that provide compatibility with FAM.
+        </para>
         <indexterm zone="gamin libfam">
-          <primary sortas="c-libfam">libfam.{so,a}</primary>
+          <primary sortas="c-libfam">libfam.so</primary>
         </indexterm>
       </listitem>
     </varlistentry>
-
     </variablelist>
-
-  </sect2>
-
+  </sect2>
 </sect1>
Index: template/template.xml
===================================================================
--- template/template.xml	(revision 4f304a0ad6c04a4bdc6ee436bba269d45c28c3fe)
+++ template/template.xml	(revision 692b244c3d4a29dadd50e5ca0c47b42c72a2e7c2)
@@ -190,5 +190,5 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>    
+      href="../../xincludes/static-libraries.xml"/>
 
     <para>
