[blfs-book] r10477 - in trunk/BOOK: . introduction/welcome x/installing

dj at linuxfromscratch.org dj at linuxfromscratch.org
Sun Jul 29 13:09:52 PDT 2012


Author: dj
Date: 2012-07-29 14:09:42 -0600 (Sun, 29 Jul 2012)
New Revision: 10477

Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/x/installing/installing.xml
   trunk/BOOK/x/installing/x7app.xml
   trunk/BOOK/x/installing/x7font.xml
   trunk/BOOK/x/installing/x7lib.xml
   trunk/BOOK/x/installing/x7proto.xml
   trunk/BOOK/x/installing/xorg-config.xml
   trunk/BOOK/x/installing/xorg7.xml
Log:
Removed external Xorg wget and md5sums files, and included for-in-do loops.

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent	2012-07-29 00:33:06 UTC (rev 10476)
+++ trunk/BOOK/general.ent	2012-07-29 20:09:42 UTC (rev 10477)
@@ -3,7 +3,7 @@
 $Date$
 -->
 
-<!ENTITY day          "27">                   <!-- Always 2 digits -->
+<!ENTITY day          "29">                   <!-- Always 2 digits -->
 <!ENTITY month        "07">                   <!-- Always 2 digits -->
 <!ENTITY year         "2012">
 <!ENTITY copyrightdate "2001-&year;">
@@ -637,8 +637,7 @@
 
 <!-- Part VI -->
 <!-- Chapter 24 -->
-<!ENTITY xorg7-version                "7.7">
-<!ENTITY xorg7-release                "7.7-1">
+<!ENTITY xorg-version                 "7.7">
 <!ENTITY util-macros-version          "1.17">
 <!ENTITY makedepend-version           "1.0.4">
 <!ENTITY libXau-version               "1.0.7">

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2012-07-29 00:33:06 UTC (rev 10476)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2012-07-29 20:09:42 UTC (rev 10477)
@@ -44,6 +44,16 @@
 
 -->
     <listitem>
+      <para>July 29th, 2012</para>
+      <itemizedlist>
+        <listitem>
+          <para>[dj] - Removed external Xorg wget and md5sums files, and
+          included for-in-do loops.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>July 27th, 2012</para>
       <itemizedlist>
         <listitem>

Modified: trunk/BOOK/x/installing/installing.xml
===================================================================
--- trunk/BOOK/x/installing/installing.xml	2012-07-29 00:33:06 UTC (rev 10476)
+++ trunk/BOOK/x/installing/installing.xml	2012-07-29 20:09:42 UTC (rev 10477)
@@ -37,14 +37,18 @@
   <application>XFree86</application>. With the modular build system, also came
   incremental updates to individual packages. The distribution of
   <application>Xorg</application> is given a release number by the developers,
-  in this case Xorg-&xorg7-version;, and is referred to as the "katamari" by
-  the upstream developers. Additionally, the BLFS book appends a build number
+  in this case Xorg-&xorg-version;, and is referred to as the "katamari" by
+  the upstream developers.</para>
+
+  <!--
+  <para>Additionally, the BLFS book appends a build number
   to the end of version string to indicate whether a group of incremental
   updates has been applied, while still retaining the versioning scheme of the
-  upstream developers. For instance, Xorg-&xorg7-version;-1 would indicate that
+  upstream developers. For instance, Xorg-&xorg-version;-1 would indicate that
   this is the 1st release, and is consistent with the katamari, while
-  Xorg-&xorg7-version;-2 would indicate that individual package updates have
+  Xorg-&xorg-version;-2 would indicate that individual package updates have
   been applied to the katamari.</para>
+  -->
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xorg7.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="util-macros.xml"/>

Modified: trunk/BOOK/x/installing/x7app.xml
===================================================================
--- trunk/BOOK/x/installing/x7app.xml	2012-07-29 00:33:06 UTC (rev 10476)
+++ trunk/BOOK/x/installing/x7app.xml	2012-07-29 20:09:42 UTC (rev 10477)
@@ -6,12 +6,121 @@
 
   <!ENTITY x7apps-download-http "http://xorg.freedesktop.org/releases/individual/app/">
   <!ENTITY x7apps-download-ftp  "ftp://ftp.x.org/pub/individual/app/">
-  <!ENTITY x7apps-wget          "&files-anduin;/xorg/app-&xorg7-release;.wget">
-  <!ENTITY x7apps-md5sum        "&files-anduin;/xorg/app-&xorg7-release;.md5">
   <!ENTITY x7apps-size          "4.8 MB">
   <!ENTITY x7apps-buildsize     "39.2 MB">
   <!ENTITY x7apps-time          "1.5 SBU">
 
+  <!ENTITY bdftopcf-version                "1.0.3">
+  <!ENTITY bdftopcf-md5sum                 "4a7a4a848c43c42f7d499b60666434a4">
+
+  <!ENTITY iceauth-version                 "1.0.5">
+  <!ENTITY iceauth-md5sum                  "08e3f6b523da8b0af179f22f339508b2">
+
+  <!ENTITY luit-version                    "1.1.1">
+  <!ENTITY luit-md5sum                     "c4a3664e08e5a47c120ff9263ee2f20c">
+
+  <!ENTITY mkfontdir-version               "1.0.7">
+  <!ENTITY mkfontdir-md5sum                "18c429148c96c2079edda922a2b67632">
+
+  <!ENTITY mkfontscale-version             "1.1.0">
+  <!ENTITY mkfontscale-md5sum              "414fcb053418fb1418e3a39f4a37e0f7">
+
+  <!ENTITY sessreg-version                 "1.0.7">
+  <!ENTITY sessreg-md5sum                  "e99172cbd72700eeeae99f64632b5dc2">
+
+  <!ENTITY setxkbmap-version               "1.3.0">
+  <!ENTITY setxkbmap-md5sum                "1001771344608e120e943a396317c33a">
+
+  <!ENTITY smproxy-version                 "1.0.5">
+  <!ENTITY smproxy-md5sum                  "edce41bd7562dcdfb813e05dbeede8ac">
+
+  <!ENTITY x11perf-version                 "1.5.4">
+  <!ENTITY x11perf-md5sum                  "5c3c7431a38775caaea6051312a49bc9">
+
+  <!ENTITY xauth-version                   "1.0.7">
+  <!ENTITY xauth-md5sum                    "cbcbd8f2156a53b609800bec4c6b6c0e">
+
+  <!ENTITY xbacklight-version              "1.1.2">
+  <!ENTITY xbacklight-md5sum               "c9891d6a3f3129d56cede72daa0ba26c">
+
+  <!ENTITY xcmsdb-version                  "1.0.4">
+  <!ENTITY xcmsdb-md5sum                   "5812be48cbbec1068e7b718eec801766">
+
+  <!ENTITY xcursorgen-version              "1.0.5">
+  <!ENTITY xcursorgen-md5sum               "09f56978a62854534deacc8aa8ff3031">
+
+  <!ENTITY xdpyinfo-version                "1.3.0">
+  <!ENTITY xdpyinfo-md5sum                 "1ef08f4c8d0e669c2edd49e4a1bf650d">
+
+  <!ENTITY xdriinfo-version                "1.0.4">
+  <!ENTITY xdriinfo-md5sum                 "3d3cad4d754e10e325438193433d59fd">
+
+  <!ENTITY xev-version                     "1.2.0">
+  <!ENTITY xev-md5sum                      "2727c72f3eba0c23f8f6b2e618d195a2">
+
+  <!ENTITY xgamma-version                  "1.0.5">
+  <!ENTITY xgamma-md5sum                   "c06067f572bc4a5298f324f27340da95">
+
+  <!ENTITY xhost-version                   "1.0.5">
+  <!ENTITY xhost-md5sum                    "a0fcd2cb6ddd9f378944cc6f4f83cd7c">
+
+  <!ENTITY xinput-version                  "1.6.0">
+  <!ENTITY xinput-md5sum                   "d2459d35b4e0b41ded26a1d1159b7ac6">
+
+  <!ENTITY xkbcomp-version                 "1.2.4">
+  <!ENTITY xkbcomp-md5sum                  "a0fc1ac3fc4fe479ade09674347c5aa0">
+
+  <!ENTITY xkbevd-version                  "1.1.3">
+  <!ENTITY xkbevd-md5sum                   "37ed71525c63a9acd42e7cde211dcc5b">
+
+  <!ENTITY xkbutils-version                "1.0.3">
+  <!ENTITY xkbutils-md5sum                 "52ad6d8d87577a8ac736ab5488bec210">
+
+  <!ENTITY xkill-version                   "1.0.3">
+  <!ENTITY xkill-md5sum                    "e7f0d57b6ba49c384e9cf8c9ff3243c1">
+
+  <!ENTITY xlsatoms-version                "1.1.1">
+  <!ENTITY xlsatoms-md5sum                 "9d0e16d116d1c89e6b668c1b2672eb57">
+
+  <!ENTITY xlsclients-version              "1.1.2">
+  <!ENTITY xlsclients-md5sum               "760099f0af112401735801e3b9aa8595">
+
+  <!ENTITY xmodmap-version                 "1.0.7">
+  <!ENTITY xmodmap-md5sum                  "d9b65f6881afe0d6d9863b30e1081bde">
+
+  <!ENTITY xpr-version                     "1.0.4">
+  <!ENTITY xpr-md5sum                      "6101f04731ffd40803df80eca274ec4b">
+
+  <!ENTITY xprop-version                   "1.2.1">
+  <!ENTITY xprop-md5sum                    "d5529dc8d811efabd136ca2d8e857deb">
+
+  <!ENTITY xrandr-version                  "1.3.5">
+  <!ENTITY xrandr-md5sum                   "9735173a84dca9b05e06fd4686196b07">
+
+  <!ENTITY xrdb-version                    "1.0.9">
+  <!ENTITY xrdb-md5sum                     "ed2e48cf33584455d74615ad4bbe4246">
+
+  <!ENTITY xrefresh-version                "1.0.4">
+  <!ENTITY xrefresh-md5sum                 "2f63f88ad0dcecd33c8cf000f38e9250">
+
+  <!ENTITY xset-version                    "1.2.2">
+  <!ENTITY xset-md5sum                     "d44e0057d6722b25d5a314e82e0b7e7c">
+
+  <!ENTITY xsetroot-version                "1.1.0">
+  <!ENTITY xsetroot-md5sum                 "b78a2da4cf128775031a5a3422fc0b78">
+
+  <!ENTITY xvinfo-version                  "1.1.1">
+  <!ENTITY xvinfo-md5sum                   "c88feb501083951a8f47a21aaeb1529d">
+
+  <!ENTITY xwd-version                     "1.0.5">
+  <!ENTITY xwd-md5sum                      "2113126f9ac9c02bb8547c112c5d037e">
+
+  <!ENTITY xwininfo-version                "1.1.2">
+  <!ENTITY xwininfo-md5sum                 "9e8b58c8aa6172e87ab4f9cf3612fedd">
+
+  <!ENTITY xwud-version                    "1.0.4">
+  <!ENTITY xwud-md5sum                     "3025b152b4f13fdffd0c46d0be587be6">
+
 ]>
 
 <sect1 id="xorg7-app" xreflabel="Xorg Applications">
@@ -25,7 +134,7 @@
   <title>Xorg Applications</title>
 
   <indexterm zone="xorg7-app">
-    <primary sortas="a-xorg7-app">Xorg-&xorg7-version; Applications</primary>
+    <primary sortas="a-xorg7-app">Xorg-&xorg-version; Applications</primary>
   </indexterm>
 
   <sect2 role="package">
@@ -46,9 +155,6 @@
         <para>Download (FTP): <ulink url="&x7apps-download-ftp;"/></para>
       </listitem>
       <listitem>
-        <para>Download MD5 sum: <ulink url="&x7apps-md5sum;"/></para>
-      </listitem>
-      <listitem>
         <para>Download size: &x7apps-size;</para>
       </listitem>
       <listitem>
@@ -59,13 +165,6 @@
       </listitem>
     </itemizedlist>
 
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Required download list: <ulink url="&x7apps-wget;"/></para>
-      </listitem>
-    </itemizedlist>
-
     <bridgehead renderas="sect3">Xorg Applications Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
@@ -86,33 +185,86 @@
   <sect2>
     <title>Downloading Xorg Applications</title>
 
+    <para>First, create a list of files to be downloaded. This file will also
+    be used to verify the integrity of the downloads when complete:</para>
+
+<screen><userinput>cat > app-&xorg-version;.md5 << "EOF"
+&bdftopcf-md5sum;  bdftopcf-&bdftopcf-version;.tar.bz2
+&iceauth-md5sum;  iceauth-&iceauth-version;.tar.bz2
+&luit-md5sum;  luit-&luit-version;.tar.bz2
+&mkfontdir-md5sum;  mkfontdir-&mkfontdir-version;.tar.bz2
+&mkfontscale-md5sum;  mkfontscale-&mkfontscale-version;.tar.bz2
+&sessreg-md5sum;  sessreg-&sessreg-version;.tar.bz2
+&setxkbmap-md5sum;  setxkbmap-&setxkbmap-version;.tar.bz2
+&smproxy-md5sum;  smproxy-&smproxy-version;.tar.bz2
+&x11perf-md5sum;  x11perf-&x11perf-version;.tar.bz2
+&xauth-md5sum;  xauth-&xauth-version;.tar.bz2
+&xbacklight-md5sum;  xbacklight-&xbacklight-version;.tar.bz2
+&xcmsdb-md5sum;  xcmsdb-&xcmsdb-version;.tar.bz2
+&xcursorgen-md5sum;  xcursorgen-&xcursorgen-version;.tar.bz2
+&xdpyinfo-md5sum;  xdpyinfo-&xdpyinfo-version;.tar.bz2
+&xdriinfo-md5sum;  xdriinfo-&xdriinfo-version;.tar.bz2
+&xev-md5sum;  xev-&xev-version;.tar.bz2
+&xgamma-md5sum;  xgamma-&xgamma-version;.tar.bz2
+&xhost-md5sum;  xhost-&xhost-version;.tar.bz2
+&xinput-md5sum;  xinput-&xinput-version;.tar.bz2
+&xkbcomp-md5sum;  xkbcomp-&xkbcomp-version;.tar.bz2
+&xkbevd-md5sum;  xkbevd-&xkbevd-version;.tar.bz2
+&xkbutils-md5sum;  xkbutils-&xkbutils-version;.tar.bz2
+&xkill-md5sum;  xkill-&xkill-version;.tar.bz2
+&xlsatoms-md5sum;  xlsatoms-&xlsatoms-version;.tar.bz2
+&xlsclients-md5sum;  xlsclients-&xlsclients-version;.tar.bz2
+&xmodmap-md5sum;  xmodmap-&xmodmap-version;.tar.bz2
+&xpr-md5sum;  xpr-&xpr-version;.tar.bz2
+&xprop-md5sum;  xprop-&xprop-version;.tar.bz2
+&xrandr-md5sum;  xrandr-&xrandr-version;.tar.bz2
+&xrdb-md5sum;  xrdb-&xrdb-version;.tar.bz2
+&xrefresh-md5sum;  xrefresh-&xrefresh-version;.tar.bz2
+&xset-md5sum;  xset-&xset-version;.tar.bz2
+&xsetroot-md5sum;  xsetroot-&xsetroot-version;.tar.bz2
+&xvinfo-md5sum;  xvinfo-&xvinfo-version;.tar.bz2
+&xwd-md5sum;  xwd-&xwd-version;.tar.bz2
+&xwininfo-md5sum;  xwininfo-&xwininfo-version;.tar.bz2
+&xwud-md5sum;  xwud-&xwud-version;.tar.bz2
+EOF</userinput></screen>
+
     <para>To download the needed files using <application>wget</application>,
     use the following commands:</para>
 
 <screen><userinput>mkdir app &&
 cd app &&
-grep -v '^#' ../app-&xorg7-release;.wget | wget -i- -c \
+grep -v '^#' ../app-&xorg-version;.md5 | awk '{print $2}' | wget -i- -c \
     -B http://xorg.freedesktop.org/releases/individual/app/ &&
-md5sum -c ../app-&xorg7-release;.md5</userinput></screen>
+md5sum -c ../app-&xorg-version;.md5</userinput></screen>
 
   </sect2>
 
   <sect2 role="installation">
     <title>Installation of Xorg Applications</title>
 
-    <para>Install the applications by running the following commands for each
-    package:</para>
+    <para>First, start a sub-shell that will exit on error:</para>
 
-<screen><userinput>./configure $XORG_CONFIG &&
-make</userinput></screen>
+<screen><userinput>bash -e</userinput></screen>
 
-    <para>These packages do not provide test suites.</para>
+    <para>Install all of the applications by running the following
+    commands:</para>
 
-    <para>Now as the <systemitem class="username">root</systemitem>
-    user:</para>
+<screen><userinput>for package in $(grep -v '^#' ../app-&xorg-version;.md5 | awk '{print $2}')
+do
+  packagedir=${package%.tar.bz2}
+  tar -xf $package
+  cd $packagedir
+  ./configure $XORG_CONFIG
+  make
+  sudo make install
+  cd ..
+  rm -r $packagedir
+done</userinput></screen>
 
-<screen role="root"><userinput>make install</userinput></screen>
+    <para>Finally, exit the shell that was started earlier:</para>
 
+<screen><userinput>exit</userinput></screen>
+
   </sect2>
 
   <sect2 role="content">

Modified: trunk/BOOK/x/installing/x7font.xml
===================================================================
--- trunk/BOOK/x/installing/x7font.xml	2012-07-29 00:33:06 UTC (rev 10476)
+++ trunk/BOOK/x/installing/x7font.xml	2012-07-29 20:09:42 UTC (rev 10477)
@@ -6,11 +6,121 @@
 
   <!ENTITY x7fonts-download-http "http://xorg.freedesktop.org/releases/individual/font/">
   <!ENTITY x7fonts-download-ftp  "ftp://ftp.x.org/pub/individual/font/">
-  <!ENTITY x7fonts-wget          "&files-anduin;/xorg/font-&xorg7-release;.wget">
-  <!ENTITY x7fonts-md5sum        "&files-anduin;/xorg/font-&xorg7-release;.md5">
   <!ENTITY x7fonts-size          "15.0 MB">
   <!ENTITY x7fonts-buildsize     "278 MB">
   <!ENTITY x7fonts-time          "2.3 SBU">
+
+  <!ENTITY encodings-version               "1.0.4">
+  <!ENTITY encodings-md5sum                "0f2d6546d514c5cc4ecf78a60657a5c1">
+
+  <!ENTITY font-adobe-100dpi-version       "1.0.3">
+  <!ENTITY font-adobe-100dpi-md5sum        "1347c3031b74c9e91dc4dfa53b12f143">
+
+  <!ENTITY font-adobe-75dpi-version        "1.0.3">
+  <!ENTITY font-adobe-75dpi-md5sum         "6c9f26c92393c0756f3e8d614713495b">
+
+  <!ENTITY font-adobe-utopia-100dpi-version "1.0.4">
+  <!ENTITY font-adobe-utopia-100dpi-md5sum  "66fb6de561648a6dce2755621d6aea17">
+
+  <!ENTITY font-adobe-utopia-75dpi-version "1.0.4">
+  <!ENTITY font-adobe-utopia-75dpi-md5sum  "e99276db3e7cef6dccc8a57bc68aeba7">
+
+  <!ENTITY font-adobe-utopia-type1-version "1.0.4">
+  <!ENTITY font-adobe-utopia-type1-md5sum  "fcf24554c348df3c689b91596d7f9971">
+
+  <!ENTITY font-alias-version              "1.0.3">
+  <!ENTITY font-alias-md5sum               "6d25f64796fef34b53b439c2e9efa562">
+
+  <!ENTITY font-arabic-misc-version        "1.0.3">
+  <!ENTITY font-arabic-misc-md5sum         "cc0726e4a277d6ed93b8e09c1f195470">
+
+  <!ENTITY font-bh-100dpi-version          "1.0.3">
+  <!ENTITY font-bh-100dpi-md5sum           "9f11ade089d689b9d59e0f47d26f39cd">
+
+  <!ENTITY font-bh-75dpi-version           "1.0.3">
+  <!ENTITY font-bh-75dpi-md5sum            "565494fc3b6ac08010201d79c677a7a7">
+
+  <!ENTITY font-bh-lucidatypewriter-100dpi-version "1.0.3">
+  <!ENTITY font-bh-lucidatypewriter-100dpi-md5sum  "c8b73a53dcefe3e8d3907d3500e484a9">
+
+  <!ENTITY font-bh-lucidatypewriter-75dpi-version "1.0.3">
+  <!ENTITY font-bh-lucidatypewriter-75dpi-md5sum  "f6d65758ac9eb576ae49ab24c5e9019a">
+
+  <!ENTITY font-bh-ttf-version             "1.0.3">
+  <!ENTITY font-bh-ttf-md5sum              "e8ca58ea0d3726b94fe9f2c17344be60">
+
+  <!ENTITY font-bh-type1-version           "1.0.3">
+  <!ENTITY font-bh-type1-md5sum            "53ed9a42388b7ebb689bdfc374f96a22">
+
+  <!ENTITY font-bitstream-100dpi-version   "1.0.3">
+  <!ENTITY font-bitstream-100dpi-md5sum    "6b223a54b15ecbd5a1bc52312ad790d8">
+
+  <!ENTITY font-bitstream-75dpi-version    "1.0.3">
+  <!ENTITY font-bitstream-75dpi-md5sum     "d7c0588c26fac055c0dd683fdd65ac34">
+
+  <!ENTITY font-bitstream-type1-version    "1.0.3">
+  <!ENTITY font-bitstream-type1-md5sum     "5e0c9895d69d2632e2170114f8283c11">
+
+  <!ENTITY font-cronyx-cyrillic-version    "1.0.3">
+  <!ENTITY font-cronyx-cyrillic-md5sum     "e452b94b59b9cfd49110bb49b6267fba">
+
+  <!ENTITY font-cursor-misc-version        "1.0.3">
+  <!ENTITY font-cursor-misc-md5sum         "3e0069d4f178a399cffe56daa95c2b63">
+
+  <!ENTITY font-daewoo-misc-version        "1.0.3">
+  <!ENTITY font-daewoo-misc-md5sum         "0571bf77f8fab465a5454569d9989506">
+
+  <!ENTITY font-dec-misc-version           "1.0.3">
+  <!ENTITY font-dec-misc-md5sum            "6e7c5108f1b16d7a1c7b2c9760edd6e5">
+
+  <!ENTITY font-ibm-type1-version          "1.0.3">
+  <!ENTITY font-ibm-type1-md5sum           "bfb2593d2102585f45daa960f43cb3c4">
+
+  <!ENTITY font-isas-misc-version          "1.0.3">
+  <!ENTITY font-isas-misc-md5sum           "a2401caccbdcf5698e001784dbd43f1a">
+
+  <!ENTITY font-jis-misc-version           "1.0.3">
+  <!ENTITY font-jis-misc-md5sum            "cb7b57d7800fd9e28ec35d85761ed278">
+
+  <!ENTITY font-micro-misc-version         "1.0.3">
+  <!ENTITY font-micro-misc-md5sum          "143c228286fe9c920ab60e47c1b60b67">
+
+  <!ENTITY font-misc-cyrillic-version      "1.0.3">
+  <!ENTITY font-misc-cyrillic-md5sum       "96109d0890ad2b6b0e948525ebb0aba8">
+
+  <!ENTITY font-misc-ethiopic-version      "1.0.3">
+  <!ENTITY font-misc-ethiopic-md5sum       "6306c808f7d7e7d660dfb3859f9091d2">
+
+  <!ENTITY font-misc-meltho-version        "1.0.3">
+  <!ENTITY font-misc-meltho-md5sum         "e3e7b0fda650adc7eb6964ff3c486b1c">
+
+  <!ENTITY font-misc-misc-version          "1.1.2">
+  <!ENTITY font-misc-misc-md5sum           "c88eb44b3b903d79fb44b860a213e623">
+
+  <!ENTITY font-mutt-misc-version          "1.0.3">
+  <!ENTITY font-mutt-misc-md5sum           "56b0296e8862fc1df5cdbb4efe604e86">
+
+  <!ENTITY font-schumacher-misc-version    "1.1.2">
+  <!ENTITY font-schumacher-misc-md5sum     "e805feb7c4f20e6bfb1118d19d972219">
+
+  <!ENTITY font-screen-cyrillic-version    "1.0.4">
+  <!ENTITY font-screen-cyrillic-md5sum     "6f3fdcf2454bf08128a651914b7948ca">
+
+  <!ENTITY font-sony-misc-version          "1.0.3">
+  <!ENTITY font-sony-misc-md5sum           "beef61a9b0762aba8af7b736bb961f86">
+
+  <!ENTITY font-sun-misc-version           "1.0.3">
+  <!ENTITY font-sun-misc-md5sum            "948f2e07810b4f31195185921470f68d">
+
+  <!ENTITY font-util-version               "1.3.0">
+  <!ENTITY font-util-md5sum                "ddfc8a89d597651408369d940d03d06b">
+
+  <!ENTITY font-winitzki-cyrillic-version  "1.0.3">
+  <!ENTITY font-winitzki-cyrillic-md5sum   "829a3159389b7f96f629e5388bfee67b">
+
+  <!ENTITY font-xfree86-type1-version      "1.0.4">
+  <!ENTITY font-xfree86-type1-md5sum       "3eeb3fb44690b477d510bbd8f86cf5aa">
+
 ]>
 
 <sect1 id="xorg7-font" xreflabel="Xorg Fonts">
@@ -44,9 +154,6 @@
         <para>Download (FTP): <ulink url="&x7fonts-download-ftp;"/></para>
       </listitem>
       <listitem>
-        <para>Download MD5 sum: <ulink url="&x7fonts-md5sum;"/></para>
-      </listitem>
-      <listitem>
         <para>Download size: &x7fonts-size;</para>
       </listitem>
       <listitem>
@@ -57,13 +164,6 @@
       </listitem>
     </itemizedlist>
 
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Required download list: <ulink url="&x7fonts-wget;"/></para>
-      </listitem>
-    </itemizedlist>
-
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required"><xref linkend="xorg7-app"/> and
     <xref linkend="xcursor-themes"/></para>
@@ -76,32 +176,86 @@
   <sect2>
     <title>Downloading Xorg Fonts</title>
 
+    <para>First, create a list of files to be downloaded. This file will also
+    be used to verify the integrity of the downloads when complete:</para>
+
+<screen><userinput>cat > font-&xorg-version;.md5 << "EOF"
+&encodings-md5sum;  encodings-&encodings-version;.tar.bz2
+&font-adobe-100dpi-md5sum;  font-adobe-100dpi-&font-adobe-100dpi-version;.tar.bz2
+&font-adobe-75dpi-md5sum;  font-adobe-75dpi-&font-adobe-75dpi-version;.tar.bz2
+&font-adobe-utopia-100dpi-md5sum;  font-adobe-utopia-100dpi-&font-adobe-utopia-100dpi-version;.tar.bz2
+&font-adobe-utopia-75dpi-md5sum;  font-adobe-utopia-75dpi-&font-adobe-utopia-75dpi-version;.tar.bz2
+&font-adobe-utopia-type1-md5sum;  font-adobe-utopia-type1-&font-adobe-utopia-type1-version;.tar.bz2
+&font-alias-md5sum;  font-alias-&font-alias-version;.tar.bz2
+&font-arabic-misc-md5sum;  font-arabic-misc-&font-arabic-misc-version;.tar.bz2
+&font-bh-100dpi-md5sum;  font-bh-100dpi-&font-bh-100dpi-version;.tar.bz2
+&font-bh-75dpi-md5sum;  font-bh-75dpi-&font-bh-75dpi-version;.tar.bz2
+&font-bh-lucidatypewriter-100dpi-md5sum;  font-bh-lucidatypewriter-100dpi-&font-bh-lucidatypewriter-100dpi-version;.tar.bz2
+&font-bh-lucidatypewriter-75dpi-md5sum;  font-bh-lucidatypewriter-75dpi-&font-bh-lucidatypewriter-75dpi-version;.tar.bz2
+&font-bh-ttf-md5sum;  font-bh-ttf-&font-bh-ttf-version;.tar.bz2
+&font-bh-type1-md5sum;  font-bh-type1-&font-bh-type1-version;.tar.bz2
+&font-bitstream-100dpi-md5sum;  font-bitstream-100dpi-&font-bitstream-100dpi-version;.tar.bz2
+&font-bitstream-75dpi-md5sum;  font-bitstream-75dpi-&font-bitstream-75dpi-version;.tar.bz2
+&font-bitstream-type1-md5sum;  font-bitstream-type1-&font-bitstream-type1-version;.tar.bz2
+&font-cronyx-cyrillic-md5sum;  font-cronyx-cyrillic-&font-cronyx-cyrillic-version;.tar.bz2
+&font-cursor-misc-md5sum;  font-cursor-misc-&font-cursor-misc-version;.tar.bz2
+&font-daewoo-misc-md5sum;  font-daewoo-misc-&font-daewoo-misc-version;.tar.bz2
+&font-dec-misc-md5sum;  font-dec-misc-&font-dec-misc-version;.tar.bz2
+&font-ibm-type1-md5sum;  font-ibm-type1-&font-ibm-type1-version;.tar.bz2
+&font-isas-misc-md5sum;  font-isas-misc-&font-isas-misc-version;.tar.bz2
+&font-jis-misc-md5sum;  font-jis-misc-&font-jis-misc-version;.tar.bz2
+&font-micro-misc-md5sum;  font-micro-misc-&font-micro-misc-version;.tar.bz2
+&font-misc-cyrillic-md5sum;  font-misc-cyrillic-&font-misc-cyrillic-version;.tar.bz2
+&font-misc-ethiopic-md5sum;  font-misc-ethiopic-&font-misc-ethiopic-version;.tar.bz2
+&font-misc-meltho-md5sum;  font-misc-meltho-&font-misc-meltho-version;.tar.bz2
+&font-misc-misc-md5sum;  font-misc-misc-&font-misc-misc-version;.tar.bz2
+&font-mutt-misc-md5sum;  font-mutt-misc-&font-mutt-misc-version;.tar.bz2
+&font-schumacher-misc-md5sum;  font-schumacher-misc-&font-schumacher-misc-version;.tar.bz2
+&font-screen-cyrillic-md5sum;  font-screen-cyrillic-&font-screen-cyrillic-version;.tar.bz2
+&font-sony-misc-md5sum;  font-sony-misc-&font-sony-misc-version;.tar.bz2
+&font-sun-misc-md5sum;  font-sun-misc-&font-sun-misc-version;.tar.bz2
+&font-util-md5sum;  font-util-&font-util-version;.tar.bz2
+&font-winitzki-cyrillic-md5sum;  font-winitzki-cyrillic-&font-winitzki-cyrillic-version;.tar.bz2
+&font-xfree86-type1-md5sum;  font-xfree86-type1-&font-xfree86-type1-version;.tar.bz2
+EOF</userinput></screen>
+
     <para>To download the needed files using <application>wget</application>,
     use the following commands:</para>
 
 <screen><userinput>mkdir font &&
 cd font &&
-grep -v '^#' ../font-&xorg7-release;.wget | wget -i- -c \
+grep -v '^#' ../font-&xorg-version;.md5 | awk '{print $2}' | wget -i- -c \
     -B http://xorg.freedesktop.org/releases/individual/font/ &&
-md5sum -c ../font-&xorg7-release;.md5</userinput></screen>
+md5sum -c ../font-&xorg-version;.md5</userinput></screen>
 
   </sect2>
 
   <sect2 role="installation">
     <title>Installation of Xorg Fonts</title>
 
-    <para>Run the following commands for each package:</para>
+    <para>First, start a subshell that will exit on error:</para>
 
-<screen><userinput>./configure $XORG_CONFIG &&
-make</userinput></screen>
+<screen><userinput>bash -e</userinput></screen>
 
-    <para>These packages do not provide test suites.</para>
+    <para>Install all of the applications by running the following
+    commands:</para>
 
-    <para>Now as the <systemitem class="username">root</systemitem>
-    user:</para>
+<screen><userinput>for package in $(grep -v '^#' ../font-&xorg-version;.md5 | awk '{print $2}')
+do
+  packagedir=${package%.tar.bz2}
+  tar -xf $package
+  cd $packagedir
+  ./configure $XORG_CONFIG
+  make
+  sudo make install
+  cd ..
+  rm -r $packagedir
+done</userinput></screen>
 
-<screen role="root"><userinput>make install</userinput></screen>
+    <para>Finally, exit the shell that was started earlier:</para>
 
+<screen><userinput>exit</userinput></screen>
+
     <para>When all of the fonts have been installed, the system must be
     configured so that <application>Fontconfig</application> can find the
     TrueType fonts since they are outside of the default search path of

Modified: trunk/BOOK/x/installing/x7lib.xml
===================================================================
--- trunk/BOOK/x/installing/x7lib.xml	2012-07-29 00:33:06 UTC (rev 10476)
+++ trunk/BOOK/x/installing/x7lib.xml	2012-07-29 20:09:42 UTC (rev 10477)
@@ -6,12 +6,109 @@
 
   <!ENTITY x7libs-download-http "http://xorg.freedesktop.org/releases/individual/lib/">
   <!ENTITY x7libs-download-ftp  "ftp://ftp.x.org/pub/individual/lib/">
-  <!ENTITY x7libs-wget          "&files-anduin;/xorg/lib-&xorg7-release;.wget">
-  <!ENTITY x7libs-md5sum        "&files-anduin;/xorg/lib-&xorg7-release;.md5">
   <!ENTITY x7libs-size          "12.1 MB">
   <!ENTITY x7libs-buildsize     "327 MB">
   <!ENTITY x7libs-time          "3.7 SBU">
 
+  <!ENTITY libAppleWM-version              "1.4.1">
+  <!ENTITY libAppleWM-md5sum               "e591bed408275337cd3f3324c622047e">
+
+  <!ENTITY libdmx-version                  "1.1.2">
+  <!ENTITY libdmx-md5sum                   "782ced3a9e754dfeb53a8a006a75eb1a">
+
+  <!ENTITY libfontenc-version              "1.1.1">
+  <!ENTITY libfontenc-md5sum               "a2a861f142c3b4367f14fc14239fc1f7">
+
+  <!ENTITY libFS-version                   "1.0.4">
+  <!ENTITY libFS-md5sum                    "645f83160cf7b562734e2038045106d1">
+
+  <!ENTITY libICE-version                  "1.0.8">
+  <!ENTITY libICE-md5sum                   "471b5ca9f5562ac0d6eac7a0bf650738">
+
+  <!ENTITY libpciaccess-version            "0.13.1">
+  <!ENTITY libpciaccess-md5sum             "399a419ac6a54f0fc07c69c9bdf452dc">
+
+  <!ENTITY libSM-version                   "1.2.1">
+  <!ENTITY libSM-md5sum                    "766de9d1e1ecf8bf74cebe2111d8e2bd">
+
+  <!ENTITY libWindowsWM-version            "1.0.1">
+  <!ENTITY libWindowsWM-md5sum             "274b2b5620a524fd7bb739edb97317f5">
+
+  <!ENTITY libX11-version                  "1.5.0">
+  <!ENTITY libX11-md5sum                   "78b4b3bab4acbdf0abcfca30a8c70cc6">
+
+  <!ENTITY libXaw-version                  "1.0.11">
+  <!ENTITY libXaw-md5sum                   "f39942f2cab379fc9b4c3731bf191b84">
+
+  <!ENTITY libXcomposite-version           "0.4.3">
+  <!ENTITY libXcomposite-md5sum            "a60e0b5c276d0aa9e2d3b982c98f61c8">
+
+  <!ENTITY libXcursor-version              "1.1.13">
+  <!ENTITY libXcursor-md5sum               "52efa81b7f26c8eda13510a2fba98eea">
+
+  <!ENTITY libXdamage-version              "1.1.3">
+  <!ENTITY libXdamage-md5sum               "44774e1a065158b52f1a0da5100cebec">
+
+  <!ENTITY libXext-version                 "1.3.1">
+  <!ENTITY libXext-md5sum                  "71251a22bc47068d60a95f50ed2ec3cf">
+
+  <!ENTITY libXfixes-version               "5.0">
+  <!ENTITY libXfixes-md5sum                "678071bd7f9f7467e2fc712d81022318">
+
+  <!ENTITY libXfont-version                "1.4.5">
+  <!ENTITY libXfont-md5sum                 "6851da5dae0a6cf5f7c9b9e2b05dd3b4">
+
+  <!ENTITY libXft-version                  "2.3.1">
+  <!ENTITY libXft-md5sum                   "78d64dece560c9e8699199f3faa521c0">
+
+  <!ENTITY libXi-version                   "1.6.1">
+  <!ENTITY libXi-md5sum                    "78ee882e1ff3b192cf54070bdb19938e">
+
+  <!ENTITY libXinerama-version             "1.1.2">
+  <!ENTITY libXinerama-md5sum              "cb45d6672c93a608f003b6404f1dd462">
+
+  <!ENTITY libxkbfile-version              "1.0.8">
+  <!ENTITY libxkbfile-md5sum               "19e6533ae64abba0773816a23f2b9507">
+
+  <!ENTITY libXmu-version                  "1.1.1">
+  <!ENTITY libXmu-md5sum                   "a4efff8de85bd45dd3da124285d10c00">
+
+  <!ENTITY libXpm-version                  "3.5.10">
+  <!ENTITY libXpm-md5sum                   "7ae7eff7a14d411e84a67bd166bcec1a">
+
+  <!ENTITY libXrandr-version               "1.3.2">
+  <!ENTITY libXrandr-md5sum                "92473da2fccf5fac665be4fa4f2037fa">
+
+  <!ENTITY libXrender-version              "0.9.7">
+  <!ENTITY libXrender-md5sum               "ee62f4c7f0f16ced4da63308963ccad2">
+
+  <!ENTITY libXres-version                 "1.0.6">
+  <!ENTITY libXres-md5sum                  "80d0c6d8522fa7a645e4f522e9a9cd20">
+
+  <!ENTITY libXScrnSaver-version           "1.2.2">
+  <!ENTITY libXScrnSaver-md5sum            "7a773b16165e39e938650bcc9027c1d5">
+
+  <!ENTITY libXt-version                   "1.1.3">
+  <!ENTITY libXt-md5sum                    "a6f137ae100e74ebe3b71eb4a38c40b3">
+
+  <!ENTITY libXtst-version                 "1.2.1">
+  <!ENTITY libXtst-md5sum                  "e8abc5c00c666f551cf26aa53819d592">
+
+  <!ENTITY libXv-version                   "1.0.7">
+  <!ENTITY libXv-md5sum                    "5e1ac203ccd3ce3e89755ed1fbe75b0b">
+
+  <!ENTITY libXvMC-version                 "1.0.7">
+  <!ENTITY libXvMC-md5sum                  "3340c99ff556ea2457b4be47f5cb96fa">
+
+  <!ENTITY libXxf86dga-version             "1.1.3">
+  <!ENTITY libXxf86dga-md5sum              "b7f38465c46e7145782d37dbb9da8c09">
+
+  <!ENTITY libXxf86vm-version              "1.1.2">
+  <!ENTITY libXxf86vm-md5sum               "ffd93bcedd8b2b5aeabf184e7b91f326">
+
+  <!ENTITY xtrans-version                  "1.2.7">
+  <!ENTITY xtrans-md5sum                   "84c66908cf003ad8c272b0eecbdbaee3">
+
 ]>
 
 <sect1 id="xorg7-lib" xreflabel="Xorg Libraries">
@@ -45,9 +142,6 @@
         <para>Download (FTP): <ulink url="&x7libs-download-ftp;"/></para>
       </listitem>
       <listitem>
-        <para>Download MD5 sum: <ulink url="&x7libs-md5sum;"/></para>
-      </listitem>
-      <listitem>
         <para>Download size: &x7libs-size;</para>
       </listitem>
       <listitem>
@@ -58,14 +152,6 @@
       </listitem>
     </itemizedlist>
 
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Required download list: <ulink url="&x7libs-wget;"/></para>
-      </listitem>
-
-    </itemizedlist>
-
     <bridgehead renderas="sect3">Xorg Libraries Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
@@ -90,45 +176,94 @@
   <sect2>
     <title>Downloading Xorg Libraries</title>
 
+    <para>First, create a list of files to be downloaded. This file will also
+    be used to verify the integrity of the downloads when complete:</para>
+
+<screen><userinput>cat > lib-&xorg-version;.md5 << "EOF"
+#&libAppleWM-md5sum;  libAppleWM-&libAppleWM-version;.tar.bz2
+&libdmx-md5sum;  libdmx-&libdmx-version;.tar.bz2
+&libfontenc-md5sum;  libfontenc-&libfontenc-version;.tar.bz2
+&libFS-md5sum;  libFS-&libFS-version;.tar.bz2
+&libICE-md5sum;  libICE-&libICE-version;.tar.bz2
+&libpciaccess-md5sum;  libpciaccess-&libpciaccess-version;.tar.bz2
+&libSM-md5sum;  libSM-&libSM-version;.tar.bz2
+#&libWindowsWM-md5sum;  libWindowsWM-&libWindowsWM-version;.tar.bz2
+&libX11-md5sum;  libX11-&libX11-version;.tar.bz2
+&libXaw-md5sum;  libXaw-&libXaw-version;.tar.bz2
+&libXcomposite-md5sum;  libXcomposite-&libXcomposite-version;.tar.bz2
+&libXcursor-md5sum;  libXcursor-&libXcursor-version;.tar.bz2
+&libXdamage-md5sum;  libXdamage-&libXdamage-version;.tar.bz2
+&libXext-md5sum;  libXext-&libXext-version;.tar.bz2
+&libXfixes-md5sum;  libXfixes-&libXfixes-version;.tar.bz2
+&libXfont-md5sum;  libXfont-&libXfont-version;.tar.bz2
+&libXft-md5sum;  libXft-&libXft-version;.tar.bz2
+&libXi-md5sum;  libXi-&libXi-version;.tar.bz2
+&libXinerama-md5sum;  libXinerama-&libXinerama-version;.tar.bz2
+&libxkbfile-md5sum;  libxkbfile-&libxkbfile-version;.tar.bz2
+&libXmu-md5sum;  libXmu-&libXmu-version;.tar.bz2
+&libXpm-md5sum;  libXpm-&libXpm-version;.tar.bz2
+&libXrandr-md5sum;  libXrandr-&libXrandr-version;.tar.bz2
+&libXrender-md5sum;  libXrender-&libXrender-version;.tar.bz2
+&libXres-md5sum;  libXres-&libXres-version;.tar.bz2
+&libXScrnSaver-md5sum;  libXScrnSaver-&libXScrnSaver-version;.tar.bz2
+&libXt-md5sum;  libXt-&libXt-version;.tar.bz2
+&libXtst-md5sum;  libXtst-&libXtst-version;.tar.bz2
+&libXv-md5sum;  libXv-&libXv-version;.tar.bz2
+&libXvMC-md5sum;  libXvMC-&libXvMC-version;.tar.bz2
+&libXxf86dga-md5sum;  libXxf86dga-&libXxf86dga-version;.tar.bz2
+&libXxf86vm-md5sum;  libXxf86vm-&libXxf86vm-version;.tar.bz2
+&xtrans-md5sum;  xtrans-&xtrans-version;.tar.bz2
+EOF</userinput></screen>
+
     <para>To download the needed files using <application>wget</application>,
     use the following commands:</para>
 
 <screen><userinput>mkdir lib &&
 cd lib &&
-grep -v '^#' ../lib-&xorg7-release;.wget | wget -i- -c \
+grep -v '^#' ../lib-&xorg-version;.md5 | awk '{print $2}' | wget -i- -c \
     -B http://xorg.freedesktop.org/releases/individual/lib/ &&
-md5sum -c ../lib-&xorg7-release;.md5</userinput></screen>
+md5sum -c ../lib-&xorg-version;.md5</userinput></screen>
 
   </sect2>
 
   <sect2 role="installation">
     <title>Installation of Xorg Libraries</title>
 
-    <para>Install the libraries by running the following commands for each
-    package:</para>
+    <para>First, start a subshell that will exit on error:</para>
 
-<screen><userinput>case $(basename "$PWD") in
-libXfont-[0-9]* )
-                 ./configure $XORG_CONFIG --disable-devel-docs
-                 ;;
-   libXt-[0-9]* )
-                 ./configure $XORG_CONFIG \
-                     --with-appdefaultdir=/etc/X11/app-defaults
-                 ;;
-              * )
-                 ./configure $XORG_CONFIG
-                 ;;
-esac &&
-make</userinput></screen>
+<screen><userinput>bash -e</userinput></screen>
 
-    <para>These packages do not provide test suites.</para>
+    <para>Install all of the applications by running the following
+    commands:</para>
 
-    <para>Now as the <systemitem class="username">root</systemitem>
-    user:</para>
+<screen><userinput>for package in $(grep -v '^#' ../lib-&xorg-version;.md5 | awk '{print $2}')
+do
+  packagedir=${package%.tar.bz2}
+  tar -xf $package
+  cd $packagedir
+  case $packagedir in
+    libXfont-[0-9]* )
+      ./configure $XORG_CONFIG --disable-devel-docs
+    ;;
+    libXt-[0-9]* )
+      ./configure $XORG_CONFIG \
+        --with-appdefaultdir=/etc/X11/app-defaults
+    ;;
+    * )
+      ./configure $XORG_CONFIG
+    ;;
+  esac
+  make
+  sudo make install
+  cd ..
+  rm -r $packagedir
+  sudo /sbin/ldconfig
+done</userinput></screen>
 
-<screen role="root"><userinput>make install &&
-ldconfig</userinput></screen>
+    <para>Finally, exit the shell that was started earlier:</para>
 
+<screen><userinput>exit</userinput></screen>
+
   </sect2>
 
   <sect2 role="commands">

Modified: trunk/BOOK/x/installing/x7proto.xml
===================================================================
--- trunk/BOOK/x/installing/x7proto.xml	2012-07-29 00:33:06 UTC (rev 10476)
+++ trunk/BOOK/x/installing/x7proto.xml	2012-07-29 20:09:42 UTC (rev 10477)
@@ -6,8 +6,6 @@
 
   <!ENTITY x7proto-download-http "http://xorg.freedesktop.org/releases/individual/proto/">
   <!ENTITY x7proto-download-ftp  "ftp://ftp.x.org/pub/individual/proto/">
-  <!ENTITY x7proto-wget          "&files-anduin;/xorg/proto-&xorg7-release;.wget">
-  <!ENTITY x7proto-md5sum        "&files-anduin;/xorg/proto-&xorg7-release;.md5">
   <!ENTITY x7proto-size          "3.0 MB">
 <!-- Editors note:  Because we recommend a scripted build that removes
      the source directories after installation, the xorg buildsizes are
@@ -17,6 +15,84 @@
   <!ENTITY x7proto-buildsize     "21 MB">
   <!ENTITY x7proto-time          "0.8 SBU">
 
+  <!ENTITY applewmproto-version            "1.4.2">
+  <!ENTITY applewmproto-md5sum             "c1d50749c3ac5215a1a9425818e856c1">
+
+  <!ENTITY bigreqsproto-version            "1.1.2">
+  <!ENTITY bigreqsproto-md5sum             "1a05fb01fa1d5198894c931cf925c025">
+
+  <!ENTITY compositeproto-version          "0.4.2">
+  <!ENTITY compositeproto-md5sum           "98482f65ba1e74a08bf5b056a4031ef0">
+
+  <!ENTITY damageproto-version             "1.2.1">
+  <!ENTITY damageproto-md5sum              "998e5904764b82642cc63d97b4ba9e95">
+
+  <!ENTITY dmxproto-version                "2.3.1">
+  <!ENTITY dmxproto-md5sum                 "4ee175bbd44d05c34d43bb129be5098a">
+
+  <!ENTITY dri2proto-version               "2.6">
+  <!ENTITY dri2proto-md5sum                "2eb74959684f47c862081099059a11ab">
+
+  <!ENTITY fixesproto-version              "5.0">
+  <!ENTITY fixesproto-md5sum               "e7431ab84d37b2678af71e29355e101d">
+
+  <!ENTITY fontsproto-version              "2.1.2">
+  <!ENTITY fontsproto-md5sum               "c5f4f1fb4ba7766eedbc9489e81f3be2">
+
+  <!ENTITY glproto-version                 "1.4.15">
+  <!ENTITY glproto-md5sum                  "d1ff0c1acc605689919c1ee2fc9b5582">
+
+  <!ENTITY inputproto-version              "2.2">
+  <!ENTITY inputproto-md5sum               "13c8aedaf98a92e282b7e456c0a5bed9">
+
+  <!ENTITY kbproto-version                 "1.0.6">
+  <!ENTITY kbproto-md5sum                  "677ea8523eec6caca86121ad2dca0b71">
+
+  <!ENTITY randrproto-version              "1.3.2">
+  <!ENTITY randrproto-md5sum               "597491c0d8055e2a66f11350c4985775">
+
+  <!ENTITY recordproto-version             "1.14.2">
+  <!ENTITY recordproto-md5sum              "1b4e5dede5ea51906f1530ca1e21d216">
+
+  <!ENTITY renderproto-version             "0.11.1">
+  <!ENTITY renderproto-md5sum              "a914ccc1de66ddeb4b611c6b0686e274">
+
+  <!ENTITY resourceproto-version           "1.2.0">
+  <!ENTITY resourceproto-md5sum            "cfdb57dae221b71b2703f8e2980eaaf4">
+
+  <!ENTITY scrnsaverproto-version          "1.2.2">
+  <!ENTITY scrnsaverproto-md5sum           "edd8a73775e8ece1d69515dd17767bfb">
+
+  <!ENTITY videoproto-version              "2.3.1">
+  <!ENTITY videoproto-md5sum               "c3b348c6e2031b72b11ae63fc7f805c2">
+
+  <!ENTITY windowswmproto-version          "1.0.4">
+  <!ENTITY windowswmproto-md5sum           "e74b2ff3172a6117f2a62b655ef99064">
+
+  <!ENTITY xcmiscproto-version             "1.2.2">
+  <!ENTITY xcmiscproto-md5sum              "5f4847c78e41b801982c8a5e06365b24">
+
+  <!ENTITY xextproto-version               "7.2.1">
+  <!ENTITY xextproto-md5sum                "eaac343af094e6b608cf15cfba0f77c5">
+
+  <!ENTITY xf86bigfontproto-version        "1.2.0">
+  <!ENTITY xf86bigfontproto-md5sum         "120e226ede5a4687b25dd357cc9b8efe">
+
+  <!ENTITY xf86dgaproto-version            "2.1">
+  <!ENTITY xf86dgaproto-md5sum             "a036dc2fcbf052ec10621fd48b68dbb1">
+
+  <!ENTITY xf86driproto-version            "2.1.1">
+  <!ENTITY xf86driproto-md5sum             "1d716d0dac3b664e5ee20c69d34bc10e">
+
+  <!ENTITY xf86vidmodeproto-version        "2.3.1">
+  <!ENTITY xf86vidmodeproto-md5sum         "e793ecefeaecfeabd1aed6a01095174e">
+
+  <!ENTITY xineramaproto-version           "1.2.1">
+  <!ENTITY xineramaproto-md5sum            "9959fe0bfb22a0e7260433b8d199590a">
+
+  <!ENTITY xproto-version                  "7.0.23">
+  <!ENTITY xproto-md5sum                   "d4d241a4849167e4e694fe73371c328c">
+
 ]>
 
 <sect1 id="xorg7-proto" xreflabel="Xorg Protocol Headers">
@@ -51,9 +127,6 @@
         <para>Download (FTP): <ulink url="&x7proto-download-ftp;"/></para>
       </listitem>
       <listitem>
-        <para>Download MD5 sum: <ulink url="&x7proto-md5sum;"/></para>
-      </listitem>
-      <listitem>
         <para>Download size: &x7proto-size;</para>
       </listitem>
       <listitem>
@@ -64,18 +137,15 @@
       </listitem>
     </itemizedlist>
 
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Required download list: <ulink url="&x7proto-wget;"/></para>
-      </listitem>
-    </itemizedlist>
-
     <bridgehead renderas="sect3">Xorg Protocol Headers Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required"> <xref linkend="util-macros"/></para>
 
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="required"> <xref linkend="sudo"/> and
+    <xref linkend="wget"/></para>
+
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional"> <xref linkend="fop"/> and <xref linkend="xmlto"/>
     (to build additional documentation)</para>
@@ -93,34 +163,86 @@
   <sect2>
     <title>Downloading Xorg Protocol Headers</title>
 
+    <para>First, create a list of files to be downloaded. This file will also
+    be used to verify the integrity of the downloads when complete:</para>
+
+<screen><userinput>cat > proto-&xorg-version;.md5 << "EOF"
+#&applewmproto-md5sum;  applewmproto-&applewmproto-version;.tar.bz2
+&bigreqsproto-md5sum;  bigreqsproto-&bigreqsproto-version;.tar.bz2
+&compositeproto-md5sum;  compositeproto-&compositeproto-version;.tar.bz2
+&damageproto-md5sum;  damageproto-&damageproto-version;.tar.bz2
+&dmxproto-md5sum;  dmxproto-&dmxproto-version;.tar.bz2
+&dri2proto-md5sum;  dri2proto-&dri2proto-version;.tar.bz2
+&fixesproto-md5sum;  fixesproto-&fixesproto-version;.tar.bz2
+&fontsproto-md5sum;  fontsproto-&fontsproto-version;.tar.bz2
+&glproto-md5sum;  glproto-&glproto-version;.tar.bz2
+&inputproto-md5sum;  inputproto-&inputproto-version;.tar.bz2
+&kbproto-md5sum;  kbproto-&kbproto-version;.tar.bz2
+&randrproto-md5sum;  randrproto-&randrproto-version;.tar.bz2
+&recordproto-md5sum;  recordproto-&recordproto-version;.tar.bz2
+&renderproto-md5sum;  renderproto-&renderproto-version;.tar.bz2
+&resourceproto-md5sum;  resourceproto-&resourceproto-version;.tar.bz2
+&scrnsaverproto-md5sum;  scrnsaverproto-&scrnsaverproto-version;.tar.bz2
+&videoproto-md5sum;  videoproto-&videoproto-version;.tar.bz2
+#&windowswmproto-md5sum;  windowswmproto-&windowswmproto-version;.tar.bz2
+&xcmiscproto-md5sum;  xcmiscproto-&xcmiscproto-version;.tar.bz2
+&xextproto-md5sum;  xextproto-&xextproto-version;.tar.bz2
+&xf86bigfontproto-md5sum;  xf86bigfontproto-&xf86bigfontproto-version;.tar.bz2
+&xf86dgaproto-md5sum;  xf86dgaproto-&xf86dgaproto-version;.tar.bz2
+&xf86driproto-md5sum;  xf86driproto-&xf86driproto-version;.tar.bz2
+&xf86vidmodeproto-md5sum;  xf86vidmodeproto-&xf86vidmodeproto-version;.tar.bz2
+&xineramaproto-md5sum;  xineramaproto-&xineramaproto-version;.tar.bz2
+&xproto-md5sum;  xproto-&xproto-version;.tar.bz2
+EOF</userinput></screen>
+
     <para>To download the needed files using <application>wget</application>,
     use the following commands:</para>
 
 <screen><userinput>mkdir proto &&
 cd proto &&
-grep -v '^#' ../proto-&xorg7-release;.wget | wget -i- -c \
+grep -v '^#' ../proto-&xorg-version;.md5 | awk '{print $2}' | wget -i- -c \
     -B http://xorg.freedesktop.org/releases/individual/proto/ &&
-md5sum -c ../proto-&xorg7-release;.md5</userinput></screen>
+md5sum -c ../proto-&xorg-version;.md5</userinput></screen>
 
   </sect2>
 
   <sect2 role="installation">
     <title>Installation of Xorg Protocol Headers</title>
 
-    <para>Install the <application>Xorg</application> protocol headers
-    by running the following commands for each package to be installed.</para>
+    <para>First, start a subshell that will exit on error:</para>
 
-<screen><userinput>./configure $XORG_CONFIG</userinput></screen>
+<screen><userinput>bash -e</userinput></screen>
 
-    <para>These packages do not provide test suites.</para>
+    <para>Install all of the applications by running the following
+    commands:</para>
 
-    <para>Now as the <systemitem class="username">root</systemitem>
-    user:</para>
+<screen><userinput>for package in $(grep -v '^#' ../proto-&xorg-version;.md5 | awk '{print $2}')
+do
+  packagedir=${package%.tar.bz2}
+  tar -xf $package
+  cd $packagedir
+  ./configure $XORG_CONFIG
+  sudo make install
+  cd ..
+  rm -r $packagedir
+done</userinput></screen>
 
-<screen role="root"><userinput>make install</userinput></screen>
+    <para>Finally, exit the shell that was started earlier:</para>
 
+<screen><userinput>exit</userinput></screen>
+
   </sect2>
 
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para><command>bash -e</command>: This command starts a sub-shell that will
+    exit if any command returns a value other than 0, causing the for loop to
+    exit immediately if an error occurs. This also eliminates the need for the
+    <command>&&</command> construct used elsewhere in the book.</para>
+
+  </sect2>
+
   <sect2 role="content">
     <title>Contents</title>
 

Modified: trunk/BOOK/x/installing/xorg-config.xml
===================================================================
--- trunk/BOOK/x/installing/xorg-config.xml	2012-07-29 00:33:06 UTC (rev 10476)
+++ trunk/BOOK/x/installing/xorg-config.xml	2012-07-29 20:09:42 UTC (rev 10477)
@@ -13,7 +13,7 @@
     <date>$Date$</date>
   </sect1info>
 
-  <title>Xorg-&xorg7-release; Testing and Configuration</title>
+  <title>Xorg-&xorg-version; Testing and Configuration</title>
 
   <indexterm zone="xorg-config">
     <primary sortas="g-configuring-xorg">Configuring Xorg</primary>

Modified: trunk/BOOK/x/installing/xorg7.xml
===================================================================
--- trunk/BOOK/x/installing/xorg7.xml	2012-07-29 00:33:06 UTC (rev 10476)
+++ trunk/BOOK/x/installing/xorg7.xml	2012-07-29 20:09:42 UTC (rev 10477)
@@ -5,7 +5,7 @@
   %general-entities;
 ]>
 
-<sect1 id="xorg7" xreflabel="Xorg-&xorg7-version;">
+<sect1 id="xorg7" xreflabel="Xorg-&xorg-version;">
   <?dbhtml filename="xorg7.html"?>
 
   <sect1info>
@@ -13,7 +13,7 @@
     <date>$Date$</date>
   </sect1info>
 
-  <title>Introduction to Xorg-&xorg7-release;</title>
+  <title>Introduction to Xorg-&xorg-version;</title>
 
   <indexterm zone="xorg7">
     <primary sortas="a-xorg7">Xorg</primary>
@@ -35,11 +35,11 @@
 
   <para>Xorg-7.0 introduced a completely auto-tooled, modular build system.
   With the new modular build system, it is no longer possible to download
-  the entire package in a single file.  In fact, there may be as many as
-  293 files that need to be fetched from the download location.  To assist
+  the entire package in a single file. In fact, there will be well over 100
+  packages that need to be fetched from the download location. To assist
   with such a large task, installing <xref linkend="wget"/> is strongly
   recommended for downloading the needed files.  A complete
-  <application>wget</application> file list is provided for each section
+  <application>wget</application> file list is provided for each page
   that includes multiple packages.</para>
 
   <para>Given the number of packages available, deciding which packages you
@@ -73,7 +73,13 @@
   </note>
 
   <para>Additionally, because of the large number of repetitive commands,
-  you are encouraged to partially automate the build.  The commands below
+  you are encouraged to partially automate the build. Instructions have been
+  given that utilize the <xref linkend="sudo"/> package. It is recommended that
+  you use the <parameter>:NOPASSWD</parameter> configuration option for the
+  user that will be building the xorg packages.</para>
+
+  <!--
+  <para>The commands below
   (or similar) can be entered at the command line to compile each
   section (proto, util, lib, app, driver).  The wiki links on each
   section's page contain specific commands to compile the entire group of
@@ -81,7 +87,7 @@
 
 <screen>bash -e #exit on all errors
 section=<replaceable><proto></replaceable>
-version=&xorg7-release;
+version=&xorg-version;
 mkdir $section
 cd $section
 
@@ -106,6 +112,7 @@
   <para>The above shell will exit immediately on error.  If it runs to
   completion, you should manually exit the shell before continuing on to
   the next set of instructions.</para>
+-->
 
   <sect2>
     <title>Setting up the Xorg Build Environment</title>




More information about the blfs-book mailing list