[PATCH modular 6/6] jhbuild: add missing modules and meta modules

[Gaetan Nadon]

Move meta modules at the top of file so it is easy for builders
to edit the list to fit their needs.

The modules definitions are now below meta modules and in the same order.
All dependencies have been updated.

Some renaming and relocating needed as some modules did not follow
the git URL. There should be only one directory structure, might
as well be the one from the git URL.

libdrm is now mesa-drm.
libGL is now mesa-mesa. It provides much more than a single library.
libxcb is now xcb-libxcb to be consistent with others using this prefix
pthread-stubs is now xcb-pthread-stubs.
macros is now util-macros.
Same for app-, data-, lib-, proto-, driver- prefixes.
Provides a more readable build log.

Now includes libevdev, glamor and the new dri3 extension.

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.

Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
---
 xorg.modules | 3765 ++++++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 2487 insertions(+), 1278 deletions(-)

diff --git a/xorg.modules b/xorg.modules
index 4ec6a88..fe346ff 100644
--- a/xorg.modules
+++ b/xorg.modules
@@ -1,82 +1,107 @@
 <?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="The X C Binding (XCB) library"/>
+      <dep package="The X11 Libraries"/>
+      <dep package="util-makedepend"/>
+      <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="xserver"/>
+      <dep package="libevdev"/>				     <!-- Linux Only -->
+      <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="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"/>
-    <dependencies>
-      <dep package="libxcb"/>
+  <!-- X11 Protocol & Extensions - Meta Module -->
+  <metamodule id="The X11 Protocol and Extensions">
+    <dependencies>
+      <dep package="proto-applewmproto"/>
+      <dep package="proto-bigreqsproto"/>
+      <dep package="proto-compositeproto"/>
+      <dep package="proto-damageproto"/>
+      <dep package="proto-dmxproto"/>
+      <dep package="proto-dri2proto"/>
+      <dep package="proto-dri3proto"/>
+      <dep package="proto-fixesproto"/>
+      <dep package="proto-fontsproto"/>
+      <dep package="proto-glproto"/>
+      <dep package="proto-inputproto"/>
+      <dep package="proto-kbproto"/>
+      <dep package="proto-presentproto"/>
+      <dep package="proto-randrproto"/>
+      <dep package="proto-recordproto"/>
+      <dep package="proto-renderproto"/>
+      <dep package="proto-resourceproto"/>
+      <dep package="proto-scrnsaverproto"/>
+      <dep package="proto-videoproto"/>
+      <dep package="proto-windowswmproto"/>
+      <dep package="proto-x11proto"/>
+      <dep package="proto-xcmiscproto"/>
+      <dep package="proto-xextproto"/>
+      <dep package="proto-xf86bigfontproto"/>
+      <dep package="proto-xf86dgaproto"/>
+      <dep package="proto-xf86driproto"/>
+      <dep package="proto-xf86vidmodeproto"/>
+      <dep package="proto-xineramaproto"/>
     </dependencies>
-   </autotools>
+  </metamodule>
 
-   <metamodule id="xcb">
+  <!--  XCB (X protocol C-language Binding) - Meta Module -->
+   <metamodule id="The X C Binding (XCB) library">
      <dependencies>
-       <dep package="libxcb"/>
+       <dep package="xcb-libxcb"/>
        <dep package="xcb-proto"/>
-       <dep package="pthread-stubs"/>
-       <dep package="libXau"/>
+       <dep package="xcb-pthread-stubs"/>
        <dep package="xcb-util"/>
        <dep package="xcb-util-image"/>
        <dep package="xcb-util-keysyms"/>
@@ -85,2205 +110,3389 @@
      </dependencies>
    </metamodule>
 
-  <autotools id="pixman">
-    <branch module="pixman"
-            checkoutdir="xorg/lib/pixman"/>
-    <dependencies/>
-  </autotools>
+  <!-- X11 Libraries - Meta Module -->
+  <metamodule id="The X11 Libraries">
+    <dependencies>
+      <dep package="lib-libAppleWM"/>				  <!-- Darwin-->
+      <dep package="lib-libFS"/>
+      <dep package="lib-libICE"/>
+      <dep package="lib-libSM"/>
+      <dep package="lib-libX11"/>
+      <dep package="lib-libXScrnSaver"/>
+      <dep package="lib-libXau"/>
+      <dep package="lib-libXaw"/>
+      <dep package="lib-libXaw3d"/>
+      <dep package="lib-libXcomposite"/>
+      <dep package="lib-libXcursor"/>
+      <dep package="lib-libXdamage"/>
+      <dep package="lib-libXdmcp"/>
+      <dep package="lib-libXext"/>
+      <dep package="lib-libXfixes"/>
+      <dep package="lib-libXfont"/>
+      <dep package="lib-libXft"/>
+      <dep package="lib-libXi"/>
+      <dep package="lib-libXinerama"/>
+      <dep package="lib-libXmu"/>
+      <dep package="lib-libXpm"/>
+      <dep package="lib-libXrandr"/>
+      <dep package="lib-libXrender"/>
+      <dep package="lib-libXRes"/>
+      <dep package="lib-libXt"/>
+      <dep package="lib-libXtst"/>
+      <dep package="lib-libXv"/>
+      <dep package="lib-libXvMC"/>
+      <dep package="lib-libXxf86dga"/>
+      <dep package="lib-libXxf86vm"/>
+      <dep package="lib-libdmx"/>
+      <dep package="lib-libfontenc"/>
+      <dep package="lib-libpciaccess"/>
+      <dep package="lib-libxkbfile"/>
+      <dep package="lib-libxshmfence"/>
+      <dep package="lib-libxtrans"/>
+      <dep package="lib-libWindowsWM"/>				 <!-- CYGWIN -->
+    </dependencies>
+  </metamodule>
 
-  <autotools id="libpciaccess">
-    <branch module="xorg/lib/libpciaccess"
-            checkoutdir="xorg/lib/libpciaccess"/>
-    <dependencies/>
-  </autotools>
+  <!--  The Mesa 3D Graphics Library - Meta Module -->
+  <metamodule id="The Mesa 3D Graphics Library">
+    <dependencies>
+      <dep package="mesa-drm"/>
+      <dep package="mesa-mesa"/>
+      <dep package="mesa-glu"/>
+      <dep package="mesa-glut"/>
+    </dependencies>
+  </metamodule>
 
-  <!-- mesa -->
+  <!-- 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>
+  </metamodule>
 
-  <!-- Need nouveau API to build xf86-video-nouveau -->
-  <autotools id="libdrm" autogenargs="--enable-nouveau-experimental-api">
-    <branch module="mesa/drm"
-            checkoutdir="mesa/drm"/>
+  <!-- X Input and Video Drivers - Meta Module -->
+  <metamodule id="The X Input Drivers">
     <dependencies>
-      <dep package="libpciaccess"/>
+      <dep package="driver-xf86-input-acecad"/>
+      <dep package="driver-xf86-input-aiptek"/>
+      <dep package="driver-xf86-input-evdev"/>			  <!-- Linux -->
+      <dep package="driver-xf86-input-joystick"/>	  <!-- Linux and BSDs-->
+      <dep package="driver-xf86-input-keyboard"/>
+      <dep package="driver-xf86-input-mouse"/>
+      <dep package="driver-xf86-input-synaptics"/>
+      <dep package="driver-xf86-input-vmmouse"/>
+      <dep package="driver-xf86-input-void"/>
     </dependencies>
-  </autotools>
+  </metamodule>
 
-  <!-- the Mesa module, which provides libGL and DRI drivers -->
-  <autotools id="libGL">
-    <branch module="mesa/mesa"
-            checkoutdir="mesa/mesa"/>
-    <dependencies>
-      <dep package="xf86driproto"/>
-      <dep package="dri2proto"/>
-      <dep package="glproto"/>
-      <dep package="libXxf86vm"/>
-      <dep package="libXdamage"/>
-      <dep package="libdrm"/>
-      <dep package="libX11"/>
-      <dep package="libXext"/>
-      <dep package="libXi"/>
-      <dep package="libXmu"/>
+  <!-- X Input and Video Drivers - Meta Module -->
+  <metamodule id="The X Video Drivers">
+    <dependencies>
+      <dep package="driver-glamor"/>
+      <dep package="driver-xf86-video-apm"/>
+      <dep package="driver-xf86-video-ark"/>
+      <dep package="driver-xf86-video-ast"/>
+      <dep package="driver-xf86-video-ati"/>
+      <dep package="driver-xf86-video-chips"/>
+      <dep package="driver-xf86-video-cirrus"/>
+      <dep package="driver-xf86-video-dummy"/>
+      <dep package="driver-xf86-video-fbdev"/>
+      <dep package="driver-xf86-video-geode"/>		     <!-- Linux i386 -->
+      <dep package="driver-xf86-video-glint"/>
+      <dep package="driver-xf86-video-i128"/>
+      <dep package="driver-xf86-video-i740"/>
+      <dep package="driver-xf86-video-intel"/>
+      <dep package="driver-xf86-video-mach64"/>
+      <dep package="driver-xf86-video-mga"/>
+      <dep package="driver-xf86-video-modesetting"/>
+      <dep package="driver-xf86-video-neomagic"/>
+      <dep package="driver-xf86-video-nested"/>
+      <dep package="driver-xf86-video-nouveau"/>
+      <dep package="driver-xf86-video-nv"/>
+      <dep package="driver-xf86-video-r128"/>
+      <dep package="driver-xf86-video-rendition"/>
+      <dep package="driver-xf86-video-s3"/>
+      <dep package="driver-xf86-video-s3virge"/>
+      <dep package="driver-xf86-video-savage"/>
+      <dep package="driver-xf86-video-siliconmotion"/>
+      <dep package="driver-xf86-video-sis"/>
+      <dep package="driver-xf86-video-sisusb"/>
+      <dep package="driver-xf86-video-suncg14"/>
+      <dep package="driver-xf86-video-suncg3"/>
+      <dep package="driver-xf86-video-suncg6"/>
+      <dep package="driver-xf86-video-sunffb"/>
+      <dep package="driver-xf86-video-sunleo"/>
+      <dep package="driver-xf86-video-suntcx"/>
+      <dep package="driver-xf86-video-tdfx"/>
+      <dep package="driver-xf86-video-tga"/>
+      <dep package="driver-xf86-video-trident"/>
+      <dep package="driver-xf86-video-tseng"/>
+      <dep package="driver-xf86-video-vesa"/>
+      <dep package="driver-xf86-video-v4l"/>			  <!-- Linux -->
+      <dep package="driver-xf86-video-vmware"/>
+      <dep package="driver-xf86-video-voodoo"/>
+      <dep package="driver-xf86-video-wsfb"/>		 <!-- NetBSD OpenBSD -->
+      <dep package="driver-xf86-video-xgixp"/>			  <!-- Linux -->
     </dependencies>
-  </autotools>
+  </metamodule>
+
+<!--  The X Font Library - Meta Module
+
+     All fonts require mkfontscale and mkfontdir to be available
+     The following fonts require bdftopcf to be available:
 
-  <autotools id="mesa-demos">
-    <branch module="mesa/demos"
-            checkoutdir="mesa/demos"/>
+	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="libGL"/>
-      <dep package="mesa-glut"/>
-      <dep package="mesa-glu"/>
+      <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>
 
-  <autotools id="mesa-glut" supports-non-srcdir-builds="no" check-target="false"
-             skip-autogen="never">
-    <branch module="mesa/glut"
-            checkoutdir="mesa/glut"/>
+  <!--
+    =========================================================================
+    | 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="proto-applewmproto">
+    <branch module="xorg/proto/applewmproto"
+            checkoutdir="xorg/proto/applewmproto"/>
     <dependencies>
-      <dep package="libGL"/>
-      <dep package="makedepend"/>
+      <dep package="util-macros"/>
     </dependencies>
   </autotools>
 
-  <autotools id="mesa-glu">
-    <branch module="mesa/glu" checkoutdir="mesa/glu"/>
+  <autotools id="proto-bigreqsproto">
+    <branch module="xorg/proto/bigreqsproto"
+            checkoutdir="xorg/proto/bigreqsproto"/>
     <dependencies>
-      <dep package="libGL"/>
+      <dep package="util-macros"/>
     </dependencies>
+    <suggests>
+      <dep package="xorg-sgml-doctools"/>
+    </suggests>
   </autotools>
 
-  <metamodule id="mesa">
+  <autotools id="proto-compositeproto">
+    <branch module="xorg/proto/compositeproto"
+            checkoutdir="xorg/proto/compositeproto"/>
     <dependencies>
-      <dep package="libdrm"/>
-      <dep package="libGL"/>
-      <dep package="mesa-demos"/>
-      <dep package="mesa-glut"/>
-      <dep package="mesa-glu"/>
+      <dep package="util-macros"/>
+      <dep package="proto-fixesproto"/>
     </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"/>
+  <autotools id="proto-damageproto">
+    <branch module="xorg/proto/damageproto"
+            checkoutdir="xorg/proto/damageproto"/>
     <dependencies>
-      <dep package="macros"/>
-      <dep package="x11proto"/>
+      <dep package="util-macros"/>
+      <dep package="proto-fixesproto"/>
     </dependencies>
   </autotools>
 
-  <!-- docs -->
-  <autotools id="xorg-sgml-doctools">
-    <branch module="xorg/doc/xorg-sgml-doctools"
-            checkoutdir="xorg/doc/xorg-sgml-doctools"/>
+  <autotools id="proto-dri2proto">
+    <branch module="xorg/proto/dri2proto"
+            checkoutdir="xorg/proto/dri2proto"/>
     <dependencies>
-      <dep package="macros"/>
+      <dep package="util-macros"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xorg-docs">
-    <branch module="xorg/doc/xorg-docs"
-            checkoutdir="xorg/doc/xorg-docs"/>
+  <autotools id="proto-dri3proto">
+    <branch module="xorg/proto/dri3proto"
+            checkoutdir="xorg/proto/dri3proto"/>
     <dependencies>
-      <dep package="xorg-sgml-doctools"/>
-      <dep package="macros"/>
+      <dep package="util-macros"/>
     </dependencies>
   </autotools>
 
-  <!-- proto -->
-  <autotools id="applewmproto">
-    <branch module="xorg/proto/applewmproto"
-            checkoutdir="xorg/proto/applewmproto"/>
-  </autotools>
-  <autotools id="bigreqsproto">
-    <branch module="xorg/proto/bigreqsproto"
-            checkoutdir="xorg/proto/bigreqsproto"/>
-  </autotools>
-  <autotools id="compositeproto">
-    <branch module="xorg/proto/compositeproto"
-            checkoutdir="xorg/proto/compositeproto"/>
-  </autotools>
-  <autotools id="damageproto">
-    <branch module="xorg/proto/damageproto"
-            checkoutdir="xorg/proto/damageproto"/>
-  </autotools>
-  <autotools id="dmxproto">
+  <autotools id="proto-dmxproto">
     <branch module="xorg/proto/dmxproto"
             checkoutdir="xorg/proto/dmxproto"/>
+    <dependencies>
+      <dep package="util-macros"/>
+    </dependencies>
   </autotools>
-  <autotools id="fixesproto">
+
+  <autotools id="proto-fixesproto">
     <branch module="xorg/proto/fixesproto"
             checkoutdir="xorg/proto/fixesproto"/>
+    <dependencies>
+      <dep package="util-macros"/>
+      <dep package="proto-xextproto"/>
+    </dependencies>
   </autotools>
-  <autotools id="fontsproto">
+
+  <autotools id="proto-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">
+
+  <autotools id="proto-glproto">
     <branch module="xorg/proto/glproto"
             checkoutdir="xorg/proto/glproto"/>
+    <dependencies>
+      <dep package="util-macros"/>
+    </dependencies>
   </autotools>
-  <autotools id="inputproto">
+
+  <autotools id="proto-inputproto">
     <branch module="xorg/proto/inputproto"
             checkoutdir="xorg/proto/inputproto"/>
+    <dependencies>
+      <dep package="util-macros"/>
+    </dependencies>
   </autotools>
-  <autotools id="kbproto">
+
+  <autotools id="proto-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="proto-presentproto">
+    <branch module="xorg/proto/presentproto"
+            checkoutdir="xorg/proto/presentproto"/>
+    <dependencies>
+      <dep package="util-macros"/>
+    </dependencies>
   </autotools>
-  <autotools id="randrproto">
+
+  <autotools id="proto-randrproto">
     <branch module="xorg/proto/randrproto"
             checkoutdir="xorg/proto/randrproto"/>
+    <dependencies>
+      <dep package="util-macros"/>
+      <dep package="proto-renderproto"/>
+    </dependencies>
   </autotools>
-  <autotools id="recordproto">
+
+  <autotools id="proto-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">
+
+  <autotools id="proto-renderproto">
     <branch module="xorg/proto/renderproto"
             checkoutdir="xorg/proto/renderproto"/>
+    <dependencies>
+      <dep package="util-macros"/>
+    </dependencies>
   </autotools>
-  <autotools id="resourceproto">
+
+  <autotools id="proto-resourceproto">
     <branch module="xorg/proto/resourceproto"
             checkoutdir="xorg/proto/resourceproto"/>
+    <dependencies>
+      <dep package="util-macros"/>
+    </dependencies>
   </autotools>
-  <autotools id="scrnsaverproto">
+
+  <autotools id="proto-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">
+
+  <autotools id="proto-videoproto">
     <branch module="xorg/proto/videoproto"
             checkoutdir="xorg/proto/videoproto"/>
+    <dependencies>
+      <dep package="util-macros"/>
+    </dependencies>
   </autotools>
-  <autotools id="windowswmproto">
+
+  <autotools id="proto-windowswmproto">
     <branch module="xorg/proto/windowswmproto"
             checkoutdir="xorg/proto/windowswmproto"/>
     <dependencies>
-      <dep package="macros"/>
+      <dep package="util-macros"/>
     </dependencies>
   </autotools>
-  <autotools id="xcmiscproto">
+
+  <autotools id="proto-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">
+
+  <autotools id="proto-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">
+
+  <autotools id="proto-xf86bigfontproto">
     <branch module="xorg/proto/xf86bigfontproto"
             checkoutdir="xorg/proto/xf86bigfontproto"/>
+    <dependencies>
+      <dep package="util-macros"/>
+    </dependencies>
   </autotools>
-  <autotools id="xf86dgaproto">
+
+  <autotools id="proto-xf86dgaproto">
     <branch module="xorg/proto/xf86dgaproto"
             checkoutdir="xorg/proto/xf86dgaproto"/>
+    <dependencies>
+      <dep package="util-macros"/>
+    </dependencies>
   </autotools>
-  <autotools id="xf86driproto">
+
+  <autotools id="proto-xf86driproto">
     <branch module="xorg/proto/xf86driproto"
             checkoutdir="xorg/proto/xf86driproto"/>
+    <dependencies>
+      <dep package="util-macros"/>
+    </dependencies>
   </autotools>
-  <autotools id="xf86vidmodeproto">
+
+  <autotools id="proto-xf86vidmodeproto">
     <branch module="xorg/proto/xf86vidmodeproto"
             checkoutdir="xorg/proto/xf86vidmodeproto"/>
+    <dependencies>
+      <dep package="util-macros"/>
+    </dependencies>
   </autotools>
-  <autotools id="xineramaproto">
+
+  <autotools id="proto-xineramaproto">
     <branch module="xorg/proto/xineramaproto"
             checkoutdir="xorg/proto/xineramaproto"/>
+    <dependencies>
+      <dep package="util-macros"/>
+    </dependencies>
   </autotools>
-  <autotools id="x11proto">
+
+  <autotools id="proto-x11proto">
     <branch module="xorg/proto/x11proto"
             checkoutdir="xorg/proto/x11proto"/>
-  </autotools>
-  <autotools id="dri2proto">
-    <branch module="xorg/proto/dri2proto"
-            checkoutdir="xorg/proto/dri2proto"/>
-  </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="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"/>
+    <dependencies>
+      <dep package="util-macros"/>
+    <suggests>
+      <dep package="xorg-sgml-doctools"/>
+    </suggests>
     </dependencies>
-  </metamodule>
-
-  <!-- libs -->
+  </autotools>
 
-  <autotools id="libAppleWM">
+  <!-- X11 Libraries - Modules definition -->
+  <autotools id="lib-libAppleWM">
     <branch module="xorg/lib/libAppleWM"
             checkoutdir="xorg/lib/libAppleWM"/>
     <dependencies>
-      <dep package="macros"/>
-      <dep package="libX11"/>
-      <dep package="libXext"/>
-      <dep package="xextproto"/>
-      <dep package="applewmproto"/>
+      <dep package="util-macros"/>
+      <dep package="proto-applewmproto"/>
+      <dep package="proto-xextproto"/>
+      <dep package="lib-libX11"/>
+      <dep package="lib-libXext"/>
     </dependencies>
   </autotools>
 
-  <autotools id="libFS">
+  <autotools id="lib-libFS">
     <branch module="xorg/lib/libFS"
             checkoutdir="xorg/lib/libFS"/>
     <dependencies>
-      <dep package="macros"/>
-      <dep package="x11proto"/>
-      <dep package="fontsproto"/>
-      <dep package="libxtrans"/>
-      <dep package="libX11"/>
+      <dep package="util-macros"/>
+      <dep package="proto-x11proto"/>
+      <dep package="proto-fontsproto"/>
+      <dep package="lib-libxtrans"/>
     </dependencies>
   </autotools>
 
-  <autotools id="libICE">
+  <autotools id="lib-libICE">
     <branch module="xorg/lib/libICE"
             checkoutdir="xorg/lib/libICE"/>
     <dependencies>
-      <dep package="macros"/>
-      <dep package="x11proto"/>
-      <dep package="libxtrans"/>
-      <dep package="libX11"/>
+      <dep package="util-macros"/>
+      <dep package="proto-x11proto"/>
+      <dep package="lib-libxtrans"/>
+    </dependencies>
+    <suggests>
+      <dep package="xorg-sgml-doctools"/>
+    </suggests>
+  </autotools>
+
+  <autotools id="lib-libpciaccess">
+    <branch module="xorg/lib/libpciaccess"
+            checkoutdir="xorg/lib/libpciaccess"/>
+    <dependencies>
+      <dep package="util-macros"/>
     </dependencies>
   </autotools>
 
-  <autotools id="libSM">
+  <autotools id="lib-libSM">
     <branch module="xorg/lib/libSM"
             checkoutdir="xorg/lib/libSM"/>
     <dependencies>
-      <dep package="macros"/>
-      <dep package="x11proto"/>
-      <dep package="libICE"/>
-      <dep package="libxtrans"/>
+      <dep package="util-macros"/>
+      <dep package="proto-x11proto"/>
+      <dep package="lib-libICE"/>
+      <dep package="lib-libxtrans"/>
     </dependencies>
+    <suggests>
+      <dep package="xorg-sgml-doctools"/>
+    </suggests>
   </autotools>
 
-  <autotools id="libX11">
+  <autotools id="lib-libX11">
     <branch module="xorg/lib/libX11"
             checkoutdir="xorg/lib/libX11"/>
     <dependencies>
-      <dep package="libxcb"/>
-      <dep package="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="xf86bigfontproto"/>
-    </dependencies>
+      <dep package="util-macros"/>
+      <dep package="proto-x11proto"/>
+      <dep package="proto-bigreqsproto"/>
+      <dep package="proto-kbproto"/>
+      <dep package="proto-inputproto"/>
+      <dep package="proto-xextproto"/>
+      <dep package="proto-xf86bigfontproto"/>
+      <dep package="xcb-libxcb"/>
+      <dep package="lib-libxtrans"/>
+    </dependencies>
+    <suggests>
+      <dep package="xorg-sgml-doctools"/>
+    </suggests>
   </autotools>
 
-  <autotools id="libXScrnSaver">
+  <autotools id="lib-libXScrnSaver">
     <branch module="xorg/lib/libXScrnSaver"
             checkoutdir="xorg/lib/libXScrnSaver"/>
     <dependencies>
-      <dep package="macros"/>
-      <dep package="libX11"/>
-      <dep package="libXext"/>
-      <dep package="xextproto"/>
-      <dep package="scrnsaverproto"/>
+      <dep package="util-macros"/>
+      <dep package="proto-scrnsaverproto"/>
+      <dep package="proto-xextproto"/>
+      <dep package="lib-libX11"/>
+      <dep package="lib-libXext"/>
     </dependencies>
   </autotools>
 
-  <autotools id="libXau">
+  <autotools id="lib-libXau">
     <branch module="xorg/lib/libXau"
             checkoutdir="xorg/lib/libXau"/>
     <dependencies>
-      <dep package="macros"/>
-      <dep package="x11proto"/>
+      <dep package="util-macros"/>
+      <dep package="proto-x11proto"/>
     </dependencies>
   </autotools>
 
-  <autotools id="libXaw">
+  <autotools id="lib-libXaw">
     <branch module="xorg/lib/libXaw"
             checkoutdir="xorg/lib/libXaw"/>
     <dependencies>
-      <dep package="macros"/>
-      <dep package="x11proto"/>
-      <dep package="libX11"/>
-      <dep package="libXt"/>
-      <dep package="libXmu"/>
-      <dep package="libXpm"/>
+      <dep package="util-macros"/>
+      <dep package="proto-x11proto"/>
+      <dep package="lib-libX11"/>
+      <dep package="lib-libXt"/>
+      <dep package="lib-libXmu"/>
+      <dep package="lib-libXpm"/>
     </dependencies>
+    <suggests>
+      <dep package="xorg-sgml-doctools"/>
+    </suggests>
   </autotools>
 
-  <autotools id="libXaw3d">
+  <autotools id="lib-libXaw3d">
     <branch module="xorg/lib/libXaw3d"
             checkoutdir="xorg/lib/libXaw3d"/>
     <dependencies>
-      <dep package="macros"/>
-      <dep package="x11proto"/>
-      <dep package="libX11"/>
-      <dep package="libXt"/>
-      <dep package="libXmu"/>
-      <dep package="libXext"/>
+      <dep package="util-macros"/>
+      <dep package="proto-x11proto"/>
+      <dep package="lib-libX11"/>
+      <dep package="lib-libXt"/>
+      <dep package="lib-libXmu"/>
+      <dep package="lib-libXext"/>
     </dependencies>
+    <suggests>
+      <dep package="lib-libXpm"/>
+    </suggests>
   </autotools>
 
-  <autotools id="libXcomposite">
+  <autotools id="lib-libXcomposite">
     <branch module="xorg/lib/libXcomposite"
             checkoutdir="xorg/lib/libXcomposite"/>
     <dependencies>
-      <dep package="macros"/>
-      <dep package="compositeproto"/>
-      <dep package="libX11"/>
-      <dep package="libXfixes"/>
-      <dep package="libXext"/>
+      <dep package="util-macros"/>
+      <dep package="proto-x11proto"/>
+      <dep package="proto-compositeproto"/>
+      <dep package="lib-libX11"/>
+      <dep package="lib-libXfixes"/>
+      <dep package="lib-libXext"/>
     </dependencies>
   </autotools>
 
-  <autotools id="libXcursor">
+  <autotools id="lib-libXcursor">
     <branch module="xorg/lib/libXcursor"
             checkoutdir="xorg/lib/libXcursor"/>
     <dependencies>
-      <dep package="macros"/>
-      <dep package="libXrender"/>
-      <dep package="libX11"/>
-      <dep package="libXfixes"/>
+      <dep package="util-macros"/>
+      <dep package="proto-x11proto"/>
+      <dep package="lib-libXrender"/>
+      <dep package="lib-libX11"/>
+      <dep package="lib-libXfixes"/>
     </dependencies>
   </autotools>
 
-  <autotools id="libXdamage">
+  <autotools id="lib-libXdamage">
     <branch module="xorg/lib/libXdamage"
             checkoutdir="xorg/lib/libXdamage"/>
     <dependencies>
-      <dep package="macros"/>
-      <dep package="libX11"/>
-      <dep package="damageproto"/>
-      <dep package="libXfixes"/>
+      <dep package="util-macros"/>
+      <dep package="proto-damageproto"/>
+      <dep package="proto-fixesproto"/>
+      <dep package="proto-xextproto"/>
+      <dep package="lib-libX11"/>
+      <dep package="lib-libXfixes"/>
     </dependencies>
   </autotools>
 
-  <autotools id="libXdmcp">
+  <autotools id="lib-libXdmcp">
     <branch module="xorg/lib/libXdmcp"
             checkoutdir="xorg/lib/libXdmcp"/>
     <dependencies>
-      <dep package="macros"/>
-      <dep package="x11proto"/>
+      <dep package="util-macros"/>
+      <dep package="proto-x11proto"/>
     </dependencies>
+    <suggests>
+      <dep package="xorg-sgml-doctools"/>
+    </suggests>
   </autotools>
 
-  <autotools id="libXext">
+  <autotools id="lib-libXext">
     <branch module="xorg/lib/libXext"
             checkoutdir="xorg/lib/libXext"/>
     <dependencies>
-      <dep package="macros"/>
-      <dep package="x11proto"/>
-      <dep package="libX11"/>
-      <dep package="xextproto"/>
+      <dep package="util-macros"/>
+      <dep package="proto-x11proto"/>
+      <dep package="proto-xextproto"/>
+      <dep package="lib-libX11"/>
     </dependencies>
+    <suggests>
+      <dep package="xorg-sgml-doctools"/>
+    </suggests>
   </autotools>
 
-  <autotools id="libXfixes">
+  <autotools id="lib-libXfixes">
     <branch module="xorg/lib/libXfixes"
             checkoutdir="xorg/lib/libXfixes"/>
     <dependencies>
-      <dep package="macros"/>
-      <dep package="libX11"/>
-      <dep package="fixesproto"/>
+      <dep package="util-macros"/>
+      <dep package="proto-x11proto"/>
+      <dep package="proto-fixesproto"/>
+      <dep package="proto-xextproto"/>
+      <dep package="lib-libX11"/>
     </dependencies>
   </autotools>
 
-  <autotools id="libXfont">
+  <autotools id="lib-libXfont">
     <branch module="xorg/lib/libXfont"
             checkoutdir="xorg/lib/libXfont"/>
     <dependencies>
-      <dep package="macros"/>
-      <dep package="x11proto"/>
-      <dep package="libxtrans"/>
-      <dep package="fontsproto"/>
-      <dep package="libfontenc"/>
-      <dep package="libX11"/>
+      <dep package="util-macros"/>
+      <dep package="proto-x11proto"/>
+      <dep package="proto-fontsproto"/>
+      <dep package="lib-libxtrans"/>
+      <dep package="lib-libfontenc"/>
+      <dep package="lib-libX11"/>
     </dependencies>
+    <suggests>
+      <dep package="xorg-sgml-doctools"/>
+    </suggests>
   </autotools>
 
-  <autotools id="libXft">
+  <autotools id="lib-libXft">
     <branch module="xorg/lib/libXft"
             checkoutdir="xorg/lib/libXft"/>
     <dependencies>
-      <dep package="macros"/>
-      <dep package="libXrender"/>
+      <dep package="util-macros"/>
+      <dep package="proto-x11proto"/>
+      <dep package="lib-libXrender"/>
       <dep package="fontconfig"/>
     </dependencies>
   </autotools>
 
-  <autotools id="libXi">
+  <autotools id="lib-libXi">
     <branch module="xorg/lib/libXi"
             checkoutdir="xorg/lib/libXi"/>
     <dependencies>
-      <dep package="macros"/>
-      <dep package="x11proto"/>
-      <dep package="libX11"/>
-      <dep package="xextproto"/>
-      <dep package="libXext"/>
-      <dep package="inputproto"/>
+      <dep package="util-macros"/>
+      <dep package="proto-x11proto"/>
+      <dep package="proto-inputproto"/>
+      <dep package="proto-xextproto"/>
+      <dep package="lib-libX11"/>
+      <dep package="lib-libXext"/>
+      <dep package="lib-libXfixes"/>
     </dependencies>
+    <suggests>
+      <dep package="xorg-sgml-doctools"/>
+    </suggests>
   </autotools>
 
-  <autotools id="libXinerama">
+  <autotools id="lib-libXinerama">
     <branch module="xorg/lib/libXinerama"
             checkoutdir="xorg/lib/libXinerama"/>
     <dependencies>
-      <dep package="macros"/>
-      <dep package="libX11"/>
-      <dep package="libXext"/>
-      <dep package="xextproto"/>
-      <dep package="xineramaproto"/>
+      <dep package="util-macros"/>
+      <dep package="proto-x11proto"/>
+      <dep package="proto-xextproto"/>
+      <dep package="proto-xineramaproto"/>
+      <dep package="lib-libX11"/>
+      <dep package="lib-libXext"/>
     </dependencies>
   </autotools>
 
-  <autotools id="libXmu">
+  <autotools id="lib-libXmu">
     <branch module="xorg/lib/libXmu"
             checkoutdir="xorg/lib/libXmu"/>
     <dependencies>
-      <dep package="macros"/>
-      <dep package="libX11"/>
-      <dep package="libXt"/>
-      <dep package="libXext"/>
+      <dep package="util-macros"/>
+      <dep package="proto-x11proto"/>
+      <dep package="proto-xextproto"/>
+      <dep package="lib-libX11"/>
+      <dep package="lib-libXt"/>
+      <dep package="lib-libXext"/>
     </dependencies>
+    <suggests>
+      <dep package="xorg-sgml-doctools"/>
+    </suggests>
   </autotools>
 
-  <autotools id="libXpm">
+  <autotools id="lib-libXpm">
     <branch module="xorg/lib/libXpm"
             checkoutdir="xorg/lib/libXpm"/>
     <dependencies>
-      <dep package="macros"/>
-      <dep package="libX11"/>
-      <dep package="x11proto"/>
-      <dep package="libXt"/>
-      <dep package="libXext"/>
+      <dep package="util-macros"/>
+      <dep package="proto-x11proto"/>
+      <dep package="proto-xextproto"/>
+      <dep package="lib-libX11"/>
+      <dep package="lib-libXt"/>
+      <dep package="lib-libXext"/>
     </dependencies>
   </autotools>
 
-  <autotools id="libXrandr">
+  <autotools id="lib-libXrandr">
     <branch module="xorg/lib/libXrandr"
             checkoutdir="xorg/lib/libXrandr"/>
     <dependencies>
-      <dep package="macros"/>
-      <dep package="libX11"/>
-      <dep package="randrproto"/>
-      <dep package="libXrender"/>
+      <dep package="util-macros"/>
+      <dep package="proto-randrproto"/>
+      <dep package="proto-renderproto"/>
+      <dep package="proto-xextproto"/>
+      <dep package="lib-libX11"/>
+      <dep package="lib-libXrender"/>
+      <dep package="lib-libXext"/>
     </dependencies>
   </autotools>
 
-  <autotools id="libXrender">
+  <autotools id="lib-libXrender">
     <branch module="xorg/lib/libXrender"
             checkoutdir="xorg/lib/libXrender"/>
     <dependencies>
-      <dep package="macros"/>
-      <dep package="renderproto"/>
-      <dep package="libX11"/>
+      <dep package="util-macros"/>
+      <dep package="proto-x11proto"/>
+      <dep package="proto-renderproto"/>
+      <dep package="lib-libX11"/>
     </dependencies>
   </autotools>
 
-  <autotools id="libXRes">
+  <autotools id="lib-libXRes">
     <branch module="xorg/lib/libXRes"
             checkoutdir="xorg/lib/libXRes"/>
     <dependencies>
-      <dep package="macros"/>
-      <dep package="libX11"/>
-      <dep package="libXext"/>
-      <dep package="resourceproto"/>
+      <dep package="util-macros"/>
+      <dep package="proto-resourceproto"/>
+      <dep package="proto-xextproto"/>
+      <dep package="lib-libX11"/>
+      <dep package="lib-libXext"/>
     </dependencies>
   </autotools>
 
-  <autotools id="libXt">
+  <autotools id="lib-libXt">
     <branch module="xorg/lib/libXt"
             checkoutdir="xorg/lib/libXt"/>
     <dependencies>
-      <dep package="macros"/>
-      <dep package="libSM"/>
-      <dep package="libX11"/>
-      <dep package="x11proto"/>
+      <dep package="util-macros"/>
+      <dep package="proto-x11proto"/>
+      <dep package="proto-kbproto"/>
+      <dep package="lib-libSM"/>
+      <dep package="lib-libICE"/>
+      <dep package="lib-libX11"/>
     </dependencies>
+    <suggests>
+      <dep package="xorg-sgml-doctools"/>
+    </suggests>
   </autotools>
 
-  <autotools id="libXtst">
+  <autotools id="lib-libXtst">
     <branch module="xorg/lib/libXtst"
             checkoutdir="xorg/lib/libXtst"/>
     <dependencies>
-      <dep package="macros"/>
-      <dep package="libX11"/>
-      <dep package="libXext"/>
-      <dep package="libXi"/>
-      <dep package="recordproto"/>
-      <dep package="xextproto"/>
+      <dep package="util-macros"/>
+      <dep package="proto-inputproto"/>
+      <dep package="proto-recordproto"/>
+      <dep package="proto-xextproto"/>
+      <dep package="lib-libX11"/>
+      <dep package="lib-libXext"/>
+      <dep package="lib-libXi"/>
     </dependencies>
+    <suggests>
+      <dep package="xorg-sgml-doctools"/>
+    </suggests>
   </autotools>
 
-  <autotools id="libXv">
+  <autotools id="lib-libXv">
     <branch module="xorg/lib/libXv"
             checkoutdir="xorg/lib/libXv"/>
     <dependencies>
-      <dep package="macros"/>
-      <dep package="libX11"/>
-      <dep package="libXext"/>
-      <dep package="xextproto"/>
-      <dep package="videoproto"/>
+      <dep package="util-macros"/>
+      <dep package="proto-xextproto"/>
+      <dep package="proto-videoproto"/>
+      <dep package="lib-libX11"/>
+      <dep package="lib-libXext"/>
     </dependencies>
   </autotools>
 
-  <autotools id="libXvMC">
+  <autotools id="lib-libXvMC">
     <branch module="xorg/lib/libXvMC"
             checkoutdir="xorg/lib/libXvMC"/>
     <dependencies>
-      <dep package="macros"/>
-      <dep package="libX11"/>
-      <dep package="libXext"/>
-      <dep package="libXv"/>
-      <dep package="xextproto"/>
-      <dep package="videoproto"/>
+      <dep package="util-macros"/>
+      <dep package="proto-xextproto"/>
+      <dep package="proto-videoproto"/>
+      <dep package="lib-libX11"/>
+      <dep package="lib-libXext"/>
+      <dep package="lib-libXv"/>
     </dependencies>
   </autotools>
 
-  <autotools id="libXxf86dga">
+  <autotools id="lib-libXxf86dga">
     <branch module="xorg/lib/libXxf86dga"
             checkoutdir="xorg/lib/libXxf86dga"/>
     <dependencies>
-      <dep package="macros"/>
-      <dep package="x11proto"/>
-      <dep package="libX11"/>
-      <dep package="libXext"/>
-      <dep package="xextproto"/>
-      <dep package="xf86dgaproto"/>
+      <dep package="util-macros"/>
+      <dep package="proto-x11proto"/>
+      <dep package="proto-xextproto"/>
+      <dep package="proto-xf86dgaproto"/>
+      <dep package="lib-libX11"/>
+      <dep package="lib-libXext"/>
     </dependencies>
   </autotools>
 
-  <autotools id="libXxf86vm">
+  <autotools id="lib-libXxf86vm">
     <branch module="xorg/lib/libXxf86vm"
             checkoutdir="xorg/lib/libXxf86vm"/>
     <dependencies>
-      <dep package="macros"/>
-      <dep package="x11proto"/>
-      <dep package="libX11"/>
-      <dep package="libXext"/>
-      <dep package="xextproto"/>
-      <dep package="xf86vidmodeproto"/>
+      <dep package="util-macros"/>
+      <dep package="proto-x11proto"/>
+      <dep package="proto-xextproto"/>
+      <dep package="proto-xf86vidmodeproto"/>
+      <dep package="lib-libX11"/>
+      <dep package="lib-libXext"/>
     </dependencies>
   </autotools>
 
-  <autotools id="libdmx">
+  <autotools id="lib-libdmx">
     <branch module="xorg/lib/libdmx"
             checkoutdir="xorg/lib/libdmx"/>
     <dependencies>
-      <dep package="macros"/>
-      <dep package="libX11"/>
-      <dep package="libXext"/>
-      <dep package="xextproto"/>
-      <dep package="dmxproto"/>
+      <dep package="util-macros"/>
+      <dep package="proto-dmxproto"/>
+      <dep package="proto-xextproto"/>
+      <dep package="lib-libX11"/>
+      <dep package="lib-libXext"/>
     </dependencies>
   </autotools>
 
-  <autotools id="libfontenc">
+  <autotools id="lib-libfontenc">
     <branch module="xorg/lib/libfontenc"
             checkoutdir="xorg/lib/libfontenc"/>
     <dependencies>
-      <dep package="macros"/>
-      <dep package="x11proto"/>
+      <dep package="util-macros"/>
+      <dep package="proto-x11proto"/>
       <dep package="font-util"/>
     </dependencies>
   </autotools>
 
-  <autotools id="libxkbfile">
+  <autotools id="lib-libxkbfile">
     <branch module="xorg/lib/libxkbfile"
             checkoutdir="xorg/lib/libxkbfile"/>
     <dependencies>
-      <dep package="macros"/>
-      <dep package="libX11"/>
-      <dep package="kbproto"/>
+      <dep package="util-macros"/>
+      <dep package="proto-kbproto"/>
+      <dep package="lib-libX11"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="lib-libxshmfence">
+    <branch module="xorg/lib/libxshmfence"
+            checkoutdir="xorg/lib/libxshmfence"/>
+    <dependencies>
+      <dep package="util-macros"/>
+      <dep package="proto-dri3proto"/>
+      <dep package="proto-presentproto"/>
     </dependencies>
   </autotools>
 
-  <autotools id="libxtrans">
+  <autotools id="lib-libxtrans">
     <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">
+  <autotools id="lib-libWindowsWM">
     <branch module="xorg/lib/libWindowsWM"
             checkoutdir="xorg/lib/libWindowsWM"/>
     <dependencies>
-      <dep package="macros"/>
-      <dep package="libX11"/>
-      <dep package="libXext"/>
-      <dep package="xextproto"/>
-      <dep package="windowswmproto"/>
-    </dependencies>
-  </autotools>
-
-  <metamodule id="xorg-libs">
-    <dependencies>
-      <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="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"/>
+      <dep package="util-macros"/>
+      <dep package="proto-windowswmproto"/>
+      <dep package="proto-xextproto"/>
+      <dep package="lib-libX11"/>
+      <dep package="lib-libXext"/>
     </dependencies>
-  </metamodule>
+  </autotools>
 
-  <!-- data -->
-  <autotools id="bitmaps">
-    <branch module="xorg/data/bitmaps"
-            checkoutdir="xorg/data/bitmaps"/>
+  <!-- X Applications - Modules definition -->
+  <autotools id="app-appres">
+    <branch module="xorg/app/appres"
+            checkoutdir="xorg/app/appres"/>
     <dependencies>
-      <dep package="macros"/>
+      <dep package="util-macros"/>
+      <dep package="proto-x11proto"/>
+      <dep package="lib-libX11"/>
+      <dep package="lib-libXt"/>
     </dependencies>
   </autotools>
 
-  <autotools id="cursors">
-    <branch module="xorg/data/cursors"
-            checkoutdir="xorg/data/cursors"/>
+  <autotools id="app-bdftopcf">
+    <branch module="xorg/app/bdftopcf"
+            checkoutdir="xorg/app/bdftopcf"/>
     <dependencies>
-      <dep package="xcursorgen"/>
+      <dep package="util-macros"/>
+      <dep package="lib-libXfont"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xkeyboard-config">
-    <branch module="xkeyboard-config"
-            checkoutdir="xkeyboard-config"/>
+  <autotools id="app-bitmap">
+    <branch module="xorg/app/bitmap"
+            checkoutdir="xorg/app/bitmap"/>
+    <dependencies>
+      <dep package="util-macros"/>
+      <dep package="proto-x11proto"/>
+      <dep package="lib-libX11"/>
+      <dep package="lib-libXaw"/>
+      <dep package="lib-libXmu"/>
+      <dep package="lib-libXt"/>
+      <dep package="data-bitmaps"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="app-editres">
+    <branch module="xorg/app/editres"
+            checkoutdir="xorg/app/editres"/>
     <dependencies>
-      <dep package="xkbcomp"/>
+      <dep package="util-macros"/>
+      <dep package="lib-libX11"/>
+      <dep package="lib-libXaw"/>
+      <dep package="lib-libXmu"/>
+      <dep package="lib-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="libICE"/>
+      <dep package="util-macros"/>
+      <dep package="proto-x11proto"/>
+      <dep package="lib-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="libfontenc"/>
+      <dep package="util-macros"/>
+      <dep package="lib-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="proto-x11proto"/>
+      <dep package="lib-libfontenc"/>
     </dependencies>
   </autotools>
 
-  <autotools id="rendercheck">
+  <autotools id="app-rendercheck">
     <branch module="xorg/app/rendercheck"
             checkoutdir="xorg/app/rendercheck"/>
     <dependencies>
-      <dep package="libXrender"/>
+      <dep package="util-macros"/>
+      <dep package="proto-x11proto"/>
+      <dep package="lib-libX11"/>
+      <dep package="lib-libXrender"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="app-rgb">
+    <branch module="xorg/app/rgb"
+            checkoutdir="xorg/app/rgb"/>
+    <dependencies>
+      <dep package="util-macros"/>
+      <dep package="proto-x11proto"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="app-rstart">
+    <branch module="xorg/app/rstart"
+            checkoutdir="xorg/app/rstart"/>
+    <dependencies>
+      <dep package="util-macros"/>
+      <dep package="proto-x11proto"/>
     </dependencies>
   </autotools>
 
-  <autotools id="scripts">
+  <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="x11proto"/>
+      <dep package="util-macros"/>
+      <dep package="proto-x11proto"/>
     </dependencies>
   </autotools>
 
-  <autotools id="setxkbmap">
+  <autotools id="app-setxkbmap">
     <branch module="xorg/app/setxkbmap"
             checkoutdir="xorg/app/setxkbmap"/>
     <dependencies>
-      <dep package="libX11"/>
+      <dep package="util-macros"/>
+      <dep package="lib-libX11"/>
+      <dep package="lib-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="libSM"/>
-      <dep package="libXt"/>
+      <dep package="util-macros"/>
+      <dep package="lib-libICE"/>
+      <dep package="lib-libSM"/>
+      <dep package="lib-libXmu"/>
+      <dep package="lib-libXt"/>
     </dependencies>
   </autotools>
 
-  <autotools id="twm">
+  <autotools id="app-twm">
     <branch module="xorg/app/twm"
             checkoutdir="xorg/app/twm"/>
     <dependencies>
-      <dep package="libX11"/>
-      <dep package="libXt"/>
+      <dep package="util-macros"/>
+      <dep package="proto-x11proto"/>
+      <dep package="lib-libICE"/>
+      <dep package="lib-libX11"/>
+      <dep package="lib-libXext"/>
+      <dep package="lib-libXmu"/>
+      <dep package="lib-libXt"/>
     </dependencies>
   </autotools>
 
-  <autotools id="x11perf">
+  <autotools id="app-x11perf">
     <branch module="xorg/app/x11perf"
             checkoutdir="xorg/app/x11perf"/>
     <dependencies>
-      <dep package="libX11"/>
-      <dep package="libXrender"/>
-      <dep package="libXft"/>
-      <dep package="libXext"/>
+      <dep package="util-macros"/>
+      <dep package="proto-x11proto"/>
+      <dep package="lib-libX11"/>
+      <dep package="lib-libXmu"/>
     </dependencies>
+    <suggests>
+      <dep package="lib-libXrender"/>
+      <dep package="lib-libXft"/>
+      <dep package="lib-libXext"/>
+    </suggests>
   </autotools>
 
-  <autotools id="xauth">
+  <autotools id="app-xauth">
     <branch module="xorg/app/xauth"
             checkoutdir="xorg/app/xauth"/>
     <dependencies>
-      <dep package="libXext"/>
-      <dep package="libXmu"/>
+      <dep package="util-macros"/>
+      <dep package="proto-x11proto"/>
+      <dep package="lib-libX11"/>
+      <dep package="lib-libXau"/>
+      <dep package="lib-libXext"/>
+      <dep package="lib-libXmu"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xbacklight">
+  <autotools id="app-xbacklight">
     <branch module="xorg/app/xbacklight"
             checkoutdir="xorg/app/xbacklight"/>
     <dependencies>
-      <dep package="libX11"/>
-      <dep package="libXrandr"/>
+      <dep package="util-macros"/>
+      <dep package="lib-libX11"/>
+      <dep package="lib-libXrandr"/>
+      <dep package="xcb-util"/>
+      <dep package="xcb-libxcb"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="app-xcalc">
+    <branch module="xorg/app/xcalc"
+            checkoutdir="xorg/app/xcalc"/>
+    <dependencies>
+      <dep package="util-macros"/>
+      <dep package="proto-x11proto"/>
+      <dep package="lib-libX11"/>
+      <dep package="lib-libXt"/>
+      <dep package="lib-libXaw"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="app-xclipboard">
+    <branch module="xorg/app/xclipboard"
+            checkoutdir="xorg/app/xclipboard"/>
+    <dependencies>
+      <dep package="util-macros"/>
+      <dep package="proto-x11proto"/>
+      <dep package="lib-libX11"/>
+      <dep package="lib-libXt"/>
+      <dep package="lib-libXaw"/>
+      <dep package="lib-libXmu"/>
+    </dependencies>
+    <suggests>
+      <dep package="lib-libxkbfile"/>
+    </suggests>
+  </autotools>
+
+  <autotools id="app-xclock">
+    <branch module="xorg/app/xclock"
+            checkoutdir="xorg/app/xclock"/>
+    <dependencies>
+      <dep package="util-macros"/>
+      <dep package="proto-x11proto"/>
+      <dep package="lib-libX11"/>
+      <dep package="lib-libXaw"/>
+      <dep package="lib-libXmu"/>
+      <dep package="lib-libXt"/>
     </dependencies>
+    <suggests>
+      <dep package="lib-libXrender"/>
+      <dep package="lib-libXft"/>
+      <dep package="lib-libxkbfile"/>
+    </suggests>
   </autotools>
 
-  <autotools id="xcmsdb">
+  <autotools id="app-xcmsdb">
     <branch module="xorg/app/xcmsdb"
             checkoutdir="xorg/app/xcmsdb"/>
     <dependencies>
-      <dep package="libX11"/>
+      <dep package="util-macros"/>
+      <dep package="lib-libX11"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="app-xconsole">
+    <branch module="xorg/app/xconsole"
+            checkoutdir="xorg/app/xconsole"/>
+    <dependencies>
+      <dep package="util-macros"/>
+      <dep package="proto-x11proto"/>
+      <dep package="lib-libX11"/>
+      <dep package="lib-libXaw"/>
+      <dep package="lib-libXmu"/>
+      <dep package="lib-libXt"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xcursorgen">
+  <autotools id="app-xcursorgen">
     <branch module="xorg/app/xcursorgen"
             checkoutdir="xorg/app/xcursorgen"/>
     <dependencies>
-      <dep package="libXcursor"/>
-      <dep package="libX11"/>
+      <dep package="util-macros"/>
+      <dep package="lib-libXcursor"/>
+      <dep package="lib-libX11"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xdpyinfo">
-    <branch module="xorg/app/xdpyinfo"
-            checkoutdir="xorg/app/xdpyinfo"/>
+  <autotools id="app-xditview">
+    <branch module="xorg/app/xditview"
+            checkoutdir="xorg/app/xditview"/>
     <dependencies>
-      <dep package="libX11"/>
-      <dep package="libXext"/>
-      <dep package="libXtst"/>
+      <dep package="util-macros"/>
+      <dep package="lib-libX11"/>
+      <dep package="lib-libXaw"/>
+      <dep package="lib-libXmu"/>
+      <dep package="lib-libXt"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xdriinfo">
+  <autotools id="app-xdm">
+    <branch module="xorg/app/xdm"
+            checkoutdir="xorg/app/xdm"/>
+    <dependencies>
+      <dep package="util-macros"/>
+      <dep package="lib-libX11"/>
+      <dep package="lib-libXau"/>
+      <dep package="lib-libXaw"/>
+      <dep package="lib-libXdmcp"/>
+      <dep package="lib-libXext"/>
+      <dep package="lib-libXmu"/>
+      <dep package="lib-libXt"/>
+    </dependencies>
+    <suggests>
+      <dep package="lib-libXinerama"/>
+      <dep package="lib-libXft"/>
+      <dep package="lib-libXpm"/>
+      <dep package="lib-libXrender"/>
+    </suggests>
+  </autotools>
+
+  <autotools id="app-xdpyinfo">
+    <branch module="xorg/app/xdpyinfo"
+            checkoutdir="xorg/app/xdpyinfo"/>
+    <dependencies>
+      <dep package="util-macros"/>
+      <dep package="proto-x11proto"/>
+      <dep package="lib-libX11"/>
+      <dep package="lib-libXext"/>
+      <dep package="lib-libXtst"/>
+      <dep package="xcb-libxcb"/>
+      <dep package="lib-libXxf86vm"/>
+      <dep package="lib-libXi"/>
+      <dep package="lib-libXrender"/>
+      <dep package="lib-libXcomposite"/>
+    </dependencies>
+    <suggests>
+      <dep package="lib-libXxf86dga"/>
+      <dep package="lib-libXinerama"/>
+      <dep package="lib-libdmx"/>
+    </suggests>
+  </autotools>
+
+  <autotools id="app-xdriinfo">
     <branch module="xorg/app/xdriinfo"
             checkoutdir="xorg/app/xdriinfo"/>
     <dependencies>
-      <dep package="glproto"/>
-      <dep package="libGL"/>
+      <dep package="util-macros"/>
+      <dep package="proto-glproto"/>
+      <dep package="lib-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="libX11"/>
+      <dep package="util-macros"/>
+      <dep package="proto-x11proto"/>
+      <dep package="lib-libX11"/>
+      <dep package="lib-libXrandr"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xeyes">
+  <autotools id="app-xeyes">
     <branch module="xorg/app/xeyes"
             checkoutdir="xorg/app/xeyes"/>
     <dependencies>
-      <dep package="libX11"/>
-      <dep package="libXt"/>
-      <dep package="libXmu"/>
+      <dep package="util-macros"/>
+      <dep package="proto-x11proto"/>
+      <dep package="lib-libX11"/>
+      <dep package="lib-libXext"/>
+      <dep package="lib-libXmu"/>
+      <dep package="lib-libXt"/>
+    </dependencies>
+    <suggests>
+      <dep package="lib-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="proto-x11proto"/>
+      <dep package="lib-libXaw"/>
+      <dep package="lib-libXft"/>
+      <dep package="lib-libXrender"/>
+      <dep package="lib-libXmu"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="app-xfontsel">
+    <branch module="xorg/app/xfontsel"
+            checkoutdir="xorg/app/xfontsel"/>
+    <dependencies>
+      <dep package="util-macros"/>
+      <dep package="lib-libX11"/>
+      <dep package="lib-libXaw"/>
+      <dep package="lib-libXmu"/>
+      <dep package="lib-libXt"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="app-xfs">
+    <branch module="xorg/app/xfs"
+            checkoutdir="xorg/app/xfs"/>
+    <dependencies>
+      <dep package="util-macros"/>
+      <dep package="proto-x11proto"/>
+      <dep package="lib-libXfont"/>
+      <dep package="lib-libxtrans"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="app-xfsinfo">
+    <branch module="xorg/app/xfsinfo"
+            checkoutdir="xorg/app/xfsinfo"/>
+    <dependencies>
+      <dep package="util-macros"/>
+      <dep package="proto-x11proto"/>
+      <dep package="lib-libFS"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xgamma">
+  <autotools id="app-xgamma">
     <branch module="xorg/app/xgamma"
             checkoutdir="xorg/app/xgamma"/>
     <dependencies>
-      <dep package="libX11"/>
-      <dep package="libXxf86vm"/>
+      <dep package="util-macros"/>
+      <dep package="lib-libX11"/>
+      <dep package="lib-libXxf86vm"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xhost">
+  <autotools id="app-xhost">
     <branch module="xorg/app/xhost"
             checkoutdir="xorg/app/xhost"/>
     <dependencies>
-      <dep package="libX11"/>
-      <dep package="libXmu"/>
+      <dep package="util-macros"/>
+      <dep package="proto-x11proto"/>
+      <dep package="lib-libX11"/>
+      <dep package="lib-libXmu"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xinit">
+  <autotools id="app-xinit">
     <branch module="xorg/app/xinit"
             checkoutdir="xorg/app/xinit"/>
     <dependencies>
-      <dep package="libX11"/>
+      <dep package="util-macros"/>
+      <dep package="proto-x11proto"/>
+      <dep package="lib-libX11"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xinput">
+  <autotools id="app-xinput">
     <branch module="xorg/app/xinput"
             checkoutdir="xorg/app/xinput"/>
     <dependencies>
-      <dep package="libX11"/>
-      <dep package="libXi"/>
-      <dep package="libXrandr"/>
-      <dep package="libXinerama"/>
+      <dep package="util-macros"/>
+      <dep package="proto-inputproto"/>
+      <dep package="lib-libX11"/>
+      <dep package="lib-libXext"/>
+      <dep package="lib-libXi"/>
+      <dep package="lib-libXrandr"/>
+      <dep package="lib-libXinerama"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xkbcomp">
+  <autotools id="app-xkbcomp">
     <branch module="xorg/app/xkbcomp"
             checkoutdir="xorg/app/xkbcomp"/>
     <dependencies>
-      <dep package="libX11"/>
+      <dep package="util-macros"/>
+      <dep package="proto-x11proto"/>
+      <dep package="lib-libX11"/>
+      <dep package="lib-libxkbfile"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xkbevd">
+  <autotools id="app-xkbevd">
     <branch module="xorg/app/xkbevd"
             checkoutdir="xorg/app/xkbevd"/>
     <dependencies>
-      <dep package="libX11"/>
-      <dep package="libxkbfile"/>
+      <dep package="util-macros"/>
+      <dep package="lib-libX11"/>
+      <dep package="lib-libxkbfile"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xkbutils">
+  <autotools id="app-xkbutils">
     <branch module="xorg/app/xkbutils"
             checkoutdir="xorg/app/xkbutils"/>
     <dependencies>
-      <dep package="libX11"/>
-      <dep package="libXaw"/>
-      <dep package="libXt"/>
+      <dep package="util-macros"/>
+      <dep package="proto-x11proto"/>
+      <dep package="lib-libX11"/>
+      <dep package="lib-libXaw"/>
+      <dep package="lib-libXt"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xkill">
+  <autotools id="app-xkill">
     <branch module="xorg/app/xkill"
             checkoutdir="xorg/app/xkill"/>
     <dependencies>
-      <dep package="libX11"/>
-      <dep package="libXmu"/>
+      <dep package="util-macros"/>
+      <dep package="proto-x11proto"/>
+      <dep package="lib-libX11"/>
+      <dep package="lib-libXmu"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xlogo">
+  <autotools id="app-xload">
+    <branch module="xorg/app/xload"
+            checkoutdir="xorg/app/xload"/>
+    <dependencies>
+      <dep package="util-macros"/>
+      <dep package="proto-x11proto"/>
+      <dep package="lib-libX11"/>
+      <dep package="lib-libXaw"/>
+      <dep package="lib-libXmu"/>
+      <dep package="lib-libXt"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="app-xlogo">
     <branch module="xorg/app/xlogo"
             checkoutdir="xorg/app/xlogo"/>
     <dependencies>
-      <dep package="libXaw"/>
+      <dep package="util-macros"/>
+      <dep package="lib-libX11"/>
+      <dep package="lib-libSM"/>
+      <dep package="lib-libXaw"/>
+      <dep package="lib-libXext"/>
+      <dep package="lib-libXmu"/>
+      <dep package="lib-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="xcb-libxcb"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xlsclients">
+  <autotools id="app-xlsclients">
     <branch module="xorg/app/xlsclients"
             checkoutdir="xorg/app/xlsclients"/>
     <dependencies>
-      <dep package="libxcb"/>
+      <dep package="util-macros"/>
+      <dep package="xcb-libxcb"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="app-xman">
+    <branch module="xorg/app/xman"
+            checkoutdir="xorg/app/xman"/>
+    <dependencies>
+      <dep package="util-macros"/>
+      <dep package="lib-libX11"/>
+      <dep package="lib-libXaw"/>
+      <dep package="lib-libXt"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xmodmap">
+  <autotools id="app-xmodmap">
     <branch module="xorg/app/xmodmap"
             checkoutdir="xorg/app/xmodmap"/>
     <dependencies>
-      <dep package="libX11"/>
+      <dep package="util-macros"/>
+      <dep package="proto-x11proto"/>
+      <dep package="lib-libX11"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xpr">
+  <autotools id="app-xpr">
     <branch module="xorg/app/xpr"
             checkoutdir="xorg/app/xpr"/>
     <dependencies>
-      <dep package="libX11"/>
-      <!--<dep package="libXmuu"/>-->
+      <dep package="util-macros"/>
+      <dep package="proto-x11proto"/>
+      <dep package="lib-libX11"/>
+      <dep package="lib-libXmu"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xprop">
+  <autotools id="app-xprop">
     <branch module="xorg/app/xprop"
             checkoutdir="xorg/app/xprop"/>
     <dependencies>
-      <dep package="libX11"/>
+      <dep package="util-macros"/>
+      <dep package="proto-x11proto"/>
+      <dep package="lib-libX11"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xrandr">
+  <autotools id="app-xrandr">
     <branch module="xorg/app/xrandr"
             checkoutdir="xorg/app/xrandr"/>
     <dependencies>
-      <dep package="libXrandr"/>
+      <dep package="util-macros"/>
+      <dep package="proto-x11proto"/>
+      <dep package="lib-libX11"/>
+      <dep package="lib-libXrandr"/>
+      <dep package="lib-libXrender"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xrdb">
+  <autotools id="app-xrdb">
     <branch module="xorg/app/xrdb"
             checkoutdir="xorg/app/xrdb"/>
     <dependencies>
-      <dep package="libX11"/>
-      <dep package="libXmu"/>
+      <dep package="util-macros"/>
+      <dep package="proto-x11proto"/>
+      <dep package="lib-libX11"/>
+      <dep package="lib-libXmu"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xrefresh">
+  <autotools id="app-xrefresh">
     <branch module="xorg/app/xrefresh"
             checkoutdir="xorg/app/xrefresh"/>
     <dependencies>
-      <dep package="libX11"/>
+      <dep package="util-macros"/>
+      <dep package="proto-x11proto"/>
+      <dep package="lib-libX11"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xset">
+  <autotools id="app-xset">
     <branch module="xorg/app/xset"
             checkoutdir="xorg/app/xset"/>
     <dependencies>
-      <dep package="libXext"/>
-      <dep package="libXmu"/>
+      <dep package="util-macros"/>
+      <dep package="proto-x11proto"/>
+      <dep package="lib-libX11"/>
+      <dep package="lib-libXext"/>
+      <dep package="lib-libXmu"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xsetroot">
+  <autotools id="app-xsetroot">
     <branch module="xorg/app/xsetroot"
             checkoutdir="xorg/app/xsetroot"/>
     <dependencies>
-      <dep package="libX11"/>
-      <dep package="libXmu"/>
-      <dep package="bitmaps"/>
+      <dep package="util-macros"/>
+      <dep package="proto-x11proto"/>
+      <dep package="data-bitmaps"/>
+      <dep package="lib-libX11"/>
+      <dep package="lib-libXcursor"/>
+      <dep package="lib-libXmu"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="app-xsm">
+    <branch module="xorg/app/xsm"
+            checkoutdir="xorg/app/xsm"/>
+    <dependencies>
+      <dep package="util-macros"/>
+      <dep package="lib-libX11"/>
+      <dep package="lib-libXt"/>
+      <dep package="lib-libICE"/>
+      <dep package="lib-libSM"/>
+      <dep package="lib-libXaw"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="app-xstdcmap">
+    <branch module="xorg/app/xstdcmap"
+            checkoutdir="xorg/app/xstdcmap"/>
+    <dependencies>
+      <dep package="util-macros"/>
+      <dep package="proto-x11proto"/>
+      <dep package="lib-libX11"/>
+      <dep package="lib-libXmu"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xvinfo">
+  <autotools id="app-xvidtune">
+    <branch module="xorg/app/xvidtune"
+            checkoutdir="xorg/app/xvidtune"/>
+    <dependencies>
+      <dep package="util-macros"/>
+      <dep package="proto-x11proto"/>
+      <dep package="lib-libX11"/>
+      <dep package="lib-libXaw"/>
+      <dep package="lib-libXmu"/>
+      <dep package="lib-libXxf86vm"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="app-xvinfo">
     <branch module="xorg/app/xvinfo"
             checkoutdir="xorg/app/xvinfo"/>
     <dependencies>
-      <dep package="libX11"/>
-      <dep package="libXv"/>
+      <dep package="util-macros"/>
+      <dep package="proto-x11proto"/>
+      <dep package="lib-libX11"/>
+      <dep package="lib-libXv"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xwd">
+  <autotools id="app-xwd">
     <branch module="xorg/app/xwd"
             checkoutdir="xorg/app/xwd"/>
     <dependencies>
-      <dep package="libX11"/>
+      <dep package="util-macros"/>
+      <dep package="proto-x11proto"/>
+      <dep package="lib-libX11"/>
     </dependencies>
+    <suggests>
+      <dep package="lib-libxkbfile"/>
+    </suggests>
   </autotools>
 
-  <autotools id="xwininfo">
+  <autotools id="app-xwininfo">
     <branch module="xorg/app/xwininfo"
             checkoutdir="xorg/app/xwininfo"/>
     <dependencies>
-      <dep package="libX11"/>
-      <dep package="libXext"/>
+      <dep package="util-macros"/>
+      <dep package="proto-x11proto"/>
+      <dep package="lib-libX11"/>
+      <dep package="xcb-libxcb"/>
     </dependencies>
+    <suggests>
+      <dep package="xcb-util-wm"/>
+    </suggests>
   </autotools>
 
-  <autotools id="xwud">
+  <autotools id="app-xwud">
     <branch module="xorg/app/xwud"
             checkoutdir="xorg/app/xwud"/>
     <dependencies>
-      <dep package="libX11"/>
-    </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"/>
+      <dep package="util-macros"/>
+      <dep package="proto-x11proto"/>
+      <dep package="lib-libX11"/>
     </dependencies>
-  </metamodule>
-
-  <!-- core font support, still required for some configurations  -->
+  </autotools>
 
-  <autotools id="bdftopcf">
-    <branch module="xorg/app/bdftopcf"
-            checkoutdir="xorg/app/bdftopcf"/>
+  <!-- Bitmap Images and Cursors Themes - Modules Definition -->
+  <autotools id="data-bitmaps">
+    <branch module="xorg/data/bitmaps"
+            checkoutdir="xorg/data/bitmaps"/>
     <dependencies>
-      <dep package="libXfont"/>
+      <dep package="util-macros"/>
     </dependencies>
   </autotools>
 
-  <autotools id="mkfontscale">
-    <branch module="xorg/app/mkfontscale"
-            checkoutdir="xorg/app/mkfontscale"/>
+  <autotools id="data-cursors">
+    <branch module="xorg/data/cursors"
+            checkoutdir="xorg/data/cursors"/>
     <dependencies>
-      <dep package="libfontenc"/>
+      <dep package="util-macros"/>
+      <dep package="app-xcursorgen"/>
+      <dep package="lib-libXcursor"/>
     </dependencies>
   </autotools>
 
-  <autotools id="mkfontdir">
-    <branch module="xorg/app/mkfontdir"
-            checkoutdir="xorg/app/mkfontdir"/>
+  <!-- The X Server -->
+  <autotools id="xserver">
+    <branch module="xorg/xserver"
+            checkoutdir="xorg/xserver"/>
+    <dependencies>
+      <dep package="util-macros"/>
+      <dep package="proto-bigreqsproto"/>
+      <dep package="proto-damageproto"/>
+      <dep package="proto-fixesproto"/>
+      <dep package="proto-fontsproto"/>
+      <dep package="proto-inputproto"/>
+      <dep package="proto-kbproto"/>
+      <dep package="proto-randrproto"/>
+      <dep package="proto-renderproto"/>
+      <dep package="proto-x11proto"/>
+      <dep package="proto-xcmiscproto"/>
+      <dep package="proto-xextproto"/>
+      <dep package="lib-libXfont"/>
+      <dep package="lib-libxtrans"/>
+      <dep package="lib-libXau"/>
+      <dep package="lib-libxkbfile"/>
+      <dep package="pixman"/>
+      <dep package="app-xkbcomp"/>
+      <dep package="lib-libxshmfence"/>			     <!-- Linux only -->
+    </dependencies>
+    <suggests>
+      <dep package="proto-compositeproto"/>
+      <dep package="proto-dmxproto"/>
+      <dep package="proto-dri2proto"/>
+      <dep package="proto-dri3proto"/>
+      <dep package="proto-glproto"/>
+      <dep package="proto-presentproto"/>
+      <dep package="proto-recordproto"/>
+      <dep package="proto-resourceproto"/>
+      <dep package="proto-scrnsaverproto"/>
+      <dep package="proto-videoproto"/>
+      <dep package="proto-xf86bigfontproto"/>
+      <dep package="proto-xf86dgaproto"/>
+      <dep package="proto-xf86driproto"/>
+      <dep package="proto-xf86vidmodeproto"/>
+      <dep package="proto-xineramaproto"/>
+      <dep package="lib-libXaw"/>
+      <dep package="lib-libXdmcp"/>
+      <dep package="lib-libXmu"/>
+      <dep package="lib-libXRes"/>
+      <dep package="lib-libXtst"/>
+      <dep package="lib-libXv"/>
+      <dep package="lib-libdmx"/>
+      <dep package="lib-libpciaccess"/>
+      <dep package="mesa-drm"/>
+      <dep package="mesa-mesa"/>
+    </suggests>
+  </autotools>
+
+  <!-- X Input Drivers - Modules Definition -->
+  <autotools id="driver-xf86-input-acecad">
+    <branch module="xorg/driver/xf86-input-acecad"
+            checkoutdir="xorg/driver/xf86-input-acecad"/>
     <dependencies>
-      <dep package="mkfontscale"/>
+      <dep package="util-macros"/>
+      <dep package="proto-x11proto"/>
+      <dep package="proto-inputproto"/>
+      <dep package="proto-kbproto"/>
+      <dep package="xserver"/>
     </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"/>
+  <autotools id="driver-xf86-input-aiptek">
+    <branch module="xorg/driver/xf86-input-aiptek"
+            checkoutdir="xorg/driver/xf86-input-aiptek"/>
     <dependencies>
-      <dep package="mkfontscale"/>
+      <dep package="util-macros"/>
+      <dep package="proto-x11proto"/>
+      <dep package="proto-inputproto"/>
+      <dep package="xserver"/>
     </dependencies>
   </autotools>
 
-  <autotools id="font-adobe-100dpi">
-    <branch module="xorg/font/adobe-100dpi"
-            checkoutdir="xorg/font/adobe-100dpi"/>
+  <autotools id="driver-xf86-input-evdev">
+    <branch module="xorg/driver/xf86-input-evdev"
+            checkoutdir="xorg/driver/xf86-input-evdev"/>
     <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
-      <dep package="font-util"/>
+      <dep package="util-macros"/>
+      <dep package="proto-x11proto"/>
+      <dep package="proto-inputproto"/>
+      <dep package="libevdev"/>
+      <dep package="xserver"/>
     </dependencies>
   </autotools>
 
-  <autotools id="font-adobe-75dpi">
-    <branch module="xorg/font/adobe-75dpi"
-            checkoutdir="xorg/font/adobe-75dpi"/>
+  <autotools id="driver-xf86-input-joystick">
+    <branch module="xorg/driver/xf86-input-joystick"
+            checkoutdir="xorg/driver/xf86-input-joystick"/>
     <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
-      <dep package="font-util"/>
+      <dep package="util-macros"/>
+      <dep package="proto-x11proto"/>
+      <dep package="proto-inputproto"/>
+      <dep package="proto-kbproto"/>
+      <dep package="xserver"/>
     </dependencies>
   </autotools>
 
-  <autotools id="font-adobe-utopia-100dpi">
-    <branch module="xorg/font/adobe-utopia-100dpi"
-            checkoutdir="xorg/font/adobe-utopia-100dpi"/>
+  <autotools id="driver-xf86-input-keyboard">
+    <branch module="xorg/driver/xf86-input-keyboard"
+            checkoutdir="xorg/driver/xf86-input-keyboard"/>
     <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
-      <dep package="font-util"/>
+      <dep package="util-macros"/>
+      <dep package="proto-x11proto"/>
+      <dep package="proto-inputproto"/>
+      <dep package="xserver"/>
     </dependencies>
   </autotools>
 
-  <autotools id="font-adobe-utopia-75dpi">
-    <branch module="xorg/font/adobe-utopia-75dpi"
-            checkoutdir="xorg/font/adobe-utopia-75dpi"/>
+  <autotools id="driver-xf86-input-mouse">
+    <branch module="xorg/driver/xf86-input-mouse"
+            checkoutdir="xorg/driver/xf86-input-mouse"/>
     <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
-      <dep package="font-util"/>
+      <dep package="util-macros"/>
+      <dep package="proto-x11proto"/>
+      <dep package="proto-inputproto"/>
+      <dep package="xserver"/>
     </dependencies>
   </autotools>
 
-  <autotools id="font-adobe-utopia-type1">
-    <branch module="xorg/font/adobe-utopia-type1"
-            checkoutdir="xorg/font/adobe-utopia-type1"/>
+  <autotools id="driver-xf86-input-synaptics">
+    <branch module="xorg/driver/xf86-input-synaptics"
+            checkoutdir="xorg/driver/xf86-input-synaptics"/>
     <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
-      <dep package="font-util"/>
+      <dep package="util-macros"/>
+      <dep package="proto-x11proto"/>
+      <dep package="proto-inputproto"/>
+      <dep package="lib-libX11"/>
+      <dep package="lib-libXi"/>
+      <dep package="xserver"/>
     </dependencies>
   </autotools>
 
-  <autotools id="font-arabic-misc">
-    <branch module="xorg/font/arabic-misc"
-            checkoutdir="xorg/font/arabic-misc"/>
+  <autotools id="driver-xf86-input-vmmouse">
+    <branch module="xorg/driver/xf86-input-vmmouse"
+            checkoutdir="xorg/driver/xf86-input-vmmouse"/>
     <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
+      <dep package="util-macros"/>
+      <dep package="proto-x11proto"/>
+      <dep package="proto-inputproto"/>
+      <dep package="xserver"/>
     </dependencies>
   </autotools>
 
-  <autotools id="font-bh-100dpi">
-    <branch module="xorg/font/bh-100dpi"
-            checkoutdir="xorg/font/bh-100dpi"/>
+  <autotools id="driver-xf86-input-void">
+    <branch module="xorg/driver/xf86-input-void"
+            checkoutdir="xorg/driver/xf86-input-void"/>
     <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
+      <dep package="util-macros"/>
+      <dep package="proto-x11proto"/>
+      <dep package="xserver"/>
     </dependencies>
   </autotools>
 
-  <autotools id="font-bh-75dpi">
-    <branch module="xorg/font/bh-75dpi"
-            checkoutdir="xorg/font/bh-75dpi"/>
+  <!-- X Video Drivers - Modules Definition -->
+  <autotools id="driver-glamor">
+    <branch module="xorg/driver/glamor"
+            checkoutdir="xorg/driver/glamor"/>
     <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
+      <dep package="util-macros"/>
+      <dep package="mesa-drm"/>
+      <dep package="xserver"/>
     </dependencies>
+    <suggests>
+      <dep package="proto-dri2proto"/>
+      <dep package="mesa-mesa"/>
+    </suggests>
   </autotools>
 
-  <autotools id="font-bh-lucidatypewriter-100dpi">
-    <branch module="xorg/font/bh-lucidatypewriter-100dpi"
-            checkoutdir="xorg/font/bh-lucidatypewriter-100dpi"/>
+  <autotools id="driver-xf86-video-apm">
+    <branch module="xorg/driver/xf86-video-apm"
+            checkoutdir="xorg/driver/xf86-video-apm"/>
     <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
+      <dep package="util-macros"/>
+      <dep package="proto-fontsproto"/>
+      <dep package="proto-x11proto"/>
+      <dep package="proto-randrproto"/>
+      <dep package="proto-renderproto"/>
+      <dep package="proto-xextproto"/>
+      <dep package="lib-libpciaccess"/>
+      <dep package="xserver"/>
     </dependencies>
+    <suggests>
+      <dep package="proto-videoproto"/>
+    </suggests>
   </autotools>
 
-  <autotools id="font-bh-lucidatypewriter-75dpi">
-    <branch module="xorg/font/bh-lucidatypewriter-75dpi"
-            checkoutdir="xorg/font/bh-lucidatypewriter-75dpi"/>
+  <autotools id="driver-xf86-video-ark">
+    <branch module="xorg/driver/xf86-video-ark"
+            checkoutdir="xorg/driver/xf86-video-ark"/>
     <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
+      <dep package="util-macros"/>
+      <dep package="proto-fontsproto"/>
+      <dep package="proto-x11proto"/>
+      <dep package="proto-xextproto"/>
+      <dep package="xserver"/>
     </dependencies>
+    <suggests>
+      <dep package="lib-libpciaccess"/>
+    </suggests>
   </autotools>
 
-  <autotools id="font-bh-ttf">
-    <branch module="xorg/font/bh-ttf"
-            checkoutdir="xorg/font/bh-ttf"/>
+  <autotools id="driver-xf86-video-ast">
+    <branch module="xorg/driver/xf86-video-ast"
+            checkoutdir="xorg/driver/xf86-video-ast"/>
     <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
+      <dep package="util-macros"/>
+      <dep package="proto-fontsproto"/>
+      <dep package="proto-x11proto"/>
+      <dep package="proto-xextproto"/>
+      <dep package="proto-randrproto"/>
+      <dep package="proto-renderproto"/>
+      <dep package="xserver"/>
     </dependencies>
+    <suggests>
+      <dep package="proto-videoproto"/>
+      <dep package="lib-libpciaccess"/>
+    </suggests>
   </autotools>
 
-  <autotools id="font-bh-type1">
-    <branch module="xorg/font/bh-type1"
-            checkoutdir="xorg/font/bh-type1"/>
+  <autotools id="driver-xf86-video-ati">
+    <branch module="xorg/driver/xf86-video-ati"
+            checkoutdir="xorg/driver/xf86-video-ati"/>
     <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
+      <dep package="util-macros"/>
+      <dep package="proto-fontsproto"/>
+      <dep package="proto-x11proto"/>
+      <dep package="proto-xextproto"/>
+      <dep package="proto-randrproto"/>
+      <dep package="proto-renderproto"/>
+      <dep package="proto-xf86driproto"/>
+      <dep package="mesa-drm"/>
+      <dep package="lib-libpciaccess"/>
+      <dep package="xserver"/>
     </dependencies>
+    <suggests>
+      <dep package="driver-glamor"/>
+      <dep package="proto-videoproto"/>
+    </suggests>
   </autotools>
 
-  <autotools id="font-bitstream-100dpi">
-    <branch module="xorg/font/bitstream-100dpi"
-            checkoutdir="xorg/font/bitstream-100dpi"/>
+  <autotools id="driver-xf86-video-chips">
+    <branch module="xorg/driver/xf86-video-chips"
+            checkoutdir="xorg/driver/xf86-video-chips"/>
     <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
+      <dep package="util-macros"/>
+      <dep package="proto-fontsproto"/>
+      <dep package="proto-x11proto"/>
+      <dep package="proto-xextproto"/>
+      <dep package="proto-randrproto"/>
+      <dep package="proto-renderproto"/>
+      <dep package="lib-libpciaccess"/>
+      <dep package="xserver"/>
     </dependencies>
+    <suggests>
+      <dep package="proto-videoproto"/>
+    </suggests>
   </autotools>
 
-  <autotools id="font-bitstream-75dpi">
-    <branch module="xorg/font/bitstream-75dpi"
-            checkoutdir="xorg/font/bitstream-75dpi"/>
+  <autotools id="driver-xf86-video-cirrus">
+    <branch module="xorg/driver/xf86-video-cirrus"
+            checkoutdir="xorg/driver/xf86-video-cirrus"/>
     <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
+      <dep package="util-macros"/>
+      <dep package="proto-fontsproto"/>
+      <dep package="proto-x11proto"/>
+      <dep package="proto-xextproto"/>
+      <dep package="proto-randrproto"/>
+      <dep package="proto-renderproto"/>
+      <dep package="xserver"/>
     </dependencies>
+    <suggests>
+      <dep package="proto-videoproto"/>
+      <dep package="lib-libpciaccess"/>
+    </suggests>
   </autotools>
 
-  <autotools id="font-bitstream-type1">
-    <branch module="xorg/font/bitstream-type1"
-            checkoutdir="xorg/font/bitstream-type1"/>
+  <autotools id="driver-xf86-video-dummy">
+    <branch module="xorg/driver/xf86-video-dummy"
+            checkoutdir="xorg/driver/xf86-video-dummy"/>
     <dependencies>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
+      <dep package="util-macros"/>
+      <dep package="proto-fontsproto"/>
+      <dep package="proto-x11proto"/>
+      <dep package="proto-randrproto"/>
+      <dep package="proto-renderproto"/>
+      <dep package="xserver"/>
     </dependencies>
+    <suggests>
+      <dep package="proto-videoproto"/>
+      <dep package="proto-xf86dgaproto"/>
+    </suggests>
   </autotools>
 
-  <autotools id="font-cronyx-cyrillic">
-    <branch module="xorg/font/cronyx-cyrillic"
-            checkoutdir="xorg/font/cronyx-cyrillic"/>
+  <autotools id="driver-xf86-video-fbdev">
+    <branch module="xorg/driver/xf86-video-fbdev"
+            checkoutdir="xorg/driver/xf86-video-fbdev"/>
     <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
+      <dep package="util-macros"/>
+      <dep package="proto-fontsproto"/>
+      <dep package="proto-x11proto"/>
+      <dep package="proto-randrproto"/>
+      <dep package="proto-renderproto"/>
+      <dep package="xserver"/>
     </dependencies>
+    <suggests>
+      <dep package="proto-videoproto"/>
+      <dep package="lib-libpciaccess"/>
+    </suggests>
   </autotools>
 
-  <autotools id="font-cursor-misc">
-    <branch module="xorg/font/cursor-misc"
-            checkoutdir="xorg/font/cursor-misc"/>
+  <autotools id="driver-xf86-video-geode">
+    <branch module="xorg/driver/xf86-video-geode"
+            checkoutdir="xorg/driver/xf86-video-geode"/>
     <dependencies>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
+      <dep package="util-macros"/>
+      <dep package="proto-fontsproto"/>
+      <dep package="proto-x11proto"/>
+      <dep package="proto-xextproto"/>
+      <dep package="proto-randrproto"/>
+      <dep package="proto-renderproto"/>
+      <dep package="xserver"/>
     </dependencies>
+    <suggests>
+      <dep package="proto-videoproto"/>
+      <dep package="lib-libpciaccess"/>
+    </suggests>
   </autotools>
 
-  <autotools id="font-daewoo-misc">
-    <branch module="xorg/font/daewoo-misc"
-            checkoutdir="xorg/font/daewoo-misc"/>
+  <autotools id="driver-xf86-video-glint">
+    <branch module="xorg/driver/xf86-video-glint"
+            checkoutdir="xorg/driver/xf86-video-glint"/>
     <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
+      <dep package="util-macros"/>
+      <dep package="proto-fontsproto"/>
+      <dep package="proto-x11proto"/>
+      <dep package="proto-xextproto"/>
+      <dep package="xserver"/>
     </dependencies>
+    <suggests>
+      <dep package="proto-videoproto"/>
+      <dep package="proto-xf86dgaproto"/>
+      <dep package="lib-libpciaccess"/>
+    </suggests>
   </autotools>
 
-  <autotools id="font-dec-misc">
-    <branch module="xorg/font/dec-misc"
-            checkoutdir="xorg/font/dec-misc"/>
+  <autotools id="driver-xf86-video-i128">
+    <branch module="xorg/driver/xf86-video-i128"
+            checkoutdir="xorg/driver/xf86-video-i128"/>
     <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
+      <dep package="util-macros"/>
+      <dep package="proto-fontsproto"/>
+      <dep package="proto-x11proto"/>
+      <dep package="proto-xextproto"/>
+      <dep package="proto-randrproto"/>
+      <dep package="proto-renderproto"/>
+      <dep package="xserver"/>
     </dependencies>
+    <suggests>
+      <dep package="proto-videoproto"/>
+      <dep package="lib-libpciaccess"/>
+    </suggests>
   </autotools>
 
-  <autotools id="font-ibm-type1">
-    <branch module="xorg/font/ibm-type1"
-            checkoutdir="xorg/font/ibm-type1"/>
+  <autotools id="driver-xf86-video-i740">
+    <branch module="xorg/driver/xf86-video-i740"
+            checkoutdir="xorg/driver/xf86-video-i740"/>
     <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
+      <dep package="util-macros"/>
+      <dep package="proto-fontsproto"/>
+      <dep package="proto-x11proto"/>
+      <dep package="proto-xextproto"/>
+      <dep package="proto-randrproto"/>
+      <dep package="proto-renderproto"/>
+      <dep package="xserver"/>
     </dependencies>
+    <suggests>
+      <dep package="proto-videoproto"/>
+      <dep package="lib-libpciaccess"/>
+    </suggests>
   </autotools>
 
-  <autotools id="font-isas-misc">
-    <branch module="xorg/font/isas-misc"
-            checkoutdir="xorg/font/isas-misc"/>
+  <autotools id="driver-xf86-video-intel">
+    <branch module="xorg/driver/xf86-video-intel"
+            checkoutdir="xorg/driver/xf86-video-intel"/>
     <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
+      <dep package="util-macros"/>
+      <dep package="proto-fontsproto"/>
+      <dep package="proto-x11proto"/>
+      <dep package="proto-xextproto"/>
+      <dep package="proto-randrproto"/>
+      <dep package="proto-renderproto"/>
+      <dep package="lib-libXrender"/>
+      <dep package="lib-libXrandr"/>
+      <dep package="lib-libXext"/>
+      <dep package="lib-libXfixes"/>
+      <dep package="lib-libpciaccess"/>
+      <dep package="mesa-drm"/>
+      <dep package="pixman"/>
+      <dep package="xserver"/>
     </dependencies>
-  </autotools>
-
-  <autotools id="font-jis-misc">
-    <branch module="xorg/font/jis-misc"
-            checkoutdir="xorg/font/jis-misc"/>
+    <suggests>
+      <dep package="driver-glamor"/>
+      <dep package="proto-dri2proto"/>
+      <dep package="proto-xf86driproto"/>
+      <dep package="lib-libX11"/>
+      <dep package="lib-libXinerama"/>
+      <dep package="lib-libXdamage"/>
+      <dep package="lib-libXcursor"/>
+      <dep package="lib-libXtst"/>
+      <dep package="lib-libXvMC"/>
+      <dep package="xcb-libxcb"/>
+    </suggests>
+  </autotools>
+
+  <autotools id="driver-xf86-video-mach64">
+    <branch module="xorg/driver/xf86-video-mach64"
+            checkoutdir="xorg/driver/xf86-video-mach64"/>
     <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
+      <dep package="util-macros"/>
+      <dep package="proto-fontsproto"/>
+      <dep package="proto-x11proto"/>
+      <dep package="proto-xextproto"/>
+      <dep package="proto-randrproto"/>
+      <dep package="proto-renderproto"/>
+      <dep package="xserver"/>
     </dependencies>
+    <suggests>
+      <dep package="proto-videoproto"/>
+      <dep package="proto-xf86driproto"/>
+      <dep package="lib-libpciaccess"/>
+      <dep package="mesa-drm"/>
+    </suggests>
   </autotools>
 
-  <autotools id="font-micro-misc">
-    <branch module="xorg/font/micro-misc"
-            checkoutdir="xorg/font/micro-misc"/>
+  <autotools id="driver-xf86-video-mga">
+    <branch module="xorg/driver/xf86-video-mga"
+            checkoutdir="xorg/driver/xf86-video-mga"/>
     <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
+      <dep package="util-macros"/>
+      <dep package="proto-fontsproto"/>
+      <dep package="proto-x11proto"/>
+      <dep package="proto-xextproto"/>
+      <dep package="proto-randrproto"/>
+      <dep package="proto-renderproto"/>
+      <dep package="xserver"/>
     </dependencies>
+    <suggests>
+      <dep package="proto-videoproto"/>
+      <dep package="proto-xf86driproto"/>
+      <dep package="lib-libpciaccess"/>
+      <dep package="mesa-drm"/>
+    </suggests>
   </autotools>
 
-  <autotools id="font-misc-cyrillic">
-    <branch module="xorg/font/misc-cyrillic"
-            checkoutdir="xorg/font/misc-cyrillic"/>
+  <autotools id="driver-xf86-video-modesetting">
+    <branch module="xorg/driver/xf86-video-modesetting"
+            checkoutdir="xorg/driver/xf86-video-modesetting"/>
     <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
+      <dep package="util-macros"/>
+      <dep package="proto-fontsproto"/>
+      <dep package="proto-x11proto"/>
+      <dep package="proto-xextproto"/>
+      <dep package="proto-randrproto"/>
+      <dep package="proto-renderproto"/>
+      <dep package="lib-libpciaccess"/>
+      <dep package="xserver"/>
     </dependencies>
+    <suggests>
+      <dep package="mesa-drm"/>
+    </suggests>
   </autotools>
 
-  <autotools id="font-misc-ethiopic">
-    <branch module="xorg/font/misc-ethiopic"
-            checkoutdir="xorg/font/misc-ethiopic"/>
+  <autotools id="driver-xf86-video-neomagic">
+    <branch module="xorg/driver/xf86-video-neomagic"
+            checkoutdir="xorg/driver/xf86-video-neomagic"/>
     <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
+      <dep package="util-macros"/>
+      <dep package="proto-fontsproto"/>
+      <dep package="proto-x11proto"/>
+      <dep package="xserver"/>
     </dependencies>
+    <suggests>
+      <dep package="lib-libpciaccess"/>
+    </suggests>
   </autotools>
 
-  <autotools id="font-misc-meltho">
-    <branch module="xorg/font/misc-meltho"
-            checkoutdir="xorg/font/misc-meltho"/>
+  <autotools id="driver-xf86-video-nested">
+    <branch module="xorg/driver/xf86-video-nested"
+            checkoutdir="xorg/driver/xf86-video-nested"/>
     <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
+      <dep package="util-macros"/>
+      <dep package="proto-fontsproto"/>
+      <dep package="proto-x11proto"/>
+      <dep package="proto-randrproto"/>
+      <dep package="proto-renderproto"/>
+      <dep package="lib-libX11"/>
+      <dep package="lib-libXext"/>
+      <dep package="xserver"/>
     </dependencies>
   </autotools>
 
-  <autotools id="font-misc-misc">
-    <branch module="xorg/font/misc-misc"
-            checkoutdir="xorg/font/misc-misc"/>
+  <autotools id="driver-xf86-video-nouveau">
+    <branch module="nouveau/xf86-video-nouveau"
+            checkoutdir="xorg/driver/xf86-video-nouveau"/>
     <dependencies>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
-      <dep package="font-util"/>
+      <dep package="util-macros"/>
+      <dep package="proto-fontsproto"/>
+      <dep package="proto-x11proto"/>
+      <dep package="proto-xextproto"/>
+      <dep package="proto-randrproto"/>
+      <dep package="proto-renderproto"/>
+      <dep package="lib-libpciaccess"/>
+      <dep package="mesa-drm"/>
+      <dep package="xserver"/>
     </dependencies>
+    <suggests>
+      <dep package="proto-dri2proto"/>
+      <dep package="proto-videoproto"/>
+    </suggests>
   </autotools>
 
-  <autotools id="font-mutt-misc">
-    <branch module="xorg/font/mutt-misc"
-            checkoutdir="xorg/font/mutt-misc"/>
+  <autotools id="driver-xf86-video-nv">
+    <branch module="xorg/driver/xf86-video-nv"
+            checkoutdir="xorg/driver/xf86-video-nv"/>
     <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
+      <dep package="util-macros"/>
+      <dep package="proto-fontsproto"/>
+      <dep package="proto-x11proto"/>
+      <dep package="proto-xextproto"/>
+      <dep package="proto-randrproto"/>
+      <dep package="proto-renderproto"/>
+      <dep package="xserver"/>
     </dependencies>
+    <suggests>
+      <dep package="proto-videoproto"/>
+      <dep package="lib-libpciaccess"/>
+    </suggests>
   </autotools>
 
-  <autotools id="font-schumacher-misc">
-    <branch module="xorg/font/schumacher-misc"
-            checkoutdir="xorg/font/schumacher-misc"/>
+  <autotools id="driver-xf86-video-r128">
+    <branch module="xorg/driver/xf86-video-r128"
+            checkoutdir="xorg/driver/xf86-video-r128"/>
     <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
+      <dep package="util-macros"/>
+      <dep package="proto-fontsproto"/>
+      <dep package="proto-x11proto"/>
+      <dep package="proto-xextproto"/>
+      <dep package="proto-randrproto"/>
+      <dep package="proto-renderproto"/>
+      <dep package="xserver"/>
     </dependencies>
+    <suggests>
+      <dep package="proto-videoproto"/>
+      <dep package="proto-xf86driproto"/>
+      <dep package="lib-libpciaccess"/>
+      <dep package="mesa-drm"/>
+    </suggests>
   </autotools>
 
-  <autotools id="font-screen-cyrillic">
-    <branch module="xorg/font/screen-cyrillic"
-            checkoutdir="xorg/font/screen-cyrillic"/>
+  <autotools id="driver-xf86-video-rendition">
+    <branch module="xorg/driver/xf86-video-rendition"
+            checkoutdir="xorg/driver/xf86-video-rendition"/>
     <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
+      <dep package="util-macros"/>
+      <dep package="proto-fontsproto"/>
+      <dep package="proto-x11proto"/>
+      <dep package="proto-xextproto"/>
+      <dep package="proto-randrproto"/>
+      <dep package="proto-renderproto"/>
+      <dep package="xserver"/>
     </dependencies>
+    <suggests>
+      <dep package="lib-libpciaccess"/>
+    </suggests>
   </autotools>
 
-  <autotools id="font-sony-misc">
-    <branch module="xorg/font/sony-misc"
-            checkoutdir="xorg/font/sony-misc"/>
+  <autotools id="driver-xf86-video-s3">
+    <branch module="xorg/driver/xf86-video-s3"
+            checkoutdir="xorg/driver/xf86-video-s3"/>
     <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
+      <dep package="util-macros"/>
+      <dep package="proto-fontsproto"/>
+      <dep package="proto-x11proto"/>
+      <dep package="proto-xextproto"/>
+      <dep package="proto-randrproto"/>
+      <dep package="proto-renderproto"/>
+      <dep package="xserver"/>
     </dependencies>
+    <suggests>
+      <dep package="proto-videoproto"/>
+      <dep package="lib-libpciaccess"/>
+    </suggests>
   </autotools>
 
-  <autotools id="font-sun-misc">
-    <branch module="xorg/font/sun-misc"
-            checkoutdir="xorg/font/sun-misc"/>
+  <autotools id="driver-xf86-video-s3virge">
+    <branch module="xorg/driver/xf86-video-s3virge"
+            checkoutdir="xorg/driver/xf86-video-s3virge"/>
     <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
+      <dep package="util-macros"/>
+      <dep package="proto-fontsproto"/>
+      <dep package="proto-x11proto"/>
+      <dep package="proto-xextproto"/>
+      <dep package="proto-randrproto"/>
+      <dep package="proto-renderproto"/>
+      <dep package="xserver"/>
     </dependencies>
+    <suggests>
+      <dep package="proto-videoproto"/>
+      <dep package="lib-libpciaccess"/>
+    </suggests>
   </autotools>
 
-  <autotools id="font-winitzki-cyrillic">
-    <branch module="xorg/font/winitzki-cyrillic"
-            checkoutdir="xorg/font/winitzki-cyrillic"/>
+  <autotools id="driver-xf86-video-savage">
+    <branch module="xorg/driver/xf86-video-savage"
+            checkoutdir="xorg/driver/xf86-video-savage"/>
     <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="font-xfree86-type1">
-    <branch module="xorg/font/xfree86-type1"
-            checkoutdir="xorg/font/xfree86-type1"/>
     <dependencies>
-      <dep package="bdftopcf"/>
-      <dep package="mkfontscale"/>
-      <dep package="mkfontdir"/>
-      <dep package="fontconfig"/>
+      <dep package="util-macros"/>
+      <dep package="proto-fontsproto"/>
+      <dep package="proto-x11proto"/>
+      <dep package="proto-xextproto"/>
+      <dep package="proto-randrproto"/>
+      <dep package="proto-renderproto"/>
+      <dep package="xserver"/>
+    </dependencies>
+    <suggests>
+      <dep package="proto-videoproto"/>
+      <dep package="proto-xf86driproto"/>
+      <dep package="lib-libpciaccess"/>
+      <dep package="mesa-drm"/>
+    </suggests>
     </dependencies>
   </autotools>
 
-  <autotools id="font-alias">
-    <branch module="xorg/font/alias"
-            checkoutdir="xorg/font/alias"/>
-  </autotools>
-
-  <metamodule id="xorg-fonts">
+  <autotools id="driver-xf86-video-siliconmotion">
+    <branch module="xorg/driver/xf86-video-siliconmotion"
+            checkoutdir="xorg/driver/xf86-video-siliconmotion"/>
     <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"/>
+      <dep package="util-macros"/>
+      <dep package="proto-fontsproto"/>
+      <dep package="proto-x11proto"/>
+      <dep package="proto-xextproto"/>
+      <dep package="xserver"/>
     </dependencies>
-  </metamodule>
-
-  <!-- input drivers -->
+    <suggests>
+      <dep package="proto-videoproto"/>
+      <dep package="lib-libpciaccess"/>
+    </suggests>
+  </autotools>
 
-  <autotools id="xf86-input-acecad">
-    <branch module="xorg/driver/xf86-input-acecad"
-            checkoutdir="xorg/driver/xf86-input-acecad"/>
+  <autotools id="driver-xf86-video-sis">
+    <branch module="xorg/driver/xf86-video-sis"
+            checkoutdir="xorg/driver/xf86-video-sis"/>
     <dependencies>
+      <dep package="util-macros"/>
+      <dep package="proto-fontsproto"/>
+      <dep package="proto-x11proto"/>
+      <dep package="proto-xextproto"/>
+      <dep package="proto-xf86dgaproto"/>
+      <dep package="proto-randrproto"/>
+      <dep package="proto-renderproto"/>
       <dep package="xserver"/>
     </dependencies>
+    <suggests>
+      <dep package="proto-videoproto"/>
+      <dep package="proto-xineramaproto"/>
+      <dep package="proto-xf86driproto"/>
+      <dep package="lib-libpciaccess"/>
+      <dep package="mesa-drm"/>
+    </suggests>
   </autotools>
 
-  <autotools id="xf86-input-aiptek">
-    <branch module="xorg/driver/xf86-input-aiptek"
-            checkoutdir="xorg/driver/xf86-input-aiptek"/>
+  <autotools id="driver-xf86-video-sisusb">
+    <branch module="xorg/driver/xf86-video-sisusb"
+            checkoutdir="xorg/driver/xf86-video-sisusb"/>
     <dependencies>
+      <dep package="util-macros"/>
+      <dep package="proto-fontsproto"/>
+      <dep package="proto-x11proto"/>
+      <dep package="proto-xextproto"/>
+      <dep package="proto-randrproto"/>
+      <dep package="proto-renderproto"/>
+      <dep package="lib-libpciaccess"/>
       <dep package="xserver"/>
     </dependencies>
+    <suggests>
+      <dep package="proto-videoproto"/>
+      <dep package="proto-xineramaproto"/>
+      <dep package="mesa-drm"/>
+    </suggests>
   </autotools>
 
-  <autotools id="xf86-input-evdev">
-    <branch module="xorg/driver/xf86-input-evdev"
-            checkoutdir="xorg/driver/xf86-input-evdev"/>
+  <autotools id="driver-xf86-video-suncg14">
+    <branch module="xorg/driver/xf86-video-suncg14"
+            checkoutdir="xorg/driver/xf86-video-suncg14"/>
     <dependencies>
+      <dep package="util-macros"/>
+      <dep package="proto-fontsproto"/>
+      <dep package="proto-x11proto"/>
+      <dep package="proto-randrproto"/>
+      <dep package="proto-renderproto"/>
       <dep package="xserver"/>
     </dependencies>
+    <suggests>
+    </suggests>
   </autotools>
 
-  <autotools id="xf86-input-joystick">
-    <branch module="xorg/driver/xf86-input-joystick"
-            checkoutdir="xorg/driver/xf86-input-joystick"/>
+  <autotools id="driver-xf86-video-suncg3">
+    <branch module="xorg/driver/xf86-video-suncg3"
+            checkoutdir="xorg/driver/xf86-video-suncg3"/>
     <dependencies>
+      <dep package="util-macros"/>
+      <dep package="proto-fontsproto"/>
+      <dep package="proto-x11proto"/>
+      <dep package="proto-randrproto"/>
+      <dep package="proto-renderproto"/>
       <dep package="xserver"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xf86-input-keyboard">
-    <branch module="xorg/driver/xf86-input-keyboard"
-            checkoutdir="xorg/driver/xf86-input-keyboard"/>
+  <autotools id="driver-xf86-video-suncg6">
+    <branch module="xorg/driver/xf86-video-suncg6"
+            checkoutdir="xorg/driver/xf86-video-suncg6"/>
     <dependencies>
+      <dep package="util-macros"/>
+      <dep package="proto-fontsproto"/>
+      <dep package="proto-x11proto"/>
+      <dep package="proto-randrproto"/>
+      <dep package="proto-renderproto"/>
       <dep package="xserver"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xf86-input-mouse">
-    <branch module="xorg/driver/xf86-input-mouse"
-            checkoutdir="xorg/driver/xf86-input-mouse"/>
+  <autotools id="driver-xf86-video-sunffb">
+    <branch module="xorg/driver/xf86-video-sunffb"
+            checkoutdir="xorg/driver/xf86-video-sunffb"/>
     <dependencies>
+      <dep package="util-macros"/>
+      <dep package="proto-fontsproto"/>
+      <dep package="proto-x11proto"/>
+      <dep package="proto-randrproto"/>
+      <dep package="proto-renderproto"/>
       <dep package="xserver"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xf86-input-synaptics">
-    <branch module="xorg/driver/xf86-input-synaptics"
-            checkoutdir="xorg/driver/xf86-input-synaptics"/>
+  <autotools id="driver-xf86-video-sunleo">
+    <branch module="xorg/driver/xf86-video-sunleo"
+            checkoutdir="xorg/driver/xf86-video-sunleo"/>
     <dependencies>
+      <dep package="util-macros"/>
+      <dep package="proto-fontsproto"/>
+      <dep package="proto-x11proto"/>
+      <dep package="proto-randrproto"/>
+      <dep package="proto-renderproto"/>
       <dep package="xserver"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xf86-input-vmmouse">
-    <branch module="xorg/driver/xf86-input-vmmouse"
-            checkoutdir="xorg/driver/xf86-input-vmmouse"/>
+  <autotools id="driver-xf86-video-suntcx">
+    <branch module="xorg/driver/xf86-video-suntcx"
+            checkoutdir="xorg/driver/xf86-video-suntcx"/>
     <dependencies>
+      <dep package="util-macros"/>
+      <dep package="proto-fontsproto"/>
+      <dep package="proto-x11proto"/>
+      <dep package="proto-randrproto"/>
+      <dep package="proto-renderproto"/>
       <dep package="xserver"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xf86-input-void">
-    <branch module="xorg/driver/xf86-input-void"
-            checkoutdir="xorg/driver/xf86-input-void"/>
+  <autotools id="driver-xf86-video-tdfx">
+    <branch module="xorg/driver/xf86-video-tdfx"
+            checkoutdir="xorg/driver/xf86-video-tdfx"/>
     <dependencies>
+      <dep package="util-macros"/>
+      <dep package="proto-fontsproto"/>
+      <dep package="proto-x11proto"/>
+      <dep package="proto-xextproto"/>
+      <dep package="proto-randrproto"/>
+      <dep package="proto-renderproto"/>
       <dep package="xserver"/>
     </dependencies>
+    <suggests>
+      <dep package="proto-videoproto"/>
+      <dep package="proto-xf86driproto"/>
+      <dep package="lib-libpciaccess"/>
+      <dep package="mesa-drm"/>
+    </suggests>
   </autotools>
 
-  <autotools id="xf86-video-apm">
-    <branch module="xorg/driver/xf86-video-apm"
-            checkoutdir="xorg/driver/xf86-video-apm"/>
+  <autotools id="driver-xf86-video-tga">
+    <branch module="xorg/driver/xf86-video-tga"
+            checkoutdir="xorg/driver/xf86-video-tga"/>
     <dependencies>
+      <dep package="util-macros"/>
+      <dep package="proto-fontsproto"/>
+      <dep package="proto-x11proto"/>
+      <dep package="proto-xextproto"/>
+      <dep package="proto-xf86dgaproto"/>
+      <dep package="proto-randrproto"/>
+      <dep package="proto-renderproto"/>
       <dep package="xserver"/>
     </dependencies>
+    <suggests>
+      <dep package="proto-videoproto"/>
+      <dep package="lib-libpciaccess"/>
+      <dep package="mesa-drm"/>
+    </suggests>
   </autotools>
 
-  <autotools id="xf86-video-ark">
-    <branch module="xorg/driver/xf86-video-ark"
-            checkoutdir="xorg/driver/xf86-video-ark"/>
+  <autotools id="driver-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>
-  </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="proto-fontsproto"/>
+      <dep package="proto-x11proto"/>
+      <dep package="proto-xextproto"/>
+      <dep package="proto-randrproto"/>
+      <dep package="proto-renderproto"/>
       <dep package="xserver"/>
     </dependencies>
+    <suggests>
+      <dep package="proto-videoproto"/>
+      <dep package="proto-xf86dgaproto"/>
+      <dep package="lib-libpciaccess"/>
+      <dep package="mesa-drm"/>
+    </suggests>
   </autotools>
 
-  <autotools id="xf86-video-ati">
-    <branch module="xorg/driver/xf86-video-ati"
-            checkoutdir="xorg/driver/xf86-video-ati"/>
+  <autotools id="driver-xf86-video-tseng">
+    <branch module="xorg/driver/xf86-video-tseng"
+            checkoutdir="xorg/driver/xf86-video-tseng"/>
     <dependencies>
+      <dep package="util-macros"/>
+      <dep package="proto-fontsproto"/>
+      <dep package="proto-x11proto"/>
+      <dep package="proto-xextproto"/>
+      <dep package="proto-randrproto"/>
+      <dep package="proto-renderproto"/>
       <dep package="xserver"/>
     </dependencies>
+    <suggests>
+      <dep package="proto-videoproto"/>
+      <dep package="lib-libpciaccess"/>
+    </suggests>
   </autotools>
 
-  <autotools id="xf86-video-chips">
-    <branch module="xorg/driver/xf86-video-chips"
-            checkoutdir="xorg/driver/xf86-video-chips"/>
+  <autotools id="driver-xf86-video-v4l">
+    <branch module="xorg/driver/xf86-video-v4l"
+            checkoutdir="xorg/driver/xf86-video-v4l"/>
     <dependencies>
+      <dep package="util-macros"/>
+      <dep package="proto-x11proto"/>
+      <dep package="proto-randrproto"/>
+      <dep package="proto-videoproto"/>
       <dep package="xserver"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xf86-video-cirrus">
-    <branch module="xorg/driver/xf86-video-cirrus"
-            checkoutdir="xorg/driver/xf86-video-cirrus"/>
+  <autotools id="driver-xf86-video-vesa">
+    <branch module="xorg/driver/xf86-video-vesa"
+            checkoutdir="xorg/driver/xf86-video-vesa"/>
     <dependencies>
+      <dep package="util-macros"/>
+      <dep package="proto-fontsproto"/>
+      <dep package="proto-x11proto"/>
+      <dep package="proto-xextproto"/>
+      <dep package="proto-randrproto"/>
+      <dep package="proto-renderproto"/>
       <dep package="xserver"/>
     </dependencies>
+    <suggests>
+      <dep package="lib-libpciaccess"/>
+    </suggests>
   </autotools>
 
-  <autotools id="xf86-video-dummy">
-    <branch module="xorg/driver/xf86-video-dummy"
-            checkoutdir="xorg/driver/xf86-video-dummy"/>
+  <autotools id="driver-xf86-video-vmware">
+    <branch module="xorg/driver/xf86-video-vmware"
+            checkoutdir="xorg/driver/xf86-video-vmware"/>
     <dependencies>
+      <dep package="util-macros"/>
+      <dep package="proto-fontsproto"/>
+      <dep package="proto-x11proto"/>
+      <dep package="proto-xextproto"/>
+      <dep package="lib-libX11"/>
+      <dep package="lib-libXext"/>
+      <dep package="proto-randrproto"/>
+      <dep package="proto-renderproto"/>
       <dep package="xserver"/>
     </dependencies>
+    <suggests>
+      <dep package="proto-videoproto"/>
+      <dep package="proto-xineramaproto"/>
+      <dep package="lib-libpciaccess"/>
+      <dep package="mesa-drm"/>
+      <dep package="mesa-mesa"/>
+    </suggests>
   </autotools>
 
-  <autotools id="xf86-video-fbdev">
-    <branch module="xorg/driver/xf86-video-fbdev"
-            checkoutdir="xorg/driver/xf86-video-fbdev"/>
+  <autotools id="driver-xf86-video-voodoo">
+    <branch module="xorg/driver/xf86-video-voodoo"
+            checkoutdir="xorg/driver/xf86-video-voodoo"/>
     <dependencies>
+      <dep package="util-macros"/>
+      <dep package="proto-fontsproto"/>
+      <dep package="proto-x11proto"/>
+      <dep package="proto-xf86dgaproto"/>
+      <dep package="proto-xextproto"/>
+      <dep package="proto-randrproto"/>
+      <dep package="proto-renderproto"/>
       <dep package="xserver"/>
     </dependencies>
+    <suggests>
+      <dep package="lib-libpciaccess"/>
+      <dep package="mesa-drm"/>
+    </suggests>
   </autotools>
 
-  <autotools id="xf86-video-geode">
-    <branch module="xorg/driver/xf86-video-geode"
-            checkoutdir="xorg/driver/xf86-video-geode"/>
+  <autotools id="driver-xf86-video-wsfb">
+    <branch module="xorg/driver/xf86-video-wsfb"
+            checkoutdir="xorg/driver/xf86-video-wsfb"/>
     <dependencies>
+      <dep package="util-macros"/>
+      <dep package="proto-x11proto"/>
       <dep package="xserver"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xf86-video-glide">
-    <branch module="xorg/driver/xf86-video-glide"
-            checkoutdir="xorg/driver/xf86-video-glide"/>
+  <autotools id="driver-xf86-video-xgixp">
+    <branch module="xorg/driver/xf86-video-xgixp"
+            checkoutdir="xorg/driver/xf86-video-xgixp"/>
     <dependencies>
+      <dep package="util-macros"/>
+      <dep package="proto-fontsproto"/>
+      <dep package="proto-x11proto"/>
+      <dep package="proto-xextproto"/>
+      <dep package="proto-xf86driproto"/>
+      <dep package="proto-randrproto"/>
+      <dep package="proto-renderproto"/>
       <dep package="xserver"/>
     </dependencies>
+    <suggests>
+      <dep package="proto-videoproto"/>
+      <dep package="lib-libpciaccess"/>
+      <dep package="mesa-drm"/>
+    </suggests>
   </autotools>
 
-  <autotools id="xf86-video-glint">
-    <branch module="xorg/driver/xf86-video-glint"
-            checkoutdir="xorg/driver/xf86-video-glint"/>
+  <!-- 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="xserver"/>
+      <dep package="util-macros"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xf86-video-i128">
-    <branch module="xorg/driver/xf86-video-i128"
-            checkoutdir="xorg/driver/xf86-video-i128"/>
+  <!--  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="xserver"/>
+      <dep package="util-macros"/>
     </dependencies>
+    <suggests>
+      <dep package="xorg-sgml-doctools"/>
+    </suggests>
   </autotools>
 
-  <autotools id="xf86-video-i740">
-    <branch module="xorg/driver/xf86-video-i740"
-            checkoutdir="xorg/driver/xf86-video-i740"/>
+<!--  The X Font Library - Modules Definition -->
+
+  <autotools id="font-util">
+    <branch module="xorg/font/util"
+            checkoutdir="xorg/font/util"/>
     <dependencies>
-      <dep package="xserver"/>
+      <dep package="util-macros"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xf86-video-impact">
-    <branch module="xorg/driver/xf86-video-impact"
-            checkoutdir="xorg/driver/xf86-video-impact"/>
+  <autotools id="font-encodings">
+    <branch module="xorg/font/encodings"
+            checkoutdir="xorg/font/encodings"/>
     <dependencies>
-      <dep package="xserver"/>
+      <dep package="util-macros"/>
+      <dep package="app-mkfontscale"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xf86-video-intel">
-    <branch module="xorg/driver/xf86-video-intel"
-            checkoutdir="xorg/driver/xf86-video-intel"/>
+  <autotools id="font-adobe-100dpi">
+    <branch module="xorg/font/adobe-100dpi"
+            checkoutdir="xorg/font/adobe-100dpi"/>
     <dependencies>
-      <dep package="macros"/>
-      <dep package="xserver"/>
-      <dep package="fontsproto"/>
-      <dep package="glproto"/>
-      <dep package="randrproto"/>
-      <dep package="renderproto"/>
-      <dep package="xextproto"/>
-      <dep package="x11proto"/>
-      <dep package="dri2proto"/>
-      <dep package="libXvMC"/>
+      <dep package="util-macros"/>
+      <dep package="font-util"/>
+      <dep package="app-bdftopcf"/>
+      <dep package="app-mkfontscale"/>
+      <dep package="app-mkfontdir"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xf86-video-mach64">
-    <branch module="xorg/driver/xf86-video-mach64"
-            checkoutdir="xorg/driver/xf86-video-mach64"/>
+  <autotools id="font-adobe-75dpi">
+    <branch module="xorg/font/adobe-75dpi"
+            checkoutdir="xorg/font/adobe-75dpi"/>
     <dependencies>
-      <dep package="xserver"/>
+      <dep package="util-macros"/>
+      <dep package="font-util"/>
+      <dep package="app-bdftopcf"/>
+      <dep package="app-mkfontscale"/>
+      <dep package="app-mkfontdir"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xf86-video-mga">
-    <branch module="xorg/driver/xf86-video-mga"
-            checkoutdir="xorg/driver/xf86-video-mga"/>
+  <autotools id="font-adobe-utopia-100dpi">
+    <branch module="xorg/font/adobe-utopia-100dpi"
+            checkoutdir="xorg/font/adobe-utopia-100dpi"/>
     <dependencies>
-      <dep package="xserver"/>
+      <dep package="util-macros"/>
+      <dep package="font-util"/>
+      <dep package="app-bdftopcf"/>
+      <dep package="app-mkfontscale"/>
+      <dep package="app-mkfontdir"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xf86-video-modesetting">
-    <branch module="xorg/driver/xf86-video-modesetting"
-            checkoutdir="xorg/driver/xf86-video-modesetting"/>
+  <autotools id="font-adobe-utopia-75dpi">
+    <branch module="xorg/font/adobe-utopia-75dpi"
+            checkoutdir="xorg/font/adobe-utopia-75dpi"/>
     <dependencies>
-      <dep package="xserver"/>
+      <dep package="util-macros"/>
+      <dep package="font-util"/>
+      <dep package="app-bdftopcf"/>
+      <dep package="app-mkfontscale"/>
+      <dep package="app-mkfontdir"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xf86-video-neomagic">
-    <branch module="xorg/driver/xf86-video-neomagic"
-            checkoutdir="xorg/driver/xf86-video-neomagic"/>
+  <autotools id="font-adobe-utopia-type1">
+    <branch module="xorg/font/adobe-utopia-type1"
+            checkoutdir="xorg/font/adobe-utopia-type1"/>
     <dependencies>
-      <dep package="xserver"/>
+      <dep package="util-macros"/>
+      <dep package="font-util"/>
+      <dep package="app-bdftopcf"/>
+      <dep package="app-mkfontscale"/>
+      <dep package="app-mkfontdir"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xf86-video-nested">
-    <branch module="xorg/driver/xf86-video-nested"
-            checkoutdir="xorg/driver/xf86-video-nested"/>
+  <autotools id="font-arabic-misc">
+    <branch module="xorg/font/arabic-misc"
+            checkoutdir="xorg/font/arabic-misc"/>
     <dependencies>
-      <dep package="xserver"/>
+      <dep package="util-macros"/>
+      <dep package="font-util"/>
+      <dep package="app-bdftopcf"/>
+      <dep package="app-mkfontscale"/>
+      <dep package="app-mkfontdir"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xf86-video-newport">
-    <branch module="xorg/driver/xf86-video-newport"
-            checkoutdir="xorg/driver/xf86-video-newport"/>
+  <autotools id="font-bh-100dpi">
+    <branch module="xorg/font/bh-100dpi"
+            checkoutdir="xorg/font/bh-100dpi"/>
     <dependencies>
-      <dep package="xserver"/>
+      <dep package="util-macros"/>
+      <dep package="font-util"/>
+      <dep package="app-bdftopcf"/>
+      <dep package="app-mkfontscale"/>
+      <dep package="app-mkfontdir"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xf86-video-nouveau">
-    <branch module="nouveau/xf86-video-nouveau"
-            checkoutdir="xorg/driver/xf86-video-nouveau"/>
+  <autotools id="font-bh-75dpi">
+    <branch module="xorg/font/bh-75dpi"
+            checkoutdir="xorg/font/bh-75dpi"/>
     <dependencies>
-      <dep package="xserver"/>
+      <dep package="util-macros"/>
+      <dep package="font-util"/>
+      <dep package="app-bdftopcf"/>
+      <dep package="app-mkfontscale"/>
+      <dep package="app-mkfontdir"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xf86-video-nv">
-    <branch module="xorg/driver/xf86-video-nv"
-            checkoutdir="xorg/driver/xf86-video-nv"/>
+  <autotools id="font-bh-lucidatypewriter-100dpi">
+    <branch module="xorg/font/bh-lucidatypewriter-100dpi"
+            checkoutdir="xorg/font/bh-lucidatypewriter-100dpi"/>
     <dependencies>
-      <dep package="xserver"/>
+      <dep package="util-macros"/>
+      <dep package="font-util"/>
+      <dep package="app-bdftopcf"/>
+      <dep package="app-mkfontscale"/>
+      <dep package="app-mkfontdir"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xf86-video-openchrome">
-    <branch module="openchrome/xf86-video-openchrome"
-            checkoutdir="xorg/driver/xf86-video-openchrome"/>
+  <autotools id="font-bh-lucidatypewriter-75dpi">
+    <branch module="xorg/font/bh-lucidatypewriter-75dpi"
+            checkoutdir="xorg/font/bh-lucidatypewriter-75dpi"/>
     <dependencies>
-      <dep package="xserver"/>
+      <dep package="util-macros"/>
+      <dep package="font-util"/>
+      <dep package="app-bdftopcf"/>
+      <dep package="app-mkfontscale"/>
+      <dep package="app-mkfontdir"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xf86-video-r128">
-    <branch module="xorg/driver/xf86-video-r128"
-            checkoutdir="xorg/driver/xf86-video-r128"/>
+  <autotools id="font-bh-ttf">
+    <branch module="xorg/font/bh-ttf"
+            checkoutdir="xorg/font/bh-ttf"/>
     <dependencies>
-      <dep package="xserver"/>
+      <dep package="util-macros"/>
+      <dep package="font-util"/>
+      <dep package="app-bdftopcf"/>
+      <dep package="app-mkfontscale"/>
+      <dep package="app-mkfontdir"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xf86-video-rendition">
-    <branch module="xorg/driver/xf86-video-rendition"
-            checkoutdir="xorg/driver/xf86-video-rendition"/>
+  <autotools id="font-bh-type1">
+    <branch module="xorg/font/bh-type1"
+            checkoutdir="xorg/font/bh-type1"/>
     <dependencies>
-      <dep package="xserver"/>
+      <dep package="util-macros"/>
+      <dep package="font-util"/>
+      <dep package="app-bdftopcf"/>
+      <dep package="app-mkfontscale"/>
+      <dep package="app-mkfontdir"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xf86-video-s3">
-    <branch module="xorg/driver/xf86-video-s3"
-            checkoutdir="xorg/driver/xf86-video-s3"/>
+  <autotools id="font-bitstream-100dpi">
+    <branch module="xorg/font/bitstream-100dpi"
+            checkoutdir="xorg/font/bitstream-100dpi"/>
     <dependencies>
-      <dep package="xserver"/>
+      <dep package="util-macros"/>
+      <dep package="font-util"/>
+      <dep package="app-bdftopcf"/>
+      <dep package="app-mkfontscale"/>
+      <dep package="app-mkfontdir"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xf86-video-s3virge">
-    <branch module="xorg/driver/xf86-video-s3virge"
-            checkoutdir="xorg/driver/xf86-video-s3virge"/>
+  <autotools id="font-bitstream-75dpi">
+    <branch module="xorg/font/bitstream-75dpi"
+            checkoutdir="xorg/font/bitstream-75dpi"/>
     <dependencies>
-      <dep package="xserver"/>
+      <dep package="util-macros"/>
+      <dep package="font-util"/>
+      <dep package="app-bdftopcf"/>
+      <dep package="app-mkfontscale"/>
+      <dep package="app-mkfontdir"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xf86-video-savage">
-    <branch module="xorg/driver/xf86-video-savage"
-            checkoutdir="xorg/driver/xf86-video-savage"/>
+  <autotools id="font-bitstream-type1">
+    <branch module="xorg/font/bitstream-type1"
+            checkoutdir="xorg/font/bitstream-type1"/>
     <dependencies>
-      <dep package="xserver"/>
+      <dep package="util-macros"/>
+      <dep package="font-util"/>
+      <dep package="app-mkfontscale"/>
+      <dep package="app-mkfontdir"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xf86-video-siliconmotion">
-    <branch module="xorg/driver/xf86-video-siliconmotion"
-            checkoutdir="xorg/driver/xf86-video-siliconmotion"/>
+  <autotools id="font-cronyx-cyrillic">
+    <branch module="xorg/font/cronyx-cyrillic"
+            checkoutdir="xorg/font/cronyx-cyrillic"/>
     <dependencies>
-      <dep package="xserver"/>
+      <dep package="util-macros"/>
+      <dep package="font-util"/>
+      <dep package="app-bdftopcf"/>
+      <dep package="app-mkfontscale"/>
+      <dep package="app-mkfontdir"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xf86-video-sis">
-    <branch module="xorg/driver/xf86-video-sis"
-            checkoutdir="xorg/driver/xf86-video-sis"/>
+  <autotools id="font-cursor-misc">
+    <branch module="xorg/font/cursor-misc"
+            checkoutdir="xorg/font/cursor-misc"/>
     <dependencies>
-      <dep package="xserver"/>
+      <dep package="util-macros"/>
+      <dep package="font-util"/>
+      <dep package="app-mkfontscale"/>
+      <dep package="app-mkfontdir"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xf86-video-sisusb">
-    <branch module="xorg/driver/xf86-video-sisusb"
-            checkoutdir="xorg/driver/xf86-video-sisusb"/>
+  <autotools id="font-daewoo-misc">
+    <branch module="xorg/font/daewoo-misc"
+            checkoutdir="xorg/font/daewoo-misc"/>
     <dependencies>
-      <dep package="xserver"/>
+      <dep package="util-macros"/>
+      <dep package="font-util"/>
+      <dep package="app-bdftopcf"/>
+      <dep package="app-mkfontscale"/>
+      <dep package="app-mkfontdir"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xf86-video-sunbw2">
-    <branch module="xorg/driver/xf86-video-sunbw2"
-            checkoutdir="xorg/driver/xf86-video-sunbw2"/>
+  <autotools id="font-dec-misc">
+    <branch module="xorg/font/dec-misc"
+            checkoutdir="xorg/font/dec-misc"/>
     <dependencies>
-      <dep package="xserver"/>
+      <dep package="util-macros"/>
+      <dep package="font-util"/>
+      <dep package="app-bdftopcf"/>
+      <dep package="app-mkfontscale"/>
+      <dep package="app-mkfontdir"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xf86-video-suncg14">
-    <branch module="xorg/driver/xf86-video-suncg14"
-            checkoutdir="xorg/driver/xf86-video-suncg14"/>
+  <autotools id="font-ibm-type1">
+    <branch module="xorg/font/ibm-type1"
+            checkoutdir="xorg/font/ibm-type1"/>
     <dependencies>
-      <dep package="xserver"/>
+      <dep package="util-macros"/>
+      <dep package="font-util"/>
+      <dep package="app-bdftopcf"/>
+      <dep package="app-mkfontscale"/>
+      <dep package="app-mkfontdir"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xf86-video-suncg3">
-    <branch module="xorg/driver/xf86-video-suncg3"
-            checkoutdir="xorg/driver/xf86-video-suncg3"/>
+  <autotools id="font-isas-misc">
+    <branch module="xorg/font/isas-misc"
+            checkoutdir="xorg/font/isas-misc"/>
     <dependencies>
-      <dep package="xserver"/>
+      <dep package="util-macros"/>
+      <dep package="font-util"/>
+      <dep package="app-bdftopcf"/>
+      <dep package="app-mkfontscale"/>
+      <dep package="app-mkfontdir"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xf86-video-suncg6">
-    <branch module="xorg/driver/xf86-video-suncg6"
-            checkoutdir="xorg/driver/xf86-video-suncg6"/>
+  <autotools id="font-jis-misc">
+    <branch module="xorg/font/jis-misc"
+            checkoutdir="xorg/font/jis-misc"/>
     <dependencies>
-      <dep package="xserver"/>
+      <dep package="util-macros"/>
+      <dep package="font-util"/>
+      <dep package="app-bdftopcf"/>
+      <dep package="app-mkfontscale"/>
+      <dep package="app-mkfontdir"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xf86-video-sunffb">
-    <branch module="xorg/driver/xf86-video-sunffb"
-            checkoutdir="xorg/driver/xf86-video-sunffb"/>
+  <autotools id="font-micro-misc">
+    <branch module="xorg/font/micro-misc"
+            checkoutdir="xorg/font/micro-misc"/>
     <dependencies>
-      <dep package="xserver"/>
+      <dep package="util-macros"/>
+      <dep package="font-util"/>
+      <dep package="app-bdftopcf"/>
+      <dep package="app-mkfontscale"/>
+      <dep package="app-mkfontdir"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xf86-video-sunleo">
-    <branch module="xorg/driver/xf86-video-sunleo"
-            checkoutdir="xorg/driver/xf86-video-sunleo"/>
+  <autotools id="font-misc-cyrillic">
+    <branch module="xorg/font/misc-cyrillic"
+            checkoutdir="xorg/font/misc-cyrillic"/>
     <dependencies>
-      <dep package="xserver"/>
+      <dep package="util-macros"/>
+      <dep package="font-util"/>
+      <dep package="app-bdftopcf"/>
+      <dep package="app-mkfontscale"/>
+      <dep package="app-mkfontdir"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xf86-video-suntcx">
-    <branch module="xorg/driver/xf86-video-suntcx"
-            checkoutdir="xorg/driver/xf86-video-suntcx"/>
+  <autotools id="font-misc-ethiopic">
+    <branch module="xorg/font/misc-ethiopic"
+            checkoutdir="xorg/font/misc-ethiopic"/>
     <dependencies>
-      <dep package="xserver"/>
+      <dep package="util-macros"/>
+      <dep package="font-util"/>
+      <dep package="app-bdftopcf"/>
+      <dep package="app-mkfontscale"/>
+      <dep package="app-mkfontdir"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xf86-video-tdfx">
-    <branch module="xorg/driver/xf86-video-tdfx"
-            checkoutdir="xorg/driver/xf86-video-tdfx"/>
+  <autotools id="font-misc-meltho">
+    <branch module="xorg/font/misc-meltho"
+            checkoutdir="xorg/font/misc-meltho"/>
     <dependencies>
-      <dep package="xserver"/>
+      <dep package="util-macros"/>
+      <dep package="font-util"/>
+      <dep package="app-bdftopcf"/>
+      <dep package="app-mkfontscale"/>
+      <dep package="app-mkfontdir"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xf86-video-tga">
-    <branch module="xorg/driver/xf86-video-tga"
-            checkoutdir="xorg/driver/xf86-video-tga"/>
+  <autotools id="font-misc-misc">
+    <branch module="xorg/font/misc-misc"
+            checkoutdir="xorg/font/misc-misc"/>
     <dependencies>
-      <dep package="xserver"/>
+      <dep package="util-macros"/>
+      <dep package="font-util"/>
+      <dep package="app-mkfontscale"/>
+      <dep package="app-mkfontdir"/>
+      <dep package="font-util"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xf86-video-trident">
-    <branch module="xorg/driver/xf86-video-trident"
-            checkoutdir="xorg/driver/xf86-video-trident"/>
+  <autotools id="font-mutt-misc">
+    <branch module="xorg/font/mutt-misc"
+            checkoutdir="xorg/font/mutt-misc"/>
     <dependencies>
-      <dep package="xserver"/>
+      <dep package="util-macros"/>
+      <dep package="font-util"/>
+      <dep package="app-bdftopcf"/>
+      <dep package="app-mkfontscale"/>
+      <dep package="app-mkfontdir"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xf86-video-tseng">
-    <branch module="xorg/driver/xf86-video-tseng"
-            checkoutdir="xorg/driver/xf86-video-tseng"/>
+  <autotools id="font-schumacher-misc">
+    <branch module="xorg/font/schumacher-misc"
+            checkoutdir="xorg/font/schumacher-misc"/>
     <dependencies>
-      <dep package="xserver"/>
+      <dep package="util-macros"/>
+      <dep package="font-util"/>
+      <dep package="app-bdftopcf"/>
+      <dep package="app-mkfontscale"/>
+      <dep package="app-mkfontdir"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xf86-video-v4l">
-    <branch module="xorg/driver/xf86-video-v4l"
-            checkoutdir="xorg/driver/xf86-video-v4l"/>
+  <autotools id="font-screen-cyrillic">
+    <branch module="xorg/font/screen-cyrillic"
+            checkoutdir="xorg/font/screen-cyrillic"/>
     <dependencies>
-      <dep package="xserver"/>
+      <dep package="util-macros"/>
+      <dep package="font-util"/>
+      <dep package="app-bdftopcf"/>
+      <dep package="app-mkfontscale"/>
+      <dep package="app-mkfontdir"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xf86-video-vesa">
-    <branch module="xorg/driver/xf86-video-vesa"
-            checkoutdir="xorg/driver/xf86-video-vesa"/>
+  <autotools id="font-sony-misc">
+    <branch module="xorg/font/sony-misc"
+            checkoutdir="xorg/font/sony-misc"/>
     <dependencies>
-      <dep package="xserver"/>
+      <dep package="util-macros"/>
+      <dep package="font-util"/>
+      <dep package="app-bdftopcf"/>
+      <dep package="app-mkfontscale"/>
+      <dep package="app-mkfontdir"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xf86-video-vmware">
-    <branch module="xorg/driver/xf86-video-vmware"
-            checkoutdir="xorg/driver/xf86-video-vmware"/>
+  <autotools id="font-sun-misc">
+    <branch module="xorg/font/sun-misc"
+            checkoutdir="xorg/font/sun-misc"/>
     <dependencies>
-      <dep package="xserver"/>
+      <dep package="util-macros"/>
+      <dep package="font-util"/>
+      <dep package="app-bdftopcf"/>
+      <dep package="app-mkfontscale"/>
+      <dep package="app-mkfontdir"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xf86-video-voodoo">
-    <branch module="xorg/driver/xf86-video-voodoo"
-            checkoutdir="xorg/driver/xf86-video-voodoo"/>
+  <autotools id="font-winitzki-cyrillic">
+    <branch module="xorg/font/winitzki-cyrillic"
+            checkoutdir="xorg/font/winitzki-cyrillic"/>
     <dependencies>
-      <dep package="xserver"/>
+      <dep package="util-macros"/>
+      <dep package="font-util"/>
+      <dep package="app-bdftopcf"/>
+      <dep package="app-mkfontscale"/>
+      <dep package="app-mkfontdir"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xf86-video-wsfb">
-    <branch module="xorg/driver/xf86-video-wsfb"
-            checkoutdir="xorg/driver/xf86-video-wsfb"/>
+  <autotools id="font-xfree86-type1">
+    <branch module="xorg/font/xfree86-type1"
+            checkoutdir="xorg/font/xfree86-type1"/>
     <dependencies>
-      <dep package="xserver"/>
+      <dep package="util-macros"/>
+      <dep package="font-util"/>
+      <dep package="app-bdftopcf"/>
+      <dep package="app-mkfontscale"/>
+      <dep package="app-mkfontdir"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xf86-video-xgixp">
-    <branch module="xorg/driver/xf86-video-xgixp"
-            checkoutdir="xorg/driver/xf86-video-xgixp"/>
+  <autotools id="font-alias">
+    <branch module="xorg/font/alias"
+            checkoutdir="xorg/font/alias"/>
     <dependencies>
-      <dep package="xserver"/>
+      <dep package="util-macros"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xts">
-    <branch repo="git.freedesktop.org" module="xorg/test/xts" checkoutdir="xorg/test/xts"/>
+
+  <!-- The X Keyboard Extension -->
+  <autotools id="xkeyboard-config">
+    <branch module="xkeyboard-config"
+            checkoutdir="xkeyboard-config"/>
     <dependencies>
-      <dep package="libX11"/>
-      <dep package="xdpyinfo"/>
-      <dep package="xset"/>
+      <dep package="app-xkbcomp"/>
     </dependencies>
+    <suggests>
+      <dep package="proto-x11proto"/>
+      <dep package="lib-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>
 
-  <!-- These drivers are marked unmaintained in xorg/doc/xorg-docs/MAINTAINERS and are also broken -->
-  <metamodule id="xorg-unmaintained-broken-drivers">
+  <autotools id="xcb-libxcb">
+    <branch module="xcb/libxcb"
+            checkoutdir="xcb/libxcb"/>
     <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="xcb-proto"/>
+      <dep package="xcb-pthread-stubs"/>
+      <dep package="lib-libXau"/>
     </dependencies>
-  </metamodule>
+  </autotools>
 
-  <!-- This driver is BSD specific, and should not be built on all platforms -->
-  <metamodule id="xorg-unmaintained-broken-drivers">
+  <autotools id="xcb-util">
+    <branch module="xcb/util"
+            checkoutdir="xcb/xcb-util"/>
     <dependencies>
-      <dep package="xf86-video-wsfb"/>
+      <dep package="proto-x11proto"/>
+      <dep package="xcb-libxcb"/>
     </dependencies>
-  </metamodule>
+  </autotools>
 
-  <metamodule id="xorg-drivers">
-    <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"/>
+   <autotools id="xcb-util-image">
+    <branch module="xcb/util-image" checkoutdir="xcb/xcb-util-image"/>
+    <dependencies>
+      <dep package="proto-x11proto"/>
+      <dep package="xcb-libxcb"/>
+      <dep package="xcb-util"/>
     </dependencies>
-  </metamodule>
+   </autotools>
 
-  <!-- Modules that only build on x86 (32 and 64bit) -->
+   <autotools id="xcb-util-keysyms">
+    <branch module="xcb/util-keysyms" checkoutdir="xcb/xcb-util-keysyms"/>
+    <dependencies>
+      <dep package="proto-x11proto"/>
+      <dep package="xcb-libxcb"/>
+    </dependencies>
+   </autotools>
 
-  <metamodule id="xorg-x86-drivers">
+   <autotools id="xcb-util-renderutil">
+    <branch module="xcb/util-renderutil" checkoutdir="xcb/xcb-util-renderutil"/>
     <dependencies>
-      <dep package="xf86-input-vmmouse"/>
+      <dep package="xcb-libxcb"/>
     </dependencies>
-  </metamodule>
+   </autotools>
 
-  <!-- This probably isn't sufficient, but it is a start -->
+   <autotools id="xcb-util-wm">
+    <branch module="xcb/util-wm" checkoutdir="xcb/xcb-util-wm"/>
+    <dependencies>
+      <dep package="xcb-libxcb"/>
+    </dependencies>
+   </autotools>
 
-  <metamodule id="xorg-sun-drivers">
+  <!--  The Mesa 3D Graphics Library - Modules Definition -->
+  <autotools id="mesa-mesa">
+    <branch module="mesa/mesa"
+            checkoutdir="mesa/mesa"/>
     <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="proto-dri2proto"/>
+      <dep package="proto-glproto"/>
+      <dep package="proto-xextproto"/>
+      <dep package="proto-xf86driproto"/>
+      <dep package="lib-libXdamage"/>
+      <dep package="lib-libX11"/>
+      <dep package="lib-libXext"/>
+      <dep package="lib-libXfixes"/>
+      <dep package="xcb-libxcb"/>
+      <dep package="mesa-drm"/>
     </dependencies>
-  </metamodule>
+    <suggests>
+      <dep package="lib-libXvMC"/>
+      <dep package="lib-libXxf86vm"/>
+    </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="lib-libpciaccess"/>
+    </dependencies>
+  </autotools>
 
-  <!-- Bogosity of depending on libraries caused by Xnest.  Sigh -->
-  <autotools id="xserver">
-    <branch module="xorg/xserver"
-            checkoutdir="xorg/xserver"/>
+  <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="xorg-protos"/>
-      <dep package="libGL"/>
-      <dep package="libXaw"/>
-      <dep package="libXfont"/>
-      <dep package="libxtrans"/>
-      <dep package="libXau"/>
-      <dep package="libxkbfile"/>
-      <dep package="libXdmcp"/>
-      <dep package="libXxf86vm"/>
-      <dep package="libXinerama"/>
-      <dep package="libXv"/>
-      <dep package="libdrm"/>
-      <dep package="libdmx"/>
-      <dep package="libXtst"/>
-      <dep package="libXRes"/>
-      <dep package="pixman"/>
-      <dep package="libpciaccess"/>
+      <dep package="lib-libX11"/>
+      <dep package="lib-libXi"/>
+      <dep package="lib-libXmu"/>
+      <dep package="mesa-mesa"/>
+      <dep package="util-makedepend"/>
     </dependencies>
   </autotools>
 
-  <metamodule id="xorg">
+  <autotools id="mesa-glu">
+    <branch module="mesa/glu" checkoutdir="mesa/glu"/>
+    <dependencies>
+      <dep package="mesa-mesa"/>
+    </dependencies>
+  </autotools>
+
+  <!-- X Build Utilities (util-macros) -->
+  <autotools id="util-macros">
+    <branch module="xorg/util/macros"
+            checkoutdir="xorg/util/macros"/>
+  </autotools>
+
+  <autotools id="util-makedepend">
+    <branch module="xorg/util/makedepend"
+            checkoutdir="xorg/util/makedepend"/>
     <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="util-macros"/>
+      <dep package="proto-x11proto"/>
+    </dependencies>
+  </autotools>
+
+  <!-- Pixman (Pixel Manipulation Library) - Module Definition -->
+  <autotools id="pixman">
+    <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="lib-libX11"/>
+      <dep package="lib-libXext"/>
+      <dep package="lib-libXau"/>
+      <dep package="lib-libxtrans"/>
+      <dep package="lib-libXmu"/>
+      <dep package="lib-libXi"/>
+      <dep package="lib-libXtst"/>
+      <dep package="lib-libXt"/>
+      <dep package="lib-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="proto-bigreqsproto"/>
+      <dep package="proto-fontsproto"/>
+      <dep package="proto-kbproto"/>
+      <dep package="proto-recordproto"/>
+      <dep package="proto-scrnsaverproto"/>
+      <dep package="proto-xcmiscproto"/>
+      <dep package="proto-xextproto"/>
+      <dep package="proto-x11proto"/>
+      <dep package="lib-libICE"/>
+      <dep package="lib-libSM"/>
+      <dep package="lib-libX11"/>
+      <dep package="lib-libXaw"/>
+      <dep package="lib-libXdmcp"/>
+      <dep package="lib-libXext"/>
+      <dep package="lib-libXi"/>
+      <dep package="lib-libXmu"/>
+      <dep package="lib-libXt"/>
+      <dep package="lib-libXtst"/>
+      <dep package="lib-libxtrans"/>
       <dep package="xorg-docs"/>
-      <dep package="xserver"/>
-      <dep package="xkeyboard-config"/>
     </dependencies>
   </metamodule>
 
-- 
1.7.9.5