several cleanups-Xorg7 related

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@5700 af4574ff-66df-0310-9fd7-8a98e5e911e0
2025-02-03 06:27:16 +08:00 · 2006-03-03 06:41:25 +00:00 · 2006-03-03 06:41:25 +00:00 · 371ff30f55
commit 371ff30f55
parent 3735050f6a
48 changed files with 149 additions and 67 deletions
--- a/basicnet/textweb/links.xml
+++ b/basicnet/textweb/links.xml
@ -71,7 +71,8 @@
    <xref linkend="sdl"/>,
    <ulink url="http://www.svgalib.org/">SVGAlib</ulink>,
    <ulink url="http://www.directfb.org/">DirectFB</ulink> and
-    X (<xref linkend="xfree86"/> or <xref linkend="xorg"/>)</para>
+    X (<xref linkend="xfree86"/>, <xref linkend="xorg"/>,
+    or <xref linkend="xorg7"/>)</para>

  </sect2>

--- a/general.ent
+++ b/general.ent
@ -1,8 +1,8 @@
-<!ENTITY day          "02">                   <!-- Always 2 digits -->
+<!ENTITY day          "03">                   <!-- Always 2 digits -->
 <!ENTITY month        "03">                   <!-- Always 2 digits -->
 <!ENTITY year         "2006">
 <!ENTITY version      "svn-&year;&month;&day;">
-<!ENTITY releasedate  "March &day;nd, &year;">
+<!ENTITY releasedate  "March &day;rd, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
 <!ENTITY lfs-version  "development">          <!-- version|stable|testing|unstable|development] -->
--- a/general/genutils/imagemagick.xml
+++ b/general/genutils/imagemagick.xml
@ -76,7 +76,8 @@ xreflabel="ImageMagick-&imagemagick-version;-&imagemagick-patch-version;">
    <bridgehead renderas="sect3">ImageMagick Dependencies</bridgehead>

    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">X (<xref linkend="xfree86"/> or <xref linkend="xorg"/>)</para>
+    <para role="recommended">X (<xref linkend="xfree86"/>, 
+    <xref linkend="xorg"/>, or <xref linkend="xorg7"/>)</para>

    <para>The optional dependencies listed below should be installed if you
    need support for the specific format or the conversion tool the dependency
--- a/general/genutils/xterm.xml
+++ b/general/genutils/xterm.xml
@ -64,6 +64,9 @@
    <para>X (<xref linkend="xorg"/>, <xref linkend="xfree86"/>,
    or <xref linkend="xorg7"/>)</para>

+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para><xref linkend="pkgconfig"/></para>
+
  </sect2>

  <sect2 role="installation">
@ -87,23 +90,28 @@ make</userinput></screen>

    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>

-<screen role="root"><userinput>make install</userinput></screen>
+<screen role="root"><userinput>make install &amp;&amp;
+make install-ti</userinput></screen>

  </sect2>

  <sect2 role="commands">
    <title>Command Explanations</title>

-    <para><command>sed -i 's@/usr/X11R6@/usr@' main.h</command>: This command 
-    corrects the PROJECTROOT definition for an installation prefix of 
-    <filename class="directory">/usr</filename>.</para>
-
    <para><parameter>--with-luit</parameter>: enables the luit filter for 
    unicode translation.</para>

    <para><parameter>--with-wide-chars</parameter>: adds support for wide
    characters.</para>

+    <para><command>sed -i 's@/usr/X11R6@/usr@' main.h</command>: This command
+    corrects the PROJECTROOT definition for an installation prefix of
+    <filename class="directory">/usr</filename>.</para>
+
+    <para><command>make install-ti</command>: This command installs corrected
+    terminfo description files for use with 
+    <application>xterm</application>.</para>
+
  </sect2>

  <sect2 role="content">
--- a/general/graphlib/aalib.xml
+++ b/general/graphlib/aalib.xml
@ -61,7 +61,8 @@
    <bridgehead renderas="sect3">AAlib Dependencies</bridgehead>

    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">X (<xref linkend="xfree86"/> or <xref linkend="xorg"/>),
+    <para role="optional">X (<xref linkend="xfree86"/>, 
+    <xref linkend="xorg"/>, or <xref linkend="xorg7"/>),
    <xref linkend="slang"/> and
    <xref linkend="gpm"/></para>

--- a/general/graphlib/giflib.xml
+++ b/general/graphlib/giflib.xml
@ -72,8 +72,8 @@
    <bridgehead renderas="sect3">giflib Dependencies</bridgehead>

    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">X (<xref linkend="xfree86"/> or
-    <xref linkend="xorg"/>)</para>
+    <para role="optional">X (<xref linkend="xfree86"/>,
+    <xref linkend="xorg"/>, or <xref linkend="xorg7"/>)</para>

  </sect2>

--- a/general/graphlib/imlib.xml
+++ b/general/graphlib/imlib.xml
@ -69,8 +69,8 @@
    <xref linkend="giflib"/></para>

    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">X (<xref linkend="xorg"/> or
-    <xref linkend="xfree86"/>) and
+    <para role="optional">X (<xref linkend="xorg"/>, <xref linkend="xorg7"/>,
+    or <xref linkend="xfree86"/>) and
    <xref linkend="GTK"/></para>

  </sect2>
--- a/general/graphlib/imlib2.xml
+++ b/general/graphlib/imlib2.xml
@ -66,7 +66,8 @@
    <xref linkend="libjpeg"/></para>

    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">X (<xref linkend="xfree86"/> or <xref linkend="xorg"/></para>
+    <para role="recommended">X (<xref linkend="xfree86"/>, 
+    <xref linkend="xorg"/>, or or <xref linkend="xorg7"/>)</para>

    <bridgehead renderas="sect4">Optional</bridgehead>
    <para role="optional"><xref linkend="libtiff"/>, and
--- a/general/graphlib/libungif.xml
+++ b/general/graphlib/libungif.xml
@ -73,7 +73,8 @@
    <bridgehead renderas="sect3">Libungif Dependencies</bridgehead>

    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">X (<xref linkend="xfree86"/> or <xref linkend="xorg"/>)</para>
+    <para role="optional">X (<xref linkend="xfree86"/>, 
+    <xref linkend="xorg"/>, or <xref linkend="xorg7"/>)</para>

  </sect2>

--- a/general/prog/pdl.xml
+++ b/general/prog/pdl.xml
@ -141,8 +141,8 @@

    <itemizedlist spacing='compact'>
      <listitem>
-        <para>OpenGL (<xref linkend="xfree86"/> or
-        <xref linkend="xorg"/>)</para>
+        <para>OpenGL (<xref linkend="xfree86"/>,
+        <xref linkend="xorg"/>, or <xref linkend="xorg7"/>)</para>
      </listitem>
    </itemizedlist>

--- a/general/prog/php.xml
+++ b/general/prog/php.xml
@ -103,7 +103,8 @@
    <xref linkend="libpng"/>,
    <xref linkend="libexif"/>,
    <xref linkend="freetype2"/>,
-    X (<xref linkend="xorg"/> or <xref linkend="xfree86"/>),
+    X (<xref linkend="xorg"/>, <xref linkend="xorg7"/>, or 
+    <xref linkend="xfree86"/>),
    <ulink url="http://www.fastio.com/">ClibPDF</ulink>,
    <ulink url="http://www.boutell.com/gd/">GD</ulink>,
    <ulink url="http://gd.tuwien.ac.at/visual/ibiblio/libs/graphics/t1lib-5.1.0.tar.gz">
--- a/general/prog/tk.xml
+++ b/general/prog/tk.xml
@ -62,7 +62,8 @@
    <bridgehead renderas="sect3">Tk Dependencies</bridgehead>

    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">X (<xref linkend="xfree86"/> or <xref linkend="xorg"/>) and
+    <para role="required">X (<xref linkend="xfree86"/>, <xref linkend="xorg"/>,
+    or <xref linkend="xorg7"/>) and
    <xref linkend="tcl"/></para>

  </sect2>
--- a/general/sysutils/dbus.xml
+++ b/general/sysutils/dbus.xml
@ -73,7 +73,8 @@
    <xref linkend="glib2"/>,
    <xref linkend="gtk2"/>,
    <xref linkend="qt"/>,
-    X (<xref linkend="xorg"/> or <xref linkend="xfree86"/>),
+    X (<xref linkend="xorg"/>, <xref linkend="xorg7"/>, or 
+    <xref linkend="xfree86"/>),
    <xref linkend="gcc"/> (for the Java compiler and tools),
    <ulink url="http://nz.cosc.canterbury.ac.nz/~greg/python/Pyrex/">Pyrex</ulink>
    (requires <xref linkend="python"/>),
--- a/general/sysutils/mc.xml
+++ b/general/sysutils/mc.xml
@ -76,7 +76,8 @@

    <bridgehead renderas="sect4">Optional</bridgehead>
    <para role="optional"><xref linkend="gpm"/>,
-    X (<xref linkend="xfree86"/> or <xref linkend="xorg"/>),
+    X (<xref linkend="xfree86"/>, <xref linkend="xorg"/>,
+    or <xref linkend="xorg7"/>),
    <xref linkend="samba3"/>,
    <xref linkend="slang"/>,
    <xref linkend="zip"/>,
--- a/gnome/core/libbonobo.xml
+++ b/gnome/core/libbonobo.xml
@ -68,8 +68,8 @@
    <xref linkend="perl-xml-parser"/></para>

    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">X (<xref linkend="xfree86"/> or
-    <xref linkend="xorg"/>) and
+    <para role="optional">X (<xref linkend="xfree86"/>,
+    <xref linkend="xorg"/>, or <xref linkend="xorg7"/>) and
    <xref linkend="gtk-doc"/></para>

  </sect2>
--- a/gnome/core/libgtop.xml
+++ b/gnome/core/libgtop.xml
@ -66,7 +66,8 @@
    <bridgehead renderas="sect4">Optional</bridgehead>
    <para role="optional"><xref linkend="popt"/>,
    <xref linkend="gdbm"/>, and
-    X (<xref linkend="xfree86"/> or <xref linkend="xorg"/>)</para>
+    X (<xref linkend="xfree86"/>, <xref linkend="xorg"/>, or
+    <xref linkend="xorg7"/>)</para>

  </sect2>

--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@ -40,6 +40,19 @@
    </listitem>

 -->
+    <listitem>
+      <para>March 2nd, 2006</para>
+      <itemizedlist>
+        <listitem>
+          <para>[dj] - Updated Xorg-7 and Mesa to use alternate module 
+          path.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Separated user and root commands in Xorg-7.0.0.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
    <listitem>
      <para>March 2nd, 2006</para>
      <itemizedlist>
@ -55,6 +68,9 @@
          <para>[dj] - Added Xorg-7.0 and corrected links in xterm and Mesa
          pages.</para>
        </listitem>
+        <listitem>
+          <para>[dj] - Added Xorg-7 to all X dependency references.</para>
+        </listitem>
      </itemizedlist>
    </listitem>

--- a/multimedia/libdriv/gst-plugins.xml
+++ b/multimedia/libdriv/gst-plugins.xml
@ -91,7 +91,8 @@
    <xref linkend="libpng"/>,
    <xref linkend="NASM"/>,
    <xref linkend="pango"/>, and
-    X (<xref linkend="xfree86"/> or <xref linkend="xorg"/>)</para>
+    X (<xref linkend="xfree86"/>, <xref linkend="xorg"/> or 
+    <xref linkend="xorg7"/>)</para>

    <bridgehead renderas="sect4">Optional Audio Libraries/Drivers/CODECs</bridgehead>
    <para role="optional"><xref linkend="alsa"/>,
--- a/multimedia/libdriv/libao.xml
+++ b/multimedia/libdriv/libao.xml
@ -65,7 +65,8 @@
    <bridgehead renderas="sect3">Libao Dependencies</bridgehead>

    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">X (<xref linkend="xfree86"/> or <xref linkend="xorg"/>),
+    <para role="optional">X (<xref linkend="xfree86"/>, <xref linkend="xorg"/>
+    or <xref linkend="xorg7"/>),
    <xref linkend="esound"/>,
    <xref linkend="alsa"/>,
    <xref linkend="arts"/>,
--- a/multimedia/libdriv/libdv.xml
+++ b/multimedia/libdriv/libdv.xml
@ -65,7 +65,8 @@
    <xref linkend="pkgconfig"/>,
    <xref linkend="sdl"/>,
    <xref linkend="GTK"/> and
-    X (<xref linkend="xfree86"/> or <xref linkend="xorg"/>)</para>
+    X (<xref linkend="xfree86"/>, <xref linkend="xorg"/>,
+    or <xref linkend="xorg7"/>)</para>

  </sect2>

--- a/multimedia/libdriv/libmpeg2.xml
+++ b/multimedia/libdriv/libmpeg2.xml
@ -65,7 +65,8 @@
    <bridgehead renderas="sect3">libmpeg2 Dependencies</bridgehead>

    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">X (<xref linkend="xorg"/> or <xref linkend="xfree86"/>)
+    <para role="optional">X (<xref linkend="xorg"/>, <xref linkend="xfree86"/>
+    or <xref linkend="xorg7"/>)
    and <xref linkend="sdl"/></para>

  </sect2>
--- a/multimedia/libdriv/nas.xml
+++ b/multimedia/libdriv/nas.xml
@ -74,8 +74,8 @@
    <bridgehead renderas="sect3">NAS Dependencies</bridgehead>

    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">X (<xref linkend="xfree86"/> or
-    <xref linkend="xorg"/>)</para>
+    <para role="required">X (<xref linkend="xfree86"/>,
+    <xref linkend="xorg"/> or <xref linkend="xorg7"/>)</para>

  </sect2>

--- a/multimedia/libdriv/sdl.xml
+++ b/multimedia/libdriv/sdl.xml
@ -75,7 +75,8 @@
    <xref linkend="arts"/>,
    <xref linkend="nas"/>,
    <xref linkend="NASM"/>,
-    X (<xref linkend="xfree86"/> or <xref linkend="xorg"/>),
+    X (<xref linkend="xfree86"/>, <xref linkend="xorg"/> or 
+    <xref linkend="xorg7"/>),
    <xref linkend="aalib"/>,
    <ulink url="http://www.directfb.org/">DirectFB</ulink>,
    <ulink url="http://www.svgalib.org/">SVGAlib</ulink>,
--- a/multimedia/libdriv/xine-lib.xml
+++ b/multimedia/libdriv/xine-lib.xml
@ -63,7 +63,8 @@
    <bridgehead renderas="sect3">Xine Libraries Dependencies</bridgehead>

    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">X (<xref linkend="xfree86"/> or <xref linkend="xorg"/>)
+    <para role="required">X (<xref linkend="xfree86"/>, <xref linkend="xorg"/>
+    or <xref linkend="xorg7"/>)
    and <xref linkend="esound"/> or OSS or
    <xref linkend="alsa"/> or <xref linkend="arts"/> or
    <ulink url="http://0pointer.de/lennart/projects/polypaudio/">polypaudio</ulink></para>
--- a/multimedia/videoutils/ffmpeg.xml
+++ b/multimedia/videoutils/ffmpeg.xml
@ -83,7 +83,8 @@
    <para role="optional"><xref linkend="libvorbis"/>,
    <xref linkend="lame"/>,
    <xref linkend="imlib2"/>,
-    X (<xref linkend="xfree86"/> or <xref linkend="xorg"/>),
+    X (<xref linkend="xfree86"/>, <xref linkend="xorg"/>,
+    or <xref linkend="xorg7"/>),
    <xref linkend="sdl"/>,
    <xref linkend="freetype2"/>,
    <xref linkend="mplayer"/> (for the shared post-processing library),
--- a/multimedia/videoutils/mplayer.xml
+++ b/multimedia/videoutils/mplayer.xml
@ -195,7 +195,8 @@
    <ulink url="http://www.ladspa.org/">LADSPA</ulink></para>

    <bridgehead renderas="sect4">Optional Video Output Drivers and Libraries</bridgehead>
-    <para role="optional">X (<xref linkend="xfree86"/> or <xref linkend="xorg"/>),
+    <para role="optional">X (<xref linkend="xfree86"/>, <xref linkend="xorg"/>,
+    or <xref linkend="xorg7"/>),
    <xref linkend="libpng"/>,
    <xref linkend="libjpeg"/>,
    <!-- <xref linkend="libungif"/> or -->
--- a/multimedia/videoutils/transcode.xml
+++ b/multimedia/videoutils/transcode.xml
@ -72,7 +72,8 @@ the Transcode Wiki at <ulink url="http://www.transcoding.org/"/>.</para>
    <bridgehead renderas="sect4">Optional (Listed in the Order That the
    <command>configure</command> Script Looks for Them)</bridgehead>
    <para role="optional"><xref linkend="pkgconfig"/>,
-    X (<xref linkend="xfree86"/> or <xref linkend="xorg"/>),
+    X (<xref linkend="xfree86"/>, <xref linkend="xorg"/>,
+    or <xref linkend="xorg7"/>),
    <xref linkend="xvid"/>,
    <!-- Adding this comment in case this package gets any momentum and
         actually uses an updated DivX. Here is the new URL to the new codec:
--- a/postlfs/editors/emacs.xml
+++ b/postlfs/editors/emacs.xml
@ -61,7 +61,8 @@
    <bridgehead renderas="sect3">Emacs Dependencies</bridgehead>

    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">X (<xref linkend="xfree86"/> or <xref linkend="xorg"/>),
+    <para role="optional">X (<xref linkend="xfree86"/>, 
+    <xref linkend="xorg"/>, or <xref linkend="xorg7"/>),
    <xref linkend="libjpeg"/>,
    <xref linkend="libpng"/>,
    <xref linkend="libtiff"/>, and
--- a/postlfs/editors/vim.xml
+++ b/postlfs/editors/vim.xml
@ -79,8 +79,8 @@
    <bridgehead renderas="sect3">Vim Dependencies</bridgehead>

    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">X (<xref linkend="xfree86"/> or
-    <xref linkend="xorg"/>)</para>
+    <para role="recommended">X (<xref linkend="xfree86"/>,
+    <xref linkend="xorg"/>, or <xref linkend="xorg7"/>)</para>

    <bridgehead renderas="sect4">Optional</bridgehead>
    <para role="optional"><xref linkend="gtk2"/>,
--- a/postlfs/security/heimdal.xml
+++ b/postlfs/security/heimdal.xml
@ -93,7 +93,8 @@
    <bridgehead renderas="sect4">Optional</bridgehead>
    <para role="optional"><xref linkend="linux-pam"/>,
    <xref linkend="openldap"/>,
-    X (<xref linkend="xorg"/> or <xref linkend="xfree86"/>),
+    X (<xref linkend="xorg"/>, <xref linkend="xfree86"/>,
+    or <xref linkend="xorg7"/>),
    <xref linkend="cracklib"/> (compiled with the <filename>heimdal</filename>
    patch), and
    <ulink url="http://www.pdc.kth.se/kth-krb/">krb4</ulink></para>
--- a/pst/printing/espgs.xml
+++ b/pst/printing/espgs.xml
@ -105,7 +105,8 @@
    <para role="optional"><xref linkend="cups"/>,
    <xref linkend="libjpeg"/>,
    <xref linkend="libpng"/>,
-    X (<xref linkend="xfree86"/> or <xref linkend="xorg"/>), and
+    X (<xref linkend="xfree86"/>, <xref linkend="xorg"/>, or
+    <xref linkend="xorg7"/>), and
    <xref linkend="GTK"/></para>

  </sect2>
--- a/pst/printing/gs.xml
+++ b/pst/printing/gs.xml
@ -101,7 +101,8 @@
    <para role="optional"><xref linkend="libjpeg"/>,
    <xref linkend="libpng"/>,
    <xref linkend="GTK"/> and
-    X (<xref linkend="xfree86"/> or <xref linkend="xorg"/>)</para>
+    X (<xref linkend="xfree86"/>, <xref linkend="xorg"/>, or
+    <xref linkend="xorg7"/>)</para>

    <bridgehead renderas="sect3">Conflicts</bridgehead>
    <para>This version of Ghostscript does not work with
--- a/pst/ps/a2ps.xml
+++ b/pst/ps/a2ps.xml
@ -71,7 +71,8 @@
    <bridgehead renderas="sect3">a2ps Dependencies</bridgehead>

    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">X (<xref linkend="xfree86"/> or <xref linkend="xorg"/>),
+    <para role="optional">X (<xref linkend="xfree86"/>, 
+    <xref linkend="xorg"/>, or <xref linkend="xorg7"/>),
    <xref linkend="psutils"/>,
    <xref linkend="tex"/>,
    <xref linkend="gs"/> or <xref linkend="espgs"/>,
--- a/pst/scanning/sane.xml
+++ b/pst/scanning/sane.xml
@ -106,8 +106,8 @@
    <xref linkend="tex"/></para>

    <bridgehead renderas="sect4">Optional (Front Ends)</bridgehead>
-    <para role="optional">X (<xref linkend="xfree86"/> or
-    <xref linkend="xorg"/>),
+    <para role="optional">X (<xref linkend="xfree86"/>,
+    <xref linkend="xorg"/>, or <xref linkend="xorg7"/>),
    <xref linkend="gtk2"/>, and
    <xref linkend="gimp"/></para>

--- a/server/mail/exim.xml
+++ b/server/mail/exim.xml
@ -76,7 +76,8 @@
    <ulink url="http://sourceforge.net/projects/tdb">TDB</ulink></para>

    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">X (<xref linkend="xfree86"/> or <xref linkend="xorg"/>),
+    <para role="optional">X (<xref linkend="xfree86"/>, 
+    <xref linkend="xorg"/>, or <xref linkend="xorg7"/>),
    <xref linkend="openldap"/>,
    <xref linkend="openssl"/> or
    <ulink url="http://www.gnu.org/software/gnutls/">GnuTLS</ulink>,
--- a/server/major/openssh.xml
+++ b/server/major/openssh.xml
@ -68,7 +68,8 @@
    <bridgehead renderas="sect4">Optional</bridgehead>
    <para role="optional"><xref linkend="linux-pam"/>,
    <xref linkend="tcpwrappers"/>,
-    X (<xref linkend="xfree86"/> or <xref linkend="xorg"/>),
+    X (<xref linkend="xfree86"/>, <xref linkend="xorg"/>,
+    or <xref linkend="xorg7"/>),
    <xref linkend="mitkrb"/> or <xref linkend="heimdal"/>,
    <xref linkend="jdk"/>,
    <xref linkend="net-tools"/>,
--- a/x/installing/xorg7.xml
+++ b/x/installing/xorg7.xml
@ -52,7 +52,7 @@
    <bridgehead renderas="sect3">Xorg Download and Installation Instructions</bridgehead>

    <para>With the modular build system, it is no longer possible to download
-    the entire package in a single file.  In fact, there may be as may as 200 
+    the entire package in a single file.  In fact, there may be as many as 200 
    files that need to be fetched from the download location.  To assist with
    such a large task, it is strongly recommended to install 
    <xref linkend="wget"/> for downloading the needed files.  A complete 
--- a/x/lib/cairo.xml
+++ b/x/lib/cairo.xml
@ -72,7 +72,8 @@
    <bridgehead renderas="sect3">cairo Dependencies</bridgehead>

    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">X (<xref linkend="xorg"/> or <xref linkend="xfree86"/>)
+    <para role="required">X (<xref linkend="xorg"/>, <xref linkend="xorg7"/>, 
+    or <xref linkend="xfree86"/>)
    and <xref linkend="pkgconfig"/></para>

    <bridgehead renderas="sect4">Optional</bridgehead>
--- a/x/lib/freeglut.xml
+++ b/x/lib/freeglut.xml
@ -64,8 +64,8 @@
    <bridgehead renderas="sect3">freeglut Dependencies</bridgehead>

    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">X (<xref linkend="xfree86"/> or
-    <xref linkend="xorg"/>)</para>
+    <para role="required">X (<xref linkend="xfree86"/>,
+    <xref linkend="xorg"/>, or <xref linkend="xorg7"/>)</para>

  </sect2>

--- a/x/lib/gtk+.xml
+++ b/x/lib/gtk+.xml
@ -64,7 +64,8 @@
    <para role="required"><xref linkend="GLib"/>,
    <xref linkend="libtiff"/>,
    <xref linkend="libjpeg"/>, and
-    X (<xref linkend="xfree86"/> or <xref linkend="xorg"/>)</para>
+    X (<xref linkend="xfree86"/>, <xref linkend="xorg"/>,
+    or <xref linkend="xorg7"/>)</para>

  </sect2>

--- a/x/lib/lesstif.xml
+++ b/x/lib/lesstif.xml
@ -69,8 +69,8 @@
    <bridgehead renderas="sect3">LessTif Dependencies</bridgehead>

    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">X (<xref linkend="xfree86"/> or
-    <xref linkend="xorg"/>)</para>
+    <para role="required">X (<xref linkend="xfree86"/>,
+    <xref linkend="xorg"/>, or <xref linkend="xorg7"/>)</para>

    <bridgehead renderas="sect4">Optional</bridgehead>
    <para role="optional"><xref linkend="lynx"/> or <xref linkend="Links"/>
--- a/x/lib/libxklavier.xml
+++ b/x/lib/libxklavier.xml
@ -61,7 +61,8 @@
    <bridgehead renderas="sect3">libxklavier Dependencies</bridgehead>

    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">X (<xref linkend="xfree86"/> or <xref linkend="xorg"/>),
+    <para role="required">X (<xref linkend="xfree86"/>, <xref linkend="xorg"/>,
+    or <xref linkend="xorg7"/>),
    <xref linkend="pkgconfig"/> and
    <xref linkend="libxml2"/></para>

--- a/x/lib/mesalib.xml
+++ b/x/lib/mesalib.xml
@ -96,7 +96,8 @@
    commands below for your system.  Correct several hard coded directories 
    in the source files with the following command:</para>

-<screen><userinput>find . -type f -exec sed -i 's@/usr/X11R6@/usr@g' {} \;</userinput></screen>
+<screen><userinput>find . -type f -exec sed -i 's@/usr/X11R6@/usr@g' {} \; &amp;&amp;
+sed -i 's@lib/modules@lib/X11/modules@' src/glx/x11/dri_glx.c</userinput></screen>

    <para>Install <application>MesaLib</application> 
    by running the following command:</para>
@ -108,8 +109,8 @@
    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>

 <screen role="root"><userinput>bin/installmesa /usr &amp;&amp;
-mkdir -v -p /usr/lib/modules/dri &amp;&amp;
-install -v -m755 lib/*dri* /usr/lib/modules/dri</userinput></screen>
+mkdir -v -p /usr/lib/X11/modules/dri &amp;&amp;
+install -v -m755 lib/*dri* /usr/lib/X11/modules/dri</userinput></screen>

    <para>If you've extracted the GLUT and Demos packages as well, then 
    build the test programs with the following commands:</para>
@ -138,6 +139,32 @@ make PROGS='glxinfo glxgears'</userinput></screen>

  </sect2>

+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para><command>find...sed -i 's@/usr/X11R6@/usr@'...</command>: This 
+    command corrects several hard coded references to the X11R6 default
+    installation path.</para>
+
+    <para><command>sed -i 's@lib/modules@lib/X11/modules@' 
+    src/glx/x11/dri_glx.c</command>: This command corrects a hard coded
+    reference to the module directory.</para>
+
+    <para><command>bin/installmesa</command>: Mesa uses a custom installation
+    script as opposed to the normal <parameter>install</parameter> make 
+    target.</para>
+
+    <para><command>install -v -m755 lib/*dri* 
+    /usr/lib/X11/modules/dri</command>: installs the DRI modules.</para>
+
+    <para><command>make PROGS='glxinfo glxgears'</command>: build only
+    the glxinfo and glxgears programs.</para>
+
+    <para><command>install -v -m755 glxinfo glxgears /usr/bin</command>: 
+    Installs only the glxinfo and glxgears programs.</para>
+
+  </sect2>
+
  <sect2 role="content">
    <title>Contents</title>

--- a/x/lib/pango.xml
+++ b/x/lib/pango.xml
@ -74,7 +74,8 @@

    <bridgehead renderas="sect4">Optional (If <application>cairo</application>
    is Not Installed)</bridgehead>
-    <para role="optional">X (<xref linkend="xfree86"/> or <xref linkend="xorg"/>)
+    <para role="optional">X (<xref linkend="xfree86"/>, <xref linkend="xorg"/>,
+    or <xref linkend="xorg7"/>)
    and <xref linkend="fontconfig"/></para>

    <bridgehead renderas="sect4">Optional (To Rebuild the API Documentation)</bridgehead>
--- a/x/lib/qt.xml
+++ b/x/lib/qt.xml
@ -67,8 +67,8 @@
    <bridgehead renderas="sect3">Qt Dependencies</bridgehead>

    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">X (<xref linkend="xfree86"/> or
-    <xref linkend="xorg"/>)</para>
+    <para role="required">X (<xref linkend="xfree86"/>,
+    <xref linkend="xorg"/>, or <xref linkend="xorg7"/>)</para>

    <bridgehead renderas="sect4">Recommended</bridgehead>
    <para role="recommended"><xref linkend="libjpeg"/> and
--- a/x/lib/startup-notification.xml
+++ b/x/lib/startup-notification.xml
@ -64,8 +64,8 @@ xreflabel="startup-notification-&startup-notification-version;">
    <bridgehead renderas="sect3">startup-notification Dependencies</bridgehead>

    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="optional">X (<xref linkend="xfree86"/> or
-    <xref linkend="xorg"/>)</para>
+    <para role="optional">X (<xref linkend="xfree86"/>,
+    <xref linkend="xorg"/>, xref linkend="xorg7"/>)</para>

  </sect2>

--- a/x/wm/fluxbox.xml
+++ b/x/wm/fluxbox.xml
@ -61,8 +61,8 @@
    <bridgehead renderas="sect3">Fluxbox Dependencies</bridgehead>

    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">X (<xref linkend="xfree86"/> or
-    <xref linkend="xorg"/>)</para>
+    <para role="required">X (<xref linkend="xfree86"/>,
+    <xref linkend="xorg"/>, or <xref linkend="xorg7"/>)</para>

    <bridgehead renderas="sect4">Optional</bridgehead>
    <para role="optional"><xref linkend="imlib2"/> Image display library</para>
--- a/x/wm/other-wms.xml
+++ b/x/wm/other-wms.xml
@ -16,8 +16,9 @@
  <title>Other Window Managers</title>

  <para><command>twm</command> is the Tab Window Manager. This is the default
-  window manager installed by the <xref linkend="xorg"/> and
-  <xref linkend="xfree86"/> <application>X Window Systems</application>.</para>
+  window manager installed by the <xref linkend="xorg"/>, 
+  <xref linkend="xorg7"/>, and <xref linkend="xfree86"/> <application>X 
+  Window Systems</application>.</para>

  <para><command>mwm</command> is the Motif® Window Manager. It is an
  <application>OSF/Motif®</application> clone packaged and installed with