--- /Source/xorg/util/modular/xorg.modules	Fri Jan 27 10:18:45 2006
+++ xorg.modules	Thu May  4 05:49:45 2006
@@ -7,65 +7,65 @@
 <?xml-stylesheet type="text/xsl" href="moduleset.xsl"?>
 <moduleset>
 
-  <cvsroot name="fontconfig.freedesktop.org"
+  <repository type="cvs" name="fontconfig.freedesktop.org"
      root=":pserver:anoncvs@cvs.freedesktop.org:/cvs/fontconfig"
      password="" />
 
-  <cvsroot name="xorg.freedesktop.org"
+  <repository type="cvs" name="xorg.freedesktop.org" default="yes"
      root=":pserver:anoncvs@cvs.freedesktop.org:/cvs/xorg"
      password="" />
 
-  <cvsroot name="dri.freedesktop.org"
+  <repository type="cvs" name="dri.freedesktop.org"
      root=":pserver:anonymous@dri.freedesktop.org:/cvs/dri"
      password="" />
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="util/macros"/>
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="util/makedepend"/>
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="util/cf"/>
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="util/imake">
+  <cvsmodule id="util/macros"/>
+  <cvsmodule id="util/makedepend"/>
+  <cvsmodule id="util/cf"/>
+  <cvsmodule id="util/imake">
     <dependencies>
 	<!--      <dep package="util/cf"/> -->
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="util/xmkmf">
+  <cvsmodule id="util/xmkmf">
     <dependencies>
       <dep package="util/imake"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="proto/AppleWM"/>
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="proto/BigReqs"/>
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="proto/Composite"/>
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="proto/Damage"/>
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="proto/DMX"/>
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="proto/EvIE"/>
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="proto/Fixes"/>
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="proto/Fontcache"/>
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="proto/Fonts"/>
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="proto/GL"/>
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="proto/Input"/>
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="proto/KB"/>
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="proto/Print"/>
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="proto/PM"/>
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="proto/Randr"/>
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="proto/Record"/>
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="proto/Render"/>
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="proto/Resource"/>
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="proto/ScrnSaver"/>
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="proto/Trap"/>
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="proto/Video"/>
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="proto/WindowsWM"/>
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="proto/XCMisc"/>
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="proto/XExt"/>
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="proto/XF86BigFont"/>
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="proto/XF86DGA"/>
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="proto/XF86DRI"/>
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="proto/XF86Misc"/>
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="proto/XF86Rush"/>
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="proto/XF86VidMode"/>
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="proto/Xinerama"/>
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="proto/X11"/>
+  <cvsmodule id="proto/AppleWM"/>
+  <cvsmodule id="proto/BigReqs"/>
+  <cvsmodule id="proto/Composite"/>
+  <cvsmodule id="proto/Damage"/>
+  <cvsmodule id="proto/DMX"/>
+  <cvsmodule id="proto/EvIE"/>
+  <cvsmodule id="proto/Fixes"/>
+  <cvsmodule id="proto/Fontcache"/>
+  <cvsmodule id="proto/Fonts"/>
+  <cvsmodule id="proto/GL"/>
+  <cvsmodule id="proto/Input"/>
+  <cvsmodule id="proto/KB"/>
+  <cvsmodule id="proto/Print"/>
+  <cvsmodule id="proto/PM"/>
+  <cvsmodule id="proto/Randr"/>
+  <cvsmodule id="proto/Record"/>
+  <cvsmodule id="proto/Render"/>
+  <cvsmodule id="proto/Resource"/>
+  <cvsmodule id="proto/ScrnSaver"/>
+  <cvsmodule id="proto/Trap"/>
+  <cvsmodule id="proto/Video"/>
+  <cvsmodule id="proto/WindowsWM"/>
+  <cvsmodule id="proto/XCMisc"/>
+  <cvsmodule id="proto/XExt"/>
+  <cvsmodule id="proto/XF86BigFont"/>
+  <cvsmodule id="proto/XF86DGA"/>
+  <cvsmodule id="proto/XF86DRI"/>
+  <cvsmodule id="proto/XF86Misc"/>
+  <cvsmodule id="proto/XF86Rush"/>
+  <cvsmodule id="proto/XF86VidMode"/>
+  <cvsmodule id="proto/Xinerama"/>
+  <cvsmodule id="proto/X11"/>
 
   <metamodule id="xorg-protos">
     <dependencies>
@@ -104,7 +104,7 @@
 
   <!-- libs -->
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="lib/FS">
+  <cvsmodule id="lib/FS">
     <dependencies>
       <dep package="util/macros"/>
       <dep package="proto/X11"/>
@@ -113,7 +113,7 @@
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="lib/ICE">
+  <cvsmodule id="lib/ICE">
     <dependencies>
       <dep package="util/macros"/>
       <dep package="proto/X11"/>
@@ -121,7 +121,7 @@
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="lib/SM">
+  <cvsmodule id="lib/SM">
     <dependencies>
       <dep package="util/macros"/>
       <dep package="proto/X11"/>
@@ -130,7 +130,7 @@
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="lib/X11">
+  <cvsmodule id="lib/X11">
     <dependencies>
       <dep package="util/macros"/>
       <dep package="proto/X11"/>
@@ -145,7 +145,7 @@
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="lib/XScrnSaver">
+  <cvsmodule id="lib/XScrnSaver">
     <dependencies>
       <dep package="util/macros"/>
       <dep package="lib/X11"/>
@@ -155,7 +155,7 @@
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="lib/XTrap">
+  <cvsmodule id="lib/XTrap">
     <dependencies>
       <dep package="util/macros"/>
       <dep package="lib/X11"/>
@@ -166,14 +166,14 @@
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="lib/Xau">
+  <cvsmodule id="lib/Xau">
     <dependencies>
       <dep package="util/macros"/>
       <dep package="proto/X11"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="lib/Xaw">
+  <cvsmodule id="lib/Xaw">
     <dependencies>
       <dep package="util/macros"/>
       <dep package="proto/X11"/>
@@ -184,7 +184,7 @@
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="lib/Xcomposite">
+  <cvsmodule id="lib/Xcomposite">
     <dependencies>
       <dep package="util/macros"/>
       <dep package="proto/Composite"/>
@@ -194,7 +194,7 @@
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="lib/Xcursor">
+  <cvsmodule id="lib/Xcursor">
     <dependencies>
       <dep package="util/macros"/>
       <dep package="lib/Xrender"/>
@@ -203,7 +203,7 @@
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="lib/Xdamage">
+  <cvsmodule id="lib/Xdamage">
     <dependencies>
       <dep package="util/macros"/>
       <dep package="lib/X11"/>
@@ -212,14 +212,14 @@
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="lib/Xdmcp">
+  <cvsmodule id="lib/Xdmcp">
     <dependencies>
       <dep package="util/macros"/>
       <dep package="proto/X11"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="lib/Xevie">
+  <cvsmodule id="lib/Xevie">
     <dependencies>
       <dep package="util/macros"/>
       <dep package="proto/X11"/>
@@ -230,7 +230,7 @@
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="lib/Xext">
+  <cvsmodule id="lib/Xext">
     <dependencies>
       <dep package="util/macros"/>
       <dep package="proto/X11"/>
@@ -239,7 +239,7 @@
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="lib/Xfixes">
+  <cvsmodule id="lib/Xfixes">
     <dependencies>
       <dep package="util/macros"/>
       <dep package="lib/X11"/>
@@ -247,7 +247,7 @@
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="lib/Xfont">
+  <cvsmodule id="lib/Xfont">
     <dependencies>
       <dep package="util/macros"/>
       <dep package="proto/X11"/>
@@ -258,7 +258,7 @@
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="lib/Xfontcache">
+  <cvsmodule id="lib/Xfontcache">
     <dependencies>
       <dep package="util/macros"/>
       <dep package="lib/X11"/>
@@ -270,7 +270,7 @@
 
   <cvsmodule id="fontconfig" cvsroot="fontconfig.freedesktop.org" />
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="lib/Xft">
+  <cvsmodule id="lib/Xft">
     <dependencies>
       <dep package="util/macros"/>
       <dep package="lib/Xrender"/>
@@ -278,7 +278,7 @@
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="lib/Xi">
+  <cvsmodule id="lib/Xi">
     <dependencies>
       <dep package="util/macros"/>
       <dep package="proto/X11"/>
@@ -289,7 +289,7 @@
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="lib/Xinerama">
+  <cvsmodule id="lib/Xinerama">
     <dependencies>
       <dep package="util/macros"/>
       <dep package="lib/X11"/>
@@ -299,7 +299,7 @@
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="lib/Xmu">
+  <cvsmodule id="lib/Xmu">
     <dependencies>
       <dep package="util/macros"/>
       <dep package="lib/X11"/>
@@ -308,7 +308,7 @@
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="lib/Xp">
+  <cvsmodule id="lib/Xp">
     <dependencies>
       <dep package="util/macros"/>
       <dep package="lib/X11"/>
@@ -318,7 +318,7 @@
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="lib/Xpm">
+  <cvsmodule id="lib/Xpm">
     <dependencies>
       <dep package="util/macros"/>
       <dep package="lib/X11"/>
@@ -328,7 +328,7 @@
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="lib/XprintAppUtil">
+  <cvsmodule id="lib/XprintAppUtil">
     <dependencies>
       <dep package="util/macros"/>
       <dep package="lib/X11"/>
@@ -337,7 +337,7 @@
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="lib/XprintUtil">
+  <cvsmodule id="lib/XprintUtil">
     <dependencies>
       <dep package="util/macros"/>
       <dep package="lib/X11"/>
@@ -345,7 +345,7 @@
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="lib/Xrandr">
+  <cvsmodule id="lib/Xrandr">
     <dependencies>
       <dep package="util/macros"/>
       <dep package="lib/X11"/>
@@ -353,7 +353,7 @@
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="lib/Xrender">
+  <cvsmodule id="lib/Xrender">
     <dependencies>
       <dep package="util/macros"/>
       <dep package="proto/Render"/>
@@ -361,7 +361,7 @@
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="lib/XRes">
+  <cvsmodule id="lib/XRes">
     <dependencies>
       <dep package="util/macros"/>
       <dep package="lib/X11"/>
@@ -370,7 +370,7 @@
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="lib/Xt">
+  <cvsmodule id="lib/Xt">
     <dependencies>
       <dep package="util/macros"/>
       <dep package="lib/SM"/>
@@ -379,7 +379,7 @@
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="lib/Xtst">
+  <cvsmodule id="lib/Xtst">
     <dependencies>
       <dep package="util/macros"/>
       <dep package="lib/X11"/>
@@ -389,7 +389,7 @@
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="lib/Xv">
+  <cvsmodule id="lib/Xv">
     <dependencies>
       <dep package="util/macros"/>
       <dep package="lib/X11"/>
@@ -399,7 +399,7 @@
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="lib/XvMC">
+  <cvsmodule id="lib/XvMC">
     <dependencies>
       <dep package="util/macros"/>
       <dep package="lib/X11"/>
@@ -410,7 +410,7 @@
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="lib/Xxf86dga">
+  <cvsmodule id="lib/Xxf86dga">
     <dependencies>
       <dep package="util/macros"/>
       <dep package="proto/X11"/>
@@ -421,7 +421,7 @@
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="lib/Xxf86misc">
+  <cvsmodule id="lib/Xxf86misc">
     <dependencies>
       <dep package="util/macros"/>
       <dep package="proto/X11"/>
@@ -432,7 +432,7 @@
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="lib/Xxf86vm">
+  <cvsmodule id="lib/Xxf86vm">
     <dependencies>
       <dep package="util/macros"/>
       <dep package="proto/X11"/>
@@ -443,7 +443,7 @@
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="lib/dmx">
+  <cvsmodule id="lib/dmx">
     <dependencies>
       <dep package="util/macros"/>
       <dep package="lib/X11"/>
@@ -453,28 +453,28 @@
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="lib/fontenc">
+  <cvsmodule id="lib/fontenc">
     <dependencies>
       <dep package="util/macros"/>
       <dep package="proto/X11"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="lib/lbxutil">
+  <cvsmodule id="lib/lbxutil">
     <dependencies>
       <dep package="util/macros"/>
       <dep package="proto/XExt"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="lib/oldX">
+  <cvsmodule id="lib/oldX">
     <dependencies>
       <dep package="util/macros"/>
       <dep package="lib/X11"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="lib/xkbfile">
+  <cvsmodule id="lib/xkbfile">
     <dependencies>
       <dep package="util/macros"/>
       <dep package="lib/X11"/>
@@ -482,7 +482,7 @@
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="lib/xkbui">
+  <cvsmodule id="lib/xkbui">
     <dependencies>
       <dep package="util/macros"/>
       <dep package="lib/X11"/>
@@ -491,14 +491,14 @@
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="lib/xtrans">
+  <cvsmodule id="lib/xtrans">
     <dependencies>
       <dep package="util/macros"/>
     </dependencies>
   </cvsmodule>
 
 
-  <cvsmodule cvsroot="dri.freedesktop.org" module="drm">
+  <cvsmodule cvsroot="dri.freedesktop.org" id="drm">
     <dependencies>
       <dep package="util/macros"/>
     </dependencies>
@@ -552,243 +552,243 @@
     </dependencies>
   </metamodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="lib/xtrans"/>
+  <cvsmodule id="lib/xtrans"/>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="font/100dpi">
+  <cvsmodule id="font/100dpi">
     <dependencies>
       <dep package="font/util"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="font/adobe-100dpi">
+  <cvsmodule id="font/adobe-100dpi">
     <dependencies>
       <dep package="font/util"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="font/adobe-75dpi">
+  <cvsmodule id="font/adobe-75dpi">
     <dependencies>
       <dep package="font/util"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="font/adobe-utopia-100dpi">
+  <cvsmodule id="font/adobe-utopia-100dpi">
     <dependencies>
       <dep package="font/util"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="font/adobe-utopia-75dpi">
+  <cvsmodule id="font/adobe-utopia-75dpi">
     <dependencies>
       <dep package="font/util"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="font/adobe-utopia-type1">
+  <cvsmodule id="font/adobe-utopia-type1">
     <dependencies>
       <dep package="font/util"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="font/alias">
+  <cvsmodule id="font/alias">
     <dependencies>
       <dep package="font/util"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="font/arabic-misc">
+  <cvsmodule id="font/arabic-misc">
     <dependencies>
       <dep package="font/util"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="font/bh-100dpi">
+  <cvsmodule id="font/bh-100dpi">
     <dependencies>
       <dep package="font/util"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="font/bh-75dpi">
+  <cvsmodule id="font/bh-75dpi">
     <dependencies>
       <dep package="font/util"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="font/bh-lucidatypewriter-100dpi">
+  <cvsmodule id="font/bh-lucidatypewriter-100dpi">
     <dependencies>
       <dep package="font/util"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="font/bh-lucidatypewriter-75dpi">
+  <cvsmodule id="font/bh-lucidatypewriter-75dpi">
     <dependencies>
       <dep package="font/util"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="font/bh-ttf">
+  <cvsmodule id="font/bh-ttf">
     <dependencies>
       <dep package="font/util"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="font/bh-type1">
+  <cvsmodule id="font/bh-type1">
     <dependencies>
       <dep package="font/util"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="font/bitstream-100dpi">
+  <cvsmodule id="font/bitstream-100dpi">
     <dependencies>
       <dep package="font/util"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="font/bitstream-75dpi">
+  <cvsmodule id="font/bitstream-75dpi">
     <dependencies>
       <dep package="font/util"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="font/bitstream-speedo">
+  <cvsmodule id="font/bitstream-speedo">
     <dependencies>
       <dep package="font/util"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="font/bitstream-type1">
+  <cvsmodule id="font/bitstream-type1">
     <dependencies>
       <dep package="font/util"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="font/cronyx-cyrillic">
+  <cvsmodule id="font/cronyx-cyrillic">
     <dependencies>
       <dep package="font/util"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="font/cursor-misc">
+  <cvsmodule id="font/cursor-misc">
     <dependencies>
       <dep package="font/util"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="font/CVS">
+  <cvsmodule id="font/CVS">
     <dependencies>
       <dep package="font/util"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="font/daewoo-misc">
+  <cvsmodule id="font/daewoo-misc">
     <dependencies>
       <dep package="font/util"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="font/dec-misc">
+  <cvsmodule id="font/dec-misc">
     <dependencies>
       <dep package="font/util"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="font/encodings">
+  <cvsmodule id="font/encodings">
     <dependencies>
       <dep package="font/util"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="font/ibm-type1">
+  <cvsmodule id="font/ibm-type1">
     <dependencies>
       <dep package="font/util"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="font/isas-misc">
+  <cvsmodule id="font/isas-misc">
     <dependencies>
       <dep package="font/util"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="font/jis-misc">
+  <cvsmodule id="font/jis-misc">
     <dependencies>
       <dep package="font/util"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="font/micro-misc">
+  <cvsmodule id="font/micro-misc">
     <dependencies>
       <dep package="font/util"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="font/misc-cyrillic">
+  <cvsmodule id="font/misc-cyrillic">
     <dependencies>
       <dep package="font/util"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="font/misc-ethiopic">
+  <cvsmodule id="font/misc-ethiopic">
     <dependencies>
       <dep package="font/util"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="font/misc-meltho">
+  <cvsmodule id="font/misc-meltho">
     <dependencies>
       <dep package="font/util"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="font/misc-misc">
+  <cvsmodule id="font/misc-misc">
     <dependencies>
       <dep package="font/util"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="font/mutt-misc">
+  <cvsmodule id="font/mutt-misc">
     <dependencies>
       <dep package="font/util"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="font/schumacher-misc">
+  <cvsmodule id="font/schumacher-misc">
     <dependencies>
       <dep package="font/util"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="font/screen-cyrillic">
+  <cvsmodule id="font/screen-cyrillic">
     <dependencies>
       <dep package="font/util"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="font/sony-misc">
+  <cvsmodule id="font/sony-misc">
     <dependencies>
       <dep package="font/util"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="font/sun-misc">
+  <cvsmodule id="font/sun-misc">
     <dependencies>
       <dep package="font/util"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="font/util">
+  <cvsmodule id="font/util">
     <dependencies>
       <dep package="font/util"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="font/winitzki-cyrillic">
+  <cvsmodule id="font/winitzki-cyrillic">
     <dependencies>
       <dep package="font/util"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="font/xfree86-type1">
+  <cvsmodule id="font/xfree86-type1">
     <dependencies>
       <dep package="font/util"/>
     </dependencies>
@@ -828,19 +828,19 @@
   </metamodule>
 
   <!-- data -->
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="data/bitmaps">
+  <cvsmodule id="data/bitmaps">
     <dependencies>
       <dep package="util/macros"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="data/cursors">
+  <cvsmodule id="data/cursors">
     <dependencies>
       <dep package="app/xcursorgen"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="data/xkbdata">
+  <cvsmodule id="data/xkbdata">
     <dependencies>
       <dep package="app/xkbcomp"/>
     </dependencies>
@@ -848,26 +848,26 @@
 
   <!-- apps -->
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="app/appres">
+  <cvsmodule id="app/appres">
     <dependencies>
       <dep package="lib/Xt"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="app/bdftopcf">
+  <cvsmodule id="app/bdftopcf">
     <dependencies>
       <dep package="lib/Xfont"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="app/beforelight">
+  <cvsmodule id="app/beforelight">
     <dependencies>
       <dep package="lib/XScrnSaver"/>
       <dep package="lib/Xt"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="app/bitmap">
+  <cvsmodule id="app/bitmap">
     <dependencies>
       <dep package="lib/Xaw"/>
       <dep package="lib/Xmu"/>
@@ -875,13 +875,13 @@
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="app/editres">
+  <cvsmodule id="app/editres">
     <dependencies>
       <dep package="lib/Xaw"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="app/fonttosfnt">
+  <cvsmodule id="app/fonttosfnt">
     <dependencies>
       <dep package="lib/X11"/>
       <dep package="lib/fontenc"/>
@@ -889,34 +889,34 @@
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="app/fslsfonts">
+  <cvsmodule id="app/fslsfonts">
     <dependencies>
       <dep package="lib/X11"/>
       <dep package="lib/FS"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="app/fstobdf">
+  <cvsmodule id="app/fstobdf">
     <dependencies>
       <dep package="lib/X11"/>
       <dep package="lib/FS"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="app/iceauth">
+  <cvsmodule id="app/iceauth">
     <dependencies>
       <dep package="lib/X11"/>
       <dep package="lib/ICE"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="app/ico">
+  <cvsmodule id="app/ico">
     <dependencies>
       <dep package="lib/X11"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="app/lbxproxy">
+  <cvsmodule id="app/lbxproxy">
     <dependencies>
       <dep package="lib/xtrans"/>
       <dep package="lib/Xext"/>
@@ -927,31 +927,31 @@
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="app/listres">
+  <cvsmodule id="app/listres">
     <dependencies>
       <dep package="lib/Xaw"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="app/luit">
+  <cvsmodule id="app/luit">
     <dependencies>
       <dep package="lib/X11"/>
       <dep package="lib/fontenc"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="app/mkcfm"/>
+  <cvsmodule id="app/mkcfm"/>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="app/mkfontdir"/>
+  <cvsmodule id="app/mkfontdir"/>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="app/mkfontscale">
+  <cvsmodule id="app/mkfontscale">
     <dependencies>
       <dep package="lib/fontenc"/>
       <!-- <dep package="freetype2"/> -->
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="app/oclock">
+  <cvsmodule id="app/oclock">
     <dependencies>
       <dep package="lib/X11"/>
       <dep package="lib/Xmu"/>
@@ -959,8 +959,8 @@
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="app/pclcomp"/>
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="app/proxymngr">
+  <cvsmodule id="app/pclcomp"/>
+  <cvsmodule id="app/proxymngr">
     <dependencies>
       <dep package="lib/X11"/>
       <dep package="lib/Xt"/>
@@ -969,76 +969,76 @@
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="app/rgb">
+  <cvsmodule id="app/rgb">
     <dependencies>
       <dep package="proto/X11"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="app/rstart"/>
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="app/scripts"/>
+  <cvsmodule id="app/rstart"/>
+  <cvsmodule id="app/scripts"/>
 
-  <!-- <cvsmodule cvsroot="xorg.freedesktop.org" module="app/sessreg"/> -->
+  <!-- <cvsmodule id="app/sessreg"/> -->
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="app/setxkbmap"/>
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="app/showfont"/>
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="app/smproxy"/>
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="app/twm"/>
+  <cvsmodule id="app/setxkbmap"/>
+  <cvsmodule id="app/showfont"/>
+  <cvsmodule id="app/smproxy"/>
+  <cvsmodule id="app/twm"/>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="app/viewres">
+  <cvsmodule id="app/viewres">
     <dependencies>
       <dep package="lib/Xaw"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="app/x11perf"/>
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="app/xauth"/>
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="app/xbiff">
+  <cvsmodule id="app/x11perf"/>
+  <cvsmodule id="app/xauth"/>
+  <cvsmodule id="app/xbiff">
     <dependencies>
       <dep package="lib/Xaw"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="app/xcalc">
+  <cvsmodule id="app/xcalc">
     <dependencies>
       <dep package="lib/Xaw"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="app/xclipboard">
+  <cvsmodule id="app/xclipboard">
     <dependencies>
       <dep package="lib/Xaw"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="app/xclock">
+  <cvsmodule id="app/xclock">
     <dependencies>
       <dep package="lib/Xaw"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="app/xcmsdb"/>
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="app/xconsole">
+  <cvsmodule id="app/xcmsdb"/>
+  <cvsmodule id="app/xconsole">
     <dependencies>
       <dep package="lib/Xaw"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="app/xcursorgen"/>
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="app/xdbedizzy"/>
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="app/xditview">
+  <cvsmodule id="app/xcursorgen"/>
+  <cvsmodule id="app/xdbedizzy"/>
+  <cvsmodule id="app/xditview">
     <dependencies>
       <dep package="lib/Xaw"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="app/xdm">
+  <cvsmodule id="app/xdm">
     <dependencies>
       <dep package="lib/Xaw"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="app/xdpyinfo">
+  <cvsmodule id="app/xdpyinfo">
     <dependencies>
       <dep package="lib/X11"/>
       <dep package="lib/Xext"/>
@@ -1046,120 +1046,120 @@
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="app/xdriinfo">
+  <cvsmodule id="app/xdriinfo">
     <dependencies>
       <dep package="proto/GL"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="app/xedit"/>
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="app/xev"/>
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="app/xeyes"/>
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="app/xf86dga"/>
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="app/xfd">
+  <cvsmodule id="app/xedit"/>
+  <cvsmodule id="app/xev"/>
+  <cvsmodule id="app/xeyes"/>
+  <cvsmodule id="app/xf86dga"/>
+  <cvsmodule id="app/xfd">
     <dependencies>
       <dep package="lib/Xaw"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="app/xfindproxy"/>
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="app/xfontsel"/>
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="app/xfs"/>
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="app/xfsinfo"/>
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="app/xfwp"/>
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="app/xgamma"/>
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="app/xgc">
+  <cvsmodule id="app/xfindproxy"/>
+  <cvsmodule id="app/xfontsel"/>
+  <cvsmodule id="app/xfs"/>
+  <cvsmodule id="app/xfsinfo"/>
+  <cvsmodule id="app/xfwp"/>
+  <cvsmodule id="app/xgamma"/>
+  <cvsmodule id="app/xgc">
     <dependencies>
       <dep package="lib/Xaw"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="app/xhost"/>
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="app/xinit"/>
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="app/xkbcomp"/>
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="app/xkbevd"/>
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="app/xkbprint"/>
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="app/xkbutils">
+  <cvsmodule id="app/xhost"/>
+  <cvsmodule id="app/xinit"/>
+  <cvsmodule id="app/xkbcomp"/>
+  <cvsmodule id="app/xkbevd"/>
+  <cvsmodule id="app/xkbprint"/>
+  <cvsmodule id="app/xkbutils">
     <dependencies>
       <dep package="lib/Xaw"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="app/xkill"/>
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="app/xload">
+  <cvsmodule id="app/xkill"/>
+  <cvsmodule id="app/xload">
     <dependencies>
       <dep package="lib/Xaw"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="app/xlogo">
+  <cvsmodule id="app/xlogo">
     <dependencies>
       <dep package="lib/Xaw"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="app/xlsatoms"/>
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="app/xlsclients"/>
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="app/xlsfonts"/>
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="app/xmag">
+  <cvsmodule id="app/xlsatoms"/>
+  <cvsmodule id="app/xlsclients"/>
+  <cvsmodule id="app/xlsfonts"/>
+  <cvsmodule id="app/xmag">
     <dependencies>
       <dep package="lib/Xaw"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="app/xman">
+  <cvsmodule id="app/xman">
     <dependencies>
       <dep package="lib/Xaw"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="app/xmessage">
+  <cvsmodule id="app/xmessage">
     <dependencies>
       <dep package="lib/Xaw"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="app/xmh">
+  <cvsmodule id="app/xmh">
     <dependencies>
       <dep package="lib/Xaw"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="app/xmodmap"/>
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="app/xmore">
+  <cvsmodule id="app/xmodmap"/>
+  <cvsmodule id="app/xmore">
     <dependencies>
       <dep package="lib/Xaw"/>
     </dependencies>
   </cvsmodule>
 
   <!--
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="app/xphelloworld"/>
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="app/xplsprinters"/>
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="app/xpr"/>
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="app/xprehashprinterlist"/>
+  <cvsmodule id="app/xphelloworld"/>
+  <cvsmodule id="app/xplsprinters"/>
+  <cvsmodule id="app/xpr"/>
+  <cvsmodule id="app/xprehashprinterlist"/>
   -->
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="app/xprop"/>
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="app/xrandr"/>
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="app/xrdb"/>
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="app/xrefresh"/>
+  <cvsmodule id="app/xprop"/>
+  <cvsmodule id="app/xrandr"/>
+  <cvsmodule id="app/xrdb"/>
+  <cvsmodule id="app/xrefresh"/>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="app/xrx">
+  <cvsmodule id="app/xrx">
     <dependencies>
       <dep package="lib/Xext"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="app/xset">
+  <cvsmodule id="app/xset">
     <dependencies>
       <dep package="lib/Xext"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="app/xsetmode"/>
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="app/xsetpointer"/>
+  <cvsmodule id="app/xsetmode"/>
+  <cvsmodule id="app/xsetpointer"/>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="app/xsetroot">
+  <cvsmodule id="app/xsetroot">
     <dependencies>
       <dep package="lib/X11"/>
       <dep package="lib/Xmu"/>
@@ -1167,25 +1167,25 @@
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="app/xsm">
+  <cvsmodule id="app/xsm">
     <dependencies>
       <dep package="lib/Xaw"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="app/xstdcmap"/>
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="app/xtrap"/>
+  <cvsmodule id="app/xstdcmap"/>
+  <cvsmodule id="app/xtrap"/>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="app/xvidtune">
+  <cvsmodule id="app/xvidtune">
     <dependencies>
       <dep package="lib/Xaw"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="app/xvinfo"/>
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="app/xwd"/>
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="app/xwininfo"/>
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="app/xwud"/>
+  <cvsmodule id="app/xvinfo"/>
+  <cvsmodule id="app/xwd"/>
+  <cvsmodule id="app/xwininfo"/>
+  <cvsmodule id="app/xwud"/>
 
   <metamodule id="xorg-apps">
     <dependencies>
@@ -1292,254 +1292,254 @@
 
   <!-- input drivers -->
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="driver/xf86-input-acecad">
+  <cvsmodule id="driver/xf86-input-acecad">
     <dependencies>
       <dep package="xserver/xorg"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="driver/xf86-input-aiptek">
+  <cvsmodule id="driver/xf86-input-aiptek">
     <dependencies>
       <dep package="xserver/xorg"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="driver/xf86-input-calcomp">
+  <cvsmodule id="driver/xf86-input-calcomp">
     <dependencies>
       <dep package="xserver/xorg"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="driver/xf86-input-citron">
+  <cvsmodule id="driver/xf86-input-citron">
     <dependencies>
       <dep package="xserver/xorg"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="driver/xf86-input-digitaledge">
+  <cvsmodule id="driver/xf86-input-digitaledge">
     <dependencies>
       <dep package="xserver/xorg"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="driver/xf86-input-dmc">
+  <cvsmodule id="driver/xf86-input-dmc">
     <dependencies>
       <dep package="xserver/xorg"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="driver/xf86-input-dynapro">
+  <cvsmodule id="driver/xf86-input-dynapro">
     <dependencies>
       <dep package="xserver/xorg"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="driver/xf86-input-elo2300">
+  <cvsmodule id="driver/xf86-input-elo2300">
     <dependencies>
       <dep package="xserver/xorg"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="driver/xf86-input-elographics">
+  <cvsmodule id="driver/xf86-input-elographics">
     <dependencies>
       <dep package="xserver/xorg"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="driver/xf86-input-evdev">
+  <cvsmodule id="driver/xf86-input-evdev">
     <dependencies>
       <dep package="xserver/xorg"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="driver/xf86-input-fpit">
+  <cvsmodule id="driver/xf86-input-fpit">
     <dependencies>
       <dep package="xserver/xorg"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="driver/xf86-input-hyperpen">
+  <cvsmodule id="driver/xf86-input-hyperpen">
     <dependencies>
       <dep package="xserver/xorg"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="driver/xf86-input-jamstudio">
+  <cvsmodule id="driver/xf86-input-jamstudio">
     <dependencies>
       <dep package="xserver/xorg"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="driver/xf86-input-joystick">
+  <cvsmodule id="driver/xf86-input-joystick">
     <dependencies>
       <dep package="xserver/xorg"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="driver/xf86-input-keyboard">
+  <cvsmodule id="driver/xf86-input-keyboard">
     <dependencies>
       <dep package="xserver/xorg"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="driver/xf86-input-magellan">
+  <cvsmodule id="driver/xf86-input-magellan">
     <dependencies>
       <dep package="xserver/xorg"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="driver/xf86-input-magictouch">
+  <cvsmodule id="driver/xf86-input-magictouch">
     <dependencies>
       <dep package="xserver/xorg"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="driver/xf86-input-microtouch">
+  <cvsmodule id="driver/xf86-input-microtouch">
     <dependencies>
       <dep package="xserver/xorg"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="driver/xf86-input-mouse">
+  <cvsmodule id="driver/xf86-input-mouse">
     <dependencies>
       <dep package="xserver/xorg"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="driver/xf86-input-mutouch">
+  <cvsmodule id="driver/xf86-input-mutouch">
     <dependencies>
       <dep package="xserver/xorg"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="driver/xf86-input-palmax">
+  <cvsmodule id="driver/xf86-input-palmax">
     <dependencies>
       <dep package="xserver/xorg"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="driver/xf86-input-penmount">
+  <cvsmodule id="driver/xf86-input-penmount">
     <dependencies>
       <dep package="xserver/xorg"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="driver/xf86-input-spaceorb">
+  <cvsmodule id="driver/xf86-input-spaceorb">
     <dependencies>
       <dep package="xserver/xorg"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="driver/xf86-input-summa">
+  <cvsmodule id="driver/xf86-input-summa">
     <dependencies>
       <dep package="xserver/xorg"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="driver/xf86-input-tek4957">
+  <cvsmodule id="driver/xf86-input-tek4957">
     <dependencies>
       <dep package="xserver/xorg"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="driver/xf86-input-ur98">
+  <cvsmodule id="driver/xf86-input-ur98">
     <dependencies>
       <dep package="xserver/xorg"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="driver/xf86-input-vmmouse">
+  <cvsmodule id="driver/xf86-input-vmmouse">
     <dependencies>
       <dep package="xserver/xorg"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="driver/xf86-input-void">
+  <cvsmodule id="driver/xf86-input-void">
     <dependencies>
       <dep package="xserver/xorg"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="driver/xf86-video-apm">
+  <cvsmodule id="driver/xf86-video-apm">
     <dependencies>
       <dep package="xserver/xorg"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="driver/xf86-video-ark">
+  <cvsmodule id="driver/xf86-video-ark">
     <dependencies>
       <dep package="xserver/xorg"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="driver/xf86-video-ati">
+  <cvsmodule id="driver/xf86-video-ati">
     <dependencies>
       <dep package="xserver/xorg"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="driver/xf86-video-chips">
+  <cvsmodule id="driver/xf86-video-chips">
     <dependencies>
       <dep package="xserver/xorg"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="driver/xf86-video-cirrus">
+  <cvsmodule id="driver/xf86-video-cirrus">
     <dependencies>
       <dep package="xserver/xorg"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="driver/xf86-video-cyrix">
+  <cvsmodule id="driver/xf86-video-cyrix">
     <dependencies>
       <dep package="xserver/xorg"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="driver/xf86-video-dummy">
+  <cvsmodule id="driver/xf86-video-dummy">
     <dependencies>
       <dep package="xserver/xorg"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="driver/xf86-video-fbdev">
+  <cvsmodule id="driver/xf86-video-fbdev">
     <dependencies>
       <dep package="xserver/xorg"/>
     </dependencies>
   </cvsmodule>
 
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="driver/xf86-video-glide">
+  <cvsmodule id="driver/xf86-video-glide">
     <dependencies>
       <dep package="xserver/xorg"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="driver/xf86-video-glint">
+  <cvsmodule id="driver/xf86-video-glint">
     <dependencies>
       <dep package="xserver/xorg"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="driver/xf86-video-i128">
+  <cvsmodule id="driver/xf86-video-i128">
     <dependencies>
       <dep package="xserver/xorg"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="driver/xf86-video-i740">
+  <cvsmodule id="driver/xf86-video-i740">
     <dependencies>
       <dep package="xserver/xorg"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="driver/xf86-video-imstt">
+  <cvsmodule id="driver/xf86-video-imstt">
     <dependencies>
       <dep package="xserver/xorg"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="driver/xf86-video-i810">
+  <cvsmodule id="driver/xf86-video-i810">
     <dependencies>
       <dep package="xserver/xorg"/>
       <dep package="proto/X11"/>
@@ -1547,181 +1547,181 @@
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="driver/xf86-video-mga">
+  <cvsmodule id="driver/xf86-video-mga">
     <dependencies>
       <dep package="xserver/xorg"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="driver/xf86-video-neomagic">
+  <cvsmodule id="driver/xf86-video-neomagic">
     <dependencies>
       <dep package="xserver/xorg"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="driver/xf86-video-newport">
+  <cvsmodule id="driver/xf86-video-newport">
     <dependencies>
       <dep package="xserver/xorg"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="driver/xf86-video-nsc">
+  <cvsmodule id="driver/xf86-video-nsc">
     <dependencies>
       <dep package="xserver/xorg"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="driver/xf86-video-nv">
+  <cvsmodule id="driver/xf86-video-nv">
     <dependencies>
       <dep package="xserver/xorg"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="driver/xf86-video-rendition">
+  <cvsmodule id="driver/xf86-video-rendition">
     <dependencies>
       <dep package="xserver/xorg"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="driver/xf86-video-s3">
+  <cvsmodule id="driver/xf86-video-s3">
     <dependencies>
       <dep package="xserver/xorg"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="driver/xf86-video-s3virge">
+  <cvsmodule id="driver/xf86-video-s3virge">
     <dependencies>
       <dep package="xserver/xorg"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="driver/xf86-video-savage">
+  <cvsmodule id="driver/xf86-video-savage">
     <dependencies>
       <dep package="xserver/xorg"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="driver/xf86-video-siliconmotion">
+  <cvsmodule id="driver/xf86-video-siliconmotion">
     <dependencies>
       <dep package="xserver/xorg"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="driver/xf86-video-sis">
+  <cvsmodule id="driver/xf86-video-sis">
     <dependencies>
       <dep package="xserver/xorg"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="driver/xf86-video-sisusb">
+  <cvsmodule id="driver/xf86-video-sisusb">
     <dependencies>
       <dep package="xserver/xorg"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="driver/xf86-video-sunbw2">
+  <cvsmodule id="driver/xf86-video-sunbw2">
     <dependencies>
       <dep package="xserver/xorg"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="driver/xf86-video-suncg14">
+  <cvsmodule id="driver/xf86-video-suncg14">
     <dependencies>
       <dep package="xserver/xorg"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="driver/xf86-video-suncg3">
+  <cvsmodule id="driver/xf86-video-suncg3">
     <dependencies>
       <dep package="xserver/xorg"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="driver/xf86-video-suncg6">
+  <cvsmodule id="driver/xf86-video-suncg6">
     <dependencies>
       <dep package="xserver/xorg"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="driver/xf86-video-sunffb">
+  <cvsmodule id="driver/xf86-video-sunffb">
     <dependencies>
       <dep package="xserver/xorg"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="driver/xf86-video-sunleo">
+  <cvsmodule id="driver/xf86-video-sunleo">
     <dependencies>
       <dep package="xserver/xorg"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="driver/xf86-video-suntcx">
+  <cvsmodule id="driver/xf86-video-suntcx">
     <dependencies>
       <dep package="xserver/xorg"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="driver/xf86-video-tdfx">
+  <cvsmodule id="driver/xf86-video-tdfx">
     <dependencies>
       <dep package="xserver/xorg"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="driver/xf86-video-tga">
+  <cvsmodule id="driver/xf86-video-tga">
     <dependencies>
       <dep package="xserver/xorg"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="driver/xf86-video-trident">
+  <cvsmodule id="driver/xf86-video-trident">
     <dependencies>
       <dep package="xserver/xorg"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="driver/xf86-video-tseng">
+  <cvsmodule id="driver/xf86-video-tseng">
     <dependencies>
       <dep package="xserver/xorg"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="driver/xf86-video-v4l">
+  <cvsmodule id="driver/xf86-video-v4l">
     <dependencies>
       <dep package="xserver/xorg"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="driver/xf86-video-vesa">
+  <cvsmodule id="driver/xf86-video-vesa">
     <dependencies>
       <dep package="xserver/xorg"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="driver/xf86-video-vga">
+  <cvsmodule id="driver/xf86-video-vga">
     <dependencies>
       <dep package="xserver/xorg"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="driver/xf86-video-via">
+  <cvsmodule id="driver/xf86-video-via">
     <dependencies>
       <dep package="xserver/xorg"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="driver/xf86-video-vmware">
+  <cvsmodule id="driver/xf86-video-vmware">
     <dependencies>
       <dep package="xserver/xorg"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="driver/xf86-video-voodoo">
+  <cvsmodule id="driver/xf86-video-voodoo">
     <dependencies>
       <dep package="xserver/xorg"/>
     </dependencies>
   </cvsmodule>
 
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="driver/xf86-video-wsfb">
+  <cvsmodule id="driver/xf86-video-wsfb">
     <dependencies>
       <dep package="xserver/xorg"/>
     </dependencies>
@@ -1826,7 +1826,7 @@
 
 
   <!-- Bogosity of depending on libraries caused by Xnest.  Sigh -->
-  <cvsmodule cvsroot="xorg.freedesktop.org" module="xserver/xorg">
+  <cvsmodule id="xserver/xorg">
     <dependencies>
       <dep package="xorg-protos"/>
       <dep package="lib/Xaw"/>