Index: general.ent
===================================================================
--- general.ent	(revision 3b69a2aac779f32e908330437c01c06f18577b69)
+++ general.ent	(revision c5c81b2c0ca5d3f721d3d8ca6f03a871916121f1)
@@ -167,6 +167,4 @@
 <!ENTITY gmime-version                "2.4.21">
 <!ENTITY libidn-version               "1.19">
-<!ENTITY xcb-proto-version            "1.6">
-<!ENTITY libxcb-version               "1.7">
 <!ENTITY libatomic_ops-version        "1.2">
 <!ENTITY libdrm-version               "2.4.23">
@@ -261,6 +259,4 @@
 <!ENTITY graphviz-version             "2.26.3">
 <!ENTITY recode-version               "3.6">
-<!ENTITY xcb-util-version             "0.3.6">
-<!ENTITY xterm-version                "267">
 <!ENTITY rman-version                 "3.2">
 <!ENTITY icon-naming-utils-version    "0.8.90">
@@ -517,10 +513,13 @@
 <!ENTITY libXau-version               "1.0.6">
 <!ENTITY libXdmcp-version             "1.1.0">
-<!-- <!ENTITY luit-version                 "1.0.5"> -->
+<!ENTITY xcb-proto-version            "1.6">
+<!ENTITY libxcb-version               "1.7">
 <!ENTITY xcursor-themes-version       "1.0.3">
 <!ENTITY xkeyboard-config-version     "2.0">
 <!ENTITY xbitmaps-version             "1.1.1">
+<!ENTITY mesalib-version              "7.9">
+<!ENTITY xcb-util-version             "0.3.6">
 <!ENTITY xorg-server-version          "1.9.3">
-
+<!ENTITY xterm-version                "267">
 <!-- Obsolete
 <!ENTITY xorg-version                 "6.9.0">
Index: general/genlib/genlib.xml
===================================================================
--- general/genlib/genlib.xml	(revision 3b69a2aac779f32e908330437c01c06f18577b69)
+++ general/genlib/genlib.xml	(revision c5c81b2c0ca5d3f721d3d8ca6f03a871916121f1)
@@ -71,10 +71,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gmime.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libidn.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xcb-proto.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libxcb.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libatomic_ops.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libdrm.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dbus-bindings.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libpthread-stubs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pth.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libassuan.xml"/>
Index: neral/genlib/libpthread-stubs.xml
===================================================================
--- general/genlib/libpthread-stubs.xml	(revision 3b69a2aac779f32e908330437c01c06f18577b69)
+++ 	(revision )
@@ -1,100 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY libpthread-stubs-download-http "http://xcb.freedesktop.org/dist/libpthread-stubs-&libpthread-stubs-version;.tar.bz2">
-  <!ENTITY libpthread-stubs-download-ftp  "ftp://ftp.x.org/pub/individual/lib/libpthread-stubs-&libpthread-stubs-version;.tar.bz2">
-  <!ENTITY libpthread-stubs-md5sum        "e8fa31b42e13f87e8f5a7a2b731db7ee">
-  <!ENTITY libpthread-stubs-size          "204 KB">
-  <!ENTITY libpthread-stubs-buildsize     "1.4 MB">
-  <!ENTITY libpthread-stubs-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="libpthread-stubs" xreflabel="libpthread-stubs-&libpthread-stubs-version;">
-  <?dbhtml filename="libpthread-stubs.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>libpthread-stubs-&libpthread-stubs-version;</title>
-
-  <indexterm zone="libpthread-stubs">
-    <primary sortas="a-libpthread-stubs">libpthread-stubs</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libpthread-stubs</title>
-
-    <para>The <application>libpthread-stubs</application> package provides
-    weak aliases for pthread functions not provided in libc or otherwise
-    available by default. This is useful for libraries that rely on pthread
-    stubs to use pthreads optionally. On Linux, all necessary pthread
-    functions are available, so this package is simply a placeholder.</para>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&libpthread-stubs-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&libpthread-stubs-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &libpthread-stubs-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &libpthread-stubs-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &libpthread-stubs-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &libpthread-stubs-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/libpthread-stubs"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libpthread-stubs</title>
-
-    <para>Install <application>libpthread-stubs</application> by running the
-    following commands:</para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>This package does not come with a test suite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem>
-    user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>None</seg>
-        <seg>None</seg>
-        <seg>None</seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: neral/genlib/libxcb.xml
===================================================================
--- general/genlib/libxcb.xml	(revision 3b69a2aac779f32e908330437c01c06f18577b69)
+++ 	(revision )
@@ -1,171 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY libxcb-download-http "http://xcb.freedesktop.org/dist/libxcb-&libxcb-version;.tar.bz2">
-  <!ENTITY libxcb-download-ftp  " ">
-  <!-- <!ENTITY libxcb-download-ftp  "ftp://ftp.x.org/pub/current/src/extras/libxcb-&libxcb-version;.tar.bz2"> -->
-  <!ENTITY libxcb-md5sum        "925699df361b99491165ebc12068056b">
-  <!ENTITY libxcb-size          "316 KB">
-  <!ENTITY libxcb-buildsize     "20.8 MB">
-  <!ENTITY libxcb-time          "0.3 SBU">
-]>
-
-<sect1 id="libxcb" xreflabel="libxcb-&libxcb-version;">
-  <?dbhtml filename="libxcb.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>libxcb-&libxcb-version;</title>
-
-  <indexterm zone="libxcb">
-    <primary sortas="a-libxcb">libxcb</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libxcb</title>
-
-    <para>The <application>libxcb</application> package provides an interface
-    to the X Window System protocol, which replaces the current Xlib interface.
-    Xlib can also use XCB as a transport layer, allowing software to make
-    requests and receive responses with both.</para>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&libxcb-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&libxcb-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &libxcb-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &libxcb-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &libxcb-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &libxcb-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libxcb Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="libXau"/>,
-    <xref linkend="libXdmcp"/>,
-    <xref linkend="libpthread-stubs"/>,
-    <xref linkend="libxslt"/>, and
-    <xref linkend="xcb-proto"/></para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="doxygen"/> (to generate API
-    documentation) and <ulink url="http://check.sourceforge.net/">Check</ulink>
-    (to run tests)</para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/libxcb"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libxcb</title>
-
-    <para>Install <application>libxcb</application> by running the following
-    commands:</para>
-
-<screen><userinput>./configure $XORG_CONFIG --docdir='${datadir}'/doc/libxcb-&libxcb-version; &amp;&amp;
-make</userinput></screen>
-
-    <para>To test the results, issue: <command>make check</command>.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><parameter>--docdir='${datadir}'/doc/libxcb-&libxcb-version;</parameter>:
-    This parameter ensures the <application>libxcb</application> documentation
-    is installed to a versioned directory.</para>
-
-    <para><parameter>--without-doxygen</parameter>: This switch can be used
-    to disable the API documentation if <xref linkend="doxygen"/> is
-    installed.</para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring libxcb</title>
-
-    <sect3 id="libxcb-config">
-      <title>Configuration Information</title>
-
-      <para>The <application>libxcb</application> developers have decided
-      to be strict in asserting locking bugs in X11 applications. This is
-      different than the behavior of <application>libX11</application> when
-      used on its own, and it will cause some applications to crash when
-      they previously did not. When an application has these types of bugs,
-      it will crash with the following assertion:</para>
-
-<screen><literal>xcb_xlib_lock: Assertion `!c->xlib.lock' failed.</literal></screen>
-
-      <para>An environment variable, <envar>LIBXCB_ALLOW_SLOPPY_LOCK</envar>,
-      can be set which will allow the locking bugs to not crash the
-      application. It is a workaround that is known to be needed in a few
-      cases. If it is found that these bugs affect an application in use, add
-      the following to your system or personal profile:</para>
-
-<screen><literal>export LIBXCB_ALLOW_SLOPPY_LOCK=1</literal></screen>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>None</seg>
-        <seg>libxcb.{so,a} and libxcb-*.{so,a}</seg>
-        <seg><envar>$XORG_PREFIX</envar>/include/xcb and
-        <envar>$XORG_PREFIX</envar>/share/doc/libxcb-&libxcb-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libxcb-lib">
-        <term><filename class='libraryfile'>libxcb.{so,a}</filename></term>
-        <listitem>
-          <para>is an interface to the X Window System protocol.</para>
-          <indexterm zone="libxcb libxcb-lib">
-            <primary sortas="c-libxcb">libxcb.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/genlib/xcb-proto.xml
===================================================================
--- general/genlib/xcb-proto.xml	(revision 3b69a2aac779f32e908330437c01c06f18577b69)
+++ 	(revision )
@@ -1,108 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY xcb-proto-download-http "http://xcb.freedesktop.org/dist/xcb-proto-&xcb-proto-version;.tar.bz2">
-  <!ENTITY xcb-proto-download-ftp  " ">
-  <!-- <!ENTITY xcb-proto-download-ftp  "ftp://ftp.x.org/pub/current/src/extras/xcb-proto-&xcb-proto-version;.tar.bz2"> -->
-  <!ENTITY xcb-proto-md5sum        "04313e1d914b44d0e457f6c494fc178b">
-  <!ENTITY xcb-proto-size          "96 KB">
-  <!ENTITY xcb-proto-buildsize     "1.1 MB">
-  <!ENTITY xcb-proto-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="xcb-proto" xreflabel="xcb-proto-&xcb-proto-version;">
-  <?dbhtml filename="xcb-proto.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>xcb-proto-&xcb-proto-version;</title>
-
-  <indexterm zone="xcb-proto">
-    <primary sortas="a-xcb-proto">xcb-proto</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to xcb-proto</title>
-
-    <para>The <application>xcb-proto</application> package provides the
-    XML-XCB protocol descriptions that <application>libxcb</application>
-    uses to generate the majority of its code and API.</para>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&xcb-proto-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&xcb-proto-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &xcb-proto-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &xcb-proto-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &xcb-proto-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &xcb-proto-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">xcb-proto Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="python"/></para>
-
-    <bridgehead renderas="sect4">Optional (required to run the
-    tests)</bridgehead>
-    <para role="optional"><xref linkend="libxml2"/></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/xcb-proto"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of xcb-proto</title>
-
-    <para>Install <application>xcb-proto</application> by running the following
-    commands:</para>
-
-<screen><userinput>./configure $XORG_CONFIG</userinput></screen>
-
-    <para>To test the results, issue: <command>make check</command>.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-install -dv -m755 ${XORG_PREFIX}/share/doc/xcb-proto-&xcb-proto-version; &amp;&amp;
-install -v -m644 doc/* ${XORG_PREFIX}/share/doc/xcb-proto-&xcb-proto-version;</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>None</seg>
-        <seg>None</seg>
-        <seg><envar>$XORG_PREFIX</envar>/share/xcb</seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: general/genutils/genutils.xml
===================================================================
--- general/genutils/genutils.xml	(revision 3b69a2aac779f32e908330437c01c06f18577b69)
+++ general/genutils/genutils.xml	(revision c5c81b2c0ca5d3f721d3d8ca6f03a871916121f1)
@@ -37,6 +37,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libiodbc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="graphviz.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xcb-util.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xterm.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="rman.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="recode.xml"/>
Index: neral/genutils/xcb-util.xml
===================================================================
--- general/genutils/xcb-util.xml	(revision 3b69a2aac779f32e908330437c01c06f18577b69)
+++ 	(revision )
@@ -1,124 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY xcb-util-download-http "http://xcb.freedesktop.org/dist/xcb-util-&xcb-util-version;.tar.bz2">
-  <!ENTITY xcb-util-download-ftp  " ">
-  <!ENTITY xcb-util-md5sum        "dd8968b8ee613cb027a8ef1fcbdc8fc9">
-  <!ENTITY xcb-util-size          "292 KB">
-  <!ENTITY xcb-util-buildsize     "4.3 MB">
-  <!ENTITY xcb-util-time          "0.1 SBU">
-]>
-
-<sect1 id="xcb-util" xreflabel="xcb-util-&xcb-util-version;">
-  <?dbhtml filename="xcb-util.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>xcb-util-&xcb-util-version;</title>
-
-  <indexterm zone="xcb-util">
-    <primary sortas="a-xcb-util">xcb-util</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to xcb-util</title>
-
-    <para>The <application>xcb-util</application> package provides additional
-    extensions to the <application>XCB</application> library, many that were
-    previously found in <application>Xlib</application>, but are not part of
-    core X protocol.</para>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&xcb-util-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&xcb-util-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &xcb-util-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &xcb-util-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &xcb-util-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &xcb-util-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">xcb-util Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="libxcb"/> and
-    <xref linkend="gperf"/></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/xcb-util"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of xcb-util</title>
-
-    <para>Install <application>xcb-util</application> by running the following
-    commands:</para>
-
-<screen><userinput>./configure $XORG_CONFIG &amp;&amp;
-make</userinput></screen>
-
-    <para>To test the results, issue: <command>make check</command>.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>None</seg>
-        <seg>libxcb-atom.{a,so}, libxcb-aux.{a,so}, libxcb-event.{a,so},
-        libxcb-icccm.{a,so}, libxcb-image.{a,so}, libxcb-keysyms.{a,so},
-        libxcb-property.{a,so}, libxcb-render-util.{a,so}, and
-        libxcb-reply.{a,so}</seg>
-        <seg>None</seg>
-      </seglistitem>
-    </segmentedlist>
-<!--
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="xcb-util-libs">
-        <term><filename class='libraryfile'>libxcb-*.{so,a}</filename></term>
-        <listitem>
-          <para>.</para>
-          <indexterm zone="xcb-util xcb-util-libs">
-            <primary sortas="c-xcb-util">libxcb-*.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
--->
-  </sect2>
-
-</sect1>
Index: neral/genutils/xterm.xml
===================================================================
--- general/genutils/xterm.xml	(revision 3b69a2aac779f32e908330437c01c06f18577b69)
+++ 	(revision )
@@ -1,198 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY xterm-download-http " ">
-  <!ENTITY xterm-download-ftp  "ftp://invisible-island.net/xterm/xterm-&xterm-version;.tgz">
-  <!ENTITY xterm-md5sum        "3945ab70cfa2a9e95804157ee1b0f8e8">
-  <!ENTITY xterm-size          "932 KB">
-  <!ENTITY xterm-buildsize     "10.6 MB">
-  <!ENTITY xterm-time          "0.2 SBU">
-]>
-
-<sect1 id="xterm2" xreflabel="xterm-&xterm-version;">
-  <?dbhtml filename="xterm.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>xterm-&xterm-version;</title>
-
-  <indexterm zone="xterm2">
-    <primary sortas="a-xterm2">xterm</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to xterm</title>
-
-    <para><application>xterm</application> is a terminal emulator for
-    the X Window System.</para>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&xterm-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&xterm-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &xterm-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &xterm-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &xterm-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &xterm-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">xterm Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="xorg7-app"/></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url='&blfs-wiki;/Xterm'/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of xterm</title>
-
-    <para>Install <application>xterm</application> by running the
-    following commands:</para>
-
-<screen><userinput>sed -i '/v0/,+1s/new:/new:kb=^?:/' termcap &amp;&amp;
-echo -e '\tkbs=\\177,' &gt;&gt;terminfo &amp;&amp;
-TERMINFO=/usr/lib/terminfo ./configure $XORG_CONFIG \
-    --enable-luit --enable-wide-chars \
-    --with-app-defaults=/etc/X11/app-defaults &amp;&amp;
-make</userinput></screen>
-
-    <para>This package does not come with a test suite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem>
-    user:</para>
-
-<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 ... termcap</command>,
-    <command>echo ... >>terminfo</command>: these commands modify the terminal
-    description, so that the Backspace key is expected to send the character
-    with ASCII code 127, for consistency with the Linux console.</para>
-
-    <para><parameter>TERMINFO=/usr/lib/terminfo</parameter>: This ensures
-    that the <command>xterm</command> terminfo file is installed to the
-    system terminfo database when the installation prefix is not
-    <filename class="directory">/usr</filename>.</para>
-
-    <para><parameter>--with-app-defaults=...</parameter>: Sets the location
-    for the <filename class="directory">app-defaults</filename>
-    directory.</para>
-
-    <para><parameter>--enable-luit</parameter>: Enables the luit filter for
-    translation between Unicode (used by xterm internally in the configuration
-    below) and the locale encoding. If <command>luit</command> is not found
-    in the PATH, the default of
-    <filename>/usr/X11R6/bin/luit</filename> will be used.</para>
-
-    <para><parameter>--enable-wide-chars</parameter>: Adds support for wide
-    characters.</para>
-
-    <para><command>make install-ti</command>: This command installs corrected
-    terminfo description files for use with
-    <application>xterm</application>.</para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring xterm</title>
-
-    <para>There are two ways to configure xterm.  You can add X resource
-    definitions to the user's <filename>~/.Xresources</filename> file, or
-    add them to the system-wide
-    <filename>$XORG_PREFIX/share/X11/app-defaults/Xterm</filename> file.</para>
-
-    <para>In order for xterm to follow the locale settings in the environment,
-    use TrueType fonts, and follow the Linux convention about the code sent by
-    the Backspace key, add the following definitions as the
-    <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>cat &gt;&gt; /etc/X11/app-defaults/XTerm &lt;&lt; "EOF"
-*VT100*locale: true
-*VT100*faceName: Monospace
-*VT100*faceSize: 10
-*backarrowKeyIsErase: true
-*ptyInitialErase: true
-EOF</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-
-      <seglistitem>
-        <seg>resize, uxterm, and xterm</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="resize">
-        <term><filename>resize</filename></term>
-        <listitem>
-          <para>prints a shell command for setting the TERM and TERMCAP
-          environment  variables to indicate the current size of xterm
-          window.</para>
-          <indexterm zone="xterm2 resize">
-            <primary sortas="b-resize">resize</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="uxterm">
-        <term><filename>uxterm</filename></term>
-        <listitem>
-          <para>is a wrapper script that modifies the current locale to use UTF-8
-          and starts xterm with the proper settings.</para>
-          <indexterm zone="xterm2 uxterm">
-            <primary sortas="b-uxterm">uxterm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xterm-bin">
-        <term><filename>xterm</filename></term>
-        <listitem>
-          <para>is a terminal emulator for the X Window System.</para>
-          <indexterm zone="xterm2 xterm2">
-            <primary sortas="b-xterm2">xterm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 3b69a2aac779f32e908330437c01c06f18577b69)
+++ introduction/welcome/changelog.xml	(revision c5c81b2c0ca5d3f721d3d8ca6f03a871916121f1)
@@ -47,4 +47,8 @@
           <para>[dj] - Separated Xorg Utilities packages (util-macros and
           makedepend).</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Moved libpthread-stubs, libxcb, Mesa, xcb-proto,
+          xcb-utils, and xterm to the Xorg section.</para>
         </listitem>
       </itemizedlist>
Index: x/installing/installing.xml
===================================================================
--- x/installing/installing.xml	(revision 3b69a2aac779f32e908330437c01c06f18577b69)
+++ x/installing/installing.xml	(revision c5c81b2c0ca5d3f721d3d8ca6f03a871916121f1)
@@ -33,13 +33,17 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libXau.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libXdmcp.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libpthread-stubs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xcb-proto.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libxcb.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x7lib.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xbitmaps.xml"/> -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xcb-util.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x7app.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xcursorthemes.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x7font.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xkeyboard-config.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="luit.xml"/> -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mesalib.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x7server.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x7driver.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xterm.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xconfig-dummy.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x-setup.xml"/>
Index: x/installing/libpthread-stubs.xml
===================================================================
--- x/installing/libpthread-stubs.xml	(revision c5c81b2c0ca5d3f721d3d8ca6f03a871916121f1)
+++ x/installing/libpthread-stubs.xml	(revision c5c81b2c0ca5d3f721d3d8ca6f03a871916121f1)
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY libpthread-stubs-download-http "http://xcb.freedesktop.org/dist/libpthread-stubs-&libpthread-stubs-version;.tar.bz2">
+  <!ENTITY libpthread-stubs-download-ftp  "ftp://ftp.x.org/pub/individual/lib/libpthread-stubs-&libpthread-stubs-version;.tar.bz2">
+  <!ENTITY libpthread-stubs-md5sum        "e8fa31b42e13f87e8f5a7a2b731db7ee">
+  <!ENTITY libpthread-stubs-size          "204 KB">
+  <!ENTITY libpthread-stubs-buildsize     "1.4 MB">
+  <!ENTITY libpthread-stubs-time          "less than 0.1 SBU">
+]>
+
+<sect1 id="libpthread-stubs" xreflabel="libpthread-stubs-&libpthread-stubs-version;">
+  <?dbhtml filename="libpthread-stubs.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>libpthread-stubs-&libpthread-stubs-version;</title>
+
+  <indexterm zone="libpthread-stubs">
+    <primary sortas="a-libpthread-stubs">libpthread-stubs</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to libpthread-stubs</title>
+
+    <para>The <application>libpthread-stubs</application> package provides
+    weak aliases for pthread functions not provided in libc or otherwise
+    available by default. This is useful for libraries that rely on pthread
+    stubs to use pthreads optionally. On Linux, all necessary pthread
+    functions are available, so this package is simply a placeholder.</para>
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&libpthread-stubs-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&libpthread-stubs-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &libpthread-stubs-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &libpthread-stubs-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &libpthread-stubs-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &libpthread-stubs-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/libpthread-stubs"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of libpthread-stubs</title>
+
+    <para>Install <application>libpthread-stubs</application> by running the
+    following commands:</para>
+
+<screen><userinput>./configure --prefix=/usr &amp;&amp;
+make</userinput></screen>
+
+    <para>This package does not come with a test suite.</para>
+
+    <para>Now, as the <systemitem class="username">root</systemitem>
+    user:</para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>None</seg>
+        <seg>None</seg>
+        <seg>None</seg>
+      </seglistitem>
+    </segmentedlist>
+
+  </sect2>
+
+</sect1>
Index: x/installing/libxcb.xml
===================================================================
--- x/installing/libxcb.xml	(revision c5c81b2c0ca5d3f721d3d8ca6f03a871916121f1)
+++ x/installing/libxcb.xml	(revision c5c81b2c0ca5d3f721d3d8ca6f03a871916121f1)
@@ -0,0 +1,171 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY libxcb-download-http "http://xcb.freedesktop.org/dist/libxcb-&libxcb-version;.tar.bz2">
+  <!ENTITY libxcb-download-ftp  " ">
+  <!-- <!ENTITY libxcb-download-ftp  "ftp://ftp.x.org/pub/current/src/extras/libxcb-&libxcb-version;.tar.bz2"> -->
+  <!ENTITY libxcb-md5sum        "925699df361b99491165ebc12068056b">
+  <!ENTITY libxcb-size          "316 KB">
+  <!ENTITY libxcb-buildsize     "20.8 MB">
+  <!ENTITY libxcb-time          "0.3 SBU">
+]>
+
+<sect1 id="libxcb" xreflabel="libxcb-&libxcb-version;">
+  <?dbhtml filename="libxcb.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>libxcb-&libxcb-version;</title>
+
+  <indexterm zone="libxcb">
+    <primary sortas="a-libxcb">libxcb</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to libxcb</title>
+
+    <para>The <application>libxcb</application> package provides an interface
+    to the X Window System protocol, which replaces the current Xlib interface.
+    Xlib can also use XCB as a transport layer, allowing software to make
+    requests and receive responses with both.</para>
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&libxcb-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&libxcb-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &libxcb-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &libxcb-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &libxcb-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &libxcb-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">libxcb Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required"><xref linkend="libXau"/>,
+    <xref linkend="libXdmcp"/>,
+    <xref linkend="libpthread-stubs"/>,
+    <xref linkend="libxslt"/>, and
+    <xref linkend="xcb-proto"/></para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional"><xref linkend="doxygen"/> (to generate API
+    documentation) and <ulink url="http://check.sourceforge.net/">Check</ulink>
+    (to run tests)</para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/libxcb"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of libxcb</title>
+
+    <para>Install <application>libxcb</application> by running the following
+    commands:</para>
+
+<screen><userinput>./configure $XORG_CONFIG --docdir='${datadir}'/doc/libxcb-&libxcb-version; &amp;&amp;
+make</userinput></screen>
+
+    <para>To test the results, issue: <command>make check</command>.</para>
+
+    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para><parameter>--docdir='${datadir}'/doc/libxcb-&libxcb-version;</parameter>:
+    This parameter ensures the <application>libxcb</application> documentation
+    is installed to a versioned directory.</para>
+
+    <para><parameter>--without-doxygen</parameter>: This switch can be used
+    to disable the API documentation if <xref linkend="doxygen"/> is
+    installed.</para>
+
+  </sect2>
+
+  <sect2 role="configuration">
+    <title>Configuring libxcb</title>
+
+    <sect3 id="libxcb-config">
+      <title>Configuration Information</title>
+
+      <para>The <application>libxcb</application> developers have decided
+      to be strict in asserting locking bugs in X11 applications. This is
+      different than the behavior of <application>libX11</application> when
+      used on its own, and it will cause some applications to crash when
+      they previously did not. When an application has these types of bugs,
+      it will crash with the following assertion:</para>
+
+<screen><literal>xcb_xlib_lock: Assertion `!c->xlib.lock' failed.</literal></screen>
+
+      <para>An environment variable, <envar>LIBXCB_ALLOW_SLOPPY_LOCK</envar>,
+      can be set which will allow the locking bugs to not crash the
+      application. It is a workaround that is known to be needed in a few
+      cases. If it is found that these bugs affect an application in use, add
+      the following to your system or personal profile:</para>
+
+<screen><literal>export LIBXCB_ALLOW_SLOPPY_LOCK=1</literal></screen>
+
+    </sect3>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>None</seg>
+        <seg>libxcb.{so,a} and libxcb-*.{so,a}</seg>
+        <seg><envar>$XORG_PREFIX</envar>/include/xcb and
+        <envar>$XORG_PREFIX</envar>/share/doc/libxcb-&libxcb-version;</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="libxcb-lib">
+        <term><filename class='libraryfile'>libxcb.{so,a}</filename></term>
+        <listitem>
+          <para>is an interface to the X Window System protocol.</para>
+          <indexterm zone="libxcb libxcb-lib">
+            <primary sortas="c-libxcb">libxcb.{so,a}</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: installing/luit.xml
===================================================================
--- x/installing/luit.xml	(revision 3b69a2aac779f32e908330437c01c06f18577b69)
+++ 	(revision )
@@ -1,131 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY luit-download-http "http://xorg.freedesktop.org/releases/individual/app/luit-&luit-version;.tar.bz2">
-  <!ENTITY luit-download-ftp  "ftp://ftp.x.org/pub/individual/app/luit-&luit-version;.tar.bz2">
-  <!ENTITY luit-md5sum        "fd8579a993c4480978e3504a4c53c189">
-  <!ENTITY luit-size          "124 KB">
-  <!ENTITY luit-buildsize     "1.0 MB">
-  <!ENTITY luit-time          "less than 0.1 SBU">
-
-]>
-
-<sect1 id="luit" xreflabel="luit-&luit-version;">
-  <?dbhtml filename="luit.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>Luit-&luit-version;</title>
-
-  <indexterm zone="luit">
-    <primary sortas="a-luit">Luit</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Luit</title>
-
-    <para><application>Luit</application> provides a filter for displaying and
-    converting UTF-8 characters in text console windows.</para>
-
-    &lfs67_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&luit-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&luit-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &luit-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &luit-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &luit-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &luit-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Luit Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="xorg7-font"/></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url='&blfs-wiki;/Luit'/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Luit</title>
-
-    <para>Install luit with the following commands:</para>
-
-<screen><userinput>./configure $XORG_CONFIG &amp;&amp;
-make</userinput></screen>
-
-    <para>This package does not come with a test suite.</para>
-
-    <para>Now as the <systemitem class="username">root</systemitem>
-    user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><parameter>--with-localealiasfile=$XORG_PREFIX/share/X11/locale/locale.alias</parameter>:
-    The default location <application>luit</application> expects the
-    <filename>locale.alias</filename> file is different than the location
-    <application>libX11</application> installs it to.</para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-      <seglistitem>
-        <seg>luit</seg>
-        <seg>None</seg>
-        <seg>None</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Description</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="luit-bin">
-        <term><command>luit</command></term>
-        <listitem>
-          <para>provides locale and ISO 2022 support for Unicode
-          terminals.</para>
-          <indexterm zone="luit luit-bin">
-            <primary sortas="b-luit">luit</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: x/installing/mesalib.xml
===================================================================
--- x/installing/mesalib.xml	(revision c5c81b2c0ca5d3f721d3d8ca6f03a871916121f1)
+++ x/installing/mesalib.xml	(revision c5c81b2c0ca5d3f721d3d8ca6f03a871916121f1)
@@ -0,0 +1,229 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY mesalib-download-http " ">
+  <!ENTITY mesalib-download-ftp  "ftp://ftp.freedesktop.org/pub/mesa/&mesalib-version;/MesaLib-&mesalib-version;.tar.bz2">
+  <!ENTITY mesalib-md5sum        "82c740c49d572baa6da2b1a1eee90bca">
+  <!ENTITY mesalib-size          "5.4 MB">
+  <!ENTITY mesalib-buildsize     "249 MB">
+  <!ENTITY mesalib-time          "3.1 SBU">
+]>
+
+<sect1 id="mesalib" xreflabel="MesaLib-&mesalib-version;">
+  <?dbhtml filename="mesalib.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>MesaLib-&mesalib-version;</title>
+
+  <indexterm zone="mesalib">
+    <primary sortas="a-MesaLib">MesaLib</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to MesaLib</title>
+
+    <para><application>Mesa</application> is an OpenGL compatible 3-D graphics
+    library.</para>
+
+    &lfs65_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&mesalib-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&mesalib-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &mesalib-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size:
+        &mesalib-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required:
+        &mesalib-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time:
+        &mesalib-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Recommended patch: <ulink
+        url="&patch-root;/MesaLib-&mesalib-version;-add_xdemos-1.patch"/>
+        (Needed if testing the Xorg installation per BLFS instructions)</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">MesaLib Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required"><xref linkend="xorg7-lib"/>,
+    <xref linkend="makedepend"/>,
+    <xref linkend="libdrm"/>,
+    <xref linkend="expat"/>, and
+    <xref linkend="talloc"/></para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional"><xref linkend="lesstif"/> (required to build motif
+    widgets)</para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/mesalib"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of MesaLib</title>
+
+    <note><para>Unlike other packages, the
+    <filename>MesaLib-&mesalib-version;.tar.bz2</filename>
+    archive will extract to the
+    <filename class="directory">Mesa-&mesalib-version;</filename>
+    directory.</para></note>
+
+    <para>Install <application>MesaLib</application> by running the following
+    commands:</para>
+
+<screen><userinput>sed 's@FLAGS=\"-g@FLAGS=\"@' -i configure &amp;&amp;
+patch -Np1 -i ../MesaLib-&mesalib-version;-add_xdemos-1.patch &amp;&amp;
+./configure $XORG_CONFIG --enable-xcb &amp;&amp;
+make</userinput></screen>
+
+    <para>This package does not come with a test suite.</para>
+
+    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>make install &amp;&amp;
+install -v -m755 -d ${XORG_PREFIX}/share/doc/MesaLib-&mesalib-version; &amp;&amp;
+install -v -m644    docs/* \
+                    ${XORG_PREFIX}/share/doc/MesaLib-&mesalib-version;</userinput></screen>
+
+    <para>Finally, if installing to any prefix other than
+    <filename class="directory">/usr</filename>, you should create symlinks
+    to the GL headers in <filename class="directory">/usr/include</filename>.
+    Execute the following command as the
+    <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>ln -s -v ${XORG_PREFIX}/include/GL /usr/include</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para><command>sed 's@FLAGS=\"-g@FLAGS=\"@' -i configure</command>: by
+    default, Mesa builds with debugging symbols.  Remove the -g switch from
+    both <envar>CFLAGS</envar> and <envar>CXXFLAGS</envar> with this
+    command.</para>
+
+    <para><option>--enable-xcb</option>: use the XCB backend instead of the
+    default XLib backend for GLX.</para>
+
+    <para><option>--enable-motif</option>: build motif widgets into the
+    GL widgets library (requires <application>lesstif</application>).</para>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Optionally Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>glxgears and glxinfo</seg>
+        <seg>libEGL.so, libGL.so, libGLU.so, libGLw.so, and *_dri.so</seg>
+        <seg><envar>$XORG_PREFIX</envar>/include/{EGL,KHR},
+        <envar>$XORG_PREFIX</envar>/lib/{dri,egl}, and
+        <envar>$XORG_PREFIX</envar>/share/doc/MesaLib-&mesalib-version;</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="glxgears">
+        <term><filename>glxgears</filename></term>
+        <listitem>
+          <para>is a GL demo useful for troubleshooting graphics
+          problems.</para>
+          <indexterm zone="mesalib glxgears">
+            <primary sortas="b-glxgears">glxgears</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="glxinfo">
+        <term><filename>glxinfo</filename></term>
+        <listitem>
+          <para>is a diagnostic program that displays information about the
+          graphics hardware and installed GL libraries.</para>
+          <indexterm zone="mesalib glxinfo">
+            <primary sortas="b-glxinfo">glxinfo</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libEGL">
+        <term><filename class='libraryfile'>libEGL.so</filename></term>
+        <listitem>
+          <para>provides a native platform graphics interface as defined by
+          the EGL-1.4 specification.</para>
+          <indexterm zone="mesalib libEGL">
+            <primary sortas="c-libGL">libEGL.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libGL">
+        <term><filename class='libraryfile'>libGL.so</filename></term>
+        <listitem>
+          <para>is the main OpenGL library.</para>
+          <indexterm zone="mesalib libGL">
+            <primary sortas="c-libGL">libGL.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libGLU">
+        <term><filename class='libraryfile'>libGLU.so</filename></term>
+        <listitem>
+          <para>is the OpenGL Utility library.</para>
+          <indexterm zone="mesalib libGLU">
+            <primary sortas="c-libGLU">libGLU.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libGLw">
+        <term><filename class='libraryfile'>libGLw.so</filename></term>
+        <listitem>
+          <para>is the Xt/Motif OpenGL drawing area widget library.</para>
+          <indexterm zone="mesalib libGLw">
+            <primary sortas="c-libGLw">libGLw.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: installing/xbitmaps.xml
===================================================================
--- x/installing/xbitmaps.xml	(revision 3b69a2aac779f32e908330437c01c06f18577b69)
+++ 	(revision )
@@ -1,104 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY xbitmaps-download-http "http://xorg.freedesktop.org/releases/individual/data/xbitmaps-&xbitmaps-version;.tar.bz2">
-  <!ENTITY xbitmaps-download-ftp  "ftp://ftp.x.org/pub/individual/data/xbitmaps-&xbitmaps-version;.tar.bz2">
-  <!ENTITY xbitmaps-md5sum        "7444bbbd999b53bec6a60608a5301f4c">
-  <!ENTITY xbitmaps-size          "116 KB">
-  <!ENTITY xbitmaps-buildsize     "835 KB">
-  <!ENTITY xbitmaps-time          "less than 0.1 SBU">
-
-]>
-
-<sect1 id="xbitmaps" xreflabel="xbitmaps-&xbitmaps-version;">
-  <?dbhtml filename="xbitmaps.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>Xbitmaps-&xbitmaps-version;</title>
-
-  <indexterm zone="xbitmaps">
-    <primary sortas="a-xbitmaps">Xbitmaps</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Xbitmaps</title>
-
-    <para>Xbitmaps provides static graphics needed by Xorg applications to
-    draw screen elements.</para>
-
-    &lfs67_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&xbitmaps-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&xbitmaps-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &xbitmaps-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &xbitmaps-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &xbitmaps-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &xbitmaps-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Xbitmaps Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="xorg7-util"/></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url='&blfs-wiki;/xbitmaps'/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Xbitmaps</title>
-
-    <para>First, configure the Xbitmaps package by running the following
-    command:</para>
-
-<screen><userinput>./configure $XORG_CONFIG</userinput></screen>
-
-    <para>This package does not come with a test suite.</para>
-
-    <para>Now install as the <systemitem class="username">root</systemitem>
-    user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>None</seg>
-        <seg>None</seg>
-        <seg><envar>$XORG_PREFIX</envar>/include/X11/bitmaps</seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: x/installing/xcb-proto.xml
===================================================================
--- x/installing/xcb-proto.xml	(revision c5c81b2c0ca5d3f721d3d8ca6f03a871916121f1)
+++ x/installing/xcb-proto.xml	(revision c5c81b2c0ca5d3f721d3d8ca6f03a871916121f1)
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY xcb-proto-download-http "http://xcb.freedesktop.org/dist/xcb-proto-&xcb-proto-version;.tar.bz2">
+  <!ENTITY xcb-proto-download-ftp  " ">
+  <!-- <!ENTITY xcb-proto-download-ftp  "ftp://ftp.x.org/pub/current/src/extras/xcb-proto-&xcb-proto-version;.tar.bz2"> -->
+  <!ENTITY xcb-proto-md5sum        "04313e1d914b44d0e457f6c494fc178b">
+  <!ENTITY xcb-proto-size          "96 KB">
+  <!ENTITY xcb-proto-buildsize     "1.1 MB">
+  <!ENTITY xcb-proto-time          "less than 0.1 SBU">
+]>
+
+<sect1 id="xcb-proto" xreflabel="xcb-proto-&xcb-proto-version;">
+  <?dbhtml filename="xcb-proto.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>xcb-proto-&xcb-proto-version;</title>
+
+  <indexterm zone="xcb-proto">
+    <primary sortas="a-xcb-proto">xcb-proto</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to xcb-proto</title>
+
+    <para>The <application>xcb-proto</application> package provides the
+    XML-XCB protocol descriptions that <application>libxcb</application>
+    uses to generate the majority of its code and API.</para>
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&xcb-proto-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&xcb-proto-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &xcb-proto-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &xcb-proto-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &xcb-proto-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &xcb-proto-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">xcb-proto Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required"><xref linkend="python"/></para>
+
+    <bridgehead renderas="sect4">Optional (required to run the
+    tests)</bridgehead>
+    <para role="optional"><xref linkend="libxml2"/></para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/xcb-proto"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of xcb-proto</title>
+
+    <para>Install <application>xcb-proto</application> by running the following
+    commands:</para>
+
+<screen><userinput>./configure $XORG_CONFIG</userinput></screen>
+
+    <para>To test the results, issue: <command>make check</command>.</para>
+
+    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>make install &amp;&amp;
+install -dv -m755 ${XORG_PREFIX}/share/doc/xcb-proto-&xcb-proto-version; &amp;&amp;
+install -v -m644 doc/* ${XORG_PREFIX}/share/doc/xcb-proto-&xcb-proto-version;</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directory</segtitle>
+
+      <seglistitem>
+        <seg>None</seg>
+        <seg>None</seg>
+        <seg><envar>$XORG_PREFIX</envar>/share/xcb</seg>
+      </seglistitem>
+    </segmentedlist>
+
+  </sect2>
+
+</sect1>
Index: x/installing/xcb-util.xml
===================================================================
--- x/installing/xcb-util.xml	(revision c5c81b2c0ca5d3f721d3d8ca6f03a871916121f1)
+++ x/installing/xcb-util.xml	(revision c5c81b2c0ca5d3f721d3d8ca6f03a871916121f1)
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY xcb-util-download-http "http://xcb.freedesktop.org/dist/xcb-util-&xcb-util-version;.tar.bz2">
+  <!ENTITY xcb-util-download-ftp  " ">
+  <!ENTITY xcb-util-md5sum        "dd8968b8ee613cb027a8ef1fcbdc8fc9">
+  <!ENTITY xcb-util-size          "292 KB">
+  <!ENTITY xcb-util-buildsize     "4.3 MB">
+  <!ENTITY xcb-util-time          "0.1 SBU">
+]>
+
+<sect1 id="xcb-util" xreflabel="xcb-util-&xcb-util-version;">
+  <?dbhtml filename="xcb-util.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>xcb-util-&xcb-util-version;</title>
+
+  <indexterm zone="xcb-util">
+    <primary sortas="a-xcb-util">xcb-util</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to xcb-util</title>
+
+    <para>The <application>xcb-util</application> package provides additional
+    extensions to the <application>XCB</application> library, many that were
+    previously found in <application>Xlib</application>, but are not part of
+    core X protocol.</para>
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&xcb-util-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&xcb-util-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &xcb-util-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &xcb-util-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &xcb-util-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &xcb-util-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">xcb-util Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required"><xref linkend="libxcb"/> and
+    <xref linkend="gperf"/></para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/xcb-util"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of xcb-util</title>
+
+    <para>Install <application>xcb-util</application> by running the following
+    commands:</para>
+
+<screen><userinput>./configure $XORG_CONFIG &amp;&amp;
+make</userinput></screen>
+
+    <para>To test the results, issue: <command>make check</command>.</para>
+
+    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>None</seg>
+        <seg>libxcb-atom.{a,so}, libxcb-aux.{a,so}, libxcb-event.{a,so},
+        libxcb-icccm.{a,so}, libxcb-image.{a,so}, libxcb-keysyms.{a,so},
+        libxcb-property.{a,so}, libxcb-render-util.{a,so}, and
+        libxcb-reply.{a,so}</seg>
+        <seg>None</seg>
+      </seglistitem>
+    </segmentedlist>
+<!--
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="xcb-util-libs">
+        <term><filename class='libraryfile'>libxcb-*.{so,a}</filename></term>
+        <listitem>
+          <para>.</para>
+          <indexterm zone="xcb-util xcb-util-libs">
+            <primary sortas="c-xcb-util">libxcb-*.{so,a}</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+-->
+  </sect2>
+
+</sect1>
Index: x/installing/xterm.xml
===================================================================
--- x/installing/xterm.xml	(revision c5c81b2c0ca5d3f721d3d8ca6f03a871916121f1)
+++ x/installing/xterm.xml	(revision c5c81b2c0ca5d3f721d3d8ca6f03a871916121f1)
@@ -0,0 +1,198 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY xterm-download-http " ">
+  <!ENTITY xterm-download-ftp  "ftp://invisible-island.net/xterm/xterm-&xterm-version;.tgz">
+  <!ENTITY xterm-md5sum        "3945ab70cfa2a9e95804157ee1b0f8e8">
+  <!ENTITY xterm-size          "932 KB">
+  <!ENTITY xterm-buildsize     "10.6 MB">
+  <!ENTITY xterm-time          "0.2 SBU">
+]>
+
+<sect1 id="xterm2" xreflabel="xterm-&xterm-version;">
+  <?dbhtml filename="xterm.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>xterm-&xterm-version;</title>
+
+  <indexterm zone="xterm2">
+    <primary sortas="a-xterm2">xterm</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to xterm</title>
+
+    <para><application>xterm</application> is a terminal emulator for
+    the X Window System.</para>
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&xterm-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&xterm-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &xterm-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &xterm-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &xterm-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &xterm-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">xterm Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required"><xref linkend="xorg7-app"/></para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url='&blfs-wiki;/Xterm'/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of xterm</title>
+
+    <para>Install <application>xterm</application> by running the
+    following commands:</para>
+
+<screen><userinput>sed -i '/v0/,+1s/new:/new:kb=^?:/' termcap &amp;&amp;
+echo -e '\tkbs=\\177,' &gt;&gt;terminfo &amp;&amp;
+TERMINFO=/usr/lib/terminfo ./configure $XORG_CONFIG \
+    --enable-luit --enable-wide-chars \
+    --with-app-defaults=/etc/X11/app-defaults &amp;&amp;
+make</userinput></screen>
+
+    <para>This package does not come with a test suite.</para>
+
+    <para>Now, as the <systemitem class="username">root</systemitem>
+    user:</para>
+
+<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 ... termcap</command>,
+    <command>echo ... >>terminfo</command>: these commands modify the terminal
+    description, so that the Backspace key is expected to send the character
+    with ASCII code 127, for consistency with the Linux console.</para>
+
+    <para><parameter>TERMINFO=/usr/lib/terminfo</parameter>: This ensures
+    that the <command>xterm</command> terminfo file is installed to the
+    system terminfo database when the installation prefix is not
+    <filename class="directory">/usr</filename>.</para>
+
+    <para><parameter>--with-app-defaults=...</parameter>: Sets the location
+    for the <filename class="directory">app-defaults</filename>
+    directory.</para>
+
+    <para><parameter>--enable-luit</parameter>: Enables the luit filter for
+    translation between Unicode (used by xterm internally in the configuration
+    below) and the locale encoding. If <command>luit</command> is not found
+    in the PATH, the default of
+    <filename>/usr/X11R6/bin/luit</filename> will be used.</para>
+
+    <para><parameter>--enable-wide-chars</parameter>: Adds support for wide
+    characters.</para>
+
+    <para><command>make install-ti</command>: This command installs corrected
+    terminfo description files for use with
+    <application>xterm</application>.</para>
+
+  </sect2>
+
+  <sect2 role="configuration">
+    <title>Configuring xterm</title>
+
+    <para>There are two ways to configure xterm.  You can add X resource
+    definitions to the user's <filename>~/.Xresources</filename> file, or
+    add them to the system-wide
+    <filename>$XORG_PREFIX/share/X11/app-defaults/Xterm</filename> file.</para>
+
+    <para>In order for xterm to follow the locale settings in the environment,
+    use TrueType fonts, and follow the Linux convention about the code sent by
+    the Backspace key, add the following definitions as the
+    <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>cat &gt;&gt; /etc/X11/app-defaults/XTerm &lt;&lt; "EOF"
+*VT100*locale: true
+*VT100*faceName: Monospace
+*VT100*faceSize: 10
+*backarrowKeyIsErase: true
+*ptyInitialErase: true
+EOF</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+
+      <seglistitem>
+        <seg>resize, uxterm, and xterm</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="resize">
+        <term><filename>resize</filename></term>
+        <listitem>
+          <para>prints a shell command for setting the TERM and TERMCAP
+          environment  variables to indicate the current size of xterm
+          window.</para>
+          <indexterm zone="xterm2 resize">
+            <primary sortas="b-resize">resize</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="uxterm">
+        <term><filename>uxterm</filename></term>
+        <listitem>
+          <para>is a wrapper script that modifies the current locale to use UTF-8
+          and starts xterm with the proper settings.</para>
+          <indexterm zone="xterm2 uxterm">
+            <primary sortas="b-uxterm">uxterm</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="xterm-bin">
+        <term><filename>xterm</filename></term>
+        <listitem>
+          <para>is a terminal emulator for the X Window System.</para>
+          <indexterm zone="xterm2 xterm2">
+            <primary sortas="b-xterm2">xterm</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: x/lib/lib.xml
===================================================================
--- x/lib/lib.xml	(revision 3b69a2aac779f32e908330437c01c06f18577b69)
+++ x/lib/lib.xml	(revision c5c81b2c0ca5d3f721d3d8ca6f03a871916121f1)
@@ -43,5 +43,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="freeglut.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="goffice.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mesalib.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xulrunner.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="webkitgtk.xml"/>
Index: lib/mesalib.xml
===================================================================
--- x/lib/mesalib.xml	(revision 3b69a2aac779f32e908330437c01c06f18577b69)
+++ 	(revision )
@@ -1,229 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY mesalib-download-http " ">
-  <!ENTITY mesalib-download-ftp  "ftp://ftp.freedesktop.org/pub/mesa/&mesalib-version;/MesaLib-&mesalib-version;.tar.bz2">
-  <!ENTITY mesalib-md5sum        "82c740c49d572baa6da2b1a1eee90bca">
-  <!ENTITY mesalib-size          "5.4 MB">
-  <!ENTITY mesalib-buildsize     "249 MB">
-  <!ENTITY mesalib-time          "3.1 SBU">
-]>
-
-<sect1 id="mesalib" xreflabel="MesaLib-&mesalib-version;">
-  <?dbhtml filename="mesalib.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>MesaLib-&mesalib-version;</title>
-
-  <indexterm zone="mesalib">
-    <primary sortas="a-MesaLib">MesaLib</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to MesaLib</title>
-
-    <para><application>Mesa</application> is an OpenGL compatible 3-D graphics
-    library.</para>
-
-    &lfs65_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&mesalib-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&mesalib-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &mesalib-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size:
-        &mesalib-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required:
-        &mesalib-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time:
-        &mesalib-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Recommended patch: <ulink
-        url="&patch-root;/MesaLib-&mesalib-version;-add_xdemos-1.patch"/>
-        (Needed if testing the Xorg installation per BLFS instructions)</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">MesaLib Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="xorg7-lib"/>,
-    <xref linkend="makedepend"/>,
-    <xref linkend="libdrm"/>,
-    <xref linkend="expat"/>, and
-    <xref linkend="talloc"/></para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="lesstif"/> (required to build motif
-    widgets)</para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/mesalib"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of MesaLib</title>
-
-    <note><para>Unlike other packages, the
-    <filename>MesaLib-&mesalib-version;.tar.bz2</filename>
-    archive will extract to the
-    <filename class="directory">Mesa-&mesalib-version;</filename>
-    directory.</para></note>
-
-    <para>Install <application>MesaLib</application> by running the following
-    commands:</para>
-
-<screen><userinput>sed 's@FLAGS=\"-g@FLAGS=\"@' -i configure &amp;&amp;
-patch -Np1 -i ../MesaLib-&mesalib-version;-add_xdemos-1.patch &amp;&amp;
-./configure $XORG_CONFIG --enable-xcb &amp;&amp;
-make</userinput></screen>
-
-    <para>This package does not come with a test suite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-install -v -m755 -d ${XORG_PREFIX}/share/doc/MesaLib-&mesalib-version; &amp;&amp;
-install -v -m644    docs/* \
-                    ${XORG_PREFIX}/share/doc/MesaLib-&mesalib-version;</userinput></screen>
-
-    <para>Finally, if installing to any prefix other than
-    <filename class="directory">/usr</filename>, you should create symlinks
-    to the GL headers in <filename class="directory">/usr/include</filename>.
-    Execute the following command as the
-    <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>ln -s -v ${XORG_PREFIX}/include/GL /usr/include</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><command>sed 's@FLAGS=\"-g@FLAGS=\"@' -i configure</command>: by
-    default, Mesa builds with debugging symbols.  Remove the -g switch from
-    both <envar>CFLAGS</envar> and <envar>CXXFLAGS</envar> with this
-    command.</para>
-
-    <para><option>--enable-xcb</option>: use the XCB backend instead of the
-    default XLib backend for GLX.</para>
-
-    <para><option>--enable-motif</option>: build motif widgets into the
-    GL widgets library (requires <application>lesstif</application>).</para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Optionally Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>glxgears and glxinfo</seg>
-        <seg>libEGL.so, libGL.so, libGLU.so, libGLw.so, and *_dri.so</seg>
-        <seg><envar>$XORG_PREFIX</envar>/include/{EGL,KHR},
-        <envar>$XORG_PREFIX</envar>/lib/{dri,egl}, and
-        <envar>$XORG_PREFIX</envar>/share/doc/MesaLib-&mesalib-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="glxgears">
-        <term><filename>glxgears</filename></term>
-        <listitem>
-          <para>is a GL demo useful for troubleshooting graphics
-          problems.</para>
-          <indexterm zone="mesalib glxgears">
-            <primary sortas="b-glxgears">glxgears</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="glxinfo">
-        <term><filename>glxinfo</filename></term>
-        <listitem>
-          <para>is a diagnostic program that displays information about the
-          graphics hardware and installed GL libraries.</para>
-          <indexterm zone="mesalib glxinfo">
-            <primary sortas="b-glxinfo">glxinfo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libEGL">
-        <term><filename class='libraryfile'>libEGL.so</filename></term>
-        <listitem>
-          <para>provides a native platform graphics interface as defined by
-          the EGL-1.4 specification.</para>
-          <indexterm zone="mesalib libEGL">
-            <primary sortas="c-libGL">libEGL.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libGL">
-        <term><filename class='libraryfile'>libGL.so</filename></term>
-        <listitem>
-          <para>is the main OpenGL library.</para>
-          <indexterm zone="mesalib libGL">
-            <primary sortas="c-libGL">libGL.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libGLU">
-        <term><filename class='libraryfile'>libGLU.so</filename></term>
-        <listitem>
-          <para>is the OpenGL Utility library.</para>
-          <indexterm zone="mesalib libGLU">
-            <primary sortas="c-libGLU">libGLU.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libGLw">
-        <term><filename class='libraryfile'>libGLw.so</filename></term>
-        <listitem>
-          <para>is the Xt/Motif OpenGL drawing area widget library.</para>
-          <indexterm zone="mesalib libGLw">
-            <primary sortas="c-libGLw">libGLw.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-  </sect2>
-
-</sect1>
