Author: dnicholson
Date: 2006-09-03 21:15:35 -0600 (Sun, 03 Sep 2006)
New Revision: 6289

Added:
   trunk/BOOK/general/genlib/libdrm.xml
   trunk/BOOK/general/genutils/rman.xml
   trunk/BOOK/general/genutils/xterm.xml
   trunk/BOOK/x/lib/mesalib.xml
   trunk/BOOK/xincludes/xorg7-only.xml
Removed:
   trunk/BOOK/x/installing/libdrm.xml
   trunk/BOOK/x/installing/mesalib.xml
   trunk/BOOK/x/installing/rman.xml
   trunk/BOOK/x/installing/xterm.xml
Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/general/genlib/genlib.xml
   trunk/BOOK/general/genutils/genutils.xml
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/x/installing/installing.xml
   trunk/BOOK/x/installing/luit.xml
   trunk/BOOK/x/lib/lib.xml
Log:
Moved externally developed packages out of the Xorg-7 chapter.
Added a missing program description to luit.


Modified: trunk/BOOK/general/genlib/genlib.xml
===================================================================
--- trunk/BOOK/general/genlib/genlib.xml        2006-08-31 03:21:52 UTC (rev 
6288)
+++ trunk/BOOK/general/genlib/genlib.xml        2006-09-04 03:15:35 UTC (rev 
6289)
@@ -65,6 +65,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="iso-codes.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="gmime.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="libidn.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="libdrm.xml"/>
   <!-- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="fam.xml"/> 
-->
 
 </chapter>

Copied: trunk/BOOK/general/genlib/libdrm.xml (from rev 6288, 
trunk/BOOK/x/installing/libdrm.xml)
===================================================================
--- trunk/BOOK/general/genlib/libdrm.xml                                (rev 0)
+++ trunk/BOOK/general/genlib/libdrm.xml        2006-09-04 03:15:35 UTC (rev 
6289)
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+   "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd"; [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY libdrm-download-http 
"http://dri.freedesktop.org/libdrm/libdrm-&libdrm-version;.tar.gz";>
+  <!ENTITY libdrm-download-ftp  
"ftp://ftp.fu-berlin.de/unix/linux/mirrors/gentoo/distfiles/libdrm-&libdrm-version;.tar.gz";>
+  <!ENTITY libdrm-md5sum        "9d1aab104eb757ceeb2c1a6d38d57411">
+  <!ENTITY libdrm-size          "276 KB">
+  <!ENTITY libdrm-buildsize     "3.2 MB">
+  <!ENTITY libdrm-time          "0.1 SBU">
+]>
+
+<sect1 id="libdrm" xreflabel="libdrm-&libdrm-version;">
+  <?dbhtml filename="libdrm.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>libdrm-&libdrm-version;</title>
+
+  <indexterm zone="libdrm">
+    <primary sortas="a-libdrm">libdrm</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to libdrm</title>
+
+    <para><application>libdrm</application> provides core library routines
+    for the X Window System to directly interface with video hardware using
+    the Linux kernel's Direct Rendering Modules.</para>
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&libdrm-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&libdrm-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &libdrm-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &libdrm-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &libdrm-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &libdrm-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/libdrm"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of libdrm</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+    href="../../xincludes/xorg7-only.xml"/>
+
+    <para>Install <application>libdrm</application> by running the following
+    commands:</para>
+
+<screen><userinput>./configure --prefix=$XORG_PREFIX &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 Libraries</segtitle>
+
+      <seglistitem>
+        <seg>libdrm.{so,a}</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="libdrm-lib">
+        <term><filename class='libraryfile'>libdrm.{so,a}</filename></term>
+        <listitem>
+          <para>contains the Direct Rendering Module library functions.</para>
+          <indexterm zone="libdrm libdrm-lib">
+            <primary sortas="c-libdrm">libdrm.{so,a}</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>

Modified: trunk/BOOK/general/genutils/genutils.xml
===================================================================
--- trunk/BOOK/general/genutils/genutils.xml    2006-08-31 03:21:52 UTC (rev 
6288)
+++ trunk/BOOK/general/genutils/genutils.xml    2006-09-04 03:15:35 UTC (rev 
6289)
@@ -29,5 +29,8 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; 
href="pilot-link.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="unixodbc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="graphviz.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="xterm.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="luit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="rman.xml"/>
 
 </chapter>

Copied: trunk/BOOK/general/genutils/rman.xml (from rev 6288, 
trunk/BOOK/x/installing/rman.xml)
===================================================================
--- trunk/BOOK/general/genutils/rman.xml                                (rev 0)
+++ trunk/BOOK/general/genutils/rman.xml        2006-09-04 03:15:35 UTC (rev 
6289)
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+   "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd"; [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY rman-download-http 
"http://prdownloads.sourceforge.net/polyglotman/rman-3.2.tar.gz?download";>
+  <!ENTITY rman-download-ftp  " ">
+  <!ENTITY rman-md5sum        "6d1d67641c6d042595a96a62340d3cc6">
+  <!ENTITY rman-size          "80 KB">
+  <!ENTITY rman-buildsize     "629 KB">
+  <!ENTITY rman-time          "0.1 SBU">
+]>
+
+<sect1 id="rman" xreflabel="rman-&rman-version;">
+  <?dbhtml filename="rman.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>rman-&rman-version;</title>
+
+  <indexterm zone="rman">
+    <primary sortas="a-rman">rman</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to rman</title>
+
+    <para><application>rman</application> is a utility to convert manual
+    pages into other formats.  It can currently supports HTML, ASCII, LaTeX,
+    LaTeX2e, RTF, POD, and partial DocBook XML output.</para>
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&rman-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&rman-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &rman-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &rman-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &rman-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &rman-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url='&blfs-wiki;/rman'/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of rman</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+    href="../../xincludes/xorg7-only.xml"/>
+
+    <para>rman is no longer part of the <application>Xorg</application>
+    distribution, however, packages that use it may expect it to be in the
+    same location as your <application>Xorg</application> programs.  Adjust
+    the makefile to account for this:</para>
+
+<screen><userinput>sed -i -e "s@/opt/[EMAIL PROTECTED]@" \
+    -e "s@/usr/[EMAIL PROTECTED]@" Makefile</userinput></screen>
+
+    <para>Build <application>rman</application> by running the
+    following command:</para>
+
+<screen><userinput>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>
+
+      <seglistitem>
+        <seg>rman</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Description</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="rman-bin">
+        <term><filename>rman</filename></term>
+        <listitem>
+          <para>is a manpage converter.</para>
+          <indexterm zone="rman rman">
+            <primary sortas="b-rman">rman</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>

Copied: trunk/BOOK/general/genutils/xterm.xml (from rev 6288, 
trunk/BOOK/x/installing/xterm.xml)
===================================================================
--- trunk/BOOK/general/genutils/xterm.xml                               (rev 0)
+++ trunk/BOOK/general/genutils/xterm.xml       2006-09-04 03:15:35 UTC (rev 
6289)
@@ -0,0 +1,185 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+   "http://www.oasis-open.org/docbook/xml/4.4/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        "20827d968ed7406d01b2125a84b7a2cd">
+  <!ENTITY xterm-size          "749 KB">
+  <!ENTITY xterm-buildsize     "7.5 MB">
+  <!ENTITY xterm-time          "0.1 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-lib"/></para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional"><xref linkend="luit"/></para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url='&blfs-wiki;/Xterm'/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of xterm</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+    href="../../xincludes/xorg7-only.xml"/>
+
+    <para>Install <application>xterm</application> by running the
+    following commands:</para>
+
+<screen><userinput>./configure $XORG_CONFIG \
+    --enable-luit --with-wide-chars &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><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
+    unicode translation.</para>
+
+    <para><parameter>--with-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/lib/X11/app-defaults/Xterm</filename> file.</para>
+
+    <para>In order for xterm to follow the locale settings in the environment
+    and use TrueType fonts, add the following definitions as the
+    <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>cat &gt;&gt; 
$XORG_PREFIX/lib/X11/app-defaults/XTerm &lt;&lt; "EOF"
+*VT100*locale: true
+*VT100*faceName: Monospace
+*VT100*faceSize: 10
+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 to start xterm with the proper settings in
+          UTF-8 locales.</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>

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent      2006-08-31 03:21:52 UTC (rev 6288)
+++ trunk/BOOK/general.ent      2006-09-04 03:15:35 UTC (rev 6289)
@@ -1,8 +1,8 @@
-<!ENTITY day          "30">                   <!-- Always 2 digits -->
-<!ENTITY month        "08">                   <!-- Always 2 digits -->
+<!ENTITY day          "04">                   <!-- Always 2 digits -->
+<!ENTITY month        "09">                   <!-- Always 2 digits -->
 <!ENTITY year         "2006">
 <!ENTITY version      "svn-&year;&month;&day;">
-<!ENTITY releasedate  "August &day;th, &year;">
+<!ENTITY releasedate  "September &day;th, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
 <!ENTITY lfs-version  "stable">          <!-- 
version|stable|testing|unstable|development] -->

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml       2006-08-31 03:21:52 UTC 
(rev 6288)
+++ trunk/BOOK/introduction/welcome/changelog.xml       2006-09-04 03:15:35 UTC 
(rev 6289)
@@ -42,6 +42,23 @@
 -->
 
     <listitem>
+      <para>September 4th, 2006</para>
+      <itemizedlist>
+        <listitem>
+          <para>[dnicholson] - Moved xterm, rman, MesaLib and libdrm
+          packages out of the Xorg-7 chapter as they are now developed
+          externally. Added notes to their pages to indicate that they
+          should only be built when using Xorg-7. Fixes ticket
+          #2120.</para>
+        </listitem>
+        <listitem>
+          <para>[dnicholson] - Added a missing program description to
+          the Luit page.</para>
+        </listitem>
+     </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>August 30th, 2006</para>
       <itemizedlist>
         <listitem>

Modified: trunk/BOOK/x/installing/installing.xml
===================================================================
--- trunk/BOOK/x/installing/installing.xml      2006-08-31 03:21:52 UTC (rev 
6288)
+++ trunk/BOOK/x/installing/installing.xml      2006-09-04 03:15:35 UTC (rev 
6289)
@@ -42,8 +42,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="x7proto.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="x7util.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="x7lib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="libdrm.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="mesalib.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="xbitmaps.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="x7app.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="x7data.xml"/>
@@ -51,8 +49,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="luit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="x7server.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="x7driver.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="xterm.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="rman.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; 
href="xconfig-dummy.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="x-setup.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="x-config.xml"/>

Deleted: trunk/BOOK/x/installing/libdrm.xml
===================================================================
--- trunk/BOOK/x/installing/libdrm.xml  2006-08-31 03:21:52 UTC (rev 6288)
+++ trunk/BOOK/x/installing/libdrm.xml  2006-09-04 03:15:35 UTC (rev 6289)
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-   "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd"; [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY libdrm-download-http 
"http://dri.freedesktop.org/libdrm/libdrm-&libdrm-version;.tar.gz";>
-  <!ENTITY libdrm-download-ftp  
"ftp://ftp.fu-berlin.de/unix/linux/mirrors/gentoo/distfiles/libdrm-&libdrm-version;.tar.gz";>
-  <!ENTITY libdrm-md5sum        "9d1aab104eb757ceeb2c1a6d38d57411">
-  <!ENTITY libdrm-size          "276 KB">
-  <!ENTITY libdrm-buildsize     "3.2 MB">
-  <!ENTITY libdrm-time          "0.1 SBU">
-]>
-
-<sect1 id="libdrm" xreflabel="libdrm-&libdrm-version;">
-  <?dbhtml filename="libdrm.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>libdrm-&libdrm-version;</title>
-
-  <indexterm zone="libdrm">
-    <primary sortas="a-libdrm">libdrm</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libdrm</title>
-
-    <para><application>libdrm</application> provides core library routines
-    for the X Window System to directly interface with video hardware using
-    the Linux kernel's Direct Rendering Modules.</para>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&libdrm-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&libdrm-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &libdrm-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &libdrm-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &libdrm-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &libdrm-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/libdrm"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libdrm</title>
-
-    <para>Install <application>libdrm</application> by running the following
-    commands:</para>
-
-<screen><userinput>./configure --prefix=$XORG_PREFIX &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 Libraries</segtitle>
-
-      <seglistitem>
-        <seg>libdrm.{so,a}</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libdrm-lib">
-        <term><filename class='libraryfile'>libdrm.{so,a}</filename></term>
-        <listitem>
-          <para>contains the Direct Rendering Module library functions.</para>
-          <indexterm zone="libdrm libdrm-lib">
-            <primary sortas="c-libdrm">libdrm.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>

Modified: trunk/BOOK/x/installing/luit.xml
===================================================================
--- trunk/BOOK/x/installing/luit.xml    2006-08-31 03:21:52 UTC (rev 6288)
+++ trunk/BOOK/x/installing/luit.xml    2006-09-04 03:15:35 UTC (rev 6289)
@@ -68,6 +68,9 @@
   <sect2 role="installation">
     <title>Installation of Luit</title>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+    href="../../xincludes/xorg7-only.xml"/>
+
     <para>A patch is required to fix a race condition in
     <application>luit</application> that was discovered shortly after
     release.  Download the patch from
@@ -94,4 +97,35 @@
 
   </sect2>
 
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Program</segtitle>
+
+      <seglistitem>
+        <seg>luit</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Description</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="luit-bin">
+        <term><filename>luit</filename></term>
+        <listitem>
+          <para>provides locale and ISO 2022 support for Unicode
+          terminals.</para>
+          <indexterm zone="luit luit">
+            <primary sortas="b-luit">luit</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
 </sect1>

Deleted: trunk/BOOK/x/installing/mesalib.xml
===================================================================
--- trunk/BOOK/x/installing/mesalib.xml 2006-08-31 03:21:52 UTC (rev 6288)
+++ trunk/BOOK/x/installing/mesalib.xml 2006-09-04 03:15:35 UTC (rev 6289)
@@ -1,232 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-   "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd"; [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY mesalib-download-http 
"http://prdownloads.sourceforge.net/mesa3d/MesaLib-&mesalib-version;.tar.bz2";>
-  <!ENTITY mesalib-download-ftp  " ">
-  <!ENTITY mesalib-md5sum        "61beda590bfc5b4a12e979d5f2d70d7a">
-  <!ENTITY mesalib-size          "3.3 MB">
-  <!ENTITY mesalib-buildsize     "823 MB">
-  <!ENTITY mesalib-time          "1.7 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>
-
-    <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 (including recommended download):
-        &mesalib-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required (including recommended download):
-        &mesalib-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time (including recommended download):
-        &mesalib-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">MesaLib Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="xorg7-lib"/>,
-    <xref linkend="xorg7-util"/>, and
-    <xref linkend="libdrm"/></para>
-
-    <note>
-      <para>It is not recomended to build a newer version of
-      <application>Mesa</application> with <xref linkend="xfree86"/> or
-      <xref linkend="xorg"/>.</para>
-    </note>
-
-    <bridgehead renderas="sect3">Recommended Download</bridgehead>
-    <para><ulink
-    
url="http://prdownloads.sourceforge.net/mesa3d/MesaDemos-&mesalib-version;.tar.bz2";>MesaDemos-&mesalib-version;</ulink>
-    provides a demo and a diagnostic program to verify that GL is working
-    properly.</para>
-
-    <bridgehead renderas="sect3">Optional Download</bridgehead>
-    <para><ulink
-    
url="http://prdownloads.sourceforge.net/mesa3d/MesaGLUT-&mesalib-version;.tar.bz2";>MesaGLUT-&mesalib-version;</ulink>
-    provides a working <filename class='libraryfile'>libglut</filename>.</para>
-
-    <note>
-      <para>You should extract all three tarballs from the same toplevel
-      directory.  All three files will extract to the
-      <filename class="directory">Mesa-&mesalib-version;</filename>
-      directory.</para>
-    </note>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/mesalib"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of MesaLib</title>
-
-    <para>You will need to adjust the commands below to reflect the
-    installation prefix of the X Window System.  First, correct several
-    hard coded directories in the source files with the following
-    commands:</para>
-
-<screen><userinput>find . -type f -exec sed -i "s@/usr/[EMAIL PROTECTED]@g" {} 
\; &amp;&amp;
-sed -i '[EMAIL PROTECTED]/[EMAIL PROTECTED]/X11/modules@' 
src/glx/x11/dri_glx.c &amp;&amp;
-sed -i '[EMAIL PROTECTED]/[EMAIL PROTECTED]/X11/modules@' 
src/mesa/drivers/dri/Makefile.template</userinput></screen>
-
-    <para>Build <application>MesaLib</application>
-    by running the following command:</para>
-
-<screen><userinput>make linux-dri</userinput></screen>
-
-    <para>This package does not come with a test suite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user,
-    issue the following commands to install
-    <application>MesaLib</application>:</para>
-
-<screen role="root"><userinput>bin/installmesa 
$XORG_PREFIX</userinput></screen>
-
-    <para>While still the root user, install the modules for
-    Xorg-&xorg7-version; with the following commands.</para>
-
-<screen role="root"><userinput>mkdir -v -p $XORG_PREFIX/lib/X11/modules/dri 
&amp;&amp;
-install -v -m755 lib/*dri* 
$XORG_PREFIX/lib/X11/modules/dri</userinput></screen>
-
-    <para>If you've extracted the Demos package as well, then
-    build the test programs with the following commands:</para>
-
-<screen><userinput>sed -i '[EMAIL PROTECTED](GLUT_LIB)@@g' configs/default 
&amp;&amp;
-cd progs/xdemos &amp;&amp;
-make PROGS='glxinfo glxgears'</userinput></screen>
-
-    <para>Install the demos as the
-    <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>install -v -m755 glxinfo glxgears 
$XORG_PREFIX/bin</userinput></screen>
-
-    <note>
-      <para>Do not remove the Mesa source tree yet, it will be required to
-      build the <xref linkend="xorg7-server"/>.</para>
-    </note>
-
-    <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>find...sed -i
-    "s@/usr/[EMAIL PROTECTED]@"...</command>:
-    This command corrects several hard coded references to the X11R6 default
-    installation path.</para>
-
-    <para><command>sed -i '[EMAIL PROTECTED]/[EMAIL PROTECTED]/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*
-    $XORG_PREFIX/lib/X11/modules/dri</command>:
-    installs the DRI modules.</para>
-
-    <para><command>sed -i '[EMAIL PROTECTED](GLUT_LIB)@@g' 
configs/default</command>:
-    disables linking against GLUT libraries for the demo programs.</para>
-
-    <para><command>make PROGS='glxinfo glxgears'</command>: build only
-    the glxinfo and glxgears programs.</para>
-
-    <para><command>install -v -m755 glxinfo glxgears
-    $XORG_PREFIX/bin</command>:
-    Installs only the glxinfo and glxgears programs.</para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>glxgears and glxinfo</seg>
-        <seg>libGL.{so,a}, libGLU.{so,a}, libGLw.{so,a}, libglut.{so,a} and
-        *_dri.so</seg>
-        <seg>$XORG_PREFIX/lib/modules/dri</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>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>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>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>

Deleted: trunk/BOOK/x/installing/rman.xml
===================================================================
--- trunk/BOOK/x/installing/rman.xml    2006-08-31 03:21:52 UTC (rev 6288)
+++ trunk/BOOK/x/installing/rman.xml    2006-09-04 03:15:35 UTC (rev 6289)
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-   "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd"; [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY rman-download-http 
"http://prdownloads.sourceforge.net/polyglotman/rman-3.2.tar.gz?download";>
-  <!ENTITY rman-download-ftp  " ">
-  <!ENTITY rman-md5sum        "6d1d67641c6d042595a96a62340d3cc6">
-  <!ENTITY rman-size          "80 KB">
-  <!ENTITY rman-buildsize     "629 KB">
-  <!ENTITY rman-time          "0.1 SBU">
-]>
-
-<sect1 id="rman" xreflabel="rman-&rman-version;">
-  <?dbhtml filename="rman.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>rman-&rman-version;</title>
-
-  <indexterm zone="rman">
-    <primary sortas="a-rman">rman</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to rman</title>
-
-    <para><application>rman</application> is a utility to convert manual
-    pages into other formats.  It can currently supports HTML, ASCII, LaTeX,
-    LaTeX2e, RTF, POD, and partial DocBook XML output.</para>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&rman-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&rman-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &rman-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &rman-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &rman-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &rman-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url='&blfs-wiki;/rman'/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of rman</title>
-
-    <para>rman is no longer part of the <application>Xorg</application>
-    distribution, however, packages that use it may expect it to be in the
-    same location as your <application>Xorg</application> programs.  Adjust
-    the makefile to account for this:</para>
-
-<screen><userinput>sed -i -e "s@/opt/[EMAIL PROTECTED]@" \
-    -e "s@/usr/[EMAIL PROTECTED]@" Makefile</userinput></screen>
-
-    <para>Build <application>rman</application> by running the
-    following command:</para>
-
-<screen><userinput>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>
-
-      <seglistitem>
-        <seg>rman</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="rman-bin">
-        <term><filename>rman</filename></term>
-        <listitem>
-          <para>is a manpage converter.</para>
-          <indexterm zone="rman rman">
-            <primary sortas="b-rman">rman</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>

Deleted: trunk/BOOK/x/installing/xterm.xml
===================================================================
--- trunk/BOOK/x/installing/xterm.xml   2006-08-31 03:21:52 UTC (rev 6288)
+++ trunk/BOOK/x/installing/xterm.xml   2006-09-04 03:15:35 UTC (rev 6289)
@@ -1,182 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-   "http://www.oasis-open.org/docbook/xml/4.4/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        "20827d968ed7406d01b2125a84b7a2cd">
-  <!ENTITY xterm-size          "749 KB">
-  <!ENTITY xterm-buildsize     "7.5 MB">
-  <!ENTITY xterm-time          "0.1 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-lib"/></para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="luit"/></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>./configure $XORG_CONFIG \
-    --enable-luit --with-wide-chars &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><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
-    unicode translation.</para>
-
-    <para><parameter>--with-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/lib/X11/app-defaults/Xterm</filename> file.</para>
-
-    <para>In order for xterm to follow the locale settings in the environment
-    and use TrueType fonts, add the following definitions as the
-    <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>cat &gt;&gt; 
$XORG_PREFIX/lib/X11/app-defaults/XTerm &lt;&lt; "EOF"
-*VT100*locale: true
-*VT100*faceName: Monospace
-*VT100*faceSize: 10
-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 to start xterm with the proper settings in
-          UTF-8 locales.</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>

Modified: trunk/BOOK/x/lib/lib.xml
===================================================================
--- trunk/BOOK/x/lib/lib.xml    2006-08-31 03:21:52 UTC (rev 6288)
+++ trunk/BOOK/x/lib/lib.xml    2006-09-04 03:15:35 UTC (rev 6289)
@@ -33,5 +33,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; 
href="libxklavier.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="freeglut.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="goffice.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="mesalib.xml"/>
 
 </chapter>

Copied: trunk/BOOK/x/lib/mesalib.xml (from rev 6288, 
trunk/BOOK/x/installing/mesalib.xml)
===================================================================
--- trunk/BOOK/x/lib/mesalib.xml                                (rev 0)
+++ trunk/BOOK/x/lib/mesalib.xml        2006-09-04 03:15:35 UTC (rev 6289)
@@ -0,0 +1,235 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+   "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd"; [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY mesalib-download-http 
"http://prdownloads.sourceforge.net/mesa3d/MesaLib-&mesalib-version;.tar.bz2";>
+  <!ENTITY mesalib-download-ftp  " ">
+  <!ENTITY mesalib-md5sum        "61beda590bfc5b4a12e979d5f2d70d7a">
+  <!ENTITY mesalib-size          "3.3 MB">
+  <!ENTITY mesalib-buildsize     "823 MB">
+  <!ENTITY mesalib-time          "1.7 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>
+
+    <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 (including recommended download):
+        &mesalib-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required (including recommended download):
+        &mesalib-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time (including recommended download):
+        &mesalib-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">MesaLib Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required"><xref linkend="xorg7-lib"/>,
+    <xref linkend="xorg7-util"/>, and
+    <xref linkend="libdrm"/></para>
+
+    <note>
+      <para>It is not recomended to build a newer version of
+      <application>Mesa</application> with <xref linkend="xfree86"/> or
+      <xref linkend="xorg"/>.</para>
+    </note>
+
+    <bridgehead renderas="sect3">Recommended Download</bridgehead>
+    <para><ulink
+    
url="http://prdownloads.sourceforge.net/mesa3d/MesaDemos-&mesalib-version;.tar.bz2";>MesaDemos-&mesalib-version;</ulink>
+    provides a demo and a diagnostic program to verify that GL is working
+    properly.</para>
+
+    <bridgehead renderas="sect3">Optional Download</bridgehead>
+    <para><ulink
+    
url="http://prdownloads.sourceforge.net/mesa3d/MesaGLUT-&mesalib-version;.tar.bz2";>MesaGLUT-&mesalib-version;</ulink>
+    provides a working <filename class='libraryfile'>libglut</filename>.</para>
+
+    <note>
+      <para>You should extract all three tarballs from the same toplevel
+      directory.  All three files will extract to the
+      <filename class="directory">Mesa-&mesalib-version;</filename>
+      directory.</para>
+    </note>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/mesalib"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of MesaLib</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+    href="../../xincludes/xorg7-only.xml"/>
+
+    <para>You will need to adjust the commands below to reflect the
+    installation prefix of the X Window System.  First, correct several
+    hard coded directories in the source files with the following
+    commands:</para>
+
+<screen><userinput>find . -type f -exec sed -i "s@/usr/[EMAIL PROTECTED]@g" {} 
\; &amp;&amp;
+sed -i '[EMAIL PROTECTED]/[EMAIL PROTECTED]/X11/modules@' 
src/glx/x11/dri_glx.c &amp;&amp;
+sed -i '[EMAIL PROTECTED]/[EMAIL PROTECTED]/X11/modules@' 
src/mesa/drivers/dri/Makefile.template</userinput></screen>
+
+    <para>Build <application>MesaLib</application>
+    by running the following command:</para>
+
+<screen><userinput>make linux-dri</userinput></screen>
+
+    <para>This package does not come with a test suite.</para>
+
+    <para>Now, as the <systemitem class="username">root</systemitem> user,
+    issue the following commands to install
+    <application>MesaLib</application>:</para>
+
+<screen role="root"><userinput>bin/installmesa 
$XORG_PREFIX</userinput></screen>
+
+    <para>While still the root user, install the modules for
+    Xorg-&xorg7-version; with the following commands.</para>
+
+<screen role="root"><userinput>mkdir -v -p $XORG_PREFIX/lib/X11/modules/dri 
&amp;&amp;
+install -v -m755 lib/*dri* 
$XORG_PREFIX/lib/X11/modules/dri</userinput></screen>
+
+    <para>If you've extracted the Demos package as well, then
+    build the test programs with the following commands:</para>
+
+<screen><userinput>sed -i '[EMAIL PROTECTED](GLUT_LIB)@@g' configs/default 
&amp;&amp;
+cd progs/xdemos &amp;&amp;
+make PROGS='glxinfo glxgears'</userinput></screen>
+
+    <para>Install the demos as the
+    <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>install -v -m755 glxinfo glxgears 
$XORG_PREFIX/bin</userinput></screen>
+
+    <note>
+      <para>Do not remove the Mesa source tree yet, it will be required to
+      build the <xref linkend="xorg7-server"/>.</para>
+    </note>
+
+    <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>find...sed -i
+    "s@/usr/[EMAIL PROTECTED]@"...</command>:
+    This command corrects several hard coded references to the X11R6 default
+    installation path.</para>
+
+    <para><command>sed -i '[EMAIL PROTECTED]/[EMAIL PROTECTED]/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*
+    $XORG_PREFIX/lib/X11/modules/dri</command>:
+    installs the DRI modules.</para>
+
+    <para><command>sed -i '[EMAIL PROTECTED](GLUT_LIB)@@g' 
configs/default</command>:
+    disables linking against GLUT libraries for the demo programs.</para>
+
+    <para><command>make PROGS='glxinfo glxgears'</command>: build only
+    the glxinfo and glxgears programs.</para>
+
+    <para><command>install -v -m755 glxinfo glxgears
+    $XORG_PREFIX/bin</command>:
+    Installs only the glxinfo and glxgears programs.</para>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>glxgears and glxinfo</seg>
+        <seg>libGL.{so,a}, libGLU.{so,a}, libGLw.{so,a}, libglut.{so,a} and
+        *_dri.so</seg>
+        <seg>$XORG_PREFIX/lib/modules/dri</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>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>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>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>

Added: trunk/BOOK/xincludes/xorg7-only.xml
===================================================================
--- trunk/BOOK/xincludes/xorg7-only.xml                         (rev 0)
+++ trunk/BOOK/xincludes/xorg7-only.xml 2006-09-04 03:15:35 UTC (rev 6289)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+   "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd"; >
+
+<!-- $LastChangedBy$
+     $Date$ -->
+
+<note>
+    <para>This package should only be built if you are installing
+    <xref linkend="xorg7"/>. If you have installed or will be
+    installing <xref linkend="xorg"/> or <xref linkend="xfree86"/>,
+    it is provided by those packages and should not be installed
+    here.</para>
+</note>


Property changes on: trunk/BOOK/xincludes/xorg7-only.xml
___________________________________________________________________
Name: svn:keywords
   + LastChangedDate Author

-- 
http://linuxfromscratch.org/mailman/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page

Reply via email to