jhbuild: add missing modules and meta modules

The X Window System JHBuild Modules List Sample File

The list is intended to be exhaustive and covers all X modules and their
dependencies, roughly matching the latest release.

With the matching jhbuildrc in $HOME/.config, run 'jhbuild build'
to build all of X. The dependencies are such that you never need to
type the name of a meta module.

It is a sample, so you will need to copy and trim it to suit your needs.
Not all modules build on all O/S and not on all CPUs. The build order
is subject to dependencies, it will not follow the list order.

Most modules will build on platforms they are not intended to run on.
This allows working on Autoconf, man pages, documentation, .pc files,
creating a tarball, and so on...

Refer to this excellent short guide on how to invoke JHBuild commands:
https://developer.gnome.org/jhbuild/unstable/index.html.en

The meta-modules are at the top of the file so it is easy to customize.

Some modules will be relocated on disk as they now follow the git URL.
Some modules have been renamed (e.g. mesa) so they are easier to find
for the non-expert. Still, inconsistencies remain.

The meta modules for broken drivers or platform specific drivers
are gone. Users are expected to copy and trim the file. There is
no "preferred" platform.

Keep in mind this is a *sample* that needs to be adapted to your environment.
It is much easier to remove than to add.

Signed-off-by: Gaetan Nadon <memsize@videotron.ca>

1 files changed, 2202 insertions, 1024 deletions

diff --git a/xorg.modules b/xorg.modules
index 920f7e2..c1e141f 100644
--- a/xorg.modules
+++ b/xorg.modules
@@ -1,82 +1,105 @@
 <?xml version="1.0"?><!--*- mode: nxml; indent-tabs-mode: nil -*-->
-<!-- TODO: what to do about doc/sgml-tools? -->
-<!-- TODO: util/cf has problems, commented out -->
-
 <!DOCTYPE moduleset SYSTEM "moduleset.dtd">
 <?xml-stylesheet type="text/xsl" href="moduleset.xsl"?>
 <moduleset>
   <repository type="git" name="git.freedesktop.org" default="yes"
               href="git://anongit.freedesktop.org/git/"/>
-
-  <!-- external modules -->
-  <autotools id="fontconfig" autogenargs="--disable-docs">
-    <branch module="fontconfig"
-            checkoutdir="fontconfig"/>
-  </autotools>
-
-  <!-- xcb -->
-  <autotools id="pthread-stubs">
-    <branch module="xcb/pthread-stubs"
-            checkoutdir="xcb/pthread-stubs"/>
-  </autotools>
-
-  <autotools id="xcb-proto">
-    <branch module="xcb/proto"
-            checkoutdir="xcb/proto"/>
-  </autotools>
-
-  <autotools id="libxcb">
-    <branch module="xcb/libxcb"
-            checkoutdir="xcb/libxcb"/>
-    <dependencies>
-      <dep package="xcb-proto"/>
-      <dep package="pthread-stubs"/>
-      <dep package="libXau"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="xcb-util">
-    <branch module="xcb/util"
-            checkoutdir="xcb/xcb-util"/>
-    <dependencies>
-      <dep package="libxcb"/>
-    </dependencies>
-  </autotools>
-
-   <autotools id="xcb-util-image">
-    <branch module="xcb/util-image" checkoutdir="xcb/xcb-util-image"/>
-    <dependencies>
-      <dep package="libxcb"/>
+<!--
+		The X Window System JHBuild Modules List Sample File
+
+	The list is intended to be exhaustive and covers all X modules and their
+	dependencies, roughly matching the latest release.
+
+	With the matching jhbuildrc in $HOME/.config, run 'jhbuild build'
+	to build all of X. The dependencies are such that you never need to
+	type the name of a meta module.
+
+	It is a sample, so you will need to copy and trim it to suit your needs.
+	Not all modules build on all O/S and not on all CPUs. The build order
+	is subject to dependencies, it will not follow the list order.
+
+	Most modules will build on platforms they are not intended to run on.
+	This allows working on Autoconf, man pages, documentation, .pc files,
+	creating a tarball, and so on...
+
+	Refer to this excellent short guide on how to invoke JHBuild commands:
+	https://developer.gnome.org/jhbuild/unstable/index.html.en
+-->
+
+
+  <!-- 	The X Window System - Meta Module  -->
+  <!--  To build with HTML output, run 'jhbuild tinderbox -o directory' -->
+  <metamodule id="The X Window System">
+    <dependencies>
+      <dep package="The Build Prerequisites"/>
+      <dep package="The X11 Protocol and Extensions"/>
+      <dep package="util-makedepend"/>
+      <dep package="The X11/XCB Libraries"/>
+      <dep package="The X C Binding (XCB) Utilities"/>
+      <dep package="The Mesa 3D Graphics Library"/>
+      <dep package="data-bitmaps"/>
+      <dep package="The X11 Applications"/>
+      <dep package="data-cursors"/>
+      <dep package="xkeyboard-config"/>
+      <dep package="The X Display Server"/>
+      <dep package="The X Input Drivers"/>		 <!-- Not for Darwin -->
+      <dep package="The X Video Drivers"/>		 <!-- Not for Darwin -->
+      <dep package="The X11 Fonts"/>
+      <dep package="xorg-docs"/>
+      <!--dep package="xts"/-->			       <!-- The X Test Suite -->
     </dependencies>
-   </autotools>
+  </metamodule>
 
-   <autotools id="xcb-util-keysyms">
-    <branch module="xcb/util-keysyms" checkoutdir="xcb/xcb-util-keysyms"/>
-    <dependencies>
-      <dep package="libxcb"/>
-    </dependencies>
-   </autotools>
 
-   <autotools id="xcb-util-renderutil">
-    <branch module="xcb/util-renderutil" checkoutdir="xcb/xcb-util-renderutil"/>
+  <!-- Build Prerequisites -->
+  <metamodule id="The Build Prerequisites">
     <dependencies>
-      <dep package="libxcb"/>
+      <dep package="util-macros"/>
+      <dep package="xcb-pthread-stubs"/>
+      <dep package="fontconfig"/>
+      <dep package="font-util"/>
+      <dep package="xorg-sgml-doctools"/>
     </dependencies>
-   </autotools>
+  </metamodule>
 
-   <autotools id="xcb-util-wm">
-    <branch module="xcb/util-wm" checkoutdir="xcb/xcb-util-wm"/>
+  <!-- X11 Protocol & Extensions - Meta Module -->
+  <metamodule id="The X11 Protocol and Extensions">
     <dependencies>
-      <dep package="libxcb"/>
+      <dep package="applewmproto"/>
+      <dep package="bigreqsproto"/>
+      <dep package="compositeproto"/>
+      <dep package="damageproto"/>
+      <dep package="dmxproto"/>
+      <dep package="dri2proto"/>
+      <dep package="dri3proto"/>
+      <dep package="fixesproto"/>
+      <dep package="fontsproto"/>
+      <dep package="glproto"/>
+      <dep package="inputproto"/>
+      <dep package="kbproto"/>
+      <dep package="presentproto"/>
+      <dep package="randrproto"/>
+      <dep package="recordproto"/>
+      <dep package="renderproto"/>
+      <dep package="resourceproto"/>
+      <dep package="scrnsaverproto"/>
+      <dep package="videoproto"/>
+      <dep package="windowswmproto"/>
+      <dep package="x11proto"/>
+      <dep package="xcb-proto"/>
+      <dep package="xcmiscproto"/>
+      <dep package="xextproto"/>
+      <dep package="xf86bigfontproto"/>
+      <dep package="xf86dgaproto"/>
+      <dep package="xf86driproto"/>
+      <dep package="xf86vidmodeproto"/>
+      <dep package="xineramaproto"/>
     </dependencies>
-   </autotools>
+  </metamodule>
 
-   <metamodule id="xcb">
+  <!--  XCB (X protocol C-language Binding) - Meta Module -->
+   <metamodule id="The X C Binding (XCB) Utilities">
      <dependencies>
-       <dep package="libxcb"/>
-       <dep package="xcb-proto"/>
-       <dep package="pthread-stubs"/>
-       <dep package="libXau"/>
        <dep package="xcb-util"/>
        <dep package="xcb-util-image"/>
        <dep package="xcb-util-keysyms"/>
@@ -85,284 +108,530 @@
      </dependencies>
    </metamodule>
 
-  <autotools id="pixman">
-    <branch module="pixman"
-            checkoutdir="xorg/lib/pixman"/>
-    <dependencies/>
-  </autotools>
-
-  <autotools id="libpciaccess">
-    <branch module="xorg/lib/libpciaccess"
-            checkoutdir="xorg/lib/libpciaccess"/>
-    <dependencies/>
-  </autotools>
-
-  <autotools id="libxshmfence">
-    <branch module="xorg/lib/libxshmfence"
-            checkoutdir="xorg/lib/libxshmfence"/>
-    <dependencies/>
-  </autotools>
-
-  <!-- mesa -->
-
-  <!-- Need nouveau API to build xf86-video-nouveau -->
-  <autotools id="libdrm" autogenargs="--enable-nouveau-experimental-api">
-    <branch module="mesa/drm"
-            checkoutdir="mesa/drm"/>
-    <dependencies>
-      <dep package="libpciaccess"/>
-    </dependencies>
-  </autotools>
-
-  <!-- the Mesa module, which provides libGL and DRI drivers -->
-  <autotools id="libGL">
-    <branch module="mesa/mesa"
-            checkoutdir="mesa/mesa"/>
+  <!-- X11 Libraries - Meta Module -->
+  <metamodule id="The X11/XCB Libraries">
     <dependencies>
-      <dep package="xf86driproto"/>
-      <dep package="dri2proto"/>
-      <dep package="dri3proto"/>
-      <dep package="glproto"/>
-      <dep package="libXxf86vm"/>
-      <dep package="libXdamage"/>
-      <dep package="libdrm"/>
+      <dep package="libAppleWM"/>				  <!-- Darwin-->
+      <dep package="libFS"/>
+      <dep package="libICE"/>
+      <dep package="libSM"/>
       <dep package="libX11"/>
+      <dep package="libXScrnSaver"/>
+      <dep package="libXau"/>
+      <dep package="libXaw"/>
+      <dep package="libXaw3d"/>
+      <dep package="libXcomposite"/>
+      <dep package="libXcursor"/>
+      <dep package="libXdamage"/>
+      <dep package="libXdmcp"/>
       <dep package="libXext"/>
+      <dep package="libXfixes"/>
+      <dep package="libXfont"/>
+      <dep package="libXft"/>
       <dep package="libXi"/>
+      <dep package="libXinerama"/>
       <dep package="libXmu"/>
+      <dep package="libXpm"/>
+      <dep package="libXrandr"/>
+      <dep package="libXrender"/>
+      <dep package="libXRes"/>
+      <dep package="libXt"/>
+      <dep package="libXtst"/>
+      <dep package="libXv"/>
+      <dep package="libXvMC"/>
+      <dep package="libXxf86dga"/>
+      <dep package="libXxf86vm"/>
+      <dep package="libdmx"/>
+      <dep package="libevdev"/>				     <!-- Linux Only -->
+      <dep package="libfontenc"/>
+      <dep package="libpciaccess"/>
+      <dep package="libpixman"/>
+      <dep package="libxcb"/>
+      <dep package="libxkbfile"/>
+      <dep package="libxshmfence"/>
+      <dep package="libxtrans"/>
+      <dep package="libWindowsWM"/>				 <!-- CYGWIN -->
     </dependencies>
-  </autotools>
+  </metamodule>
 
-  <autotools id="mesa-demos">
-    <branch module="mesa/demos"
-            checkoutdir="mesa/demos"/>
+  <!--  The Mesa 3D Graphics Library - Meta Module -->
+  <metamodule id="The Mesa 3D Graphics Library">
     <dependencies>
-      <dep package="libGL"/>
-      <dep package="mesa-glut"/>
-      <dep package="mesa-glu"/>
+      <dep package="mesa-drm"/>
+      <dep package="mesa-mesa"/>
     </dependencies>
-  </autotools>
+  </metamodule>
 
-  <autotools id="mesa-glut" supports-non-srcdir-builds="no" check-target="false"
-             skip-autogen="never">
-    <branch module="mesa/glut"
-            checkoutdir="mesa/glut"/>
-    <dependencies>
-      <dep package="libGL"/>
-      <dep package="makedepend"/>
+  <!-- X Applications - Meta Module -->
+  <metamodule id="The X11 Applications">
+    <dependencies>
+      <dep package="app-appres"/>
+      <dep package="app-bdftopcf"/>
+      <dep package="app-bitmap"/>
+      <dep package="app-editres"/>
+      <dep package="app-iceauth"/>
+      <dep package="app-luit"/>
+      <dep package="app-mkfontdir"/>
+      <dep package="app-mkfontscale"/>
+      <dep package="app-rendercheck"/>
+      <dep package="app-rgb"/>
+      <dep package="app-rstart"/>
+      <dep package="app-scripts"/>
+      <dep package="app-sessreg"/>
+      <dep package="app-setxkbmap"/>
+      <dep package="app-smproxy"/>
+      <dep package="app-twm"/>
+      <dep package="app-x11perf"/>
+      <dep package="app-xauth"/>
+      <dep package="app-xbacklight"/>
+      <dep package="app-xcalc"/>
+      <dep package="app-xclipboard"/>
+      <dep package="app-xclock"/>
+      <dep package="app-xcmsdb"/>
+      <dep package="app-xconsole"/>
+      <dep package="app-xcursorgen"/>
+      <dep package="app-xditview"/>
+      <dep package="app-xdm"/>
+      <dep package="app-xdpyinfo"/>
+      <dep package="app-xdriinfo"/>
+      <dep package="app-xev"/>
+      <dep package="app-xeyes"/>
+      <dep package="app-xfd"/>
+      <dep package="app-xfontsel"/>
+      <dep package="app-xfs"/>
+      <dep package="app-xfsinfo"/>
+      <dep package="app-xgamma"/>
+      <dep package="app-xhost"/>
+      <dep package="app-xinit"/>
+      <dep package="app-xinput"/>
+      <dep package="app-xkbcomp"/>
+      <dep package="app-xkbevd"/>
+      <dep package="app-xkbutils"/>
+      <dep package="app-xkill"/>
+      <dep package="app-xload"/>
+      <dep package="app-xlogo"/>
+      <dep package="app-xlsatoms"/>
+      <dep package="app-xlsclients"/>
+      <dep package="app-xman"/>
+      <dep package="app-xmodmap"/>
+      <dep package="app-xpr"/>
+      <dep package="app-xprop"/>
+      <dep package="app-xrandr"/>
+      <dep package="app-xrdb"/>
+      <dep package="app-xrefresh"/>
+      <dep package="app-xset"/>
+      <dep package="app-xsetroot"/>
+      <dep package="app-xsm"/>
+      <dep package="app-xstdcmap"/>
+      <dep package="app-xvidtune"/>
+      <dep package="app-xvinfo"/>
+      <dep package="app-xwd"/>
+      <dep package="app-xwininfo"/>
+      <dep package="app-xwud"/>
     </dependencies>
-  </autotools>
+  </metamodule>
 
-  <autotools id="mesa-glu">
-    <branch module="mesa/glu" checkoutdir="mesa/glu"/>
+  <!-- X Server - Meta Module -->
+  <metamodule id="The X Display Server">
     <dependencies>
-      <dep package="libGL"/>
+      <dep package="xserver"/>
     </dependencies>
-  </autotools>
+  </metamodule>
 
-  <metamodule id="mesa">
+  <!-- X Input and Video Drivers - Meta Module -->
+  <metamodule id="The X Input Drivers">
     <dependencies>
-      <dep package="libdrm"/>
-      <dep package="libGL"/>
-      <dep package="mesa-demos"/>
-      <dep package="mesa-glut"/>
-      <dep package="mesa-glu"/>
+      <dep package="xf86-input-acecad"/>
+      <dep package="xf86-input-aiptek"/>
+      <dep package="xf86-input-evdev"/>			  <!-- Linux -->
+      <dep package="xf86-input-joystick"/>	  <!-- Linux and BSDs-->
+      <dep package="xf86-input-keyboard"/>
+      <dep package="xf86-input-mouse"/>
+      <dep package="xf86-input-synaptics"/>
+      <dep package="xf86-input-vmmouse"/>
+      <dep package="xf86-input-void"/>
     </dependencies>
   </metamodule>
 
-  <!-- util -->
-  <autotools id="macros">
-    <branch module="xorg/util/macros"
-            checkoutdir="xorg/util/macros"/>
-  </autotools>
-
-  <autotools id="makedepend">
-    <branch module="xorg/util/makedepend"
-            checkoutdir="xorg/util/makedepend"/>
+  <!-- X Input and Video Drivers - Meta Module -->
+  <metamodule id="The X Video Drivers">
     <dependencies>
-      <dep package="macros"/>
-      <dep package="x11proto"/>
+      <dep package="glamor"/>
+      <dep package="xf86-video-apm"/>
+      <dep package="xf86-video-ark"/>
+      <dep package="xf86-video-ast"/>
+      <dep package="xf86-video-ati"/>
+      <dep package="xf86-video-chips"/>
+      <dep package="xf86-video-cirrus"/>
+      <dep package="xf86-video-dummy"/>
+      <dep package="xf86-video-fbdev"/>
+      <dep package="xf86-video-geode"/>		     <!-- Linux i386 -->
+      <dep package="xf86-video-glint"/>
+      <dep package="xf86-video-i128"/>
+      <dep package="xf86-video-i740"/>
+      <dep package="xf86-video-intel"/>
+      <dep package="xf86-video-mach64"/>
+      <dep package="xf86-video-mga"/>
+      <dep package="xf86-video-modesetting"/>
+      <dep package="xf86-video-neomagic"/>
+      <dep package="xf86-video-nested"/>
+      <dep package="xf86-video-nouveau"/>
+      <dep package="xf86-video-nv"/>
+      <dep package="xf86-video-r128"/>
+      <dep package="xf86-video-rendition"/>
+      <dep package="xf86-video-s3"/>
+      <dep package="xf86-video-s3virge"/>
+      <dep package="xf86-video-savage"/>
+      <dep package="xf86-video-siliconmotion"/>
+      <dep package="xf86-video-sis"/>
+      <dep package="xf86-video-sisusb"/>
+      <dep package="xf86-video-suncg14"/>
+      <dep package="xf86-video-suncg3"/>
+      <dep package="xf86-video-suncg6"/>
+      <dep package="xf86-video-sunffb"/>
+      <dep package="xf86-video-sunleo"/>
+      <dep package="xf86-video-suntcx"/>
+      <dep package="xf86-video-tdfx"/>
+      <dep package="xf86-video-tga"/>
+      <dep package="xf86-video-trident"/>
+      <dep package="xf86-video-tseng"/>
+      <dep package="xf86-video-vesa"/>
+      <dep package="xf86-video-v4l"/>			  <!-- Linux -->
+      <dep package="xf86-video-vmware"/>
+      <dep package="xf86-video-voodoo"/>
+      <dep package="xf86-video-wsfb"/>		 <!-- NetBSD OpenBSD -->
+      <dep package="xf86-video-xgixp"/>			  <!-- Linux -->
     </dependencies>
-  </autotools>
+  </metamodule>
 
-  <!-- docs -->
-  <autotools id="xorg-sgml-doctools">
-    <branch module="xorg/doc/xorg-sgml-doctools"
-            checkoutdir="xorg/doc/xorg-sgml-doctools"/>
-    <dependencies>
-      <dep package="macros"/>
-    </dependencies>
-  </autotools>
+<!--  The X Font Library - Meta Module
 
-  <autotools id="xorg-docs">
-    <branch module="xorg/doc/xorg-docs"
-            checkoutdir="xorg/doc/xorg-docs"/>
+     All fonts require mkfontscale and mkfontdir to be available
+     The following fonts require bdftopcf to be available:
+
+	adobe-100dpi, adobe-75dpi, adobe-utopia-100dpi, adobe-utopia-75dpi,
+	arabic-misc, bh-100dpi, bh-75dpi, bh-lucidatypewriter-100dpi,
+	bh-lucidatypewriter-75dpi, bitstream-100dpi, bitstream-75dpi,
+	cronyx-cyrillic, cursor-misc, daewoo-misc, dec-misc, isas-misc,
+	jis-misc, micro-misc, misc-cyrillic, misc-misc, mutt-misc,
+	schumacher-misc, screen-cyrillic, sony-misc, sun-misc and
+	winitzki-cyrillic
+
+    The alias module is recommended to be installed after the other fonts
+    since the fonts.alias files reference specific fonts installed from the
+    other font modules
+-->
+  <metamodule id="The X11 Fonts">
     <dependencies>
-      <dep package="xorg-sgml-doctools"/>
-      <dep package="macros"/>
+      <dep package="font-encodings"/>
+      <dep package="font-adobe-100dpi"/>
+      <dep package="font-adobe-75dpi"/>
+      <dep package="font-adobe-utopia-100dpi"/>
+      <dep package="font-adobe-utopia-75dpi"/>
+      <dep package="font-adobe-utopia-type1"/>
+      <dep package="font-arabic-misc"/>
+      <dep package="font-bh-100dpi"/>
+      <dep package="font-bh-75dpi"/>
+      <dep package="font-bh-lucidatypewriter-100dpi"/>
+      <dep package="font-bh-lucidatypewriter-75dpi"/>
+      <dep package="font-bh-ttf"/>
+      <dep package="font-bh-type1"/>
+      <dep package="font-bitstream-100dpi"/>
+      <dep package="font-bitstream-75dpi"/>
+      <dep package="font-bitstream-type1"/>
+      <dep package="font-cronyx-cyrillic"/>
+      <dep package="font-cursor-misc"/>
+      <dep package="font-daewoo-misc"/>
+      <dep package="font-dec-misc"/>
+      <dep package="font-ibm-type1"/>
+      <dep package="font-isas-misc"/>
+      <dep package="font-jis-misc"/>
+      <dep package="font-micro-misc"/>
+      <dep package="font-misc-cyrillic"/>
+      <dep package="font-misc-ethiopic"/>
+      <dep package="font-misc-meltho"/>
+      <dep package="font-misc-misc"/>
+      <dep package="font-mutt-misc"/>
+      <dep package="font-schumacher-misc"/>
+      <dep package="font-screen-cyrillic"/>
+      <dep package="font-sony-misc"/>
+      <dep package="font-sun-misc"/>
+      <dep package="font-winitzki-cyrillic"/>
+      <dep package="font-xfree86-type1"/>
+      <dep package="font-alias"/>
     </dependencies>
-  </autotools>
+  </metamodule>
 
-  <!-- proto -->
+  <!--
+    =========================================================================
+    | This section contains the "definition" of the modules listed above    |
+    | No changes are needed here to trim the modules list to fit your needs |
+    =========================================================================
+  -->
+
+  <!-- X11 Protocol & Extensions - Modules definition -->
   <autotools id="applewmproto">
     <branch module="xorg/proto/applewmproto"
             checkoutdir="xorg/proto/applewmproto"/>
+    <dependencies>
+      <dep package="util-macros"/>
+    </dependencies>
   </autotools>
+
   <autotools id="bigreqsproto">
     <branch module="xorg/proto/bigreqsproto"
             checkoutdir="xorg/proto/bigreqsproto"/>
+    <dependencies>
+      <dep package="util-macros"/>
+    </dependencies>
+    <suggests>
+      <dep package="xorg-sgml-doctools"/>
+    </suggests>
   </autotools>
+
   <autotools id="compositeproto">
     <branch module="xorg/proto/compositeproto"
             checkoutdir="xorg/proto/compositeproto"/>
+    <dependencies>
+      <dep package="util-macros"/>
+      <dep package="fixesproto"/>
+    </dependencies>
   </autotools>
+
   <autotools id="damageproto">
     <branch module="xorg/proto/damageproto"
             checkoutdir="xorg/proto/damageproto"/>
+    <dependencies>
+      <dep package="util-macros"/>
+      <dep package="fixesproto"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="dri2proto">
+    <branch module="xorg/proto/dri2proto"
+            checkoutdir="xorg/proto/dri2proto"/>
+    <dependencies>
+      <dep package="util-macros"/>
+    </dependencies>
   </autotools>
+
+  <autotools id="dri3proto">
+    <branch module="xorg/proto/dri3proto"
+            checkoutdir="xorg/proto/dri3proto"/>
+    <dependencies>
+      <dep package="util-macros"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="dmxproto">
     <branch module="xorg/proto/dmxproto"
             checkoutdir="xorg/proto/dmxproto"/>
+    <dependencies>
+      <dep package="util-macros"/>
+    </dependencies>
   </autotools>
+
   <autotools id="fixesproto">
     <branch module="xorg/proto/fixesproto"
             checkoutdir="xorg/proto/fixesproto"/>
+    <dependencies>
+      <dep package="util-macros"/>
+      <dep package="xextproto"/>
+    </dependencies>
   </autotools>
+
   <autotools id="fontsproto">
     <branch module="xorg/proto/fontsproto"
             checkoutdir="xorg/proto/fontsproto"/>
+    <dependencies>
+      <dep package="util-macros"/>
+    </dependencies>
+    <suggests>
+      <dep package="xorg-sgml-doctools"/>
+    </suggests>
   </autotools>
+
   <autotools id="glproto">
     <branch module="xorg/proto/glproto"
             checkoutdir="xorg/proto/glproto"/>
+    <dependencies>
+      <dep package="util-macros"/>
+    </dependencies>
   </autotools>
+
   <autotools id="inputproto">
     <branch module="xorg/proto/inputproto"
             checkoutdir="xorg/proto/inputproto"/>
+    <dependencies>
+      <dep package="util-macros"/>
+    </dependencies>
   </autotools>
+
   <autotools id="kbproto">
     <branch module="xorg/proto/kbproto"
             checkoutdir="xorg/proto/kbproto"/>
+    <dependencies>
+      <dep package="util-macros"/>
+    </dependencies>
+    <suggests>
+      <dep package="xorg-sgml-doctools"/>
+    </suggests>
   </autotools>
+
   <autotools id="presentproto">
     <branch module="xorg/proto/presentproto"
             checkoutdir="xorg/proto/presentproto"/>
+    <dependencies>
+      <dep package="util-macros"/>
+    </dependencies>
   </autotools>
+
   <autotools id="randrproto">
     <branch module="xorg/proto/randrproto"
             checkoutdir="xorg/proto/randrproto"/>
+    <dependencies>
+      <dep package="util-macros"/>
+      <dep package="renderproto"/>
+    </dependencies>
   </autotools>
+
   <autotools id="recordproto">
     <branch module="xorg/proto/recordproto"
             checkoutdir="xorg/proto/recordproto"/>
+    <dependencies>
+      <dep package="util-macros"/>
+    </dependencies>
+    <suggests>
+      <dep package="xorg-sgml-doctools"/>
+    </suggests>
   </autotools>
+
   <autotools id="renderproto">
     <branch module="xorg/proto/renderproto"
             checkoutdir="xorg/proto/renderproto"/>
+    <dependencies>
+      <dep package="util-macros"/>
+    </dependencies>
   </autotools>
+
   <autotools id="resourceproto">
     <branch module="xorg/proto/resourceproto"
             checkoutdir="xorg/proto/resourceproto"/>
+    <dependencies>
+      <dep package="util-macros"/>
+    </dependencies>
   </autotools>
+
   <autotools id="scrnsaverproto">
     <branch module="xorg/proto/scrnsaverproto"
             checkoutdir="xorg/proto/scrnsaverproto"/>
+    <dependencies>
+      <dep package="util-macros"/>
+    </dependencies>
+    <suggests>
+      <dep package="xorg-sgml-doctools"/>
+    </suggests>
   </autotools>
+
   <autotools id="videoproto">
     <branch module="xorg/proto/videoproto"
             checkoutdir="xorg/proto/videoproto"/>
+    <dependencies>
+      <dep package="util-macros"/>
+    </dependencies>
   </autotools>
+
   <autotools id="windowswmproto">
     <branch module="xorg/proto/windowswmproto"
             checkoutdir="xorg/proto/windowswmproto"/>
     <dependencies>
-      <dep package="macros"/>
+      <dep package="util-macros"/>
     </dependencies>
   </autotools>
+
   <autotools id="xcmiscproto">
     <branch module="xorg/proto/xcmiscproto"
             checkoutdir="xorg/proto/xcmiscproto"/>
+    <dependencies>
+      <dep package="util-macros"/>
+    </dependencies>
+    <suggests>
+      <dep package="xorg-sgml-doctools"/>
+    </suggests>
   </autotools>
+
   <autotools id="xextproto">
     <branch module="xorg/proto/xextproto"
             checkoutdir="xorg/proto/xextproto"/>
+    <dependencies>
+      <dep package="util-macros"/>
+    </dependencies>
+    <suggests>
+      <dep package="xorg-sgml-doctools"/>
+    </suggests>
   </autotools>
+
   <autotools id="xf86bigfontproto">
     <branch module="xorg/proto/xf86bigfontproto"
             checkoutdir="xorg/proto/xf86bigfontproto"/>
+    <dependencies>
+      <dep package="util-macros"/>
+    </dependencies>
   </autotools>
+
   <autotools id="xf86dgaproto">
     <branch module="xorg/proto/xf86dgaproto"
             checkoutdir="xorg/proto/xf86dgaproto"/>
+    <dependencies>
+      <dep package="util-macros"/>
+    </dependencies>
   </autotools>
+
   <autotools id="xf86driproto">
     <branch module="xorg/proto/xf86driproto"
             checkoutdir="xorg/proto/xf86driproto"/>
+    <dependencies>
+      <dep package="util-macros"/>
+    </dependencies>
   </autotools>
+
   <autotools id="xf86vidmodeproto">
     <branch module="xorg/proto/xf86vidmodeproto"
             checkoutdir="xorg/proto/xf86vidmodeproto"/>
+    <dependencies>
+      <dep package="util-macros"/>
+    </dependencies>
   </autotools>
+
   <autotools id="xineramaproto">
     <branch module="xorg/proto/xineramaproto"
             checkoutdir="xorg/proto/xineramaproto"/>
+    <dependencies>
+      <dep package="util-macros"/>
+    </dependencies>
   </autotools>
+
   <autotools id="x11proto">
     <branch module="xorg/proto/x11proto"
             checkoutdir="xorg/proto/x11proto"/>
-  </autotools>
-  <autotools id="dri2proto">
-    <branch module="xorg/proto/dri2proto"
-            checkoutdir="xorg/proto/dri2proto"/>
-  </autotools>
-  <autotools id="dri3proto">
-    <branch module="xorg/proto/dri3proto"
-            checkoutdir="xorg/proto/dri3proto"/>
-  </autotools>
-
-  <metamodule id="xorg-protos">
     <dependencies>
-      <dep package="macros"/>
-      <dep package="bigreqsproto"/>
-      <dep package="compositeproto"/>
-      <dep package="damageproto"/>
-      <dep package="dmxproto"/>
-      <dep package="fixesproto"/>
-      <dep package="fontsproto"/>
-      <dep package="glproto"/>
-      <dep package="inputproto"/>
-      <dep package="kbproto"/>
-      <dep package="xineramaproto"/>
-      <dep package="presentproto"/>
-      <dep package="randrproto"/>
-      <dep package="recordproto"/>
-      <dep package="renderproto"/>
-      <dep package="resourceproto"/>
-      <dep package="scrnsaverproto"/>
-      <dep package="videoproto"/>
-      <dep package="xcmiscproto"/>
-      <dep package="xextproto"/>
-      <dep package="xf86bigfontproto"/>
-      <dep package="xf86dgaproto"/>
-      <dep package="xf86driproto"/>
-      <dep package="xf86vidmodeproto"/>
-      <dep package="x11proto"/>
-      <dep package="dri2proto"/>
-      <dep package="dri3proto"/>
+      <dep package="util-macros"/>
+    <suggests>
+      <dep package="xorg-sgml-doctools"/>
+    </suggests>
     </dependencies>
-  </metamodule>
-
-  <!-- libs -->
+  </autotools>
 
+  <!-- X11 Libraries - Modules definition -->
   <autotools id="libAppleWM">
     <branch module="xorg/lib/libAppleWM"
             checkoutdir="xorg/lib/libAppleWM"/>
     <dependencies>
-      <dep package="macros"/>
+      <dep package="util-macros"/>
+      <dep package="applewmproto"/>
+      <dep package="xextproto"/>
       <dep package="libX11"/>
       <dep package="libXext"/>
-      <dep package="xextproto"/>
-      <dep package="applewmproto"/>
     </dependencies>
   </autotools>
 
@@ -370,11 +639,10 @@
     <branch module="xorg/lib/libFS"
             checkoutdir="xorg/lib/libFS"/>
     <dependencies>
-      <dep package="macros"/>
+      <dep package="util-macros"/>
       <dep package="x11proto"/>
       <dep package="fontsproto"/>
       <dep package="libxtrans"/>
-      <dep package="libX11"/>
     </dependencies>
   </autotools>
 
@@ -382,10 +650,20 @@
     <branch module="xorg/lib/libICE"
             checkoutdir="xorg/lib/libICE"/>
     <dependencies>
-      <dep package="macros"/>
+      <dep package="util-macros"/>
       <dep package="x11proto"/>
       <dep package="libxtrans"/>
-      <dep package="libX11"/>
+    </dependencies>
+    <suggests>
+      <dep package="xorg-sgml-doctools"/>
+    </suggests>
+  </autotools>
+
+  <autotools id="libpciaccess">
+    <branch module="xorg/lib/libpciaccess"
+            checkoutdir="xorg/lib/libpciaccess"/>
+    <dependencies>
+      <dep package="util-macros"/>
     </dependencies>
   </autotools>
 
@@ -393,41 +671,44 @@
     <branch module="xorg/lib/libSM"
             checkoutdir="xorg/lib/libSM"/>
     <dependencies>
-      <dep package="macros"/>
+      <dep package="util-macros"/>
       <dep package="x11proto"/>
       <dep package="libICE"/>
       <dep package="libxtrans"/>
     </dependencies>
+    <suggests>
+      <dep package="xorg-sgml-doctools"/>
+    </suggests>
   </autotools>
 
   <autotools id="libX11">
     <branch module="xorg/lib/libX11"
             checkoutdir="xorg/lib/libX11"/>
     <dependencies>
-      <dep package="libxcb"/>
-      <dep package="macros"/>
+      <dep package="util-macros"/>
       <dep package="x11proto"/>
       <dep package="bigreqsproto"/>
-      <dep package="xextproto"/>
-      <dep package="libxtrans"/>
-      <dep package="libXau"/>
-      <dep package="xcmiscproto"/>
-      <dep package="libXdmcp"/>
       <dep package="kbproto"/>
       <dep package="inputproto"/>
+      <dep package="xextproto"/>
       <dep package="xf86bigfontproto"/>
+      <dep package="libxcb"/>
+      <dep package="libxtrans"/>
     </dependencies>
+    <suggests>
+      <dep package="xorg-sgml-doctools"/>
+    </suggests>
   </autotools>
 
   <autotools id="libXScrnSaver">
     <branch module="xorg/lib/libXScrnSaver"
             checkoutdir="xorg/lib/libXScrnSaver"/>
     <dependencies>
-      <dep package="macros"/>
+      <dep package="util-macros"/>
+      <dep package="scrnsaverproto"/>
+      <dep package="xextproto"/>
       <dep package="libX11"/>
       <dep package="libXext"/>
-      <dep package="xextproto"/>
-      <dep package="scrnsaverproto"/>
     </dependencies>
   </autotools>
 
@@ -435,7 +716,7 @@
     <branch module="xorg/lib/libXau"
             checkoutdir="xorg/lib/libXau"/>
     <dependencies>
-      <dep package="macros"/>
+      <dep package="util-macros"/>
       <dep package="x11proto"/>
     </dependencies>
   </autotools>
@@ -444,33 +725,40 @@
     <branch module="xorg/lib/libXaw"
             checkoutdir="xorg/lib/libXaw"/>
     <dependencies>
-      <dep package="macros"/>
+      <dep package="util-macros"/>
       <dep package="x11proto"/>
       <dep package="libX11"/>
       <dep package="libXt"/>
       <dep package="libXmu"/>
       <dep package="libXpm"/>
     </dependencies>
+    <suggests>
+      <dep package="xorg-sgml-doctools"/>
+    </suggests>
   </autotools>
 
   <autotools id="libXaw3d">
     <branch module="xorg/lib/libXaw3d"
             checkoutdir="xorg/lib/libXaw3d"/>
     <dependencies>
-      <dep package="macros"/>
+      <dep package="util-macros"/>
       <dep package="x11proto"/>
       <dep package="libX11"/>
       <dep package="libXt"/>
       <dep package="libXmu"/>
       <dep package="libXext"/>
     </dependencies>
+    <suggests>
+      <dep package="libXpm"/>
+    </suggests>
   </autotools>
 
   <autotools id="libXcomposite">
     <branch module="xorg/lib/libXcomposite"
             checkoutdir="xorg/lib/libXcomposite"/>
     <dependencies>
-      <dep package="macros"/>
+      <dep package="util-macros"/>
+      <dep package="x11proto"/>
       <dep package="compositeproto"/>
       <dep package="libX11"/>
       <dep package="libXfixes"/>
@@ -482,7 +770,8 @@
     <branch module="xorg/lib/libXcursor"
             checkoutdir="xorg/lib/libXcursor"/>
     <dependencies>
-      <dep package="macros"/>
+      <dep package="util-macros"/>
+      <dep package="x11proto"/>
       <dep package="libXrender"/>
       <dep package="libX11"/>
       <dep package="libXfixes"/>
@@ -493,9 +782,11 @@
     <branch module="xorg/lib/libXdamage"
             checkoutdir="xorg/lib/libXdamage"/>
     <dependencies>
-      <dep package="macros"/>
-      <dep package="libX11"/>
+      <dep package="util-macros"/>
       <dep package="damageproto"/>
+      <dep package="fixesproto"/>
+      <dep package="xextproto"/>
+      <dep package="libX11"/>
       <dep package="libXfixes"/>
     </dependencies>
   </autotools>
@@ -504,29 +795,37 @@
     <branch module="xorg/lib/libXdmcp"
             checkoutdir="xorg/lib/libXdmcp"/>
     <dependencies>
-      <dep package="macros"/>
+      <dep package="util-macros"/>
       <dep package="x11proto"/>
     </dependencies>
+    <suggests>
+      <dep package="xorg-sgml-doctools"/>
+    </suggests>
   </autotools>
 
   <autotools id="libXext">
     <branch module="xorg/lib/libXext"
             checkoutdir="xorg/lib/libXext"/>
     <dependencies>
-      <dep package="macros"/>
+      <dep package="util-macros"/>
       <dep package="x11proto"/>
-      <dep package="libX11"/>
       <dep package="xextproto"/>
+      <dep package="libX11"/>
     </dependencies>
+    <suggests>
+      <dep package="xorg-sgml-doctools"/>
+    </suggests>
   </autotools>
 
   <autotools id="libXfixes">
     <branch module="xorg/lib/libXfixes"
             checkoutdir="xorg/lib/libXfixes"/>
     <dependencies>
-      <dep package="macros"/>
-      <dep package="libX11"/>
+      <dep package="util-macros"/>
+      <dep package="x11proto"/>
       <dep package="fixesproto"/>
+      <dep package="xextproto"/>
+      <dep package="libX11"/>
     </dependencies>
   </autotools>
 
@@ -534,20 +833,24 @@
     <branch module="xorg/lib/libXfont"
             checkoutdir="xorg/lib/libXfont"/>
     <dependencies>
-      <dep package="macros"/>
+      <dep package="util-macros"/>
       <dep package="x11proto"/>
-      <dep package="libxtrans"/>
       <dep package="fontsproto"/>
+      <dep package="libxtrans"/>
       <dep package="libfontenc"/>
       <dep package="libX11"/>
     </dependencies>
+    <suggests>
+      <dep package="xorg-sgml-doctools"/>
+    </suggests>
   </autotools>
 
   <autotools id="libXft">
     <branch module="xorg/lib/libXft"
             checkoutdir="xorg/lib/libXft"/>
     <dependencies>
-      <dep package="macros"/>
+      <dep package="util-macros"/>
+      <dep package="x11proto"/>
       <dep package="libXrender"/>
       <dep package="fontconfig"/>
     </dependencies>
@@ -557,24 +860,29 @@
     <branch module="xorg/lib/libXi"
             checkoutdir="xorg/lib/libXi"/>
     <dependencies>
-      <dep package="macros"/>
+      <dep package="util-macros"/>
       <dep package="x11proto"/>
-      <dep package="libX11"/>
+      <dep package="inputproto"/>
       <dep package="xextproto"/>
+      <dep package="libX11"/>
       <dep package="libXext"/>
-      <dep package="inputproto"/>
+      <dep package="libXfixes"/>
     </dependencies>
+    <suggests>
+      <dep package="xorg-sgml-doctools"/>
+    </suggests>
   </autotools>
 
   <autotools id="libXinerama">
     <branch module="xorg/lib/libXinerama"
             checkoutdir="xorg/lib/libXinerama"/>
     <dependencies>
-      <dep package="macros"/>
-      <dep package="libX11"/>
-      <dep package="libXext"/>
+      <dep package="util-macros"/>
+      <dep package="x11proto"/>
       <dep package="xextproto"/>
       <dep package="xineramaproto"/>
+      <dep package="libX11"/>
+      <dep package="libXext"/>
     </dependencies>
   </autotools>
 
@@ -582,20 +890,26 @@
     <branch module="xorg/lib/libXmu"
             checkoutdir="xorg/lib/libXmu"/>
     <dependencies>
-      <dep package="macros"/>
+      <dep package="util-macros"/>
+      <dep package="x11proto"/>
+      <dep package="xextproto"/>
       <dep package="libX11"/>
       <dep package="libXt"/>
       <dep package="libXext"/>
     </dependencies>
+    <suggests>
+      <dep package="xorg-sgml-doctools"/>
+    </suggests>
   </autotools>
 
   <autotools id="libXpm">
     <branch module="xorg/lib/libXpm"
             checkoutdir="xorg/lib/libXpm"/>
     <dependencies>
-      <dep package="macros"/>
-      <dep package="libX11"/>
+      <dep package="util-macros"/>
       <dep package="x11proto"/>
+      <dep package="xextproto"/>
+      <dep package="libX11"/>
       <dep package="libXt"/>
       <dep package="libXext"/>
     </dependencies>
@@ -605,10 +919,13 @@
     <branch module="xorg/lib/libXrandr"
             checkoutdir="xorg/lib/libXrandr"/>
     <dependencies>
-      <dep package="macros"/>
-      <dep package="libX11"/>
+      <dep package="util-macros"/>
       <dep package="randrproto"/>
+      <dep package="renderproto"/>
+      <dep package="xextproto"/>
+      <dep package="libX11"/>
       <dep package="libXrender"/>
+      <dep package="libXext"/>
     </dependencies>
   </autotools>
 
@@ -616,7 +933,8 @@
     <branch module="xorg/lib/libXrender"
             checkoutdir="xorg/lib/libXrender"/>
     <dependencies>
-      <dep package="macros"/>
+      <dep package="util-macros"/>
+      <dep package="x11proto"/>
       <dep package="renderproto"/>
       <dep package="libX11"/>
     </dependencies>
@@ -626,10 +944,11 @@
     <branch module="xorg/lib/libXRes"
             checkoutdir="xorg/lib/libXRes"/>
     <dependencies>
-      <dep package="macros"/>
+      <dep package="util-macros"/>
+      <dep package="resourceproto"/>
+      <dep package="xextproto"/>
       <dep package="libX11"/>
       <dep package="libXext"/>
-      <dep package="resourceproto"/>
     </dependencies>
   </autotools>
 
@@ -637,35 +956,44 @@
     <branch module="xorg/lib/libXt"
             checkoutdir="xorg/lib/libXt"/>
     <dependencies>
-      <dep package="macros"/>
+      <dep package="util-macros"/>
+      <dep package="x11proto"/>
+      <dep package="kbproto"/>
       <dep package="libSM"/>
+      <dep package="libICE"/>
       <dep package="libX11"/>
-      <dep package="x11proto"/>
     </dependencies>
+    <suggests>
+      <dep package="xorg-sgml-doctools"/>
+    </suggests>
   </autotools>
 
   <autotools id="libXtst">
     <branch module="xorg/lib/libXtst"
             checkoutdir="xorg/lib/libXtst"/>
     <dependencies>
-      <dep package="macros"/>
+      <dep package="util-macros"/>
+      <dep package="inputproto"/>
+      <dep package="recordproto"/>
+      <dep package="xextproto"/>
       <dep package="libX11"/>
       <dep package="libXext"/>
       <dep package="libXi"/>
-      <dep package="recordproto"/>
-      <dep package="xextproto"/>
     </dependencies>
+    <suggests>
+      <dep package="xorg-sgml-doctools"/>
+    </suggests>
   </autotools>
 
   <autotools id="libXv">
     <branch module="xorg/lib/libXv"
             checkoutdir="xorg/lib/libXv"/>
     <dependencies>
-      <dep package="macros"/>
-      <dep package="libX11"/>
-      <dep package="libXext"/>
+      <dep package="util-macros"/>
       <dep package="xextproto"/>
       <dep package="videoproto"/>
+      <dep package="libX11"/>
+      <dep package="libXext"/>
     </dependencies>
   </autotools>
 
@@ -673,12 +1001,12 @@
     <branch module="xorg/lib/libXvMC"
             checkoutdir="xorg/lib/libXvMC"/>
     <dependencies>
-      <dep package="macros"/>
+      <dep package="util-macros"/>
+      <dep package="xextproto"/>
+      <dep package="videoproto"/>
       <dep package="libX11"/>
       <dep package="libXext"/>
       <dep package="libXv"/>
-      <dep package="xextproto"/>
-      <dep package="videoproto"/>
     </dependencies>
   </autotools>
 
@@ -686,12 +1014,12 @@
     <branch module="xorg/lib/libXxf86dga"
             checkoutdir="xorg/lib/libXxf86dga"/>
     <dependencies>
-      <dep package="macros"/>
+      <dep package="util-macros"/>
       <dep package="x11proto"/>
-      <dep package="libX11"/>
-      <dep package="libXext"/>
       <dep package="xextproto"/>
       <dep package="xf86dgaproto"/>
+      <dep package="libX11"/>
+      <dep package="libXext"/>
     </dependencies>
   </autotools>
 
@@ -699,12 +1027,12 @@
     <branch module="xorg/lib/libXxf86vm"
             checkoutdir="xorg/lib/libXxf86vm"/>
     <dependencies>
-      <dep package="macros"/>
+      <dep package="util-macros"/>
       <dep package="x11proto"/>
-      <dep package="libX11"/>
-      <dep package="libXext"/>
       <dep package="xextproto"/>
       <dep package="xf86vidmodeproto"/>
+      <dep package="libX11"/>
+      <dep package="libXext"/>
     </dependencies>
   </autotools>
 
@@ -712,11 +1040,11 @@
     <branch module="xorg/lib/libdmx"
             checkoutdir="xorg/lib/libdmx"/>
     <dependencies>
-      <dep package="macros"/>
+      <dep package="util-macros"/>
+      <dep package="dmxproto"/>
+      <dep package="xextproto"/>
       <dep package="libX11"/>
       <dep package="libXext"/>
-      <dep package="xextproto"/>
-      <dep package="dmxproto"/>
     </dependencies>
   </autotools>
 
@@ -724,7 +1052,7 @@
     <branch module="xorg/lib/libfontenc"
             checkoutdir="xorg/lib/libfontenc"/>
     <dependencies>
-      <dep package="macros"/>
+      <dep package="util-macros"/>
       <dep package="x11proto"/>
       <dep package="font-util"/>
     </dependencies>
@@ -734,9 +1062,19 @@
     <branch module="xorg/lib/libxkbfile"
             checkoutdir="xorg/lib/libxkbfile"/>
     <dependencies>
-      <dep package="macros"/>
-      <dep package="libX11"/>
+      <dep package="util-macros"/>
       <dep package="kbproto"/>
+      <dep package="libX11"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="libxshmfence">
+    <branch module="xorg/lib/libxshmfence"
+            checkoutdir="xorg/lib/libxshmfence"/>
+    <dependencies>
+      <dep package="util-macros"/>
+      <dep package="dri3proto"/>
+      <dep package="presentproto"/>
     </dependencies>
   </autotools>
 
@@ -744,956 +1082,852 @@
     <branch module="xorg/lib/libxtrans"
             checkoutdir="xorg/lib/libxtrans"/>
     <dependencies>
-      <dep package="macros"/>
+      <dep package="util-macros"/>
     </dependencies>
+    <suggests>
+      <dep package="xorg-sgml-doctools"/>
+    </suggests>
   </autotools>
 
   <autotools id="libWindowsWM">
     <branch module="xorg/lib/libWindowsWM"
             checkoutdir="xorg/lib/libWindowsWM"/>
     <dependencies>
-      <dep package="macros"/>
+      <dep package="util-macros"/>
+      <dep package="windowswmproto"/>
+      <dep package="xextproto"/>
       <dep package="libX11"/>
       <dep package="libXext"/>
-      <dep package="xextproto"/>
-      <dep package="windowswmproto"/>
     </dependencies>
   </autotools>
 
-  <metamodule id="xorg-libs">
+  <!-- X Applications - Modules definition -->
+  <autotools id="app-appres">
+    <branch module="xorg/app/appres"
+            checkoutdir="xorg/app/appres"/>
     <dependencies>
-      <dep package="libFS"/>
-      <dep package="libICE"/>
-      <dep package="libSM"/>
+      <dep package="util-macros"/>
+      <dep package="x11proto"/>
       <dep package="libX11"/>
-      <dep package="libXScrnSaver"/>
-      <dep package="libXau"/>
-      <dep package="libXaw"/>
-      <dep package="libXaw3d"/>
-      <dep package="libXcomposite"/>
-      <dep package="libXcursor"/>
-      <dep package="libXdamage"/>
-      <dep package="libXdmcp"/>
-      <dep package="libXext"/>
-      <dep package="libXfixes"/>
-      <dep package="libXfont"/>
-      <dep package="libXft"/>
-      <dep package="libXi"/>
-      <dep package="libXinerama"/>
-      <dep package="libXmu"/>
-      <dep package="libXpm"/>
-      <dep package="libXrandr"/>
-      <dep package="libXrender"/>
-      <dep package="libXRes"/>
       <dep package="libXt"/>
-      <dep package="libXtst"/>
-      <dep package="libXv"/>
-      <dep package="libXvMC"/>
-      <dep package="libXxf86dga"/>
-      <dep package="libXxf86vm"/>
-      <dep package="libdmx"/>
-      <dep package="libfontenc"/>
-      <dep package="libxkbfile"/>
-      <dep package="libxtrans"/>
-      <dep package="libdrm"/>
-      <dep package="libGL"/>
-      <dep package="pixman"/>
-      <dep package="libpciaccess"/>
-      <dep package="libxcb"/>
-      <dep package="xcb-util"/>
     </dependencies>
-  </metamodule>
+  </autotools>
 
-  <!-- data -->
-  <autotools id="bitmaps">
-    <branch module="xorg/data/bitmaps"
-            checkoutdir="xorg/data/bitmaps"/>
+  <autotools id="app-bdftopcf">
+    <branch module="xorg/app/bdftopcf"
+            checkoutdir="xorg/app/bdftopcf"/>
     <dependencies>
-      <dep package="macros"/>
+      <dep package="util-macros"/>
+      <dep package="libXfont"/>
     </dependencies>
   </autotools>
 
-  <autotools id="cursors">
-    <branch module="xorg/data/cursors"
-            checkoutdir="xorg/data/cursors"/>
+  <autotools id="app-bitmap">
+    <branch module="xorg/app/bitmap"
+            checkoutdir="xorg/app/bitmap"/>
     <dependencies>
-      <dep package="xcursorgen"/>
+      <dep package="util-macros"/>
+      <dep package="x11proto"/>
+      <dep package="libX11"/>
+      <dep package="libXaw"/>
+      <dep package="libXmu"/>
+      <dep package="libXt"/>
+      <dep package="data-bitmaps"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xkeyboard-config">
-    <branch module="xkeyboard-config"
-            checkoutdir="xkeyboard-config"/>
+  <autotools id="app-editres">
+    <branch module="xorg/app/editres"
+            checkoutdir="xorg/app/editres"/>
     <dependencies>
-      <dep package="xkbcomp"/>
+      <dep package="util-macros"/>
+      <dep package="libX11"/>
+      <dep package="libXaw"/>
+      <dep package="libXmu"/>
+      <dep package="libXt"/>
     </dependencies>
   </autotools>
 
-  <!-- apps -->
-  <autotools id="iceauth">
+  <autotools id="app-iceauth">
     <branch module="xorg/app/iceauth"
             checkoutdir="xorg/app/iceauth"/>
     <dependencies>
-      <dep package="libX11"/>
+      <dep package="util-macros"/>
+      <dep package="x11proto"/>
       <dep package="libICE"/>
     </dependencies>
   </autotools>
 
-  <autotools id="luit">
+  <autotools id="app-luit">
     <branch module="xorg/app/luit"
             checkoutdir="xorg/app/luit"/>
     <dependencies>
-      <dep package="libX11"/>
+      <dep package="util-macros"/>
+      <dep package="libfontenc"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="app-mkfontdir">
+    <branch module="xorg/app/mkfontdir"
+            checkoutdir="xorg/app/mkfontdir"/>
+    <dependencies>
+      <dep package="util-macros"/>
+      <dep package="app-mkfontscale"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="app-mkfontscale">
+    <branch module="xorg/app/mkfontscale"
+            checkoutdir="xorg/app/mkfontscale"/>
+    <dependencies>
+      <dep package="util-macros"/>
+      <dep package="x11proto"/>
       <dep package="libfontenc"/>
     </dependencies>
   </autotools>
 
-  <autotools id="rendercheck">
+  <autotools id="app-rendercheck">
     <branch module="xorg/app/rendercheck"
             checkoutdir="xorg/app/rendercheck"/>
     <dependencies>
+      <dep package="util-macros"/>
+      <dep package="x11proto"/>
+      <dep package="libX11"/>
       <dep package="libXrender"/>
     </dependencies>
   </autotools>
 
-  <autotools id="scripts">
+  <autotools id="app-rgb">
+    <branch module="xorg/app/rgb"
+            checkoutdir="xorg/app/rgb"/>
+    <dependencies>
+      <dep package="util-macros"/>
+      <dep package="x11proto"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="app-rstart">
+    <branch module="xorg/app/rstart"
+            checkoutdir="xorg/app/rstart"/>
+    <dependencies>
+      <dep package="util-macros"/>
+      <dep package="x11proto"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="app-scripts">
     <branch module="xorg/app/scripts"
             checkoutdir="xorg/app/scripts"/>
+    <dependencies>
+      <dep package="util-macros"/>
+    </dependencies>
   </autotools>
 
-  <autotools id="sessreg">
+  <autotools id="app-sessreg">
     <branch module="xorg/app/sessreg"
             checkoutdir="xorg/app/sessreg"/>
     <dependencies>
+      <dep package="util-macros"/>
       <dep package="x11proto"/>
     </dependencies>
   </autotools>
 
-  <autotools id="setxkbmap">
+  <autotools id="app-setxkbmap">
     <branch module="xorg/app/setxkbmap"
             checkoutdir="xorg/app/setxkbmap"/>
     <dependencies>
+      <dep package="util-macros"/>
       <dep package="libX11"/>
+      <dep package="libxkbfile"/>
     </dependencies>
   </autotools>
 
-  <autotools id="smproxy">
+  <autotools id="app-smproxy">
     <branch module="xorg/app/smproxy"
             checkoutdir="xorg/app/smproxy"/>
     <dependencies>
-      <dep package="libX11"/>
+      <dep package="util-macros"/>
+      <dep package="libICE"/>
       <dep package="libSM"/>
+      <dep package="libXmu"/>
       <dep package="libXt"/>
     </dependencies>
   </autotools>
 
-  <autotools id="twm">
+  <autotools id="app-twm">
     <branch module="xorg/app/twm"
             checkoutdir="xorg/app/twm"/>
     <dependencies>
+      <dep package="util-macros"/>
+      <dep package="x11proto"/>
+      <dep package="libICE"/>
       <dep package="libX11"/>
+      <dep package="libXext"/>
+      <dep package="libXmu"/>
       <dep package="libXt"/>
     </dependencies>
   </autotools>
 
-  <autotools id="x11perf">
+  <autotools id="app-x11perf">
     <branch module="xorg/app/x11perf"
             checkoutdir="xorg/app/x11perf"/>
     <dependencies>
+      <dep package="util-macros"/>
+      <dep package="x11proto"/>
       <dep package="libX11"/>
+      <dep package="libXmu"/>
+    </dependencies>
+    <suggests>
       <dep package="libXrender"/>
       <dep package="libXft"/>
       <dep package="libXext"/>
-    </dependencies>
+    </suggests>
   </autotools>
 
-  <autotools id="xauth">
+  <autotools id="app-xauth">
     <branch module="xorg/app/xauth"
             checkoutdir="xorg/app/xauth"/>
     <dependencies>
+      <dep package="util-macros"/>
+      <dep package="x11proto"/>
+      <dep package="libX11"/>
+      <dep package="libXau"/>
       <dep package="libXext"/>
       <dep package="libXmu"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xbacklight">
+  <autotools id="app-xbacklight">
     <branch module="xorg/app/xbacklight"
             checkoutdir="xorg/app/xbacklight"/>
     <dependencies>
+      <dep package="util-macros"/>
       <dep package="libX11"/>
       <dep package="libXrandr"/>
+      <dep package="xcb-util"/>
+      <dep package="libxcb"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="app-xcalc">
+    <branch module="xorg/app/xcalc"
+            checkoutdir="xorg/app/xcalc"/>
+    <dependencies>
+      <dep package="util-macros"/>
+      <dep package="x11proto"/>
+      <dep package="libX11"/>
+      <dep package="libXt"/>
+      <dep package="libXaw"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="app-xclipboard">
+    <branch module="xorg/app/xclipboard"
+            checkoutdir="xorg/app/xclipboard"/>
+    <dependencies>
+      <dep package="util-macros"/>
+      <dep package="x11proto"/>
+      <dep package="libX11"/>
+      <dep package="libXt"/>
+      <dep package="libXaw"/>
+      <dep package="libXmu"/>
     </dependencies>
+    <suggests>
+      <dep package="libxkbfile"/>
+    </suggests>
+  </autotools>
+
+  <autotools id="app-xclock">
+    <branch module="xorg/app/xclock"
+            checkoutdir="xorg/app/xclock"/>
+    <dependencies>
+      <dep package="util-macros"/>
+      <dep package="x11proto"/>
+      <dep package="libX11"/>
+      <dep package="libXaw"/>
+      <dep package="libXmu"/>
+      <dep package="libXt"/>
+    </dependencies>
+    <suggests>
+      <dep package="libXrender"/>
+      <dep package="libXft"/>
+      <dep package="libxkbfile"/>
+    </suggests>
   </autotools>
 
-  <autotools id="xcmsdb">
+  <autotools id="app-xcmsdb">
     <branch module="xorg/app/xcmsdb"
             checkoutdir="xorg/app/xcmsdb"/>
     <dependencies>
+      <dep package="util-macros"/>
       <dep package="libX11"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xcursorgen">
+  <autotools id="app-xconsole">
+    <branch module="xorg/app/xconsole"
+            checkoutdir="xorg/app/xconsole"/>
+    <dependencies>
+      <dep package="util-macros"/>
+      <dep package="x11proto"/>
+      <dep package="libX11"/>
+      <dep package="libXaw"/>
+      <dep package="libXmu"/>
+      <dep package="libXt"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="app-xcursorgen">
     <branch module="xorg/app/xcursorgen"
             checkoutdir="xorg/app/xcursorgen"/>
     <dependencies>
+      <dep package="util-macros"/>
       <dep package="libXcursor"/>
       <dep package="libX11"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xdpyinfo">
+  <autotools id="app-xditview">
+    <branch module="xorg/app/xditview"
+            checkoutdir="xorg/app/xditview"/>
+    <dependencies>
+      <dep package="util-macros"/>
+      <dep package="libX11"/>
+      <dep package="libXaw"/>
+      <dep package="libXmu"/>
+      <dep package="libXt"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="app-xdm">
+    <branch module="xorg/app/xdm"
+            checkoutdir="xorg/app/xdm"/>
+    <dependencies>
+      <dep package="util-macros"/>
+      <dep package="libX11"/>
+      <dep package="libXau"/>
+      <dep package="libXaw"/>
+      <dep package="libXdmcp"/>
+      <dep package="libXext"/>
+      <dep package="libXmu"/>
+      <dep package="libXt"/>
+    </dependencies>
+    <suggests>
+      <dep package="libXinerama"/>
+      <dep package="libXft"/>
+      <dep package="libXpm"/>
+      <dep package="libXrender"/>
+    </suggests>
+  </autotools>
+
+  <autotools id="app-xdpyinfo">
     <branch module="xorg/app/xdpyinfo"
             checkoutdir="xorg/app/xdpyinfo"/>
     <dependencies>
+      <dep package="util-macros"/>
+      <dep package="x11proto"/>
       <dep package="libX11"/>
       <dep package="libXext"/>
       <dep package="libXtst"/>
+      <dep package="libxcb"/>
+      <dep package="libXxf86vm"/>
+      <dep package="libXi"/>
+      <dep package="libXrender"/>
+      <dep package="libXcomposite"/>
     </dependencies>
+    <suggests>
+      <dep package="libXxf86dga"/>
+      <dep package="libXinerama"/>
+      <dep package="libdmx"/>
+    </suggests>
   </autotools>
 
-  <autotools id="xdriinfo">
+  <autotools id="app-xdriinfo">
     <branch module="xorg/app/xdriinfo"
             checkoutdir="xorg/app/xdriinfo"/>
     <dependencies>
+      <dep package="util-macros"/>
       <dep package="glproto"/>
-      <dep package="libGL"/>
+      <dep package="libX11"/>
+      <dep package="mesa-mesa"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xev">
+  <autotools id="app-xev">
     <branch module="xorg/app/xev"
             checkoutdir="xorg/app/xev"/>
     <dependencies>
+      <dep package="util-macros"/>
+      <dep package="x11proto"/>
       <dep package="libX11"/>
+      <dep package="libXrandr"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xeyes">
+  <autotools id="app-xeyes">
     <branch module="xorg/app/xeyes"
             checkoutdir="xorg/app/xeyes"/>
     <dependencies>
+      <dep package="util-macros"/>
+      <dep package="x11proto"/>
       <dep package="libX11"/>
+      <dep package="libXext"/>
+      <dep package="libXmu"/>
       <dep package="libXt"/>
+    </dependencies>
+    <suggests>
+      <dep package="libXrender"/>
+    </suggests>
+  </autotools>
+
+  <autotools id="app-xfd">
+    <branch module="xorg/app/xfd"
+            checkoutdir="xorg/app/xfd"/>
+    <dependencies>
+      <dep package="util-macros"/>
+      <dep package="fontconfig"/>
+      <dep package="x11proto"/>
+      <dep package="libXaw"/>
+      <dep package="libXft"/>
+      <dep package="libXrender"/>
+      <dep package="libXmu"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="app-xfontsel">
+    <branch module="xorg/app/xfontsel"
+            checkoutdir="xorg/app/xfontsel"/>
+    <dependencies>
+      <dep package="util-macros"/>
+      <dep package="libX11"/>
+      <dep package="libXaw"/>
       <dep package="libXmu"/>
+      <dep package="libXt"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="app-xfs">
+    <branch module="xorg/app/xfs"
+            checkoutdir="xorg/app/xfs"/>
+    <dependencies>
+      <dep package="util-macros"/>
+      <dep package="x11proto"/>
+      <dep package="libXfont"/>
+      <dep package="libxtrans"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xgamma">
+  <autotools id="app-xfsinfo">
+    <branch module="xorg/app/xfsinfo"
+            checkoutdir="xorg/app/xfsinfo"/>
+    <dependencies>
+      <dep package="util-macros"/>
+      <dep package="x11proto"/>
+      <dep package="libFS"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="app-xgamma">
     <branch module="xorg/app/xgamma"
             checkoutdir="xorg/app/xgamma"/>
     <dependencies>
+      <dep package="util-macros"/>
       <dep package="libX11"/>
       <dep package="libXxf86vm"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xhost">
+  <autotools id="app-xhost">
     <branch module="xorg/app/xhost"
             checkoutdir="xorg/app/xhost"/>
     <dependencies>
+      <dep package="util-macros"/>
+      <dep package="x11proto"/>
       <dep package="libX11"/>
       <dep package="libXmu"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xinit">
+  <autotools id="app-xinit">
     <branch module="xorg/app/xinit"
             checkoutdir="xorg/app/xinit"/>
     <dependencies>
+      <dep package="util-macros"/>
+      <dep package="x11proto"/>
       <dep package="libX11"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xinput">
+  <autotools id="app-xinput">
     <branch module="xorg/app/xinput"
             checkoutdir="xorg/app/xinput"/>
     <dependencies>
+      <dep package="util-macros"/>
+      <dep package="inputproto"/>
       <dep package="libX11"/>
+      <dep package="libXext"/>
       <dep package="libXi"/>
       <dep package="libXrandr"/>
       <dep package="libXinerama"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xkbcomp">
+  <autotools id="app-xkbcomp">
     <branch module="xorg/app/xkbcomp"
             checkoutdir="xorg/app/xkbcomp"/>
     <dependencies>
+      <dep package="util-macros"/>
+      <dep package="x11proto"/>
       <dep package="libX11"/>
+      <dep package="libxkbfile"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xkbevd">
+  <autotools id="app-xkbevd">
     <branch module="xorg/app/xkbevd"
             checkoutdir="xorg/app/xkbevd"/>
     <dependencies>
+      <dep package="util-macros"/>
       <dep package="libX11"/>
       <dep package="libxkbfile"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xkbutils">
+  <autotools id="app-xkbutils">
     <branch module="xorg/app/xkbutils"
             checkoutdir="xorg/app/xkbutils"/>
     <dependencies>
+      <dep package="util-macros"/>
+      <dep package="x11proto"/>
       <dep package="libX11"/>
       <dep package="libXaw"/>
       <dep package="libXt"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xkill">
+  <autotools id="app-xkill">
     <branch module="xorg/app/xkill"
             checkoutdir="xorg/app/xkill"/>
     <dependencies>
+      <dep package="util-macros"/>
+      <dep package="x11proto"/>
+      <dep package="libX11"/>
+      <dep package="libXmu"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="app-xload">
+    <branch module="xorg/app/xload"
+            checkoutdir="xorg/app/xload"/>
+    <dependencies>
+      <dep package="util-macros"/>
+      <dep package="x11proto"/>
       <dep package="libX11"/>
+      <dep package="libXaw"/>
       <dep package="libXmu"/>
+      <dep package="libXt"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xlogo">
+  <autotools id="app-xlogo">
     <branch module="xorg/app/xlogo"
             checkoutdir="xorg/app/xlogo"/>
     <dependencies>
+      <dep package="util-macros"/>
+      <dep package="libX11"/>
+      <dep package="libSM"/>
       <dep package="libXaw"/>
+      <dep package="libXext"/>
+      <dep package="libXmu"/>
+      <dep package="libXt"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xlsatoms">
+  <autotools id="app-xlsatoms">
     <branch module="xorg/app/xlsatoms"
             checkoutdir="xorg/app/xlsatoms"/>
     <dependencies>
-      <dep package="libX11"/>
-      <dep package="libXmu"/>
+      <dep package="util-macros"/>
+      <dep package="libxcb"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xlsclients">
+  <autotools id="app-xlsclients">
     <branch module="xorg/app/xlsclients"
             checkoutdir="xorg/app/xlsclients"/>
     <dependencies>
+      <dep package="util-macros"/>
       <dep package="libxcb"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xmodmap">
+  <autotools id="app-xman">
+    <branch module="xorg/app/xman"
+            checkoutdir="xorg/app/xman"/>
+    <dependencies>
+      <dep package="util-macros"/>
+      <dep package="libX11"/>
+      <dep package="libXaw"/>
+      <dep package="libXt"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="app-xmodmap">
     <branch module="xorg/app/xmodmap"
             checkoutdir="xorg/app/xmodmap"/>
     <dependencies>
+      <dep package="util-macros"/>
+      <dep package="x11proto"/>
       <dep package="libX11"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xpr">
+  <autotools id="app-xpr">
     <branch module="xorg/app/xpr"
             checkoutdir="xorg/app/xpr"/>
     <dependencies>
+      <dep package="util-macros"/>
+      <dep package="x11proto"/>
       <dep package="libX11"/>
-      <!--<dep package="libXmuu"/>-->
+      <dep package="libXmu"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xprop">
+  <autotools id="app-xprop">
     <branch module="xorg/app/xprop"
             checkoutdir="xorg/app/xprop"/>
     <dependencies>
+      <dep package="util-macros"/>
+      <dep package="x11proto"/>
       <dep package="libX11"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xrandr">
+  <autotools id="app-xrandr">
     <branch module="xorg/app/xrandr"
             checkoutdir="xorg/app/xrandr"/>
     <dependencies>
+      <dep package="util-macros"/>
+      <dep package="x11proto"/>
+      <dep package="libX11"/>
       <dep package="libXrandr"/>
+      <dep package="libXrender"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xrdb">
+  <autotools id="app-xrdb">
     <branch module="xorg/app/xrdb"
             checkoutdir="xorg/app/xrdb"/>
     <dependencies>
+      <dep package="util-macros"/>
+      <dep package="x11proto"/>
       <dep package="libX11"/>
       <dep package="libXmu"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xrefresh">
+  <autotools id="app-xrefresh">
     <branch module="xorg/app/xrefresh"
             checkoutdir="xorg/app/xrefresh"/>
     <dependencies>
+      <dep package="util-macros"/>
+      <dep package="x11proto"/>
       <dep package="libX11"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xset">
+  <autotools id="app-xset">
     <branch module="xorg/app/xset"
             checkoutdir="xorg/app/xset"/>
     <dependencies>
+      <dep package="util-macros"/>
+      <dep package="x11proto"/>
+      <dep package="libX11"/>
       <dep package="libXext"/>
       <dep package="libXmu"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xsetroot">
+  <autotools id="app-xsetroot">
     <branch module="xorg/app/xsetroot"
             checkoutdir="xorg/app/xsetroot"/>
     <dependencies>
+      <dep package="util-macros"/>
+      <dep package="x11proto"/>
+      <dep package="data-bitmaps"/>
       <dep package="libX11"/>
+      <dep package="libXcursor"/>
       <dep package="libXmu"/>
-      <dep package="bitmaps"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xvinfo">
-    <branch module="xorg/app/xvinfo"
-            checkoutdir="xorg/app/xvinfo"/>
+  <autotools id="app-xsm">
+    <branch module="xorg/app/xsm"
+            checkoutdir="xorg/app/xsm"/>
     <dependencies>
+      <dep package="util-macros"/>
       <dep package="libX11"/>
-      <dep package="libXv"/>
+      <dep package="libXt"/>
+      <dep package="libICE"/>
+      <dep package="libSM"/>
+      <dep package="libXaw"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xwd">
-    <branch module="xorg/app/xwd"
-            checkoutdir="xorg/app/xwd"/>
+  <autotools id="app-xstdcmap">
+    <branch module="xorg/app/xstdcmap"
+            checkoutdir="xorg/app/xstdcmap"/>
     <dependencies>
+      <dep package="util-macros"/>
+      <dep package="x11proto"/>
       <dep package="libX11"/>
+      <dep package="libXmu"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xwininfo">
-    <branch module="xorg/app/xwininfo"
-            checkoutdir="xorg/app/xwininfo"/>
+  <autotools id="app-xvidtune">
+    <branch module="xorg/app/xvidtune"
+            checkoutdir="xorg/app/xvidtune"/>
     <dependencies>
+      <dep package="util-macros"/>
+      <dep package="x11proto"/>
       <dep package="libX11"/>
-      <dep package="libXext"/>
+      <dep package="libXaw"/>
+      <dep package="libXmu"/>
+      <dep package="libXxf86vm"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xwud">
-    <branch module="xorg/app/xwud"
-            checkoutdir="xorg/app/xwud"/>
+  <autotools id="app-xvinfo">
+    <branch module="xorg/app/xvinfo"
+            checkoutdir="xorg/app/xvinfo"/>
     <dependencies>
+      <dep package="util-macros"/>
+      <dep package="x11proto"/>
       <dep package="libX11"/>
+      <dep package="libXv"/>
     </dependencies>
   </autotools>
 
-  <metamodule id="xorg-apps">
-    <dependencies>
-      <dep package="iceauth"/>
-      <dep package="luit"/>
-      <dep package="rendercheck"/>
-      <dep package="scripts"/>
-      <dep package="sessreg"/>
-      <dep package="setxkbmap"/>
-      <dep package="smproxy"/>
-      <dep package="twm"/>
-      <dep package="x11perf"/>
-      <dep package="xauth"/>
-      <dep package="xbacklight"/>
-      <dep package="xcmsdb"/>
-      <dep package="xcursorgen"/>
-      <dep package="xdpyinfo"/>
-      <dep package="xdriinfo"/>
-      <dep package="xev"/>
-      <dep package="xeyes"/>
-      <dep package="xgamma"/>
-      <dep package="xhost"/>
-      <dep package="xinit"/>
-      <dep package="xinput"/>
-      <dep package="xkbcomp"/>
-      <dep package="xkbevd"/>
-      <dep package="xkbutils"/>
-      <dep package="xkill"/>
-      <dep package="xlogo"/>
-      <dep package="xlsatoms"/>
-      <dep package="xlsclients"/>
-      <dep package="xmodmap"/>
-      <dep package="xpr"/>
-      <dep package="xprop"/>
-      <dep package="xrandr"/>
-      <dep package="xrdb"/>
-      <dep package="xrefresh"/>
-      <dep package="xset"/>
-      <dep package="xsetroot"/>
-      <dep package="xvinfo"/>
-      <dep package="xwd"/>
-      <dep package="xwininfo"/>
-      <dep package="xwud"/>
-    </dependencies>
-  </metamodule>
-
-  <!-- core font support, still required for some configurations  -->
-
-  <autotools id="bdftopcf">
-    <branch module="xorg/app/bdftopcf"
-            checkoutdir="xorg/app/bdftopcf"/>
-    <dependencies>
-      <dep package="libXfont"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="mkfontscale">
-    <branch module="xorg/app/mkfontscale"
-            checkoutdir="xorg/app/mkfontscale"/>
-    <dependencies>
-      <dep package="libfontenc"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="mkfontdir">
-    <branch module="xorg/app/mkfontdir"
-            checkoutdir="xorg/app/mkfontdir"/>
-    <dependencies>
-      <dep package="mkfontscale"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="font-util">
-    <branch module="xorg/font/util"
-            checkoutdir="xorg/font/util"/>
-  </autotools>
-
-  <autotools id="encodings">
-    <branch module="xorg/font/encodings"
-            checkoutdir="xorg/font/encodings"/>
-    <dependencies>
-      <dep package="mkfontscale"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="font-adobe-100dpi">
-    <branch module="xorg/font/adobe-100dpi"
-            checkoutdir="xorg/font/adobe-100dpi"/>
-    <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
-      <dep package="font-util"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="font-adobe-75dpi">
-    <branch module="xorg/font/adobe-75dpi"
-            checkoutdir="xorg/font/adobe-75dpi"/>
-    <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
-      <dep package="font-util"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="font-adobe-utopia-100dpi">
-    <branch module="xorg/font/adobe-utopia-100dpi"
-            checkoutdir="xorg/font/adobe-utopia-100dpi"/>
-    <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
-      <dep package="font-util"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="font-adobe-utopia-75dpi">
-    <branch module="xorg/font/adobe-utopia-75dpi"
-            checkoutdir="xorg/font/adobe-utopia-75dpi"/>
-    <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
-      <dep package="font-util"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="font-adobe-utopia-type1">
-    <branch module="xorg/font/adobe-utopia-type1"
-            checkoutdir="xorg/font/adobe-utopia-type1"/>
-    <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
-      <dep package="font-util"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="font-arabic-misc">
-    <branch module="xorg/font/arabic-misc"
-            checkoutdir="xorg/font/arabic-misc"/>
-    <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="font-bh-100dpi">
-    <branch module="xorg/font/bh-100dpi"
-            checkoutdir="xorg/font/bh-100dpi"/>
-    <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="font-bh-75dpi">
-    <branch module="xorg/font/bh-75dpi"
-            checkoutdir="xorg/font/bh-75dpi"/>
-    <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="font-bh-lucidatypewriter-100dpi">
-    <branch module="xorg/font/bh-lucidatypewriter-100dpi"
-            checkoutdir="xorg/font/bh-lucidatypewriter-100dpi"/>
-    <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="font-bh-lucidatypewriter-75dpi">
-    <branch module="xorg/font/bh-lucidatypewriter-75dpi"
-            checkoutdir="xorg/font/bh-lucidatypewriter-75dpi"/>
-    <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="font-bh-ttf">
-    <branch module="xorg/font/bh-ttf"
-            checkoutdir="xorg/font/bh-ttf"/>
-    <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="font-bh-type1">
-    <branch module="xorg/font/bh-type1"
-            checkoutdir="xorg/font/bh-type1"/>
-    <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="font-bitstream-100dpi">
-    <branch module="xorg/font/bitstream-100dpi"
-            checkoutdir="xorg/font/bitstream-100dpi"/>
-    <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="font-bitstream-75dpi">
-    <branch module="xorg/font/bitstream-75dpi"
-            checkoutdir="xorg/font/bitstream-75dpi"/>
-    <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="font-bitstream-type1">
-    <branch module="xorg/font/bitstream-type1"
-            checkoutdir="xorg/font/bitstream-type1"/>
-    <dependencies>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="font-cronyx-cyrillic">
-    <branch module="xorg/font/cronyx-cyrillic"
-            checkoutdir="xorg/font/cronyx-cyrillic"/>
-    <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="font-cursor-misc">
-    <branch module="xorg/font/cursor-misc"
-            checkoutdir="xorg/font/cursor-misc"/>
-    <dependencies>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="font-daewoo-misc">
-    <branch module="xorg/font/daewoo-misc"
-            checkoutdir="xorg/font/daewoo-misc"/>
-    <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="font-dec-misc">
-    <branch module="xorg/font/dec-misc"
-            checkoutdir="xorg/font/dec-misc"/>
-    <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="font-ibm-type1">
-    <branch module="xorg/font/ibm-type1"
-            checkoutdir="xorg/font/ibm-type1"/>
-    <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="font-isas-misc">
-    <branch module="xorg/font/isas-misc"
-            checkoutdir="xorg/font/isas-misc"/>
-    <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="font-jis-misc">
-    <branch module="xorg/font/jis-misc"
-            checkoutdir="xorg/font/jis-misc"/>
-    <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="font-micro-misc">
-    <branch module="xorg/font/micro-misc"
-            checkoutdir="xorg/font/micro-misc"/>
-    <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="font-misc-cyrillic">
-    <branch module="xorg/font/misc-cyrillic"
-            checkoutdir="xorg/font/misc-cyrillic"/>
-    <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="font-misc-ethiopic">
-    <branch module="xorg/font/misc-ethiopic"
-            checkoutdir="xorg/font/misc-ethiopic"/>
-    <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="font-misc-meltho">
-    <branch module="xorg/font/misc-meltho"
-            checkoutdir="xorg/font/misc-meltho"/>
-    <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="font-misc-misc">
-    <branch module="xorg/font/misc-misc"
-            checkoutdir="xorg/font/misc-misc"/>
-    <dependencies>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
-      <dep package="font-util"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="font-mutt-misc">
-    <branch module="xorg/font/mutt-misc"
-            checkoutdir="xorg/font/mutt-misc"/>
-    <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="font-schumacher-misc">
-    <branch module="xorg/font/schumacher-misc"
-            checkoutdir="xorg/font/schumacher-misc"/>
+  <autotools id="app-xwd">
+    <branch module="xorg/app/xwd"
+            checkoutdir="xorg/app/xwd"/>
     <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
+      <dep package="util-macros"/>
+      <dep package="x11proto"/>
+      <dep package="libX11"/>
     </dependencies>
+    <suggests>
+      <dep package="libxkbfile"/>
+    </suggests>
   </autotools>
 
-  <autotools id="font-screen-cyrillic">
-    <branch module="xorg/font/screen-cyrillic"
-            checkoutdir="xorg/font/screen-cyrillic"/>
+  <autotools id="app-xwininfo">
+    <branch module="xorg/app/xwininfo"
+            checkoutdir="xorg/app/xwininfo"/>
     <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
+      <dep package="util-macros"/>
+      <dep package="x11proto"/>
+      <dep package="libX11"/>
+      <dep package="libxcb"/>
     </dependencies>
+    <suggests>
+      <dep package="xcb-util-wm"/>
+    </suggests>
   </autotools>
 
-  <autotools id="font-sony-misc">
-    <branch module="xorg/font/sony-misc"
-            checkoutdir="xorg/font/sony-misc"/>
+  <autotools id="app-xwud">
+    <branch module="xorg/app/xwud"
+            checkoutdir="xorg/app/xwud"/>
     <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
+      <dep package="util-macros"/>
+      <dep package="x11proto"/>
+      <dep package="libX11"/>
     </dependencies>
   </autotools>
 
-  <autotools id="font-sun-misc">
-    <branch module="xorg/font/sun-misc"
-            checkoutdir="xorg/font/sun-misc"/>
+  <!-- Bitmap Images and Cursors Themes - Modules Definition -->
+  <autotools id="data-bitmaps">
+    <branch module="xorg/data/bitmaps"
+            checkoutdir="xorg/data/bitmaps"/>
     <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
+      <dep package="util-macros"/>
     </dependencies>
   </autotools>
 
-  <autotools id="font-winitzki-cyrillic">
-    <branch module="xorg/font/winitzki-cyrillic"
-            checkoutdir="xorg/font/winitzki-cyrillic"/>
+  <autotools id="data-cursors">
+    <branch module="xorg/data/cursors"
+            checkoutdir="xorg/data/cursors"/>
     <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
+      <dep package="util-macros"/>
+      <dep package="app-xcursorgen"/>
+      <dep package="libXcursor"/>
     </dependencies>
   </autotools>
 
-  <autotools id="font-xfree86-type1">
-    <branch module="xorg/font/xfree86-type1"
-            checkoutdir="xorg/font/xfree86-type1"/>
+  <!-- The X Server -->
+  <autotools id="xserver">
+    <branch module="xorg/xserver"
+            checkoutdir="xorg/xserver"/>
     <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
+      <dep package="util-macros"/>
+      <dep package="bigreqsproto"/>
+      <dep package="damageproto"/>
+      <dep package="fixesproto"/>
+      <dep package="fontsproto"/>
+      <dep package="inputproto"/>
+      <dep package="kbproto"/>
+      <dep package="randrproto"/>
+      <dep package="renderproto"/>
+      <dep package="x11proto"/>
+      <dep package="xcmiscproto"/>
+      <dep package="xextproto"/>
+      <dep package="libXfont"/>
+      <dep package="libxtrans"/>
+      <dep package="libXau"/>
+      <dep package="libxkbfile"/>
+      <dep package="libpixman"/>
+      <dep package="app-xkbcomp"/>
+      <dep package="libxshmfence"/>			     <!-- Linux only -->
     </dependencies>
+    <suggests>
+      <dep package="compositeproto"/>
+      <dep package="dmxproto"/>
+      <dep package="dri2proto"/>
+      <dep package="dri3proto"/>
+      <dep package="glproto"/>
+      <dep package="presentproto"/>
+      <dep package="recordproto"/>
+      <dep package="resourceproto"/>
+      <dep package="scrnsaverproto"/>
+      <dep package="videoproto"/>
+      <dep package="xf86bigfontproto"/>
+      <dep package="xf86dgaproto"/>
+      <dep package="xf86driproto"/>
+      <dep package="xf86vidmodeproto"/>
+      <dep package="xineramaproto"/>
+      <dep package="libXaw"/>
+      <dep package="libXdmcp"/>
+      <dep package="libXmu"/>
+      <dep package="libXRes"/>
+      <dep package="libXtst"/>
+      <dep package="libXv"/>
+      <dep package="libdmx"/>
+      <dep package="libpciaccess"/>
+      <dep package="mesa-drm"/>
+      <dep package="mesa-mesa"/>
+    </suggests>
   </autotools>
 
-  <autotools id="font-alias">
-    <branch module="xorg/font/alias"
-            checkoutdir="xorg/font/alias"/>
-  </autotools>
-
-  <metamodule id="xorg-fonts">
-    <dependencies>
-      <dep package="font-util"/>
-      <dep package="encodings"/>
-      <dep package="font-adobe-100dpi"/>
-      <dep package="font-adobe-75dpi"/>
-      <dep package="font-adobe-utopia-100dpi"/>
-      <dep package="font-adobe-utopia-75dpi"/>
-      <dep package="font-adobe-utopia-type1"/>
-      <dep package="font-arabic-misc"/>
-      <dep package="font-bh-100dpi"/>
-      <dep package="font-bh-75dpi"/>
-      <dep package="font-bh-lucidatypewriter-100dpi"/>
-      <dep package="font-bh-lucidatypewriter-75dpi"/>
-      <dep package="font-bh-ttf"/>
-      <dep package="font-bh-type1"/>
-      <dep package="font-bitstream-100dpi"/>
-      <dep package="font-bitstream-75dpi"/>
-      <dep package="font-bitstream-type1"/>
-      <dep package="font-cronyx-cyrillic"/>
-      <dep package="font-cursor-misc"/>
-      <dep package="font-daewoo-misc"/>
-      <dep package="font-dec-misc"/>
-      <dep package="font-ibm-type1"/>
-      <dep package="font-isas-misc"/>
-      <dep package="font-jis-misc"/>
-      <dep package="font-micro-misc"/>
-      <dep package="font-misc-cyrillic"/>
-      <dep package="font-misc-ethiopic"/>
-      <dep package="font-misc-meltho"/>
-      <dep package="font-misc-misc"/>
-      <dep package="font-mutt-misc"/>
-      <dep package="font-schumacher-misc"/>
-      <dep package="font-screen-cyrillic"/>
-      <dep package="font-sony-misc"/>
-      <dep package="font-sun-misc"/>
-      <dep package="font-winitzki-cyrillic"/>
-      <dep package="font-xfree86-type1"/>
-      <dep package="font-alias"/>
-    </dependencies>
-  </metamodule>
-
-  <!-- input drivers -->
-
+  <!-- X Input Drivers - Modules Definition -->
   <autotools id="xf86-input-acecad">
     <branch module="xorg/driver/xf86-input-acecad"
             checkoutdir="xorg/driver/xf86-input-acecad"/>
     <dependencies>
+      <dep package="util-macros"/>
+      <dep package="x11proto"/>
+      <dep package="inputproto"/>
+      <dep package="kbproto"/>
       <dep package="xserver"/>
     </dependencies>
   </autotools>
@@ -1702,6 +1936,9 @@
     <branch module="xorg/driver/xf86-input-aiptek"
             checkoutdir="xorg/driver/xf86-input-aiptek"/>
     <dependencies>
+      <dep package="util-macros"/>
+      <dep package="x11proto"/>
+      <dep package="inputproto"/>
       <dep package="xserver"/>
     </dependencies>
   </autotools>
@@ -1710,6 +1947,10 @@
     <branch module="xorg/driver/xf86-input-evdev"
             checkoutdir="xorg/driver/xf86-input-evdev"/>
     <dependencies>
+      <dep package="util-macros"/>
+      <dep package="x11proto"/>
+      <dep package="inputproto"/>
+      <dep package="libevdev"/>
       <dep package="xserver"/>
     </dependencies>
   </autotools>
@@ -1718,6 +1959,10 @@
     <branch module="xorg/driver/xf86-input-joystick"
             checkoutdir="xorg/driver/xf86-input-joystick"/>
     <dependencies>
+      <dep package="util-macros"/>
+      <dep package="x11proto"/>
+      <dep package="inputproto"/>
+      <dep package="kbproto"/>
       <dep package="xserver"/>
     </dependencies>
   </autotools>
@@ -1726,6 +1971,9 @@
     <branch module="xorg/driver/xf86-input-keyboard"
             checkoutdir="xorg/driver/xf86-input-keyboard"/>
     <dependencies>
+      <dep package="util-macros"/>
+      <dep package="x11proto"/>
+      <dep package="inputproto"/>
       <dep package="xserver"/>
     </dependencies>
   </autotools>
@@ -1734,6 +1982,9 @@
     <branch module="xorg/driver/xf86-input-mouse"
             checkoutdir="xorg/driver/xf86-input-mouse"/>
     <dependencies>
+      <dep package="util-macros"/>
+      <dep package="x11proto"/>
+      <dep package="inputproto"/>
       <dep package="xserver"/>
     </dependencies>
   </autotools>
@@ -1742,6 +1993,11 @@
     <branch module="xorg/driver/xf86-input-synaptics"
             checkoutdir="xorg/driver/xf86-input-synaptics"/>
     <dependencies>
+      <dep package="util-macros"/>
+      <dep package="x11proto"/>
+      <dep package="inputproto"/>
+      <dep package="libX11"/>
+      <dep package="libXi"/>
       <dep package="xserver"/>
     </dependencies>
   </autotools>
@@ -1750,6 +2006,9 @@
     <branch module="xorg/driver/xf86-input-vmmouse"
             checkoutdir="xorg/driver/xf86-input-vmmouse"/>
     <dependencies>
+      <dep package="util-macros"/>
+      <dep package="x11proto"/>
+      <dep package="inputproto"/>
       <dep package="xserver"/>
     </dependencies>
   </autotools>
@@ -1758,183 +2017,356 @@
     <branch module="xorg/driver/xf86-input-void"
             checkoutdir="xorg/driver/xf86-input-void"/>
     <dependencies>
+      <dep package="util-macros"/>
+      <dep package="x11proto"/>
       <dep package="xserver"/>
     </dependencies>
   </autotools>
 
+  <!-- X Video Drivers - Modules Definition -->
+  <autotools id="glamor">
+    <branch module="xorg/driver/glamor"
+            checkoutdir="xorg/driver/glamor"/>
+    <dependencies>
+      <dep package="util-macros"/>
+      <dep package="mesa-drm"/>
+      <dep package="xserver"/>
+    </dependencies>
+    <suggests>
+      <dep package="dri2proto"/>
+      <dep package="mesa-mesa"/>
+    </suggests>
+  </autotools>
+
   <autotools id="xf86-video-apm">
     <branch module="xorg/driver/xf86-video-apm"
             checkoutdir="xorg/driver/xf86-video-apm"/>
     <dependencies>
+      <dep package="util-macros"/>
+      <dep package="fontsproto"/>
+      <dep package="x11proto"/>
+      <dep package="randrproto"/>
+      <dep package="renderproto"/>
+      <dep package="xextproto"/>
+      <dep package="libpciaccess"/>
       <dep package="xserver"/>
     </dependencies>
+    <suggests>
+      <dep package="videoproto"/>
+    </suggests>
   </autotools>
 
   <autotools id="xf86-video-ark">
     <branch module="xorg/driver/xf86-video-ark"
             checkoutdir="xorg/driver/xf86-video-ark"/>
     <dependencies>
+      <dep package="util-macros"/>
+      <dep package="fontsproto"/>
+      <dep package="x11proto"/>
+      <dep package="xextproto"/>
       <dep package="xserver"/>
     </dependencies>
+    <suggests>
+      <dep package="libpciaccess"/>
+    </suggests>
   </autotools>
 
   <autotools id="xf86-video-ast">
     <branch module="xorg/driver/xf86-video-ast"
             checkoutdir="xorg/driver/xf86-video-ast"/>
     <dependencies>
+      <dep package="util-macros"/>
+      <dep package="fontsproto"/>
+      <dep package="x11proto"/>
+      <dep package="xextproto"/>
+      <dep package="randrproto"/>
+      <dep package="renderproto"/>
       <dep package="xserver"/>
     </dependencies>
+    <suggests>
+      <dep package="videoproto"/>
+      <dep package="libpciaccess"/>
+    </suggests>
   </autotools>
 
   <autotools id="xf86-video-ati">
     <branch module="xorg/driver/xf86-video-ati"
             checkoutdir="xorg/driver/xf86-video-ati"/>
     <dependencies>
+      <dep package="util-macros"/>
+      <dep package="fontsproto"/>
+      <dep package="x11proto"/>
+      <dep package="xextproto"/>
+      <dep package="randrproto"/>
+      <dep package="renderproto"/>
+      <dep package="xf86driproto"/>
+      <dep package="mesa-drm"/>
+      <dep package="libpciaccess"/>
       <dep package="xserver"/>
     </dependencies>
+    <suggests>
+      <dep package="glamor"/>
+      <dep package="videoproto"/>
+    </suggests>
   </autotools>
 
   <autotools id="xf86-video-chips">
     <branch module="xorg/driver/xf86-video-chips"
             checkoutdir="xorg/driver/xf86-video-chips"/>
     <dependencies>
+      <dep package="util-macros"/>
+      <dep package="fontsproto"/>
+      <dep package="x11proto"/>
+      <dep package="xextproto"/>
+      <dep package="randrproto"/>
+      <dep package="renderproto"/>
+      <dep package="libpciaccess"/>
       <dep package="xserver"/>
     </dependencies>
+    <suggests>
+      <dep package="videoproto"/>
+    </suggests>
   </autotools>
 
   <autotools id="xf86-video-cirrus">
     <branch module="xorg/driver/xf86-video-cirrus"
             checkoutdir="xorg/driver/xf86-video-cirrus"/>
     <dependencies>
+      <dep package="util-macros"/>
+      <dep package="fontsproto"/>
+      <dep package="x11proto"/>
+      <dep package="xextproto"/>
+      <dep package="randrproto"/>
+      <dep package="renderproto"/>
       <dep package="xserver"/>
     </dependencies>
+    <suggests>
+      <dep package="videoproto"/>
+      <dep package="libpciaccess"/>
+    </suggests>
   </autotools>
 
   <autotools id="xf86-video-dummy">
     <branch module="xorg/driver/xf86-video-dummy"
             checkoutdir="xorg/driver/xf86-video-dummy"/>
     <dependencies>
+      <dep package="util-macros"/>
+      <dep package="fontsproto"/>
+      <dep package="x11proto"/>
+      <dep package="randrproto"/>
+      <dep package="renderproto"/>
       <dep package="xserver"/>
     </dependencies>
+    <suggests>
+      <dep package="videoproto"/>
+      <dep package="xf86dgaproto"/>
+    </suggests>
   </autotools>
 
   <autotools id="xf86-video-fbdev">
     <branch module="xorg/driver/xf86-video-fbdev"
             checkoutdir="xorg/driver/xf86-video-fbdev"/>
     <dependencies>
+      <dep package="util-macros"/>
+      <dep package="fontsproto"/>
+      <dep package="x11proto"/>
+      <dep package="randrproto"/>
+      <dep package="renderproto"/>
       <dep package="xserver"/>
     </dependencies>
+    <suggests>
+      <dep package="videoproto"/>
+      <dep package="libpciaccess"/>
+    </suggests>
   </autotools>
 
   <autotools id="xf86-video-geode">
     <branch module="xorg/driver/xf86-video-geode"
             checkoutdir="xorg/driver/xf86-video-geode"/>
     <dependencies>
+      <dep package="util-macros"/>
+      <dep package="fontsproto"/>
+      <dep package="x11proto"/>
+      <dep package="xextproto"/>
+      <dep package="randrproto"/>
+      <dep package="renderproto"/>
       <dep package="xserver"/>
     </dependencies>
-  </autotools>
-
-  <autotools id="xf86-video-glide">
-    <branch module="xorg/driver/xf86-video-glide"
-            checkoutdir="xorg/driver/xf86-video-glide"/>
-    <dependencies>
-      <dep package="xserver"/>
-    </dependencies>
+    <suggests>
+      <dep package="videoproto"/>
+      <dep package="libpciaccess"/>
+    </suggests>
   </autotools>
 
   <autotools id="xf86-video-glint">
     <branch module="xorg/driver/xf86-video-glint"
             checkoutdir="xorg/driver/xf86-video-glint"/>
     <dependencies>
+      <dep package="util-macros"/>
+      <dep package="fontsproto"/>
+      <dep package="x11proto"/>
+      <dep package="xextproto"/>
       <dep package="xserver"/>
     </dependencies>
+    <suggests>
+      <dep package="videoproto"/>
+      <dep package="xf86dgaproto"/>
+      <dep package="libpciaccess"/>
+    </suggests>
   </autotools>
 
   <autotools id="xf86-video-i128">
     <branch module="xorg/driver/xf86-video-i128"
             checkoutdir="xorg/driver/xf86-video-i128"/>
     <dependencies>
+      <dep package="util-macros"/>
+      <dep package="fontsproto"/>
+      <dep package="x11proto"/>
+      <dep package="xextproto"/>
+      <dep package="randrproto"/>
+      <dep package="renderproto"/>
       <dep package="xserver"/>
     </dependencies>
+    <suggests>
+      <dep package="videoproto"/>
+      <dep package="libpciaccess"/>
+    </suggests>
   </autotools>
 
   <autotools id="xf86-video-i740">
     <branch module="xorg/driver/xf86-video-i740"
             checkoutdir="xorg/driver/xf86-video-i740"/>
     <dependencies>
+      <dep package="util-macros"/>
+      <dep package="fontsproto"/>
+      <dep package="x11proto"/>
+      <dep package="xextproto"/>
+      <dep package="randrproto"/>
+      <dep package="renderproto"/>
       <dep package="xserver"/>
     </dependencies>
-  </autotools>
-
-  <autotools id="xf86-video-impact">
-    <branch module="xorg/driver/xf86-video-impact"
-            checkoutdir="xorg/driver/xf86-video-impact"/>
-    <dependencies>
-      <dep package="xserver"/>
-    </dependencies>
+    <suggests>
+      <dep package="videoproto"/>
+      <dep package="libpciaccess"/>
+    </suggests>
   </autotools>
 
   <autotools id="xf86-video-intel">
     <branch module="xorg/driver/xf86-video-intel"
             checkoutdir="xorg/driver/xf86-video-intel"/>
     <dependencies>
-      <dep package="macros"/>
-      <dep package="xserver"/>
+      <dep package="util-macros"/>
       <dep package="fontsproto"/>
-      <dep package="glproto"/>
+      <dep package="x11proto"/>
+      <dep package="xextproto"/>
       <dep package="randrproto"/>
       <dep package="renderproto"/>
-      <dep package="xextproto"/>
-      <dep package="x11proto"/>
+      <dep package="libXrender"/>
+      <dep package="libXrandr"/>
+      <dep package="libXext"/>
+      <dep package="libXfixes"/>
+      <dep package="libpciaccess"/>
+      <dep package="mesa-drm"/>
+      <dep package="libpixman"/>
+      <dep package="xserver"/>
+    </dependencies>
+    <suggests>
+      <dep package="glamor"/>
       <dep package="dri2proto"/>
+      <dep package="xf86driproto"/>
+      <dep package="libX11"/>
+      <dep package="libXinerama"/>
+      <dep package="libXdamage"/>
+      <dep package="libXcursor"/>
+      <dep package="libXtst"/>
       <dep package="libXvMC"/>
-    </dependencies>
+      <dep package="libxcb"/>
+    </suggests>
   </autotools>
 
   <autotools id="xf86-video-mach64">
     <branch module="xorg/driver/xf86-video-mach64"
             checkoutdir="xorg/driver/xf86-video-mach64"/>
     <dependencies>
+      <dep package="util-macros"/>
+      <dep package="fontsproto"/>
+      <dep package="x11proto"/>
+      <dep package="xextproto"/>
+      <dep package="randrproto"/>
+      <dep package="renderproto"/>
       <dep package="xserver"/>
     </dependencies>
+    <suggests>
+      <dep package="videoproto"/>
+      <dep package="xf86driproto"/>
+      <dep package="libpciaccess"/>
+      <dep package="mesa-drm"/>
+    </suggests>
   </autotools>
 
   <autotools id="xf86-video-mga">
     <branch module="xorg/driver/xf86-video-mga"
             checkoutdir="xorg/driver/xf86-video-mga"/>
     <dependencies>
+      <dep package="util-macros"/>
+      <dep package="fontsproto"/>
+      <dep package="x11proto"/>
+      <dep package="xextproto"/>
+      <dep package="randrproto"/>
+      <dep package="renderproto"/>
       <dep package="xserver"/>
     </dependencies>
+    <suggests>
+      <dep package="videoproto"/>
+      <dep package="xf86driproto"/>
+      <dep package="libpciaccess"/>
+      <dep package="mesa-drm"/>
+    </suggests>
   </autotools>
 
   <autotools id="xf86-video-modesetting">
     <branch module="xorg/driver/xf86-video-modesetting"
             checkoutdir="xorg/driver/xf86-video-modesetting"/>
     <dependencies>
+      <dep package="util-macros"/>
+      <dep package="fontsproto"/>
+      <dep package="x11proto"/>
+      <dep package="xextproto"/>
+      <dep package="randrproto"/>
+      <dep package="renderproto"/>
+      <dep package="libpciaccess"/>
       <dep package="xserver"/>
     </dependencies>
+    <suggests>
+      <dep package="mesa-drm"/>
+    </suggests>
   </autotools>
 
   <autotools id="xf86-video-neomagic">
     <branch module="xorg/driver/xf86-video-neomagic"
             checkoutdir="xorg/driver/xf86-video-neomagic"/>
     <dependencies>
+      <dep package="util-macros"/>
+      <dep package="fontsproto"/>
+      <dep package="x11proto"/>
       <dep package="xserver"/>
     </dependencies>
+    <suggests>
+      <dep package="libpciaccess"/>
+    </suggests>
   </autotools>
 
   <autotools id="xf86-video-nested">
     <branch module="xorg/driver/xf86-video-nested"
             checkoutdir="xorg/driver/xf86-video-nested"/>
     <dependencies>
-      <dep package="xserver"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="xf86-video-newport">
-    <branch module="xorg/driver/xf86-video-newport"
-            checkoutdir="xorg/driver/xf86-video-newport"/>
-    <dependencies>
+      <dep package="util-macros"/>
+      <dep package="fontsproto"/>
+      <dep package="x11proto"/>
+      <dep package="randrproto"/>
+      <dep package="renderproto"/>
+      <dep package="libX11"/>
+      <dep package="libXext"/>
       <dep package="xserver"/>
     </dependencies>
   </autotools>
@@ -1943,110 +2375,217 @@
     <branch module="nouveau/xf86-video-nouveau"
             checkoutdir="xorg/driver/xf86-video-nouveau"/>
     <dependencies>
+      <dep package="util-macros"/>
+      <dep package="fontsproto"/>
+      <dep package="x11proto"/>
+      <dep package="xextproto"/>
+      <dep package="randrproto"/>
+      <dep package="renderproto"/>
+      <dep package="libpciaccess"/>
+      <dep package="mesa-drm"/>
       <dep package="xserver"/>
     </dependencies>
+    <suggests>
+      <dep package="dri2proto"/>
+      <dep package="videoproto"/>
+    </suggests>
   </autotools>
 
   <autotools id="xf86-video-nv">
     <branch module="xorg/driver/xf86-video-nv"
             checkoutdir="xorg/driver/xf86-video-nv"/>
     <dependencies>
+      <dep package="util-macros"/>
+      <dep package="fontsproto"/>
+      <dep package="x11proto"/>
+      <dep package="xextproto"/>
+      <dep package="randrproto"/>
+      <dep package="renderproto"/>
       <dep package="xserver"/>
     </dependencies>
-  </autotools>
-
-  <autotools id="xf86-video-openchrome">
-    <branch module="openchrome/xf86-video-openchrome"
-            checkoutdir="xorg/driver/xf86-video-openchrome"/>
-    <dependencies>
-      <dep package="xserver"/>
-    </dependencies>
+    <suggests>
+      <dep package="videoproto"/>
+      <dep package="libpciaccess"/>
+    </suggests>
   </autotools>
 
   <autotools id="xf86-video-r128">
     <branch module="xorg/driver/xf86-video-r128"
             checkoutdir="xorg/driver/xf86-video-r128"/>
     <dependencies>
+      <dep package="util-macros"/>
+      <dep package="fontsproto"/>
+      <dep package="x11proto"/>
+      <dep package="xextproto"/>
+      <dep package="randrproto"/>
+      <dep package="renderproto"/>
       <dep package="xserver"/>
     </dependencies>
+    <suggests>
+      <dep package="videoproto"/>
+      <dep package="xf86driproto"/>
+      <dep package="libpciaccess"/>
+      <dep package="mesa-drm"/>
+    </suggests>
   </autotools>
 
   <autotools id="xf86-video-rendition">
     <branch module="xorg/driver/xf86-video-rendition"
             checkoutdir="xorg/driver/xf86-video-rendition"/>
     <dependencies>
+      <dep package="util-macros"/>
+      <dep package="fontsproto"/>
+      <dep package="x11proto"/>
+      <dep package="xextproto"/>
+      <dep package="randrproto"/>
+      <dep package="renderproto"/>
       <dep package="xserver"/>
     </dependencies>
+    <suggests>
+      <dep package="libpciaccess"/>
+    </suggests>
   </autotools>
 
   <autotools id="xf86-video-s3">
     <branch module="xorg/driver/xf86-video-s3"
             checkoutdir="xorg/driver/xf86-video-s3"/>
     <dependencies>
+      <dep package="util-macros"/>
+      <dep package="fontsproto"/>
+      <dep package="x11proto"/>
+      <dep package="xextproto"/>
+      <dep package="randrproto"/>
+      <dep package="renderproto"/>
       <dep package="xserver"/>
     </dependencies>
+    <suggests>
+      <dep package="videoproto"/>
+      <dep package="libpciaccess"/>
+    </suggests>
   </autotools>
 
   <autotools id="xf86-video-s3virge">
     <branch module="xorg/driver/xf86-video-s3virge"
             checkoutdir="xorg/driver/xf86-video-s3virge"/>
     <dependencies>
+      <dep package="util-macros"/>
+      <dep package="fontsproto"/>
+      <dep package="x11proto"/>
+      <dep package="xextproto"/>
+      <dep package="randrproto"/>
+      <dep package="renderproto"/>
       <dep package="xserver"/>
     </dependencies>
+    <suggests>
+      <dep package="videoproto"/>
+      <dep package="libpciaccess"/>
+    </suggests>
   </autotools>
 
   <autotools id="xf86-video-savage">
     <branch module="xorg/driver/xf86-video-savage"
             checkoutdir="xorg/driver/xf86-video-savage"/>
     <dependencies>
+    <dependencies>
+      <dep package="util-macros"/>
+      <dep package="fontsproto"/>
+      <dep package="x11proto"/>
+      <dep package="xextproto"/>
+      <dep package="randrproto"/>
+      <dep package="renderproto"/>
       <dep package="xserver"/>
     </dependencies>
+    <suggests>
+      <dep package="videoproto"/>
+      <dep package="xf86driproto"/>
+      <dep package="libpciaccess"/>
+      <dep package="mesa-drm"/>
+    </suggests>
+    </dependencies>
   </autotools>
 
   <autotools id="xf86-video-siliconmotion">
     <branch module="xorg/driver/xf86-video-siliconmotion"
             checkoutdir="xorg/driver/xf86-video-siliconmotion"/>
     <dependencies>
+      <dep package="util-macros"/>
+      <dep package="fontsproto"/>
+      <dep package="x11proto"/>
+      <dep package="xextproto"/>
       <dep package="xserver"/>
     </dependencies>
+    <suggests>
+      <dep package="videoproto"/>
+      <dep package="libpciaccess"/>
+    </suggests>
   </autotools>
 
   <autotools id="xf86-video-sis">
     <branch module="xorg/driver/xf86-video-sis"
             checkoutdir="xorg/driver/xf86-video-sis"/>
     <dependencies>
+      <dep package="util-macros"/>
+      <dep package="fontsproto"/>
+      <dep package="x11proto"/>
+      <dep package="xextproto"/>
+      <dep package="xf86dgaproto"/>
+      <dep package="randrproto"/>
+      <dep package="renderproto"/>
       <dep package="xserver"/>
     </dependencies>
+    <suggests>
+      <dep package="videoproto"/>
+      <dep package="xineramaproto"/>
+      <dep package="xf86driproto"/>
+      <dep package="libpciaccess"/>
+      <dep package="mesa-drm"/>
+    </suggests>
   </autotools>
 
   <autotools id="xf86-video-sisusb">
     <branch module="xorg/driver/xf86-video-sisusb"
             checkoutdir="xorg/driver/xf86-video-sisusb"/>
     <dependencies>
+      <dep package="util-macros"/>
+      <dep package="fontsproto"/>
+      <dep package="x11proto"/>
+      <dep package="xextproto"/>
+      <dep package="randrproto"/>
+      <dep package="renderproto"/>
+      <dep package="libpciaccess"/>
       <dep package="xserver"/>
     </dependencies>
-  </autotools>
-
-  <autotools id="xf86-video-sunbw2">
-    <branch module="xorg/driver/xf86-video-sunbw2"
-            checkoutdir="xorg/driver/xf86-video-sunbw2"/>
-    <dependencies>
-      <dep package="xserver"/>
-    </dependencies>
+    <suggests>
+      <dep package="videoproto"/>
+      <dep package="xineramaproto"/>
+      <dep package="mesa-drm"/>
+    </suggests>
   </autotools>
 
   <autotools id="xf86-video-suncg14">
     <branch module="xorg/driver/xf86-video-suncg14"
             checkoutdir="xorg/driver/xf86-video-suncg14"/>
     <dependencies>
+      <dep package="util-macros"/>
+      <dep package="fontsproto"/>
+      <dep package="x11proto"/>
+      <dep package="randrproto"/>
+      <dep package="renderproto"/>
       <dep package="xserver"/>
     </dependencies>
+    <suggests>
+    </suggests>
   </autotools>
 
   <autotools id="xf86-video-suncg3">
     <branch module="xorg/driver/xf86-video-suncg3"
             checkoutdir="xorg/driver/xf86-video-suncg3"/>
     <dependencies>
+      <dep package="util-macros"/>
+      <dep package="fontsproto"/>
+      <dep package="x11proto"/>
+      <dep package="randrproto"/>
+      <dep package="renderproto"/>
       <dep package="xserver"/>
     </dependencies>
   </autotools>
@@ -2055,6 +2594,11 @@
     <branch module="xorg/driver/xf86-video-suncg6"
             checkoutdir="xorg/driver/xf86-video-suncg6"/>
     <dependencies>
+      <dep package="util-macros"/>
+      <dep package="fontsproto"/>
+      <dep package="x11proto"/>
+      <dep package="randrproto"/>
+      <dep package="renderproto"/>
       <dep package="xserver"/>
     </dependencies>
   </autotools>
@@ -2063,6 +2607,11 @@
     <branch module="xorg/driver/xf86-video-sunffb"
             checkoutdir="xorg/driver/xf86-video-sunffb"/>
     <dependencies>
+      <dep package="util-macros"/>
+      <dep package="fontsproto"/>
+      <dep package="x11proto"/>
+      <dep package="randrproto"/>
+      <dep package="renderproto"/>
       <dep package="xserver"/>
     </dependencies>
   </autotools>
@@ -2071,6 +2620,11 @@
     <branch module="xorg/driver/xf86-video-sunleo"
             checkoutdir="xorg/driver/xf86-video-sunleo"/>
     <dependencies>
+      <dep package="util-macros"/>
+      <dep package="fontsproto"/>
+      <dep package="x11proto"/>
+      <dep package="randrproto"/>
+      <dep package="renderproto"/>
       <dep package="xserver"/>
     </dependencies>
   </autotools>
@@ -2079,6 +2633,11 @@
     <branch module="xorg/driver/xf86-video-suntcx"
             checkoutdir="xorg/driver/xf86-video-suntcx"/>
     <dependencies>
+      <dep package="util-macros"/>
+      <dep package="fontsproto"/>
+      <dep package="x11proto"/>
+      <dep package="randrproto"/>
+      <dep package="renderproto"/>
       <dep package="xserver"/>
     </dependencies>
   </autotools>
@@ -2087,38 +2646,92 @@
     <branch module="xorg/driver/xf86-video-tdfx"
             checkoutdir="xorg/driver/xf86-video-tdfx"/>
     <dependencies>
+      <dep package="util-macros"/>
+      <dep package="fontsproto"/>
+      <dep package="x11proto"/>
+      <dep package="xextproto"/>
+      <dep package="randrproto"/>
+      <dep package="renderproto"/>
       <dep package="xserver"/>
     </dependencies>
+    <suggests>
+      <dep package="videoproto"/>
+      <dep package="xf86driproto"/>
+      <dep package="libpciaccess"/>
+      <dep package="mesa-drm"/>
+    </suggests>
   </autotools>
 
   <autotools id="xf86-video-tga">
     <branch module="xorg/driver/xf86-video-tga"
             checkoutdir="xorg/driver/xf86-video-tga"/>
     <dependencies>
+      <dep package="util-macros"/>
+      <dep package="fontsproto"/>
+      <dep package="x11proto"/>
+      <dep package="xextproto"/>
+      <dep package="xf86dgaproto"/>
+      <dep package="randrproto"/>
+      <dep package="renderproto"/>
       <dep package="xserver"/>
     </dependencies>
+    <suggests>
+      <dep package="videoproto"/>
+      <dep package="libpciaccess"/>
+      <dep package="mesa-drm"/>
+    </suggests>
   </autotools>
 
   <autotools id="xf86-video-trident">
     <branch module="xorg/driver/xf86-video-trident"
             checkoutdir="xorg/driver/xf86-video-trident"/>
     <dependencies>
+      <dep package="util-macros"/>
+      <dep package="xserver"/>
+    </dependencies>
+    <dependencies>
+      <dep package="util-macros"/>
+      <dep package="fontsproto"/>
+      <dep package="x11proto"/>
+      <dep package="xextproto"/>
+      <dep package="randrproto"/>
+      <dep package="renderproto"/>
       <dep package="xserver"/>
     </dependencies>
+    <suggests>
+      <dep package="videoproto"/>
+      <dep package="xf86dgaproto"/>
+      <dep package="libpciaccess"/>
+      <dep package="mesa-drm"/>
+    </suggests>
   </autotools>
 
   <autotools id="xf86-video-tseng">
     <branch module="xorg/driver/xf86-video-tseng"
             checkoutdir="xorg/driver/xf86-video-tseng"/>
     <dependencies>
+      <dep package="util-macros"/>
+      <dep package="fontsproto"/>
+      <dep package="x11proto"/>
+      <dep package="xextproto"/>
+      <dep package="randrproto"/>
+      <dep package="renderproto"/>
       <dep package="xserver"/>
     </dependencies>
+    <suggests>
+      <dep package="videoproto"/>
+      <dep package="libpciaccess"/>
+    </suggests>
   </autotools>
 
   <autotools id="xf86-video-v4l">
     <branch module="xorg/driver/xf86-video-v4l"
             checkoutdir="xorg/driver/xf86-video-v4l"/>
     <dependencies>
+      <dep package="util-macros"/>
+      <dep package="x11proto"/>
+      <dep package="randrproto"/>
+      <dep package="videoproto"/>
       <dep package="xserver"/>
     </dependencies>
   </autotools>
@@ -2127,30 +2740,67 @@
     <branch module="xorg/driver/xf86-video-vesa"
             checkoutdir="xorg/driver/xf86-video-vesa"/>
     <dependencies>
+      <dep package="util-macros"/>
+      <dep package="fontsproto"/>
+      <dep package="x11proto"/>
+      <dep package="xextproto"/>
+      <dep package="randrproto"/>
+      <dep package="renderproto"/>
       <dep package="xserver"/>
     </dependencies>
+    <suggests>
+      <dep package="libpciaccess"/>
+    </suggests>
   </autotools>
 
   <autotools id="xf86-video-vmware">
     <branch module="xorg/driver/xf86-video-vmware"
             checkoutdir="xorg/driver/xf86-video-vmware"/>
     <dependencies>
+      <dep package="util-macros"/>
+      <dep package="fontsproto"/>
+      <dep package="x11proto"/>
+      <dep package="xextproto"/>
+      <dep package="libX11"/>
+      <dep package="libXext"/>
+      <dep package="randrproto"/>
+      <dep package="renderproto"/>
       <dep package="xserver"/>
     </dependencies>
+    <suggests>
+      <dep package="videoproto"/>
+      <dep package="xineramaproto"/>
+      <dep package="libpciaccess"/>
+      <dep package="mesa-drm"/>
+      <dep package="mesa-mesa"/>
+    </suggests>
   </autotools>
 
   <autotools id="xf86-video-voodoo">
     <branch module="xorg/driver/xf86-video-voodoo"
             checkoutdir="xorg/driver/xf86-video-voodoo"/>
     <dependencies>
+      <dep package="util-macros"/>
+      <dep package="fontsproto"/>
+      <dep package="x11proto"/>
+      <dep package="xf86dgaproto"/>
+      <dep package="xextproto"/>
+      <dep package="randrproto"/>
+      <dep package="renderproto"/>
       <dep package="xserver"/>
     </dependencies>
+    <suggests>
+      <dep package="libpciaccess"/>
+      <dep package="mesa-drm"/>
+    </suggests>
   </autotools>
 
   <autotools id="xf86-video-wsfb">
     <branch module="xorg/driver/xf86-video-wsfb"
             checkoutdir="xorg/driver/xf86-video-wsfb"/>
     <dependencies>
+      <dep package="util-macros"/>
+      <dep package="x11proto"/>
       <dep package="xserver"/>
     </dependencies>
   </autotools>
@@ -2159,149 +2809,677 @@
     <branch module="xorg/driver/xf86-video-xgixp"
             checkoutdir="xorg/driver/xf86-video-xgixp"/>
     <dependencies>
+      <dep package="util-macros"/>
+      <dep package="fontsproto"/>
+      <dep package="x11proto"/>
+      <dep package="xextproto"/>
+      <dep package="xf86driproto"/>
+      <dep package="randrproto"/>
+      <dep package="renderproto"/>
       <dep package="xserver"/>
     </dependencies>
+    <suggests>
+      <dep package="videoproto"/>
+      <dep package="libpciaccess"/>
+      <dep package="mesa-drm"/>
+    </suggests>
   </autotools>
 
-  <autotools id="xts">
-    <branch repo="git.freedesktop.org" module="xorg/test/xts" checkoutdir="xorg/test/xts"/>
+  <!-- DocBook/XML stylesheets and documents cross-linking database -->
+  <!-- Consult the README file for further build instructions -->
+  <autotools id="xorg-sgml-doctools">
+    <branch module="xorg/doc/xorg-sgml-doctools"
+            checkoutdir="xorg/doc/xorg-sgml-doctools"/>
     <dependencies>
-      <dep package="libX11"/>
-      <dep package="xdpyinfo"/>
-      <dep package="xset"/>
+      <dep package="util-macros"/>
     </dependencies>
   </autotools>
 
-  <!-- These drivers are marked unmaintained in xorg/doc/xorg-docs/MAINTAINERS and are also broken -->
-  <metamodule id="xorg-unmaintained-broken-drivers">
+  <!--  X Toplevel Documents -->
+  <!-- Documentation specific to a module, if any, is located in the module -->
+  <autotools id="xorg-docs">
+    <branch module="xorg/doc/xorg-docs"
+            checkoutdir="xorg/doc/xorg-docs"/>
     <dependencies>
-      <dep package="xf86-video-apm"/>
-      <dep package="xf86-video-ark"/>
-      <dep package="xf86-video-i740"/>
-      <dep package="xf86-video-impact"/>
-      <dep package="xf86-video-imstt"/>
-      <dep package="xf86-video-s3"/>
-      <dep package="xf86-video-s3virge"/>
-      <dep package="xf86-video-siliconmotion"/>
-      <dep package="xf86-video-sunbw2"/>
-      <dep package="xf86-video-v4l"/>
+      <dep package="util-macros"/>
     </dependencies>
-  </metamodule>
+    <suggests>
+      <dep package="xorg-sgml-doctools"/>
+    </suggests>
+  </autotools>
+
+<!--  The X Font Library - Modules Definition -->
 
-  <!-- This driver is BSD specific, and should not be built on all platforms -->
-  <metamodule id="xorg-unmaintained-broken-drivers">
+  <autotools id="font-util">
+    <branch module="xorg/font/util"
+            checkoutdir="xorg/font/util"/>
     <dependencies>
-      <dep package="xf86-video-wsfb"/>
+      <dep package="util-macros"/>
     </dependencies>
-  </metamodule>
+  </autotools>
 
-  <metamodule id="xorg-drivers">
+  <autotools id="font-encodings">
+    <branch module="xorg/font/encodings"
+            checkoutdir="xorg/font/encodings"/>
     <dependencies>
-      <dep package="xf86-input-acecad"/>
-      <dep package="xf86-input-aiptek"/>
-      <dep package="xf86-input-evdev"/>
-      <dep package="xf86-input-joystick"/>
-      <dep package="xf86-input-keyboard"/>
-      <dep package="xf86-input-mouse"/>
-      <dep package="xf86-input-void"/>
-      <dep package="xf86-video-ast"/>
-      <dep package="xf86-video-ati"/>
-      <dep package="xf86-video-chips"/>
-      <dep package="xf86-video-cirrus"/>
-      <dep package="xf86-video-dummy"/>
-      <dep package="xf86-video-fbdev"/>
-      <dep package="xf86-video-geode"/>
-      <dep package="xf86-video-glint"/>
-      <dep package="xf86-video-i128"/>
-      <dep package="xf86-video-intel"/>
-      <dep package="xf86-video-mach64"/>
-      <dep package="xf86-video-mga"/>
-      <dep package="xf86-video-neomagic"/>
-      <dep package="xf86-video-nested"/>
-      <dep package="xf86-video-nouveau"/>
-      <dep package="xf86-video-nv"/>
-      <dep package="xf86-video-openchrome"/>
-      <dep package="xf86-video-r128"/>
-      <dep package="xf86-video-rendition"/>
-      <dep package="xf86-video-savage"/>
-      <dep package="xf86-video-sis"/>
-      <dep package="xf86-video-sisusb"/>
-      <dep package="xf86-video-suncg14"/>
-      <dep package="xf86-video-suncg3"/>
-      <dep package="xf86-video-suncg6"/>
-      <dep package="xf86-video-sunffb"/>
-      <dep package="xf86-video-sunleo"/>
-      <dep package="xf86-video-suntcx"/>
-      <dep package="xf86-video-tdfx"/>
-      <dep package="xf86-video-tga"/>
-      <dep package="xf86-video-trident"/>
-      <dep package="xf86-video-tseng"/>
-      <dep package="xf86-video-vesa"/>
-      <dep package="xf86-video-vmware"/>
-      <dep package="xf86-video-voodoo"/>
-      <dep package="xf86-video-xgixp"/>
+      <dep package="util-macros"/>
+      <dep package="app-mkfontscale"/>
     </dependencies>
-  </metamodule>
+  </autotools>
 
-  <!-- Modules that only build on x86 (32 and 64bit) -->
+  <autotools id="font-adobe-100dpi">
+    <branch module="xorg/font/adobe-100dpi"
+            checkoutdir="xorg/font/adobe-100dpi"/>
+    <dependencies>
+      <dep package="util-macros"/>
+      <dep package="font-util"/>
+      <dep package="app-bdftopcf"/>
+      <dep package="app-mkfontscale"/>
+      <dep package="app-mkfontdir"/>
+    </dependencies>
+  </autotools>
 
-  <metamodule id="xorg-x86-drivers">
+  <autotools id="font-adobe-75dpi">
+    <branch module="xorg/font/adobe-75dpi"
+            checkoutdir="xorg/font/adobe-75dpi"/>
     <dependencies>
-      <dep package="xf86-input-vmmouse"/>
+      <dep package="util-macros"/>
+      <dep package="font-util"/>
+      <dep package="app-bdftopcf"/>
+      <dep package="app-mkfontscale"/>
+      <dep package="app-mkfontdir"/>
     </dependencies>
-  </metamodule>
+  </autotools>
 
-  <!-- This probably isn't sufficient, but it is a start -->
+  <autotools id="font-adobe-utopia-100dpi">
+    <branch module="xorg/font/adobe-utopia-100dpi"
+            checkoutdir="xorg/font/adobe-utopia-100dpi"/>
+    <dependencies>
+      <dep package="util-macros"/>
+      <dep package="font-util"/>
+      <dep package="app-bdftopcf"/>
+      <dep package="app-mkfontscale"/>
+      <dep package="app-mkfontdir"/>
+    </dependencies>
+  </autotools>
 
-  <metamodule id="xorg-sun-drivers">
+  <autotools id="font-adobe-utopia-75dpi">
+    <branch module="xorg/font/adobe-utopia-75dpi"
+            checkoutdir="xorg/font/adobe-utopia-75dpi"/>
     <dependencies>
-      <dep package="xf86-video-suncg14"/>
-      <dep package="xf86-video-suncg3"/>
-      <dep package="xf86-video-suncg6"/>
-      <dep package="xf86-video-sunffb"/>
-      <dep package="xf86-video-sunleo"/>
-      <dep package="xf86-video-suntcx"/>
+      <dep package="util-macros"/>
+      <dep package="font-util"/>
+      <dep package="app-bdftopcf"/>
+      <dep package="app-mkfontscale"/>
+      <dep package="app-mkfontdir"/>
     </dependencies>
-  </metamodule>
+  </autotools>
 
+  <autotools id="font-adobe-utopia-type1">
+    <branch module="xorg/font/adobe-utopia-type1"
+            checkoutdir="xorg/font/adobe-utopia-type1"/>
+    <dependencies>
+      <dep package="util-macros"/>
+      <dep package="font-util"/>
+      <dep package="app-bdftopcf"/>
+      <dep package="app-mkfontscale"/>
+      <dep package="app-mkfontdir"/>
+    </dependencies>
+  </autotools>
 
-  <!-- Bogosity of depending on libraries caused by Xnest.  Sigh -->
-  <autotools id="xserver">
-    <branch module="xorg/xserver"
-            checkoutdir="xorg/xserver"/>
+  <autotools id="font-arabic-misc">
+    <branch module="xorg/font/arabic-misc"
+            checkoutdir="xorg/font/arabic-misc"/>
     <dependencies>
-      <dep package="xorg-protos"/>
-      <dep package="libGL"/>
-      <dep package="libXaw"/>
-      <dep package="libXfont"/>
-      <dep package="libxtrans"/>
+      <dep package="util-macros"/>
+      <dep package="font-util"/>
+      <dep package="app-bdftopcf"/>
+      <dep package="app-mkfontscale"/>
+      <dep package="app-mkfontdir"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="font-bh-100dpi">
+    <branch module="xorg/font/bh-100dpi"
+            checkoutdir="xorg/font/bh-100dpi"/>
+    <dependencies>
+      <dep package="util-macros"/>
+      <dep package="font-util"/>
+      <dep package="app-bdftopcf"/>
+      <dep package="app-mkfontscale"/>
+      <dep package="app-mkfontdir"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="font-bh-75dpi">
+    <branch module="xorg/font/bh-75dpi"
+            checkoutdir="xorg/font/bh-75dpi"/>
+    <dependencies>
+      <dep package="util-macros"/>
+      <dep package="font-util"/>
+      <dep package="app-bdftopcf"/>
+      <dep package="app-mkfontscale"/>
+      <dep package="app-mkfontdir"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="font-bh-lucidatypewriter-100dpi">
+    <branch module="xorg/font/bh-lucidatypewriter-100dpi"
+            checkoutdir="xorg/font/bh-lucidatypewriter-100dpi"/>
+    <dependencies>
+      <dep package="util-macros"/>
+      <dep package="font-util"/>
+      <dep package="app-bdftopcf"/>
+      <dep package="app-mkfontscale"/>
+      <dep package="app-mkfontdir"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="font-bh-lucidatypewriter-75dpi">
+    <branch module="xorg/font/bh-lucidatypewriter-75dpi"
+            checkoutdir="xorg/font/bh-lucidatypewriter-75dpi"/>
+    <dependencies>
+      <dep package="util-macros"/>
+      <dep package="font-util"/>
+      <dep package="app-bdftopcf"/>
+      <dep package="app-mkfontscale"/>
+      <dep package="app-mkfontdir"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="font-bh-ttf">
+    <branch module="xorg/font/bh-ttf"
+            checkoutdir="xorg/font/bh-ttf"/>
+    <dependencies>
+      <dep package="util-macros"/>
+      <dep package="font-util"/>
+      <dep package="app-bdftopcf"/>
+      <dep package="app-mkfontscale"/>
+      <dep package="app-mkfontdir"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="font-bh-type1">
+    <branch module="xorg/font/bh-type1"
+            checkoutdir="xorg/font/bh-type1"/>
+    <dependencies>
+      <dep package="util-macros"/>
+      <dep package="font-util"/>
+      <dep package="app-bdftopcf"/>
+      <dep package="app-mkfontscale"/>
+      <dep package="app-mkfontdir"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="font-bitstream-100dpi">
+    <branch module="xorg/font/bitstream-100dpi"
+            checkoutdir="xorg/font/bitstream-100dpi"/>
+    <dependencies>
+      <dep package="util-macros"/>
+      <dep package="font-util"/>
+      <dep package="app-bdftopcf"/>
+      <dep package="app-mkfontscale"/>
+      <dep package="app-mkfontdir"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="font-bitstream-75dpi">
+    <branch module="xorg/font/bitstream-75dpi"
+            checkoutdir="xorg/font/bitstream-75dpi"/>
+    <dependencies>
+      <dep package="util-macros"/>
+      <dep package="font-util"/>
+      <dep package="app-bdftopcf"/>
+      <dep package="app-mkfontscale"/>
+      <dep package="app-mkfontdir"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="font-bitstream-type1">
+    <branch module="xorg/font/bitstream-type1"
+            checkoutdir="xorg/font/bitstream-type1"/>
+    <dependencies>
+      <dep package="util-macros"/>
+      <dep package="font-util"/>
+      <dep package="app-mkfontscale"/>
+      <dep package="app-mkfontdir"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="font-cronyx-cyrillic">
+    <branch module="xorg/font/cronyx-cyrillic"
+            checkoutdir="xorg/font/cronyx-cyrillic"/>
+    <dependencies>
+      <dep package="util-macros"/>
+      <dep package="font-util"/>
+      <dep package="app-bdftopcf"/>
+      <dep package="app-mkfontscale"/>
+      <dep package="app-mkfontdir"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="font-cursor-misc">
+    <branch module="xorg/font/cursor-misc"
+            checkoutdir="xorg/font/cursor-misc"/>
+    <dependencies>
+      <dep package="util-macros"/>
+      <dep package="font-util"/>
+      <dep package="app-mkfontscale"/>
+      <dep package="app-mkfontdir"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="font-daewoo-misc">
+    <branch module="xorg/font/daewoo-misc"
+            checkoutdir="xorg/font/daewoo-misc"/>
+    <dependencies>
+      <dep package="util-macros"/>
+      <dep package="font-util"/>
+      <dep package="app-bdftopcf"/>
+      <dep package="app-mkfontscale"/>
+      <dep package="app-mkfontdir"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="font-dec-misc">
+    <branch module="xorg/font/dec-misc"
+            checkoutdir="xorg/font/dec-misc"/>
+    <dependencies>
+      <dep package="util-macros"/>
+      <dep package="font-util"/>
+      <dep package="app-bdftopcf"/>
+      <dep package="app-mkfontscale"/>
+      <dep package="app-mkfontdir"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="font-ibm-type1">
+    <branch module="xorg/font/ibm-type1"
+            checkoutdir="xorg/font/ibm-type1"/>
+    <dependencies>
+      <dep package="util-macros"/>
+      <dep package="font-util"/>
+      <dep package="app-bdftopcf"/>
+      <dep package="app-mkfontscale"/>
+      <dep package="app-mkfontdir"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="font-isas-misc">
+    <branch module="xorg/font/isas-misc"
+            checkoutdir="xorg/font/isas-misc"/>
+    <dependencies>
+      <dep package="util-macros"/>
+      <dep package="font-util"/>
+      <dep package="app-bdftopcf"/>
+      <dep package="app-mkfontscale"/>
+      <dep package="app-mkfontdir"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="font-jis-misc">
+    <branch module="xorg/font/jis-misc"
+            checkoutdir="xorg/font/jis-misc"/>
+    <dependencies>
+      <dep package="util-macros"/>
+      <dep package="font-util"/>
+      <dep package="app-bdftopcf"/>
+      <dep package="app-mkfontscale"/>
+      <dep package="app-mkfontdir"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="font-micro-misc">
+    <branch module="xorg/font/micro-misc"
+            checkoutdir="xorg/font/micro-misc"/>
+    <dependencies>
+      <dep package="util-macros"/>
+      <dep package="font-util"/>
+      <dep package="app-bdftopcf"/>
+      <dep package="app-mkfontscale"/>
+      <dep package="app-mkfontdir"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="font-misc-cyrillic">
+    <branch module="xorg/font/misc-cyrillic"
+            checkoutdir="xorg/font/misc-cyrillic"/>
+    <dependencies>
+      <dep package="util-macros"/>
+      <dep package="font-util"/>
+      <dep package="app-bdftopcf"/>
+      <dep package="app-mkfontscale"/>
+      <dep package="app-mkfontdir"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="font-misc-ethiopic">
+    <branch module="xorg/font/misc-ethiopic"
+            checkoutdir="xorg/font/misc-ethiopic"/>
+    <dependencies>
+      <dep package="util-macros"/>
+      <dep package="font-util"/>
+      <dep package="app-bdftopcf"/>
+      <dep package="app-mkfontscale"/>
+      <dep package="app-mkfontdir"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="font-misc-meltho">
+    <branch module="xorg/font/misc-meltho"
+            checkoutdir="xorg/font/misc-meltho"/>
+    <dependencies>
+      <dep package="util-macros"/>
+      <dep package="font-util"/>
+      <dep package="app-bdftopcf"/>
+      <dep package="app-mkfontscale"/>
+      <dep package="app-mkfontdir"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="font-misc-misc">
+    <branch module="xorg/font/misc-misc"
+            checkoutdir="xorg/font/misc-misc"/>
+    <dependencies>
+      <dep package="util-macros"/>
+      <dep package="font-util"/>
+      <dep package="app-mkfontscale"/>
+      <dep package="app-mkfontdir"/>
+      <dep package="font-util"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="font-mutt-misc">
+    <branch module="xorg/font/mutt-misc"
+            checkoutdir="xorg/font/mutt-misc"/>
+    <dependencies>
+      <dep package="util-macros"/>
+      <dep package="font-util"/>
+      <dep package="app-bdftopcf"/>
+      <dep package="app-mkfontscale"/>
+      <dep package="app-mkfontdir"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="font-schumacher-misc">
+    <branch module="xorg/font/schumacher-misc"
+            checkoutdir="xorg/font/schumacher-misc"/>
+    <dependencies>
+      <dep package="util-macros"/>
+      <dep package="font-util"/>
+      <dep package="app-bdftopcf"/>
+      <dep package="app-mkfontscale"/>
+      <dep package="app-mkfontdir"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="font-screen-cyrillic">
+    <branch module="xorg/font/screen-cyrillic"
+            checkoutdir="xorg/font/screen-cyrillic"/>
+    <dependencies>
+      <dep package="util-macros"/>
+      <dep package="font-util"/>
+      <dep package="app-bdftopcf"/>
+      <dep package="app-mkfontscale"/>
+      <dep package="app-mkfontdir"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="font-sony-misc">
+    <branch module="xorg/font/sony-misc"
+            checkoutdir="xorg/font/sony-misc"/>
+    <dependencies>
+      <dep package="util-macros"/>
+      <dep package="font-util"/>
+      <dep package="app-bdftopcf"/>
+      <dep package="app-mkfontscale"/>
+      <dep package="app-mkfontdir"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="font-sun-misc">
+    <branch module="xorg/font/sun-misc"
+            checkoutdir="xorg/font/sun-misc"/>
+    <dependencies>
+      <dep package="util-macros"/>
+      <dep package="font-util"/>
+      <dep package="app-bdftopcf"/>
+      <dep package="app-mkfontscale"/>
+      <dep package="app-mkfontdir"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="font-winitzki-cyrillic">
+    <branch module="xorg/font/winitzki-cyrillic"
+            checkoutdir="xorg/font/winitzki-cyrillic"/>
+    <dependencies>
+      <dep package="util-macros"/>
+      <dep package="font-util"/>
+      <dep package="app-bdftopcf"/>
+      <dep package="app-mkfontscale"/>
+      <dep package="app-mkfontdir"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="font-xfree86-type1">
+    <branch module="xorg/font/xfree86-type1"
+            checkoutdir="xorg/font/xfree86-type1"/>
+    <dependencies>
+      <dep package="util-macros"/>
+      <dep package="font-util"/>
+      <dep package="app-bdftopcf"/>
+      <dep package="app-mkfontscale"/>
+      <dep package="app-mkfontdir"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="font-alias">
+    <branch module="xorg/font/alias"
+            checkoutdir="xorg/font/alias"/>
+    <dependencies>
+      <dep package="util-macros"/>
+    </dependencies>
+  </autotools>
+
+
+  <!-- The X Keyboard Extension -->
+  <autotools id="xkeyboard-config">
+    <branch module="xkeyboard-config"
+            checkoutdir="xkeyboard-config"/>
+    <dependencies>
+      <dep package="app-xkbcomp"/>
+    </dependencies>
+    <suggests>
+      <dep package="x11proto"/>
+      <dep package="libX11"/>
+    </suggests>
+  </autotools>
+
+  <!--  XCB (X protocol C-language Binding)  Modules Defintion -->
+  <autotools id="xcb-pthread-stubs">
+    <branch module="xcb/pthread-stubs"
+            checkoutdir="xcb/pthread-stubs"/>
+  </autotools>
+
+  <autotools id="xcb-proto">
+    <branch module="xcb/proto"
+            checkoutdir="xcb/proto"/>
+  </autotools>
+
+  <autotools id="libxcb">
+    <branch module="xcb/libxcb"
+            checkoutdir="xcb/libxcb"/>
+    <dependencies>
+      <dep package="xcb-proto"/>
+      <dep package="xcb-pthread-stubs"/>
       <dep package="libXau"/>
-      <dep package="libxkbfile"/>
-      <dep package="libXdmcp"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="xcb-util">
+    <branch module="xcb/util"
+            checkoutdir="xcb/xcb-util"/>
+    <dependencies>
+      <dep package="x11proto"/>
+      <dep package="libxcb"/>
+    </dependencies>
+  </autotools>
+
+   <autotools id="xcb-util-image">
+    <branch module="xcb/util-image" checkoutdir="xcb/xcb-util-image"/>
+    <dependencies>
+      <dep package="x11proto"/>
+      <dep package="libxcb"/>
+      <dep package="xcb-util"/>
+    </dependencies>
+   </autotools>
+
+   <autotools id="xcb-util-keysyms">
+    <branch module="xcb/util-keysyms" checkoutdir="xcb/xcb-util-keysyms"/>
+    <dependencies>
+      <dep package="x11proto"/>
+      <dep package="libxcb"/>
+    </dependencies>
+   </autotools>
+
+   <autotools id="xcb-util-renderutil">
+    <branch module="xcb/util-renderutil" checkoutdir="xcb/xcb-util-renderutil"/>
+    <dependencies>
+      <dep package="libxcb"/>
+    </dependencies>
+   </autotools>
+
+   <autotools id="xcb-util-wm">
+    <branch module="xcb/util-wm" checkoutdir="xcb/xcb-util-wm"/>
+    <dependencies>
+      <dep package="libxcb"/>
+    </dependencies>
+   </autotools>
+
+  <!--  The Mesa 3D Graphics Library - Modules Definition -->
+  <autotools id="mesa-mesa">
+    <branch module="mesa/mesa"
+            checkoutdir="mesa/mesa"/>
+    <dependencies>
+      <dep package="dri2proto"/>
+      <dep package="glproto"/>
+      <dep package="xextproto"/>
+      <dep package="xf86driproto"/>
+      <dep package="libXdamage"/>
+      <dep package="libX11"/>
+      <dep package="libXext"/>
+      <dep package="libXfixes"/>
+      <dep package="libxcb"/>
+      <dep package="mesa-drm"/>
+    </dependencies>
+    <suggests>
+      <dep package="libXvMC"/>
       <dep package="libXxf86vm"/>
-      <dep package="libXinerama"/>
-      <dep package="libXv"/>
-      <dep package="libdrm"/>
-      <dep package="libdmx"/>
-      <dep package="libXtst"/>
-      <dep package="libXRes"/>
-      <dep package="pixman"/>
+    </suggests>
+  </autotools>
+
+  <!-- Mesa DRM accessing the Direct Rendering Manager - Module Definition -->
+  <!-- Need nouveau API to build xf86-video-nouveau -->
+  <autotools id="mesa-drm" autogenargs="--enable-nouveau-experimental-api">
+    <branch module="mesa/drm"
+            checkoutdir="mesa/drm"/>
+    <dependencies>
       <dep package="libpciaccess"/>
-      <dep package="libxshmfence"/>
     </dependencies>
   </autotools>
 
-  <metamodule id="xorg">
+  <!-- X Build Utilities (util-macros) -->
+  <autotools id="util-macros">
+    <branch module="xorg/util/macros"
+            checkoutdir="xorg/util/macros"/>
+  </autotools>
+
+  <!-- X Build Utilities (util-makedepend) -->
+  <autotools id="util-makedepend">
+    <branch module="xorg/util/makedepend"
+            checkoutdir="xorg/util/makedepend"/>
+    <dependencies>
+      <dep package="util-macros"/>
+      <dep package="x11proto"/>
+    </dependencies>
+  </autotools>
+
+  <!-- Pixman (Pixel Manipulation Library) - Module Definition -->
+  <autotools id="libpixman">
+    <branch module="pixman"
+            checkoutdir="pixman"/>
+    <dependencies/>
+  </autotools>
+
+  <!--  Fontconfig (Font customization and configuration library)  -->
+  <autotools id="fontconfig" autogenargs="--disable-docs">
+    <branch module="fontconfig"
+            checkoutdir="fontconfig"/>
+  </autotools>
+
+  <!-- 	Wrapper library for evdev devices -->
+  <autotools id="libevdev">
+    <branch module="libevdev"
+            checkoutdir="libevdev"/>
+    <dependencies/>
+  </autotools>
+
+  <!-- X Test Suite, tests for core protocol conformance -->
+  <autotools id="xts">
+    <branch module="xorg/test/xts"
+            checkoutdir="xorg/test/xts"/>
+    <dependencies>
+      <dep package="util-macros"/>
+      <dep package="libX11"/>
+      <dep package="libXext"/>
+      <dep package="libXau"/>
+      <dep package="libxtrans"/>
+      <dep package="libXmu"/>
+      <dep package="libXi"/>
+      <dep package="libXtst"/>
+      <dep package="libXt"/>
+      <dep package="libXaw"/>
+      <dep package="app-bdftopcf"/>
+      <dep package="app-mkfontdir"/>
+      <dep package="app-xdpyinfo"/>
+      <dep package="app-xset"/>
+    </dependencies>
+  </autotools>
+
+  <!--
+		Documents containing cross-references - Meta Module
+
+	These should be rebuilt one more time after an initial successful build
+	with the -f -c options. This will allow the cross-reference database to
+	be fully populated. This is needed because of the circular references
+	among documents that build order cannot correct.
+
+		Run 'jhbuild build -f -c olink-docs'
+
+	Consult the xorg-sgml-doctools README for deeper explanations
+  -->
+  <metamodule id="olink-docs">
     <dependencies>
-      <dep package="xcb"/>
-      <dep package="xorg-protos"/>
-      <dep package="xorg-libs"/>
-      <dep package="xorg-apps"/>
-      <dep package="xorg-fonts"/>
-      <dep package="xorg-drivers"/>
+      <dep package="bigreqsproto"/>
+      <dep package="fontsproto"/>
+      <dep package="kbproto"/>
+      <dep package="recordproto"/>
+      <dep package="scrnsaverproto"/>
+      <dep package="xcmiscproto"/>
+      <dep package="xextproto"/>
+      <dep package="x11proto"/>
+      <dep package="libICE"/>
+      <dep package="libSM"/>
+      <dep package="libX11"/>
+      <dep package="libXaw"/>
+      <dep package="libXdmcp"/>
+      <dep package="libXext"/>
+      <dep package="libXi"/>
+      <dep package="libXmu"/>
+      <dep package="libXt"/>
+      <dep package="libXtst"/>
+      <dep package="libxtrans"/>
       <dep package="xorg-docs"/>
-      <dep package="xserver"/>
-      <dep package="xkeyboard-config"/>
     </dependencies>
   </metamodule>