Index: x/lib/freeglut.xml
===================================================================
--- x/lib/freeglut.xml	(revision f5754762a96e631478f328f5d4b64468bf5c5560)
+++ x/lib/freeglut.xml	(revision 606dfd4eafc21d4919ea5197b659d68e743793bb)
@@ -6,5 +6,5 @@
 
   <!ENTITY freeglut-download-http
-  "&sourceforge-repo;/freeglut/freeglut-&freeglut-version;.tar.gz">
+           "&sourceforge-repo;/freeglut/freeglut-&freeglut-version;.tar.gz">
   <!ENTITY freeglut-download-ftp " ">
   <!ENTITY freeglut-md5sum        "5db8651af306bc403fbfd36934a20e1d">
@@ -14,5 +14,5 @@
 ]>
 
-<sect1 id="freeglut" xreflabel="freeglut-&freeglut-version;">
+<sect1 id="freeglut" xreflabel="Freeglut-&freeglut-version;">
   <?dbhtml filename="freeglut.html"?>
 
@@ -22,5 +22,5 @@
   </sect1info>
 
-  <title>freeglut-&freeglut-version;</title>
+  <title>Freeglut-&freeglut-version;</title>
 
   <indexterm zone="freeglut">
@@ -29,69 +29,95 @@
 
   <sect2 role="package">
-    <title>Introduction to freeglut</title>
+    <title>Introduction to Freeglut</title>
 
-    <para><application>freeglut</application> is intended to be a 100%
-    compatible, completely opensourced clone of the GLUT library. GLUT is a
-    window system independent toolkit for writing OpenGL programs, implementing
-    a simple windowing API, which makes learning about and exploring OpenGL
-    programming very easy.</para>
+    <para>
+      <application>Freeglut</application> is intended to be a 100%
+      compatible, completely opensourced clone of the GLUT library.
+      GLUT is a window system independent toolkit for writing OpenGL
+      programs, implementing a simple windowing API, which makes
+      learning about and exploring OpenGL programming very easy.
+    </para>
 
-    &lfs71_checked;
+    &lfs72_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&freeglut-download-http;"/></para>
+        <para>
+          Download (HTTP): <ulink url="&freeglut-download-http;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download (FTP): <ulink url="&freeglut-download-ftp;"/></para>
+        <para>
+          Download (FTP): <ulink url="&freeglut-download-ftp;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download MD5 sum: &freeglut-md5sum;</para>
+        <para>
+          Download MD5 sum: &freeglut-md5sum;
+        </para>
       </listitem>
       <listitem>
-        <para>Download size: &freeglut-size;</para>
+        <para>
+          Download size: &freeglut-size;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated disk space required: &freeglut-buildsize;</para>
+        <para>
+          Estimated disk space required: &freeglut-buildsize;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated build time: &freeglut-time;</para>
+        <para>
+          Estimated build time: &freeglut-time;
+        </para>
       </listitem>
     </itemizedlist>
 
-    <bridgehead renderas="sect3">freeglut Dependencies</bridgehead>
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Required patch:
+          <ulink url="&patch-root;/freeglut-&freeglut-version;-remove_smooth_opengl3_demo-1.patch"/>
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Freeglut Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="mesalib"/></para>
+    <para role="required">
+      <xref linkend="mesalib"/>
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/freeglut"/></para>
+      <ulink url="&blfs-wiki;/freeglut"/>
+    </para>
   </sect2>
 
   <sect2 role="installation">
-    <title>Installation of freeglut</title>
+    <title>Installation of Freeglut</title>
 
-    <para>Some of the demo programs in <application>freeglut</application> are 
-    quite old and do not follow current practice when looking for libraries. 
-    If your $XORG_PREFIX is not <filename class='directory'>/usr</filename>, add
-    the following command:</para>
+    <para>
+      Install <application>Freeglut</application> by running the
+      following commands:
+    </para>
 
-<screen><userinput>export LIBRARY_PATH=$XORG_PREFIX/lib</userinput></screen>
-
-    <para>Install <application>freeglut</application> by running the
-    following commands:</para>
-
-<screen><userinput>./configure --prefix=$XORG_PREFIX --disable-static &amp;&amp;
+<screen><userinput>patch -Np1 -i ../freeglut-&freeglut-version;-remove_smooth_opengl3_demo-1.patch &amp;&amp;
+./configure --prefix=/usr --disable-static &amp;&amp;
 make</userinput></screen>
 
-    <para>This package does not come with a test suite.</para>
+    <para>
+      This package does not come with a test suite.
+    </para>
 
-    <para>Now, as the <systemitem class="username">root</systemitem>
-    user:</para>
+    <para>
+      Now, as the <systemitem class="username">root</systemitem>
+      user:
+    </para>
 
-<screen role="root"><userinput>make install &amp;&amp;
-mkdir -p $XORG_PREFIX/share/doc/freeglut-&freeglut-version; &amp;&amp;
-cp doc/*.{html,png} $XORG_PREFIX/share/doc/freeglut-&freeglut-version;</userinput></screen>
+<screen role="root"><userinput>make install</userinput></screen>
+
   </sect2>
 
@@ -99,6 +125,7 @@
     <title>Command Explanations</title>
 
-    <para><option>--disable-static</option>: This option stops it compiling a
-    static version of the library.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/static-libraries.xml"/>
+
   </sect2>
 
@@ -107,10 +134,10 @@
 
     <segmentedlist>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
+      <segtitle>Installed Library</segtitle>
 
       <seglistitem>
-        <seg>libglut.so</seg>
-        <seg><replaceable>&lt;$XORG_PREFIX&gt;</replaceable>/share/doc/freeglut-&freeglut-version;</seg>
+        <seg>
+          libglut.so
+        </seg>
       </seglistitem>
     </segmentedlist>
@@ -122,8 +149,10 @@
 
       <varlistentry id="libglut">
-        <term><filename class='libraryfile'>libglut.so</filename></term>
+        <term><filename class="libraryfile">libglut.so</filename></term>
         <listitem>
-          <para>contains functions that implement the OpenGL Utility
-          Toolkit.</para>
+          <para>
+            contains functions that implement the OpenGL Utility
+            Toolkit.
+          </para>
           <indexterm zone="freeglut libglut">
             <primary sortas="c-libglut">libglut.so</primary>
@@ -131,5 +160,8 @@
         </listitem>
       </varlistentry>
+
     </variablelist>
+
   </sect2>
+
 </sect1>
