diff --git a/srcpkgs/xf86-input-acecad/template b/srcpkgs/xf86-input-acecad/template
index ea05ed21d2..511cb7e041 100644
--- a/srcpkgs/xf86-input-acecad/template
+++ b/srcpkgs/xf86-input-acecad/template
@@ -1,6 +1,7 @@
 # Template build file for 'xf86-input-acecad'.
 pkgname=xf86-input-acecad
 version=1.4.0
+revision=1
 distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 short_desc="Xorg acecad input driver"
@@ -9,5 +10,8 @@ checksum=48341d8b6b0060228134b36543986c949ea828d6ce6d0484d29b3dde9ddbd556
 long_desc="
  This is the acecad input driver for the Xorg X11 server."
 
-Add_dependency full glibc
-Add_dependency full xorg-server
+Add_dependency run glibc
+Add_dependency run libsysfs
+Add_dependency run xorg-server
+Add_dependency build libsysfs-devel
+Add_dependency build xorg-server-devel
diff --git a/srcpkgs/xf86-input-aiptek/template b/srcpkgs/xf86-input-aiptek/template
index 8debd42705..d5ccd8ee59 100644
--- a/srcpkgs/xf86-input-aiptek/template
+++ b/srcpkgs/xf86-input-aiptek/template
@@ -1,6 +1,7 @@
 # Template build file for 'xf86-input-aiptek'.
 pkgname=xf86-input-aiptek
 version=1.3.0
+revision=1
 distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 short_desc="Xorg aiptek input driver"
@@ -9,5 +10,6 @@ checksum=b37f35bb021dffc337c731bfbbb6ce7c0953dc69f7c660cbe48b0f84a07b5e5c
 long_desc="
  This is the aiptek input driver for the Xorg X11 server."
 
-Add_dependency full glibc
-Add_dependency full xorg-server
+Add_dependency run glibc
+Add_dependency run xorg-server
+Add_dependency build xorg-server-devel
diff --git a/srcpkgs/xf86-input-evdev/template b/srcpkgs/xf86-input-evdev/template
index 99c309bc71..7c4c9389c8 100644
--- a/srcpkgs/xf86-input-evdev/template
+++ b/srcpkgs/xf86-input-evdev/template
@@ -1,6 +1,7 @@
 # Template build file for 'xf86-input-evdev'.
 pkgname=xf86-input-evdev
 version=2.3.2
+revision=1
 distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 short_desc="Xorg event device input driver"
diff --git a/srcpkgs/xf86-input-evdev/xf86-input-evdev-devel.template b/srcpkgs/xf86-input-evdev/xf86-input-evdev-devel.template
index cf5f4d97cf..077c3da316 100644
--- a/srcpkgs/xf86-input-evdev/xf86-input-evdev-devel.template
+++ b/srcpkgs/xf86-input-evdev/xf86-input-evdev-devel.template
@@ -5,6 +5,8 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
+revision=1
+
 Add_dependency run xorg-server-devel
 Add_dependency run xf86-input-evdev
 
diff --git a/srcpkgs/xf86-input-joystick/template b/srcpkgs/xf86-input-joystick/template
index 9dd0c1ac72..eca7529a22 100644
--- a/srcpkgs/xf86-input-joystick/template
+++ b/srcpkgs/xf86-input-joystick/template
@@ -1,6 +1,7 @@
 # Template build file for 'xf86-input-joystick'.
 pkgname=xf86-input-joystick
 version=1.4.99.2
+revision=1
 distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 short_desc="Joystick Input driver for Xorg"
@@ -10,5 +11,6 @@ long_desc="
  This is the Joystick Input driver for the Xorg X11 server."
 
 subpackages="$pkgname-devel"
-Add_dependency full glibc
-Add_dependency full xorg-server
+Add_dependency run glibc
+Add_dependency run xorg-server
+Add_dependency build xorg-server-devel
diff --git a/srcpkgs/xf86-input-joystick/xf86-input-joystick-devel.template b/srcpkgs/xf86-input-joystick/xf86-input-joystick-devel.template
index 39015003b8..19ea31bf66 100644
--- a/srcpkgs/xf86-input-joystick/xf86-input-joystick-devel.template
+++ b/srcpkgs/xf86-input-joystick/xf86-input-joystick-devel.template
@@ -5,6 +5,9 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
+revision=1
+
+Add_dependency run xorg-server-devel
 Add_dependency run xf86-input-joystick
 
 do_install()
diff --git a/srcpkgs/xf86-input-keyboard/template b/srcpkgs/xf86-input-keyboard/template
index 1fe191086f..c334cd713b 100644
--- a/srcpkgs/xf86-input-keyboard/template
+++ b/srcpkgs/xf86-input-keyboard/template
@@ -1,6 +1,7 @@
 # Template build file for 'xf86-input-keyboard'.
 pkgname=xf86-input-keyboard
 version=1.4.0
+revision=1
 distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 short_desc="Xorg keyboard input driver"
@@ -9,5 +10,6 @@ checksum=842d36cfca68ddab4f2c562c73bfd43ba76de2d490d60034f0c5dd524aa6d6a5
 long_desc="
  This is the keyboard input driver for the Xorg X11 server."
 
-Add_dependency full glibc
-Add_dependency full xorg-server
+Add_dependency run glibc
+Add_dependency run xorg-server
+Add_dependency build xorg-server-devel
diff --git a/srcpkgs/xf86-input-mouse/template b/srcpkgs/xf86-input-mouse/template
index b6e689b37c..57902af748 100644
--- a/srcpkgs/xf86-input-mouse/template
+++ b/srcpkgs/xf86-input-mouse/template
@@ -1,6 +1,7 @@
 # Template build file for 'xf86-input-mouse'.
 pkgname=xf86-input-mouse
 version=1.5.0
+revision=1
 distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 short_desc="Xorg mouse input driver"
@@ -9,5 +10,6 @@ checksum=f303e20872ab2fb20e07a7f734d17723346d2b4b8687ea2086f7a7468d1ab397
 long_desc="
  This is the mouse input driver for the Xorg X11 server."
 
-Add_dependency full glibc
-Add_dependency full xorg-server
+Add_dependency run glibc
+Add_dependency run xorg-server
+Add_dependency build xorg-server-devel
diff --git a/srcpkgs/xf86-input-synaptics/template b/srcpkgs/xf86-input-synaptics/template
index 33d7914a96..c4f912ef04 100644
--- a/srcpkgs/xf86-input-synaptics/template
+++ b/srcpkgs/xf86-input-synaptics/template
@@ -1,7 +1,7 @@
 # Template build file for 'xf86-input-synaptics'.
 pkgname=xf86-input-synaptics
 version=1.2.0
-revision=1
+revision=2
 distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 short_desc="Xorg synaptics touchpad input driver"
diff --git a/srcpkgs/xf86-input-synaptics/xf86-input-synaptics-devel.template b/srcpkgs/xf86-input-synaptics/xf86-input-synaptics-devel.template
index cd0ced2c0e..13243d0a63 100644
--- a/srcpkgs/xf86-input-synaptics/xf86-input-synaptics-devel.template
+++ b/srcpkgs/xf86-input-synaptics/xf86-input-synaptics-devel.template
@@ -5,7 +5,7 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-revision=1
+revision=2
 
 Add_dependency run libXtst-devel
 Add_dependency run libX11-devel
diff --git a/srcpkgs/xf86-input-vmmouse/template b/srcpkgs/xf86-input-vmmouse/template
index 5e62a1929c..03f911330c 100644
--- a/srcpkgs/xf86-input-vmmouse/template
+++ b/srcpkgs/xf86-input-vmmouse/template
@@ -1,6 +1,7 @@
 # Template build file for 'xf86-input-vmmouse'.
 pkgname=xf86-input-vmmouse
 version=12.6.5
+revision=1
 distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 short_desc="Xorg VMware virtual mouse input driver"
@@ -9,5 +10,6 @@ checksum=381ac3b9dc47f7bb425b4748fc9945e9c70054e40d71aedcd5327b5834d68c0d
 long_desc="
  This is the VMware virtual mouse input driver for the Xorg X11 server."
 
-Add_dependency full glibc
-Add_dependency full xorg-server
+Add_dependency run glibc
+Add_dependency run xorg-server
+Add_dependency build xorg-server-devel
diff --git a/srcpkgs/xf86-video-apm/template b/srcpkgs/xf86-video-apm/template
index 99693ba6b6..645e87e824 100644
--- a/srcpkgs/xf86-video-apm/template
+++ b/srcpkgs/xf86-video-apm/template
@@ -1,6 +1,7 @@
 # Template build file for 'xf86-video-apm'.
 pkgname=xf86-video-apm
 version=1.2.2
+revision=1
 distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 short_desc="Xorg Alliance ProMotion video driver"
@@ -10,5 +11,6 @@ long_desc="
  This is the video driver for Alliance ProMotion video cards for
  the Xorg X11 server."
 
-Add_dependency full glibc
-Add_dependency full xorg-server
+Add_dependency run glibc
+Add_dependency run xorg-server
+Add_dependency build xorg-server-devel
diff --git a/srcpkgs/xf86-video-ark/template b/srcpkgs/xf86-video-ark/template
index 5502df1122..1e43d59c29 100644
--- a/srcpkgs/xf86-video-ark/template
+++ b/srcpkgs/xf86-video-ark/template
@@ -1,6 +1,7 @@
 # Template build file for 'xf86-video-ark'.
 pkgname=xf86-video-ark
 version=0.7.2
+revision=1
 distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 short_desc="Xorg ARK Logic video driver"
@@ -10,5 +11,6 @@ long_desc="
  This is the video driver for the ARK Logic video cards for
  the Xorg X11 server."
 
-Add_dependency full glibc
-Add_dependency full xorg-server
+Add_dependency run glibc
+Add_dependency run xorg-server
+Add_dependency build xorg-server-devel
diff --git a/srcpkgs/xf86-video-ast/template b/srcpkgs/xf86-video-ast/template
index 9ed29adad4..c54472f4a9 100644
--- a/srcpkgs/xf86-video-ast/template
+++ b/srcpkgs/xf86-video-ast/template
@@ -1,6 +1,7 @@
 # Template build file for 'xf86-video-ast'.
 pkgname=xf86-video-ast
 version=0.89.9
+revision=1
 distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 short_desc="Xorg AST2000  video driver"
@@ -9,5 +10,6 @@ checksum=880f16d32a373a052515f4ae28a3f1a97543d0d73d2ea5d74baf23bdc3a6b401
 long_desc="
  This is the video driver for AST2000 video cards for the Xorg X11 server."
 
-Add_dependency full glibc
-Add_dependency full xorg-server
+Add_dependency run glibc
+Add_dependency run xorg-server
+Add_dependency build xorg-server-devel
diff --git a/srcpkgs/xf86-video-ati/template b/srcpkgs/xf86-video-ati/template
index de913e110d..8b7b66cc33 100644
--- a/srcpkgs/xf86-video-ati/template
+++ b/srcpkgs/xf86-video-ati/template
@@ -1,6 +1,7 @@
 # Template build file for 'xf86-video-ati'.
 pkgname=xf86-video-ati
 version=6.12.192
+revision=1
 distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 short_desc="Xorg ATI Radeon video driver"
diff --git a/srcpkgs/xf86-video-chips/template b/srcpkgs/xf86-video-chips/template
index 9318ade6b4..02048f4256 100644
--- a/srcpkgs/xf86-video-chips/template
+++ b/srcpkgs/xf86-video-chips/template
@@ -1,6 +1,7 @@
 # Template build file for 'xf86-video-chips'.
 pkgname=xf86-video-chips
 version=1.2.2
+revision=1
 distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 short_desc="Xorg Chips and Technologies video driver"
@@ -10,5 +11,6 @@ long_desc="
  This is the video driver for Chips and Technologies video cards for
  the Xorg X11 server."
 
-Add_dependency full glibc
-Add_dependency full xorg-server
+Add_dependency run glibc
+Add_dependency run xorg-server
+Add_dependency build xorg-server-devel
diff --git a/srcpkgs/xf86-video-cirrus/template b/srcpkgs/xf86-video-cirrus/template
index 425d87e468..ac765847e2 100644
--- a/srcpkgs/xf86-video-cirrus/template
+++ b/srcpkgs/xf86-video-cirrus/template
@@ -1,6 +1,7 @@
 # Template build file for 'xf86-video-cirrus'.
 pkgname=xf86-video-cirrus
 version=1.3.2
+revision=1
 distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 short_desc="Xorg Cirrus Logic video driver"
@@ -10,5 +11,6 @@ long_desc="
  This is the video driver for Cirrus Logic video cards for
  the Xorg X11 server."
 
-Add_dependency full glibc
-Add_dependency full xorg-server
+Add_dependency run glibc
+Add_dependency run xorg-server
+Add_dependency build xorg-server-devel
diff --git a/srcpkgs/xf86-video-fbdev/template b/srcpkgs/xf86-video-fbdev/template
index 07117417cc..428257c7da 100644
--- a/srcpkgs/xf86-video-fbdev/template
+++ b/srcpkgs/xf86-video-fbdev/template
@@ -1,6 +1,7 @@
 # Template build file for 'xf86-video-fbdev'.
 pkgname=xf86-video-fbdev
 version=0.4.1
+revision=1
 distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 short_desc="Xorg framebuffer video driver"
@@ -9,5 +10,6 @@ checksum=2bf857179523433a9cc6c6eea059298db4c865e649aa58dfc67c828f28b7288f
 long_desc="
  This is the video driver for framebuffer devices for the Xorg X11 server."
 
-Add_dependency full glibc
-Add_dependency full xorg-server
+Add_dependency run glibc
+Add_dependency run xorg-server
+Add_dependency build xorg-server-devel
diff --git a/srcpkgs/xf86-video-geode/template b/srcpkgs/xf86-video-geode/template
index b867379cc7..440158f767 100644
--- a/srcpkgs/xf86-video-geode/template
+++ b/srcpkgs/xf86-video-geode/template
@@ -1,6 +1,7 @@
 # Template build file for 'xf86-video-geode'.
 pkgname=xf86-video-geode
 version=2.11.6
+revision=1
 distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 short_desc="Xorg AMD Geode GX/LX video driver"
@@ -10,5 +11,6 @@ long_desc="
  This is the video driver for AMD Geode GX/LX video cards for the
  Xorg X11 server."
 
-Add_dependency full glibc
-Add_dependency full xorg-server
+Add_dependency run glibc
+Add_dependency run xorg-server
+Add_dependency build xorg-server-devel
diff --git a/srcpkgs/xf86-video-glint/template b/srcpkgs/xf86-video-glint/template
index f860c6e263..73a1adb962 100644
--- a/srcpkgs/xf86-video-glint/template
+++ b/srcpkgs/xf86-video-glint/template
@@ -1,6 +1,7 @@
 # Template build file for 'xf86-video-glint'.
 pkgname=xf86-video-glint
 version=1.2.4
+revision=1
 distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 short_desc="Xorg GLINT/Permedia video driver"
@@ -10,5 +11,6 @@ long_desc="
  This is the video driver for 3Dlabs and Texas Instruments GLINT/Permedia
  based video cards for the Xorg X11 server."
 
-Add_dependency full glibc
-Add_dependency full xorg-server
+Add_dependency run glibc
+Add_dependency run xorg-server
+Add_dependency build xorg-server-devel
diff --git a/srcpkgs/xf86-video-i128/template b/srcpkgs/xf86-video-i128/template
index 8b90c810a8..4a18449dd9 100644
--- a/srcpkgs/xf86-video-i128/template
+++ b/srcpkgs/xf86-video-i128/template
@@ -1,6 +1,7 @@
 # Template build file for 'xf86-video-i128'.
 pkgname=xf86-video-i128
 version=1.3.3
+revision=1
 distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 short_desc="Xorg Number 9 I128 video driver"
@@ -10,5 +11,6 @@ long_desc="
  This is the video driver for Number 9 I128 video cards for
  the Xorg X11 server."
 
-Add_dependency full glibc
-Add_dependency full xorg-server
+Add_dependency run glibc
+Add_dependency run xorg-server
+Add_dependency build xorg-server-devel
diff --git a/srcpkgs/xf86-video-i740/template b/srcpkgs/xf86-video-i740/template
index a7e4af7cd9..a22b281cd1 100644
--- a/srcpkgs/xf86-video-i740/template
+++ b/srcpkgs/xf86-video-i740/template
@@ -1,6 +1,7 @@
 # Template build file for 'xf86-video-i740'.
 pkgname=xf86-video-i740
 version=1.3.2
+revision=1
 distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 short_desc="Xorg Intel 740 video driver"
@@ -10,5 +11,6 @@ long_desc="
  This is the video driver for Intel 740 video cards for
  the Xorg X11 server."
 
-Add_dependency full glibc
-Add_dependency full xorg-server
+Add_dependency run glibc
+Add_dependency run xorg-server
+Add_dependency build xorg-server-devel
diff --git a/srcpkgs/xf86-video-intel/template b/srcpkgs/xf86-video-intel/template
index 75660446e6..08b4e6804a 100644
--- a/srcpkgs/xf86-video-intel/template
+++ b/srcpkgs/xf86-video-intel/template
@@ -1,6 +1,7 @@
 # Template build file for 'xf86-video-intel'.
 pkgname=xf86-video-intel
 version=2.11.0
+revision=1
 distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 short_desc="Xorg Intel video driver"
diff --git a/srcpkgs/xf86-video-mach64/template b/srcpkgs/xf86-video-mach64/template
index 841ebc1c68..31681ceb8b 100644
--- a/srcpkgs/xf86-video-mach64/template
+++ b/srcpkgs/xf86-video-mach64/template
@@ -1,6 +1,7 @@
 # Template build file for 'xf86-video-mach64'.
 pkgname=xf86-video-mach64
 version=6.8.2
+revision=1
 distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 short_desc="Xorg ATI Mach64 video driver"
@@ -10,5 +11,6 @@ long_desc="
  This is the video driver for ATI Mach64 video cards for
  the Xorg X11 server."
 
-Add_dependency full glibc
-Add_dependency full xorg-server
+Add_dependency run glibc
+Add_dependency run xorg-server
+Add_dependency build xorg-server-devel
diff --git a/srcpkgs/xf86-video-mga/template b/srcpkgs/xf86-video-mga/template
index 3565aee8ef..b6eb735830 100644
--- a/srcpkgs/xf86-video-mga/template
+++ b/srcpkgs/xf86-video-mga/template
@@ -1,6 +1,7 @@
 # Template build file for 'xf86-video-mga'.
 pkgname=xf86-video-mga
 version=1.4.11
+revision=1
 distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 short_desc="Xorg Matrox video driver"
@@ -9,5 +10,6 @@ checksum=c91922316f486f74d41ddbda92ff94a7917cea151ad802cf25603ab6b90f97e6
 long_desc="
  This is the video driver for Matrox video cards for the Xorg X11 server."
 
-Add_dependency full glibc
-Add_dependency full xorg-server
+Add_dependency run glibc
+Add_dependency run xorg-server
+Add_dependency build xorg-server-devel
diff --git a/srcpkgs/xf86-video-neomagic/template b/srcpkgs/xf86-video-neomagic/template
index 6f6ade565e..3e58131bd5 100644
--- a/srcpkgs/xf86-video-neomagic/template
+++ b/srcpkgs/xf86-video-neomagic/template
@@ -1,6 +1,7 @@
 # Template build file for 'xf86-video-neomagic'.
 pkgname=xf86-video-neomagic
 version=1.2.4
+revision=1
 distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 short_desc="Xorg Neomagic video driver"
@@ -9,5 +10,6 @@ checksum=434da2986d007243f4590a86d16a1632a9611b71de44d6e46f28bd3cdb898353
 long_desc="
  This is the video driver for Neomagic video cards for the Xorg X11 server."
 
-Add_dependency full glibc
-Add_dependency full xorg-server
+Add_dependency run glibc
+Add_dependency run xorg-server
+Add_dependency build xorg-server-devel
diff --git a/srcpkgs/xf86-video-openchrome/template b/srcpkgs/xf86-video-openchrome/template
index 5e9c9584fc..c3d49c00d9 100644
--- a/srcpkgs/xf86-video-openchrome/template
+++ b/srcpkgs/xf86-video-openchrome/template
@@ -1,7 +1,7 @@
 # Template build file for 'xf86-video-openchrome'.
 pkgname=xf86-video-openchrome
 version=0.2.904
-revision=1
+revision=2
 distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 short_desc="Xorg VIA Unichromes video driver"
diff --git a/srcpkgs/xf86-video-r128/template b/srcpkgs/xf86-video-r128/template
index 4d7522267b..63b1c3ba7f 100644
--- a/srcpkgs/xf86-video-r128/template
+++ b/srcpkgs/xf86-video-r128/template
@@ -1,6 +1,7 @@
 # Template build file for 'xf86-video-r128'.
 pkgname=xf86-video-r128
 version=6.8.1
+revision=1
 distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 short_desc="Xorg ATI Rage 128 video driver"
@@ -10,5 +11,6 @@ long_desc="
  This is the video driver for ATI Rage 128 video cards for
  the Xorg X11 server."
 
-Add_dependency full glibc
-Add_dependency full xorg-server
+Add_dependency run glibc
+Add_dependency run xorg-server
+Add_dependency build xorg-server-devel
diff --git a/srcpkgs/xf86-video-s3/template b/srcpkgs/xf86-video-s3/template
index 02e11e7cfe..b9ae79f2bc 100644
--- a/srcpkgs/xf86-video-s3/template
+++ b/srcpkgs/xf86-video-s3/template
@@ -1,6 +1,7 @@
 # Template build file for 'xf86-video-s3'.
 pkgname=xf86-video-s3
 version=0.6.3
+revision=1
 distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 short_desc="Xorg S3 video driver"
@@ -9,5 +10,6 @@ checksum=ed9f65aa6eb1811d8c16cddfce00c5fc5880d6d46b907a83ef77700610085144
 long_desc="
  This is the video driver for S3 video cards for the Xorg X11 server."
 
-Add_dependency full glibc
-Add_dependency full xorg-server
+Add_dependency run glibc
+Add_dependency run xorg-server
+Add_dependency build xorg-server-devel
diff --git a/srcpkgs/xf86-video-s3virge/template b/srcpkgs/xf86-video-s3virge/template
index 89071178ec..0c9d465df2 100644
--- a/srcpkgs/xf86-video-s3virge/template
+++ b/srcpkgs/xf86-video-s3virge/template
@@ -1,6 +1,7 @@
 # Template build file for 'xf86-video-s3virge'.
 pkgname=xf86-video-s3virge
 version=1.10.4
+revision=1
 distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 short_desc="Xorg S3 Virge video driver"
@@ -10,5 +11,6 @@ long_desc="
  This is the video driver for S3 Virge video cards for the Xorg
  X11 server."
 
-Add_dependency full glibc
-Add_dependency full xorg-server
+Add_dependency run glibc
+Add_dependency run xorg-server
+Add_dependency build xorg-server-devel
diff --git a/srcpkgs/xf86-video-savage/template b/srcpkgs/xf86-video-savage/template
index 584a4d3b58..e62ad1a303 100644
--- a/srcpkgs/xf86-video-savage/template
+++ b/srcpkgs/xf86-video-savage/template
@@ -1,6 +1,7 @@
 # Template build file for 'xf86-video-savage'.
 pkgname=xf86-video-savage
 version=2.3.1
+revision=1
 distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 short_desc="Xorg S3 Savage video driver"
@@ -10,5 +11,6 @@ long_desc="
  This is the video driver for S3 Savage video cards for the Xorg
  X11 server."
 
-Add_dependency full glibc
-Add_dependency full xorg-server
+Add_dependency run glibc
+Add_dependency run xorg-server
+Add_dependency build xorg-server-devel
diff --git a/srcpkgs/xf86-video-siliconmotion/template b/srcpkgs/xf86-video-siliconmotion/template
index 4e8bf51b04..3e0aaf1eb9 100644
--- a/srcpkgs/xf86-video-siliconmotion/template
+++ b/srcpkgs/xf86-video-siliconmotion/template
@@ -1,6 +1,7 @@
 # Template build file for 'xf86-video-siliconmotion'.
 pkgname=xf86-video-siliconmotion
 version=1.7.3
+revision=1
 distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 short_desc="Xorg Silicon Motion video driver"
@@ -10,5 +11,6 @@ long_desc="
  This is the video driver for Silicon Motion video cards for
  the Xorg X11 server."
 
-Add_dependency full glibc
-Add_dependency full xorg-server
+Add_dependency run glibc
+Add_dependency run xorg-server
+Add_dependency build xorg-server-devel
diff --git a/srcpkgs/xf86-video-sis/template b/srcpkgs/xf86-video-sis/template
index b3add7c61b..4ae3f8a187 100644
--- a/srcpkgs/xf86-video-sis/template
+++ b/srcpkgs/xf86-video-sis/template
@@ -1,6 +1,7 @@
 # Template build file for 'xf86-video-sis'.
 pkgname=xf86-video-sis
 version=0.10.2
+revision=1
 distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 short_desc="Xorg video driver"
@@ -10,5 +11,6 @@ long_desc="
  This is the video driver for SiS (Silicon Integrated Systems) and XGI
  video chips for the Xorg X11 server."
 
-Add_dependency full glibc
-Add_dependency full xorg-server
+Add_dependency run glibc
+Add_dependency run xorg-server
+Add_dependency build xorg-server-devel
diff --git a/srcpkgs/xf86-video-sisusb/template b/srcpkgs/xf86-video-sisusb/template
index 4bcd8b3765..8be1c6b35c 100644
--- a/srcpkgs/xf86-video-sisusb/template
+++ b/srcpkgs/xf86-video-sisusb/template
@@ -1,6 +1,7 @@
 # Template build file for 'xf86-video-sisusb'.
 pkgname=xf86-video-sisusb
 version=0.9.3
+revision=1
 distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 short_desc="Xorg SiS USB video driver"
@@ -10,5 +11,6 @@ long_desc="
  This is the video driver for SiS (Silicon Integrated Systems) video chips
  that are connected via a Net2280-based USB dongle for the Xorg X11 server."
 
-Add_dependency full glibc
-Add_dependency full xorg-server
+Add_dependency run glibc
+Add_dependency run xorg-server
+Add_dependency build xorg-server-devel
diff --git a/srcpkgs/xf86-video-tdfx/template b/srcpkgs/xf86-video-tdfx/template
index 092ea56725..076107bf65 100644
--- a/srcpkgs/xf86-video-tdfx/template
+++ b/srcpkgs/xf86-video-tdfx/template
@@ -1,6 +1,7 @@
 # Template build file for 'xf86-video-tdfx'.
 pkgname=xf86-video-tdfx
 version=1.4.3
+revision=1
 distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 short_desc="Xorg 3Dfx video driver"
@@ -9,5 +10,6 @@ checksum=3ad935ca0aa306d10d1e6125a6bd485a3948c184dcfda01670961dc4740ebf33
 long_desc="
  This is the video driver for 3Dfx video cards for the Xorg X11 server."
 
-Add_dependency full glibc
-Add_dependency full xorg-server
+Add_dependency run glibc
+Add_dependency run xorg-server
+Add_dependency build xorg-server-devel
diff --git a/srcpkgs/xf86-video-trident/template b/srcpkgs/xf86-video-trident/template
index bc577a786a..424a354041 100644
--- a/srcpkgs/xf86-video-trident/template
+++ b/srcpkgs/xf86-video-trident/template
@@ -1,6 +1,7 @@
 # Template build file for 'xf86-video-trident'.
 pkgname=xf86-video-trident
 version=1.3.3
+revision=1
 distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 short_desc="Xorg Trident video driver"
@@ -9,5 +10,6 @@ checksum=6241eab6f3f0a075380be6b614e33ad72256242c865115bc8b696f83a75d11f5
 long_desc="
  This is the video driver for Trident video cards for the Xorg X11 server."
 
-Add_dependency full glibc
-Add_dependency full xorg-server
+Add_dependency run glibc
+Add_dependency run xorg-server
+Add_dependency build xorg-server-devel
diff --git a/srcpkgs/xf86-video-tseng/template b/srcpkgs/xf86-video-tseng/template
index 644c57ae5d..432c8da6ec 100644
--- a/srcpkgs/xf86-video-tseng/template
+++ b/srcpkgs/xf86-video-tseng/template
@@ -1,6 +1,7 @@
 # Template build file for 'xf86-video-tseng'.
 pkgname=xf86-video-tseng
 version=1.2.3
+revision=1
 distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 short_desc="Xorg Tseng Labs video driver"
@@ -10,5 +11,6 @@ long_desc="
  This is the video driver for Tseng Labs video cards for the
  Xorg X11 server."
 
-Add_dependency full glibc
-Add_dependency full xorg-server
+Add_dependency run glibc
+Add_dependency run xorg-server
+Add_dependency build xorg-server-devel
diff --git a/srcpkgs/xf86-video-v4l/template b/srcpkgs/xf86-video-v4l/template
index 0c02e9c8a6..8bda411842 100644
--- a/srcpkgs/xf86-video-v4l/template
+++ b/srcpkgs/xf86-video-v4l/template
@@ -1,6 +1,7 @@
 # Template build file for 'xf86-video-v4l'.
 pkgname=xf86-video-v4l
 version=0.2.0
+revision=1
 distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 short_desc="Xorg Video4Linux video driver"
@@ -10,5 +11,6 @@ long_desc="
  This is the video driver for Video4Linux video cards for the
  Xorg X11 server."
 
-Add_dependency full glibc
-Add_dependency full xorg-server
+Add_dependency run glibc
+Add_dependency run xorg-server
+Add_dependency build xorg-server-devel
diff --git a/srcpkgs/xf86-video-vesa/template b/srcpkgs/xf86-video-vesa/template
index 64db6cb8f4..749149375a 100644
--- a/srcpkgs/xf86-video-vesa/template
+++ b/srcpkgs/xf86-video-vesa/template
@@ -1,6 +1,7 @@
 # Template build file for 'xf86-video-vesa'.
 pkgname=xf86-video-vesa
 version=2.3.0
+revision=1
 distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 short_desc="Xorg VESA video driver"
diff --git a/srcpkgs/xf86-video-vmware/template b/srcpkgs/xf86-video-vmware/template
index adcaac3a77..be8d384a0c 100644
--- a/srcpkgs/xf86-video-vmware/template
+++ b/srcpkgs/xf86-video-vmware/template
@@ -1,6 +1,7 @@
 # Template build file for 'xf86-video-vmware'.
 pkgname=xf86-video-vmware
 version=11.0.0
+revision=1
 distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 short_desc="Modular Xorg VMware virtual video driver"
@@ -11,6 +12,6 @@ long_desc="
 
 Add_dependency run glibc
 Add_dependency run libdrm
-Add_dependency run xorg-server	">=1.7.1"
+Add_dependency run xorg-server
 Add_dependency build libdrm-devel
 Add_dependency build xorg-server-devel
diff --git a/srcpkgs/xf86-video-voodoo/template b/srcpkgs/xf86-video-voodoo/template
index f7bfaedb5c..e4f16433be 100644
--- a/srcpkgs/xf86-video-voodoo/template
+++ b/srcpkgs/xf86-video-voodoo/template
@@ -1,6 +1,7 @@
 # Template build file for 'xf86-video-voodoo'.
 pkgname=xf86-video-voodoo
 version=1.2.3
+revision=1
 distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 short_desc="Xorg Voodoo 1/2 series video driver"
@@ -10,5 +11,6 @@ long_desc="
  This is the video driver for Voodoo 1 and Voodoo 2 series video cards
  for the Xorg X11 server."
 
-Add_dependency full glibc
-Add_dependency full xorg-server
+Add_dependency run glibc
+Add_dependency run xorg-server
+Add_dependency build xorg-server-devel
diff --git a/srcpkgs/xorg-video-drivers/template b/srcpkgs/xorg-video-drivers/template
index d638d9c80d..33744ae855 100644
--- a/srcpkgs/xorg-video-drivers/template
+++ b/srcpkgs/xorg-video-drivers/template
@@ -1,7 +1,7 @@
 # Template file for 'xorg-video-drivers'
 pkgname=xorg-video-drivers
 version=7.5
-revision=4
+revision=5
 build_style=meta-template
 short_desc="X.org video drivers meta-package"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -31,7 +31,7 @@ Add_dependency full xf86-video-r128		">=6.8.1"
 Add_dependency full xf86-video-s3		">=0.6.3"
 Add_dependency full xf86-video-s3virge		">=1.10.4"
 Add_dependency full xf86-video-savage		">=2.3.1"
-Add_dependency full xf86-video-siliconmotion	">=1.7.3"
+#Add_dependency full xf86-video-siliconmotion	">=1.7.3"
 Add_dependency full xf86-video-sis		">=0.10.2"
 Add_dependency full xf86-video-sisusb		">=0.9.3"
 Add_dependency full xf86-video-tdfx		">=1.4.3"