diff --git a/templates/libXi/template b/templates/libXi/template
index 7a76f2210c..1acabe82ac 100644
--- a/templates/libXi/template
+++ b/templates/libXi/template
@@ -1,17 +1,18 @@
-# Template build file for 'libXi'.
 pkgname=libXi
 version=1.1.3
-distfiles="
-http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version.tar.bz2"
+distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
-configure_args="--disable-malloc0returnsnull"
-pkgconfig_override="xi.pc"
 short_desc="X Input extension library"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=e6446f28a903eed54eccc5d4df685f9623942a0b
+checksum=c77a5bbe97d0d0a6493adefcf1bd57aca91bc33279633b3f6cf1d2bb8812153f
 long_desc="
  This package contains the Xi extension. This is the X Input extension
  library.
 
  This is part of the X Libraries and Protocol Headers Project at
  freedesktop.org."
+
+shared_deps="libX11-1.1 libXext-1.0"
+build_depends="pkg-config-0.23 xproto-7.0 xextproto-7.0 inputproto-1.4
+ ${shared_deps}"
+run_depends="glibc-2.8 ${shared_deps}"
diff --git a/templates/libXinerama/template b/templates/libXinerama/template
index ab1d49875e..91eb0c8241 100644
--- a/templates/libXinerama/template
+++ b/templates/libXinerama/template
@@ -1,13 +1,13 @@
-# Template build file for 'libXinerama'.
 pkgname=libXinerama
 version=1.0.3
-distfiles="
-http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version.tar.bz2"
+distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
-configure_args="--disable-malloc0returnsnull"
-pkgconfig_override="xinerama.pc"
 short_desc="X PanoramiX extension library"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=99115fedb0930a6acb5450bfabfe7416159ee45b
+checksum=07b3564cd56154c20580b56230b7a95d74fe6582c80cedf0550d8d7955181219
 long_desc="
  libXinerama provides X PanoramiX extension library."
+
+shared_deps="libX11-1.1 libXext-1.0"
+build_depends="pkg-config-0.23 xextproto-7.0 xineramaproto-1.0 ${shared_deps}"
+run_depends="glibc-2.8 ${shared_deps}"
diff --git a/templates/libXrandr/template b/templates/libXrandr/template
index 67e4d6cca9..48825afea8 100644
--- a/templates/libXrandr/template
+++ b/templates/libXrandr/template
@@ -1,14 +1,10 @@
-# Template build file for 'libXrandr'.
 pkgname=libXrandr
 version=1.2.3
-distfiles="
-http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version.tar.bz2"
+distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
-configure_args="--disable-malloc0returnsnull"
-pkgconfig_override="xrandr.pc"
 short_desc="X RandR Library from X.org"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=56911f90cbb7e7550f26dbcb5271b3a6788118df
+checksum=f8edfe26b8c4c3677a3a949f81a8b09a5fad62972020bfd230401e11cc0ed267
 long_desc="
  This package provides the X RandR Library from the modular X.org
  X11 project.
@@ -17,3 +13,8 @@ long_desc="
  Rotate, and Reflection Extension. This allows clients to change
  the size and rotation of the root window of a screen, along with
  the ability to reflect the screen about either axis."
+
+shared_deps="libX11-1.1 libXext-1.0 libXrender-0.9"
+build_depends="pkg-config-0.23 xproto-7.0 xextproto-7.0 renderproto-1.2
+ ${shared_deps}"
+run_depends="glibc-2.8 ${shared_deps}"
diff --git a/templates/libXv/template b/templates/libXv/template
index 95c21fe105..e60261b5cd 100644
--- a/templates/libXv/template
+++ b/templates/libXv/template
@@ -1,14 +1,15 @@
-# Template build file for 'libXv'.
 pkgname=libXv
 version=1.0.4
-distfiles="
-http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version.tar.bz2"
+distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
-make_cmd="$XBPS_MASTERDIR/bin/gmake"
-pkgconfig_override="xv.pc"
 short_desc="Xv Extension library"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=2083556832a74f2357e4c8921666e38791316e5b
+checksum=4d3cc49b6f4da6d396196054eca23a91df1a41001c736dcfd22fec5a5c7428c8
 long_desc="
  This package provides the X Window System video extension from
  the modular X.org project"
+
+shared_deps="libX11-1.1 libXext-1.0"
+build_depends="pkg-config-0.23 xproto-7.0 xextproto-7.0 videoproto-2.2
+ ${shared_deps}"
+run_depends="glibc-2.8 ${shared_deps}"
diff --git a/templates/libXvMC/template b/templates/libXvMC/template
index bbb7236e00..81ac9c8f83 100644
--- a/templates/libXvMC/template
+++ b/templates/libXvMC/template
@@ -1,15 +1,15 @@
-# Template build file for 'libXvMC'.
 pkgname=libXvMC
 version=1.0.4
-distfiles="
-http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version.tar.bz2"
+distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
-make_cmd="$XBPS_MASTERDIR/bin/gmake"
-pkgconfig_override="xvmc.pc"
 short_desc="XVideo Motion Compensation Library"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=ccb5bcb022e9596dea17213419d56e7e123c043b
+checksum=1217825ba8d66198466ee8306d0d6d237d2dd80d0f0783c98701296791833abb
 long_desc="
  X-Video Motion Compensation (XvMC) provides accelerated video
  playback by offloading video decoding to hardware.  It is an
  extension of the X video extension for the X Window System."
+
+shared_deps="libX11-1.1 libXext-1.0 libXv-1.0"
+build_depends="pkg-config-0.23 xextproto-7.0 videoproto-2.2 ${shared_deps}"
+run_depends="glibc-2.8 ${shared_deps}"
diff --git a/templates/libXxf86misc/template b/templates/libXxf86misc/template
index e76620b66d..3b0f91aa12 100644
--- a/templates/libXxf86misc/template
+++ b/templates/libXxf86misc/template
@@ -1,14 +1,16 @@
-# Template build file for 'libXxf86misc'.
 pkgname=libXxf86misc
 version=1.0.1
-distfiles="
-http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version.tar.bz2"
+distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
-pkgconfig_override="xxf86misc.pc"
 short_desc="Library for the XFree86-Misc X extension"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=b600bd56ec931c3ff5087cf46e21b7bd9928eaaf
+checksum=2122d67d49aaa06eeaeb3db173ea8a7048f3b52665e5135874bc5cadada91289
 long_desc="
  This library from the modular X.org project provides an interface
  to the XFree86-Misc extension which allows various server settings
  to be queried and changed dynamically."
+
+shared_deps="libX11-1.1 libXext-1.0"
+build_depends="pkg-config-0.23 xproto-7.0 xextproto-7.0 xf86miscproto-0.9
+ ${shared_deps}"
+run_depends="glibc-2.8 ${shared_deps}"
diff --git a/templates/libXxf86vm/template b/templates/libXxf86vm/template
index e5354e30bb..f5c13b98f6 100644
--- a/templates/libXxf86vm/template
+++ b/templates/libXxf86vm/template
@@ -1,16 +1,18 @@
-# Template build file for 'libXxf86vm'.
 pkgname=libXxf86vm
 version=1.0.2
-distfiles="
-http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version.tar.bz2"
+distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
-pkgconfig_override="xxf86vm.pc"
 short_desc="Library for the XFree86-VidMode X extension"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=10fcd0ebd90c0110e6b04da660578aa883895256
+checksum=3cb3c3c6552a4fbc686ba6c2dbeb6e4ba2a27103279908831d56363de73951de
 long_desc="
  These functions provide an interface to the server extension
  XFree86-VidModeExtension which allows the video modes to be queried
  and adjusted dynamically and mode switching to be controlled.
 
  This library is from the modular X.org project."
+
+shared_deps="libX11-1.1 libXext-1.0"
+build_depends="pkg-config-0.23 xproto-7.0 xextproto-7.0 xf86vidmodeproto-2.2
+ ${shared_deps}"
+run_depends="glibc-2.8 ${shared_deps}"
diff --git a/templates/libxkbfile/template b/templates/libxkbfile/template
index 1fe8d38234..c3c9fb1982 100644
--- a/templates/libxkbfile/template
+++ b/templates/libxkbfile/template
@@ -1,11 +1,12 @@
-# Template build file for 'libxkbfile'.
 pkgname=libxkbfile
 version=1.0.5
-distfiles="
-http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version.tar.bz2"
+distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
-pkgconfig_override="xkbfile.pc"
 short_desc="The xkbfile Library from modular X.org"
-checksum=5c0f4bba0ffacdcd06846bd6c436ba3d9275691b
-longdesc="
+checksum=0ab628271fc9cb6d05f861d9823573088d81d510aca95b87ac0504b2e558965f
+long_desc="
 The xkbfile library is from the modular X.org X11 project."
+
+shared_deps="libX11-1.1 libXext-1.0"
+build_depends="pkg-config-0.23 xproto-7.0 xextproto-7.0 ${shared_deps}"
+run_depends="glibc-2.8 ${shared_deps}"