Index: x/installing/mesalib.xml
===================================================================
--- x/installing/mesalib.xml	(revision 4849cdc412bcdd44bbddd037f68ff26a6fc55b00)
+++ x/installing/mesalib.xml	(revision dcdde936a4754d243233e835e9664ef60c324da9)
@@ -7,7 +7,7 @@
   <!ENTITY mesalib-download-http " ">
   <!ENTITY mesalib-download-ftp  "ftp://ftp.freedesktop.org/pub/mesa/&mesalib-version;/MesaLib-&mesalib-version;.tar.bz2">
-  <!ENTITY mesalib-md5sum        "df2aab86ff4a510ce5b0d074caa0a59f">
+  <!ENTITY mesalib-md5sum        "952ccd03547ed72333b64e1746cf8ada">
   <!ENTITY mesalib-size          "5.9 MB">
-  <!ENTITY mesalib-buildsize     "330 MB">
+  <!ENTITY mesalib-buildsize     "340 MB">
   <!ENTITY mesalib-time          "5.5 SBU">
 
@@ -114,4 +114,10 @@
     <bridgehead renderas="sect3">Additional Patches</bridgehead>
     <itemizedlist spacing="compact">
+      <!-- <listitem>
+        <para>
+          Required patch:
+          <ulink url="&patch-root;/MesaLib-&mesalib-version;-llvm_fixes-1.patch"/>
+        </para>
+      </listitem> -->
       <listitem>
         <para>
@@ -188,5 +194,6 @@
     </para>
 
-<screen><userinput>autoreconf -fi &amp;&amp;
+<screen><userinput><!-- patch -Np1 -i ../MesaLib-&mesalib-version;-llvm_fixes-1.patch &amp;&amp;
+-->autoreconf -fi &amp;&amp;
 ./configure CFLAGS="-O2" CXXFLAGS="-O2"    \
             --prefix=/usr                  \
@@ -274,5 +281,5 @@
       "-g -O2". That results in binaries and libraries being built with
       debugging symbols which make them bigger. Override the default
-      flags to omit -g switch so the final libraries are smaller.
+      flags to omit -g compiler flag so the final libraries are smaller.
     </para>
 
@@ -325,6 +332,6 @@
 
     <para>
-      <option>--enable-glx-tls</option>: This switch enables TLS support
-      in GLX.
+      <option>--enable-glx-tls</option>: This switch enables TLS (Thread Local
+      Storage) support in GLX.
     </para>
 
@@ -374,7 +381,7 @@
         </seg>
         <seg>
-          libdricore9.1.2.so, libEGL.so, libgbm.so, libglapi.so,
+          libdricore9.1.3.so, libEGL.so, libgbm.so, libglapi.so,
           libGLESv1_CM.so, libGLESv2.so, libGL.so, libGLU.so,
-          libllvmradeon9.1.2.so, libOpenVG.so, libOSMesa.so and
+          libllvmradeon9.1.3.so, libOpenVG.so, libOSMesa.so and
           libxatracker.so
         </seg>
@@ -427,5 +434,5 @@
 
       <varlistentry id="libdricore">
-        <term><filename class="libraryfile">libdricore9.1.0.so</filename></term>
+        <term><filename class="libraryfile">libdricore9.1.3.so</filename></term>
         <listitem>
           <para>
@@ -434,5 +441,5 @@
           </para>
           <indexterm zone="mesalib libdricore">
-            <primary sortas="c-libdricore">libdricore9.1.0.so</primary>
+            <primary sortas="c-libdricore">libdricore9.1.3.so</primary>
           </indexterm>
         </listitem>
Index: x/installing/x7driver.xml
===================================================================
--- x/installing/x7driver.xml	(revision 4849cdc412bcdd44bbddd037f68ff26a6fc55b00)
+++ x/installing/x7driver.xml	(revision dcdde936a4754d243233e835e9664ef60c324da9)
@@ -26,9 +26,9 @@
   <!ENTITY xorg-evdev-driver-time          "less than 0.1 SBU">
 
-  <!ENTITY xorg-synaptics-driver-version "1.7.0">
+  <!ENTITY xorg-synaptics-driver-version "1.7.1">
 
   <!ENTITY xorg-synaptics-driver-download-http "&xorg-download-http;/driver/xf86-input-synaptics-&xorg-synaptics-driver-version;.tar.bz2">
   <!ENTITY xorg-synaptics-driver-download-ftp  "&xorg-download-ftp;/driver/xf86-input-synaptics-&xorg-synaptics-driver-version;.tar.bz2">
-  <!ENTITY xorg-synaptics-driver-md5sum        "5e4f232a18a1741e4c34895d28238f8d">
+  <!ENTITY xorg-synaptics-driver-md5sum        "6505de717972b6a24b8eb13e69eb996c">
   <!ENTITY xorg-synaptics-driver-size          "432 KB">
   <!ENTITY xorg-synaptics-driver-buildsize     "5.6 MB">
@@ -80,9 +80,9 @@
   <!ENTITY xorg-fbdev-driver-time          "less than 0.1 SBU">
 
-  <!ENTITY xorg-intel-driver-version "2.21.6">
+  <!ENTITY xorg-intel-driver-version "2.21.7">
 
   <!ENTITY xorg-intel-driver-download-http "&xorg-download-http;/driver/xf86-video-intel-&xorg-intel-driver-version;.tar.bz2">
   <!ENTITY xorg-intel-driver-download-ftp  "&xorg-download-ftp;/driver/xf86-video-intel-&xorg-intel-driver-version;.tar.bz2">
-  <!ENTITY xorg-intel-driver-md5sum        "a4f002f50b370fe550231c9b33e12399">
+  <!ENTITY xorg-intel-driver-md5sum        "c3a8b542fc4787ad17a5f0567a3429fd">
   <!ENTITY xorg-intel-driver-size          "1.7 MB">
   <!ENTITY xorg-intel-driver-buildsize     "70 MB">
@@ -579,5 +579,5 @@
 
 <screen><literal>Device Drivers  ---&gt;
-  Input Device Support ---&gt;
+  Input device support ---&gt;
     Event interface: Y or M</literal></screen>
 
@@ -1049,5 +1049,5 @@
   Input device support  ---&gt;
     [*] Tablets  ---&gt;
-      Wacom Intuos/Graphire tablet support (USB): Y</literal></screen>
+      Wacom Intuos/Graphire tablet support (USB): Y or M</literal></screen>
 
       <indexterm zone="xorg-wacom-driver xorg-wacom-driver-kernel">
@@ -1219,7 +1219,5 @@
 <screen><literal>Device Drivers  ---&gt;
   Graphics support ---&gt;
-    &lt;*&gt; Direct Rendering Manager (XFree86 4.1.0 and higher DRI support) ---&gt;
-      ATI Radeon: Y or M
-        Enable modesetting on radeon by default - NEW DRIVER: Y</literal></screen>
+    ATI Radeon: Y or M</literal></screen>
 
       <indexterm zone="xorg-ati-driver xorg-ati-driver-kernel">
@@ -1414,4 +1412,21 @@
     </sect3>
 
+    <sect3 role="kernel" id="xorg-cirrus-driver-kernel">
+      <title>Kernel Configuration</title>
+
+    <para>
+      Enable the following options in the kernel configuration and recompile the
+      kernel if necessary:
+    </para>
+
+<screen><literal>Device Drivers  ---&gt;
+  Graphics support ---&gt;
+    Cirrus driver for QEMU emulated device: Y or M</literal></screen>
+
+      <indexterm zone="xorg-cirrus-driver xorg-cirrus-driver-kernel">
+        <primary sortas="d-xorg-cirrus-driver">xorg-cirrus-driver</primary>
+      </indexterm>
+    </sect3>
+
     <sect3 role="installation">
       <title>Installation of Xorg Cirrus Driver</title>
@@ -1690,8 +1705,7 @@
 <screen><literal>Device Drivers  ---&gt;
   Graphics support ---&gt;
-    &lt;*&gt; Direct Rendering Manager (XFree86 4.1.0 and higher DRI support) ---&gt;
-      Intel I810: Y or M
-      Intel 8xx/9xx/G3x/G4x/HD Graphics: Y or M
-        Enable modesetting on intel by default: Y</literal></screen>
+    Intel I810: Y or M
+    Intel 8xx/9xx/G3x/G4x/HD Graphics: Y or M
+      Enable modesetting on intel by default: Y</literal></screen>
 
       <indexterm zone="xorg-intel-driver xorg-intel-driver-kernel">
@@ -1991,6 +2005,5 @@
 <screen><literal>Device Drivers  ---&gt;
   Graphics support ---&gt;
-    &lt;*&gt; Direct Rendering Manager (XFree86 4.1.0 and higher DRI support) ---&gt;
-      Matrox g200/g400: Y or M</literal></screen>
+    Matrox g200/g400: Y or M</literal></screen>
 
       <indexterm zone="xorg-mga-driver xorg-mga-driver-kernel">
@@ -2136,7 +2149,6 @@
 <screen><literal>Device Drivers  ---&gt;
   Graphics support ---&gt;
-    &lt;*&gt; Direct Rendering Manager (XFree86 4.1.0 and higher DRI support) ---&gt;: Y or M
-      &lt;*&gt; Nouveau (nVidia) cards: Y or M
-      [*]Support for backlight control: Y</literal></screen>
+    Nouveau (nVidia) cards: Y or M
+      Support for backlight control: Y</literal></screen>
 
       <indexterm zone="xorg-nouveau-driver xorg-nouveau-driver-kernel">
@@ -2280,6 +2292,5 @@
 <screen><literal>Device Drivers  ---&gt;
   Graphics support ---&gt;
-    &lt;*&gt; Direct Rendering Manager (XFree86 4.1.0 and higher DRI support) ---&gt;
-      Via unichrome video cards: Y or M</literal></screen>
+    Via unichrome video cards: Y or M</literal></screen>
 
       <indexterm zone="xorg-openchrome-driver xorg-openchrome-driver-kernel">
@@ -2426,6 +2437,5 @@
 <screen><literal>Device Drivers  ---&gt;
   Graphics support ---&gt;
-    &lt;*&gt; Direct Rendering Manager (XFree86 4.1.0 and higher DRI support) ---&gt;
-      ATI Rage 128: Y or M</literal></screen>
+    ATI Rage 128: Y or M</literal></screen>
 
       <indexterm zone="xorg-r128-driver xorg-r128-driver-kernel">
@@ -2570,6 +2580,5 @@
 <screen><literal>Device Drivers  ---&gt;
   Graphics support ---&gt;
-    &lt;*&gt; Direct Rendering Manager (XFree86 4.1.0 and higher DRI support) ---&gt;
-      Savage video cards: Y or M</literal></screen>
+    Savage video cards: Y or M</literal></screen>
 
       <indexterm zone="xorg-savage-driver xorg-savage-driver-kernel">
@@ -2725,6 +2734,5 @@
 <screen><literal>Device Drivers  ---&gt;
   Graphics support ---&gt;
-    &lt;*&gt; Direct Rendering Manager (XFree86 4.1.0 and higher DRI support) ---&gt;
-      SiS video cards: Y or M</literal></screen>
+    SiS video cards: Y or M</literal></screen>
 
       <indexterm zone="xorg-sis-driver xorg-sis-driver-kernel">
@@ -2869,6 +2877,5 @@
 <screen><literal>Device Drivers  ---&gt;
   Graphics support ---&gt;
-    &lt;*&gt; Direct Rendering Manager (XFree86 4.1.0 and higher DRI support) ---&gt;
-      3dfx Banshee/Voodoo3+: Y or M</literal></screen>
+    3dfx Banshee/Voodoo3+: Y or M</literal></screen>
 
       <indexterm zone="xorg-tdfx-driver xorg-tdfx-driver-kernel">
@@ -3027,5 +3034,5 @@
 <screen><literal>Device Drivers  ---&gt;
   Graphics support ---&gt;
-    &lt;*&gt; Support for frame buffer devices ---&gt;
+    -*- Support for frame buffer devices ---&gt;
       VESA VGA graphics support: Y</literal></screen>
 
@@ -3182,6 +3189,6 @@
 <screen><literal>Device Drivers  ---&gt;
   Graphics support ---&gt;
-    &lt;*&gt; Direct Rendering Manager (XFree86 4.1.0 and higher DRI support) ---&gt;
-      DRM driver for VMware Virtual GPU: Y or M</literal></screen>
+    DRM driver for VMware Virtual GPU: Y or M
+      Enable framebuffer console under vmwgfx by default: Y</literal></screen>
 
       <indexterm zone="xorg-vmware-driver xorg-vmware-driver-kernel">
Index: x/lib/gtk-engines.xml
===================================================================
--- x/lib/gtk-engines.xml	(revision 4849cdc412bcdd44bbddd037f68ff26a6fc55b00)
+++ x/lib/gtk-engines.xml	(revision dcdde936a4754d243233e835e9664ef60c324da9)
@@ -38,5 +38,5 @@
     </para>
 
-    &lfs72_checked;
+    &lfs73_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: x/lib/webkitgtk.xml
===================================================================
--- x/lib/webkitgtk.xml	(revision 4849cdc412bcdd44bbddd037f68ff26a6fc55b00)
+++ x/lib/webkitgtk.xml	(revision dcdde936a4754d243233e835e9664ef60c324da9)
@@ -36,5 +36,5 @@
     </para>
 
-    &lfs72_checked;
+    &lfs73_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: x/lib/xulrunner.xml
===================================================================
--- x/lib/xulrunner.xml	(revision 4849cdc412bcdd44bbddd037f68ff26a6fc55b00)
+++ x/lib/xulrunner.xml	(revision dcdde936a4754d243233e835e9664ef60c324da9)
@@ -9,8 +9,8 @@
   <!ENTITY xulrunner-download-ftp
            "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/&firefox-version;/source/firefox-&firefox-version;.source.tar.bz2">
-  <!ENTITY xulrunner-md5sum        "b822ff4b2348410587dec563235d9320">
-  <!ENTITY xulrunner-size          "96 MB">
-  <!ENTITY xulrunner-buildsize     "3.9 GB (121 MB installed)">
-  <!ENTITY xulrunner-time          "29 SBU">
+  <!ENTITY xulrunner-md5sum        "6e2510e9466b280c367de0e4c05a8840">
+  <!ENTITY xulrunner-size          "101 MB">
+  <!ENTITY xulrunner-buildsize     "4.1 GB (125 MB installed)">
+  <!ENTITY xulrunner-time          "35 SBU">
 ]>
 
@@ -40,5 +40,5 @@
     </para>
 
-    &lfs72_checked;
+    &lfs73_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -108,4 +108,5 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
+      <xref linkend="curl"/>,
       <xref linkend="dbus-glib"/>,
       <xref linkend="doxygen"/>,
Index: x/wm/openbox.xml
===================================================================
--- x/wm/openbox.xml	(revision 4849cdc412bcdd44bbddd037f68ff26a6fc55b00)
+++ x/wm/openbox.xml	(revision dcdde936a4754d243233e835e9664ef60c324da9)
@@ -37,5 +37,5 @@
     </para>
 
-    &lfs72_checked;
+    &lfs73_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
