- fix misplaced @

- fix typos in x11r7 packages

204 files changed, 204 insertions, 204 deletions

diff --git a/package/Makefile.autotools.in b/package/Makefile.autotools.in
index 7f2afffc7..f7c984d9f 100644
--- a/package/Makefile.autotools.in
+++ b/package/Makefile.autotools.in
@@ -139,7 +139,7 @@ $(BUILD_DIR)/%/.stamp_extracted:
 	$(call MESSAGE,"Extracting")
 	$(Q)mkdir -p $(@D)
 	$(Q)$(INFLATE$(suffix $($(PKG)_SOURCE))) $(DL_DIR)/$($(PKG)_SOURCE) | \
-	$(Q)$(TAR) --strip-components=1 -C $(@D) $(TAR_OPTIONS) -
+	$(TAR) --strip-components=1 -C $(@D) $(TAR_OPTIONS) -
 	$(Q)touch $@
 
 # Patch
diff --git a/package/x11r7/libxcb/libxcb.mk b/package/x11r7/libxcb/libxcb.mk
index 24469329e..79888d95d 100644
--- a/package/x11r7/libxcb/libxcb.mk
+++ b/package/x11r7/libxcb/libxcb.mk
@@ -10,7 +10,7 @@ LIBXCB_SITE = http://xcb.freedesktop.org/dist/
 LIBXCB_INSTALL_STAGING = YES
 
 LIBXCB_AUTORECONF = YES
-LIBXCB_DEPENDANCIES = pthread-stubs xcb-proto xlib_libXdmcp xlib_libXau
+LIBXCB_DEPENDENCIES = pthread-stubs xcb-proto xlib_libXdmcp xlib_libXau
 LIBXCB_CONF_ENV = STAGING_DIR="$(STAGING_DIR)"
 
 $(eval $(call AUTOTARGETS,libxcb))
diff --git a/package/x11r7/openchrome/openchrome.mk b/package/x11r7/openchrome/openchrome.mk
index 713b68791..e84d13e1e 100644
--- a/package/x11r7/openchrome/openchrome.mk
+++ b/package/x11r7/openchrome/openchrome.mk
@@ -7,7 +7,7 @@ OPENCHROME_VERSION = r355
 OPENCHROME_SOURCE = openchrome-$(OPENCHROME_VERSION).tar.bz2
 OPENCHROME_SITE = http://bazaar.mezis.net/
 
-OPENCHROME_DEPENDANCIES = xserver_xorg-server libdrm xlib_libX11 xlib_libXvMC xproto_fontsproto xproto_glproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xf86driproto xproto_xproto
+OPENCHROME_DEPENDENCIES = xserver_xorg-server libdrm xlib_libX11 xlib_libXvMC xproto_fontsproto xproto_glproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xf86driproto xproto_xproto
 
 OPENCHROME_AUTORECONF = YES
 OPENCHROME_CONF_OPT = --enable-shared --disable-static
diff --git a/package/x11r7/pthread-stubs/pthread-stubs.mk b/package/x11r7/pthread-stubs/pthread-stubs.mk
index 90bb6cfa1..33384b049 100644
--- a/package/x11r7/pthread-stubs/pthread-stubs.mk
+++ b/package/x11r7/pthread-stubs/pthread-stubs.mk
@@ -7,7 +7,7 @@ PTHREAD_STUBS_VERSION = 0.1
 PTHREAD_STUBS_SOURCE = libpthread-stubs-$(PTHREAD_STUBS_VERSION).tar.bz2
 PTHREAD_STUBS_SITE = http://xcb.freedesktop.org/dist/
 
-PTHREAD_STUBS_DEPENDANCIES = uclibc
+PTHREAD_STUBS_DEPENDENCIES = uclibc
 PTHREAD_STUBS_INSTALL_STAGING = YES
 
 $(eval $(call AUTOTARGETS,pthread-stubs))
diff --git a/package/x11r7/xapp_appres/xapp_appres.mk b/package/x11r7/xapp_appres/xapp_appres.mk
index bce580bff..090f2a704 100644
--- a/package/x11r7/xapp_appres/xapp_appres.mk
+++ b/package/x11r7/xapp_appres/xapp_appres.mk
@@ -8,6 +8,6 @@ XAPP_APPRES_VERSION = 1.0.1
 XAPP_APPRES_SOURCE = appres-$(XAPP_APPRES_VERSION).tar.bz2
 XAPP_APPRES_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_APPRES_AUTORECONF = YES
-XAPP_APPRES_DEPENDANCIES = xlib_libX11 xlib_libXt
+XAPP_APPRES_DEPENDENCIES = xlib_libX11 xlib_libXt
 
 $(eval $(call AUTOTARGETS,xapp_appres))
diff --git a/package/x11r7/xapp_bdftopcf/xapp_bdftopcf.mk b/package/x11r7/xapp_bdftopcf/xapp_bdftopcf.mk
index 38a8f406f..fbbf08400 100644
--- a/package/x11r7/xapp_bdftopcf/xapp_bdftopcf.mk
+++ b/package/x11r7/xapp_bdftopcf/xapp_bdftopcf.mk
@@ -8,6 +8,6 @@ XAPP_BDFTOPCF_VERSION = 1.0.0
 XAPP_BDFTOPCF_SOURCE = bdftopcf-$(XAPP_BDFTOPCF_VERSION).tar.bz2
 XAPP_BDFTOPCF_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_BDFTOPCF_AUTORECONF = YES
-XAPP_BDFTOPCF_DEPENDANCIES = xlib_libXfont
+XAPP_BDFTOPCF_DEPENDENCIES = xlib_libXfont
 
 $(eval $(call AUTOTARGETS,xapp_bdftopcf))
diff --git a/package/x11r7/xapp_beforelight/xapp_beforelight.mk b/package/x11r7/xapp_beforelight/xapp_beforelight.mk
index 13454f20c..a3f557623 100644
--- a/package/x11r7/xapp_beforelight/xapp_beforelight.mk
+++ b/package/x11r7/xapp_beforelight/xapp_beforelight.mk
@@ -8,6 +8,6 @@ XAPP_BEFORELIGHT_VERSION = 1.0.2
 XAPP_BEFORELIGHT_SOURCE = beforelight-$(XAPP_BEFORELIGHT_VERSION).tar.bz2
 XAPP_BEFORELIGHT_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_BEFORELIGHT_AUTORECONF = YES
-XAPP_BEFORELIGHT_DEPENDANCIES = xlib_libX11 xlib_libXScrnSaver xlib_libXaw xlib_libXt
+XAPP_BEFORELIGHT_DEPENDENCIES = xlib_libX11 xlib_libXScrnSaver xlib_libXaw xlib_libXt
 
 $(eval $(call AUTOTARGETS,xapp_beforelight))
diff --git a/package/x11r7/xapp_bitmap/xapp_bitmap.mk b/package/x11r7/xapp_bitmap/xapp_bitmap.mk
index e62e25404..6ee408192 100644
--- a/package/x11r7/xapp_bitmap/xapp_bitmap.mk
+++ b/package/x11r7/xapp_bitmap/xapp_bitmap.mk
@@ -8,6 +8,6 @@ XAPP_BITMAP_VERSION = 1.0.2
 XAPP_BITMAP_SOURCE = bitmap-$(XAPP_BITMAP_VERSION).tar.bz2
 XAPP_BITMAP_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_BITMAP_AUTORECONF = YES
-XAPP_BITMAP_DEPENDANCIES = xlib_libX11 xlib_libXaw xlib_libXmu xdata_xbitmaps
+XAPP_BITMAP_DEPENDENCIES = xlib_libX11 xlib_libXaw xlib_libXmu xdata_xbitmaps
 
 $(eval $(call AUTOTARGETS,xapp_bitmap))
diff --git a/package/x11r7/xapp_editres/xapp_editres.mk b/package/x11r7/xapp_editres/xapp_editres.mk
index f2508405b..c5c5df780 100644
--- a/package/x11r7/xapp_editres/xapp_editres.mk
+++ b/package/x11r7/xapp_editres/xapp_editres.mk
@@ -8,6 +8,6 @@ XAPP_EDITRES_VERSION = 1.0.2
 XAPP_EDITRES_SOURCE = editres-$(XAPP_EDITRES_VERSION).tar.bz2
 XAPP_EDITRES_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_EDITRES_AUTORECONF = YES
-XAPP_EDITRES_DEPENDANCIES = xlib_libX11 xlib_libXaw xlib_libXmu xlib_libXt
+XAPP_EDITRES_DEPENDENCIES = xlib_libX11 xlib_libXaw xlib_libXmu xlib_libXt
 
 $(eval $(call AUTOTARGETS,xapp_editres))
diff --git a/package/x11r7/xapp_fonttosfnt/xapp_fonttosfnt.mk b/package/x11r7/xapp_fonttosfnt/xapp_fonttosfnt.mk
index efd153bb2..08cd78347 100644
--- a/package/x11r7/xapp_fonttosfnt/xapp_fonttosfnt.mk
+++ b/package/x11r7/xapp_fonttosfnt/xapp_fonttosfnt.mk
@@ -8,6 +8,6 @@ XAPP_FONTTOSFNT_VERSION = 1.0.3
 XAPP_FONTTOSFNT_SOURCE = fonttosfnt-$(XAPP_FONTTOSFNT_VERSION).tar.bz2
 XAPP_FONTTOSFNT_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_FONTTOSFNT_AUTORECONF = YES
-XAPP_FONTTOSFNT_DEPENDANCIES = freetype xlib_libX11 xlib_libfontenc
+XAPP_FONTTOSFNT_DEPENDENCIES = freetype xlib_libX11 xlib_libfontenc
 
 $(eval $(call AUTOTARGETS,xapp_fonttosfnt))
diff --git a/package/x11r7/xapp_fslsfonts/xapp_fslsfonts.mk b/package/x11r7/xapp_fslsfonts/xapp_fslsfonts.mk
index 9327e83be..20a6c4e0e 100644
--- a/package/x11r7/xapp_fslsfonts/xapp_fslsfonts.mk
+++ b/package/x11r7/xapp_fslsfonts/xapp_fslsfonts.mk
@@ -8,6 +8,6 @@ XAPP_FSLSFONTS_VERSION = 1.0.1
 XAPP_FSLSFONTS_SOURCE = fslsfonts-$(XAPP_FSLSFONTS_VERSION).tar.bz2
 XAPP_FSLSFONTS_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_FSLSFONTS_AUTORECONF = YES
-XAPP_FSLSFONTS_DEPENDANCIES = xlib_libFS xlib_libX11
+XAPP_FSLSFONTS_DEPENDENCIES = xlib_libFS xlib_libX11
 
 $(eval $(call AUTOTARGETS,xapp_fslsfonts))
diff --git a/package/x11r7/xapp_fstobdf/xapp_fstobdf.mk b/package/x11r7/xapp_fstobdf/xapp_fstobdf.mk
index c45f8eb21..b7c436972 100644
--- a/package/x11r7/xapp_fstobdf/xapp_fstobdf.mk
+++ b/package/x11r7/xapp_fstobdf/xapp_fstobdf.mk
@@ -8,6 +8,6 @@ XAPP_FSTOBDF_VERSION = 1.0.2
 XAPP_FSTOBDF_SOURCE = fstobdf-$(XAPP_FSTOBDF_VERSION).tar.bz2
 XAPP_FSTOBDF_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_FSTOBDF_AUTORECONF = YES
-XAPP_FSTOBDF_DEPENDANCIES = xlib_libFS xlib_libX11
+XAPP_FSTOBDF_DEPENDENCIES = xlib_libFS xlib_libX11
 
 $(eval $(call AUTOTARGETS,xapp_fstobdf))
diff --git a/package/x11r7/xapp_iceauth/xapp_iceauth.mk b/package/x11r7/xapp_iceauth/xapp_iceauth.mk
index c98561065..5326a93f2 100644
--- a/package/x11r7/xapp_iceauth/xapp_iceauth.mk
+++ b/package/x11r7/xapp_iceauth/xapp_iceauth.mk
@@ -8,6 +8,6 @@ XAPP_ICEAUTH_VERSION = 1.0.1
 XAPP_ICEAUTH_SOURCE = iceauth-$(XAPP_ICEAUTH_VERSION).tar.bz2
 XAPP_ICEAUTH_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_ICEAUTH_AUTORECONF = YES
-XAPP_ICEAUTH_DEPENDANCIES = xlib_libICE xlib_libX11
+XAPP_ICEAUTH_DEPENDENCIES = xlib_libICE xlib_libX11
 
 $(eval $(call AUTOTARGETS,xapp_iceauth))
diff --git a/package/x11r7/xapp_ico/xapp_ico.mk b/package/x11r7/xapp_ico/xapp_ico.mk
index 7d04ab239..e99d4fac6 100644
--- a/package/x11r7/xapp_ico/xapp_ico.mk
+++ b/package/x11r7/xapp_ico/xapp_ico.mk
@@ -8,6 +8,6 @@ XAPP_ICO_VERSION = 1.0.1
 XAPP_ICO_SOURCE = ico-$(XAPP_ICO_VERSION).tar.bz2
 XAPP_ICO_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_ICO_AUTORECONF = YES
-XAPP_ICO_DEPENDANCIES = xlib_libX11
+XAPP_ICO_DEPENDENCIES = xlib_libX11
 
 $(eval $(call AUTOTARGETS,xapp_ico))
diff --git a/package/x11r7/xapp_lbxproxy/xapp_lbxproxy.mk b/package/x11r7/xapp_lbxproxy/xapp_lbxproxy.mk
index 4b4083d90..31da1e090 100644
--- a/package/x11r7/xapp_lbxproxy/xapp_lbxproxy.mk
+++ b/package/x11r7/xapp_lbxproxy/xapp_lbxproxy.mk
@@ -8,6 +8,6 @@ XAPP_LBXPROXY_VERSION = 1.0.1
 XAPP_LBXPROXY_SOURCE = lbxproxy-$(XAPP_LBXPROXY_VERSION).tar.bz2
 XAPP_LBXPROXY_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_LBXPROXY_AUTORECONF = YES
-XAPP_LBXPROXY_DEPENDANCIES = xlib_libICE xlib_libX11 xlib_libXext xlib_liblbxutil xlib_xtrans xproto_xproxymanagementprotocol
+XAPP_LBXPROXY_DEPENDENCIES = xlib_libICE xlib_libX11 xlib_libXext xlib_liblbxutil xlib_xtrans xproto_xproxymanagementprotocol
 
 $(eval $(call AUTOTARGETS,xapp_lbxproxy))
diff --git a/package/x11r7/xapp_listres/xapp_listres.mk b/package/x11r7/xapp_listres/xapp_listres.mk
index 9f4476b4c..e5281cb2b 100644
--- a/package/x11r7/xapp_listres/xapp_listres.mk
+++ b/package/x11r7/xapp_listres/xapp_listres.mk
@@ -8,6 +8,6 @@ XAPP_LISTRES_VERSION = 1.0.1
 XAPP_LISTRES_SOURCE = listres-$(XAPP_LISTRES_VERSION).tar.bz2
 XAPP_LISTRES_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_LISTRES_AUTORECONF = YES
-XAPP_LISTRES_DEPENDANCIES = xlib_libX11 xlib_libXaw xlib_libXmu xlib_libXt
+XAPP_LISTRES_DEPENDENCIES = xlib_libX11 xlib_libXaw xlib_libXmu xlib_libXt
 
 $(eval $(call AUTOTARGETS,xapp_listres))
diff --git a/package/x11r7/xapp_luit/xapp_luit.mk b/package/x11r7/xapp_luit/xapp_luit.mk
index 186eb620c..c61aaf8f6 100644
--- a/package/x11r7/xapp_luit/xapp_luit.mk
+++ b/package/x11r7/xapp_luit/xapp_luit.mk
@@ -8,6 +8,6 @@ XAPP_LUIT_VERSION = 1.0.2
 XAPP_LUIT_SOURCE = luit-$(XAPP_LUIT_VERSION).tar.bz2
 XAPP_LUIT_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_LUIT_AUTORECONF = YES
-XAPP_LUIT_DEPENDANCIES = xlib_libX11 xlib_libfontenc
+XAPP_LUIT_DEPENDENCIES = xlib_libX11 xlib_libfontenc
 
 $(eval $(call AUTOTARGETS,xapp_luit))
diff --git a/package/x11r7/xapp_mkfontdir/xapp_mkfontdir.mk b/package/x11r7/xapp_mkfontdir/xapp_mkfontdir.mk
index 94b59c163..9c3722250 100644
--- a/package/x11r7/xapp_mkfontdir/xapp_mkfontdir.mk
+++ b/package/x11r7/xapp_mkfontdir/xapp_mkfontdir.mk
@@ -8,6 +8,6 @@ XAPP_MKFONTDIR_VERSION = 1.0.2
 XAPP_MKFONTDIR_SOURCE = mkfontdir-$(XAPP_MKFONTDIR_VERSION).tar.bz2
 XAPP_MKFONTDIR_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_MKFONTDIR_AUTORECONF = YES
-XAPP_MKFONTDIR_DEPENDANCIES = xapp_mkfontscale
+XAPP_MKFONTDIR_DEPENDENCIES = xapp_mkfontscale
 
 $(eval $(call AUTOTARGETS,xapp_mkfontdir))
diff --git a/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk b/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk
index 94c017ec7..b4394dd23 100644
--- a/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk
+++ b/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk
@@ -8,6 +8,6 @@ XAPP_MKFONTSCALE_VERSION = 1.0.3
 XAPP_MKFONTSCALE_SOURCE = mkfontscale-$(XAPP_MKFONTSCALE_VERSION).tar.bz2
 XAPP_MKFONTSCALE_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_MKFONTSCALE_AUTORECONF = YES
-XAPP_MKFONTSCALE_DEPENDANCIES = freetype xlib_libX11 xlib_libfontenc
+XAPP_MKFONTSCALE_DEPENDENCIES = freetype xlib_libX11 xlib_libfontenc
 
 $(eval $(call AUTOTARGETS,xapp_mkfontscale))
diff --git a/package/x11r7/xapp_oclock/xapp_oclock.mk b/package/x11r7/xapp_oclock/xapp_oclock.mk
index 82893dd2e..1c23abbf6 100644
--- a/package/x11r7/xapp_oclock/xapp_oclock.mk
+++ b/package/x11r7/xapp_oclock/xapp_oclock.mk
@@ -8,6 +8,6 @@ XAPP_OCLOCK_VERSION = 1.0.1
 XAPP_OCLOCK_SOURCE = oclock-$(XAPP_OCLOCK_VERSION).tar.bz2
 XAPP_OCLOCK_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_OCLOCK_AUTORECONF = YES
-XAPP_OCLOCK_DEPENDANCIES = xlib_libX11 xlib_libXext xlib_libXmu
+XAPP_OCLOCK_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXmu
 
 $(eval $(call AUTOTARGETS,xapp_oclock))
diff --git a/package/x11r7/xapp_proxymngr/xapp_proxymngr.mk b/package/x11r7/xapp_proxymngr/xapp_proxymngr.mk
index 775a63f5d..a9a0f8f8d 100644
--- a/package/x11r7/xapp_proxymngr/xapp_proxymngr.mk
+++ b/package/x11r7/xapp_proxymngr/xapp_proxymngr.mk
@@ -8,6 +8,6 @@ XAPP_PROXYMNGR_VERSION = 1.0.1
 XAPP_PROXYMNGR_SOURCE = proxymngr-$(XAPP_PROXYMNGR_VERSION).tar.bz2
 XAPP_PROXYMNGR_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_PROXYMNGR_AUTORECONF = YES
-XAPP_PROXYMNGR_DEPENDANCIES = xlib_libICE xlib_libX11 xlib_libXt xproto_xproxymanagementprotocol
+XAPP_PROXYMNGR_DEPENDENCIES = xlib_libICE xlib_libX11 xlib_libXt xproto_xproxymanagementprotocol
 
 $(eval $(call AUTOTARGETS,xapp_proxymngr))
diff --git a/package/x11r7/xapp_rgb/xapp_rgb.mk b/package/x11r7/xapp_rgb/xapp_rgb.mk
index 32337f98d..588df2aa2 100644
--- a/package/x11r7/xapp_rgb/xapp_rgb.mk
+++ b/package/x11r7/xapp_rgb/xapp_rgb.mk
@@ -8,6 +8,6 @@ XAPP_RGB_VERSION = 1.0.1
 XAPP_RGB_SOURCE = rgb-$(XAPP_RGB_VERSION).tar.bz2
 XAPP_RGB_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_RGB_AUTORECONF = YES
-XAPP_RGB_DEPENDANCIES = xproto_xproto
+XAPP_RGB_DEPENDENCIES = xproto_xproto
 
 $(eval $(call AUTOTARGETS,xapp_rgb))
diff --git a/package/x11r7/xapp_rstart/xapp_rstart.mk b/package/x11r7/xapp_rstart/xapp_rstart.mk
index 6ea0c0774..375862321 100644
--- a/package/x11r7/xapp_rstart/xapp_rstart.mk
+++ b/package/x11r7/xapp_rstart/xapp_rstart.mk
@@ -8,6 +8,6 @@ XAPP_RSTART_VERSION = 1.0.2
 XAPP_RSTART_SOURCE = rstart-$(XAPP_RSTART_VERSION).tar.bz2
 XAPP_RSTART_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_RSTART_AUTORECONF = YES
-XAPP_RSTART_DEPENDANCIES = xlib_libX11
+XAPP_RSTART_DEPENDENCIES = xlib_libX11
 
 $(eval $(call AUTOTARGETS,xapp_rstart))
diff --git a/package/x11r7/xapp_scripts/xapp_scripts.mk b/package/x11r7/xapp_scripts/xapp_scripts.mk
index da583ea51..743310a82 100644
--- a/package/x11r7/xapp_scripts/xapp_scripts.mk
+++ b/package/x11r7/xapp_scripts/xapp_scripts.mk
@@ -8,6 +8,6 @@ XAPP_SCRIPTS_VERSION = 1.0.1
 XAPP_SCRIPTS_SOURCE = scripts-$(XAPP_SCRIPTS_VERSION).tar.bz2
 XAPP_SCRIPTS_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_SCRIPTS_AUTORECONF = YES
-XAPP_SCRIPTS_DEPENDANCIES = xlib_libX11
+XAPP_SCRIPTS_DEPENDENCIES = xlib_libX11
 
 $(eval $(call AUTOTARGETS,xapp_scripts))
diff --git a/package/x11r7/xapp_sessreg/xapp_sessreg.mk b/package/x11r7/xapp_sessreg/xapp_sessreg.mk
index 3610d1396..dfa8b838d 100644
--- a/package/x11r7/xapp_sessreg/xapp_sessreg.mk
+++ b/package/x11r7/xapp_sessreg/xapp_sessreg.mk
@@ -8,6 +8,6 @@ XAPP_SESSREG_VERSION = 1.0.2
 XAPP_SESSREG_SOURCE = sessreg-$(XAPP_SESSREG_VERSION).tar.bz2
 XAPP_SESSREG_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_SESSREG_AUTORECONF = YES
-XAPP_SESSREG_DEPENDANCIES = xlib_libX11 xproto_xproto
+XAPP_SESSREG_DEPENDENCIES = xlib_libX11 xproto_xproto
 
 $(eval $(call AUTOTARGETS,xapp_sessreg))
diff --git a/package/x11r7/xapp_setxkbmap/xapp_setxkbmap.mk b/package/x11r7/xapp_setxkbmap/xapp_setxkbmap.mk
index a9437a7f8..87911f0f6 100644
--- a/package/x11r7/xapp_setxkbmap/xapp_setxkbmap.mk
+++ b/package/x11r7/xapp_setxkbmap/xapp_setxkbmap.mk
@@ -8,6 +8,6 @@ XAPP_SETXKBMAP_VERSION = 1.0.3
 XAPP_SETXKBMAP_SOURCE = setxkbmap-$(XAPP_SETXKBMAP_VERSION).tar.bz2
 XAPP_SETXKBMAP_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_SETXKBMAP_AUTORECONF = YES
-XAPP_SETXKBMAP_DEPENDANCIES = xlib_libX11 xlib_libxkbfile
+XAPP_SETXKBMAP_DEPENDENCIES = xlib_libX11 xlib_libxkbfile
 
 $(eval $(call AUTOTARGETS,xapp_setxkbmap))
diff --git a/package/x11r7/xapp_showfont/xapp_showfont.mk b/package/x11r7/xapp_showfont/xapp_showfont.mk
index d5b1847bc..f1bb1ad89 100644
--- a/package/x11r7/xapp_showfont/xapp_showfont.mk
+++ b/package/x11r7/xapp_showfont/xapp_showfont.mk
@@ -8,6 +8,6 @@ XAPP_SHOWFONT_VERSION = 1.0.1
 XAPP_SHOWFONT_SOURCE = showfont-$(XAPP_SHOWFONT_VERSION).tar.bz2
 XAPP_SHOWFONT_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_SHOWFONT_AUTORECONF = YES
-XAPP_SHOWFONT_DEPENDANCIES = xlib_libFS
+XAPP_SHOWFONT_DEPENDENCIES = xlib_libFS
 
 $(eval $(call AUTOTARGETS,xapp_showfont))
diff --git a/package/x11r7/xapp_smproxy/xapp_smproxy.mk b/package/x11r7/xapp_smproxy/xapp_smproxy.mk
index 0729e2e86..618da55ff 100644
--- a/package/x11r7/xapp_smproxy/xapp_smproxy.mk
+++ b/package/x11r7/xapp_smproxy/xapp_smproxy.mk
@@ -8,6 +8,6 @@ XAPP_SMPROXY_VERSION = 1.0.2
 XAPP_SMPROXY_SOURCE = smproxy-$(XAPP_SMPROXY_VERSION).tar.bz2
 XAPP_SMPROXY_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_SMPROXY_AUTORECONF = YES
-XAPP_SMPROXY_DEPENDANCIES = xlib_libXmu xlib_libXt
+XAPP_SMPROXY_DEPENDENCIES = xlib_libXmu xlib_libXt
 
 $(eval $(call AUTOTARGETS,xapp_smproxy))
diff --git a/package/x11r7/xapp_viewres/xapp_viewres.mk b/package/x11r7/xapp_viewres/xapp_viewres.mk
index 6bffce4e7..1cf91a470 100644
--- a/package/x11r7/xapp_viewres/xapp_viewres.mk
+++ b/package/x11r7/xapp_viewres/xapp_viewres.mk
@@ -8,6 +8,6 @@ XAPP_VIEWRES_VERSION = 1.0.1
 XAPP_VIEWRES_SOURCE = viewres-$(XAPP_VIEWRES_VERSION).tar.bz2
 XAPP_VIEWRES_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_VIEWRES_AUTORECONF = YES
-XAPP_VIEWRES_DEPENDANCIES = xlib_libXaw
+XAPP_VIEWRES_DEPENDENCIES = xlib_libXaw
 
 $(eval $(call AUTOTARGETS,xapp_viewres))
diff --git a/package/x11r7/xapp_x11perf/xapp_x11perf.mk b/package/x11r7/xapp_x11perf/xapp_x11perf.mk
index f3d427200..8a3ca18ca 100644
--- a/package/x11r7/xapp_x11perf/xapp_x11perf.mk
+++ b/package/x11r7/xapp_x11perf/xapp_x11perf.mk
@@ -8,6 +8,6 @@ XAPP_X11PERF_VERSION = 1.4.1
 XAPP_X11PERF_SOURCE = x11perf-$(XAPP_X11PERF_VERSION).tar.bz2
 XAPP_X11PERF_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_X11PERF_AUTORECONF = YES
-XAPP_X11PERF_DEPENDANCIES = xlib_libX11 xlib_libXmu xlib_libXft
+XAPP_X11PERF_DEPENDENCIES = xlib_libX11 xlib_libXmu xlib_libXft
 
 $(eval $(call AUTOTARGETS,xapp_x11perf))
diff --git a/package/x11r7/xapp_xauth/xapp_xauth.mk b/package/x11r7/xapp_xauth/xapp_xauth.mk
index 6b890ece9..4311898d2 100644
--- a/package/x11r7/xapp_xauth/xapp_xauth.mk
+++ b/package/x11r7/xapp_xauth/xapp_xauth.mk
@@ -8,6 +8,6 @@ XAPP_XAUTH_VERSION = 1.0.2
 XAPP_XAUTH_SOURCE = xauth-$(XAPP_XAUTH_VERSION).tar.bz2
 XAPP_XAUTH_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XAUTH_AUTORECONF = YES
-XAPP_XAUTH_DEPENDANCIES = xlib_libX11 xlib_libXau xlib_libXext xlib_libXmu
+XAPP_XAUTH_DEPENDENCIES = xlib_libX11 xlib_libXau xlib_libXext xlib_libXmu
 
 $(eval $(call AUTOTARGETS,xapp_xauth))
diff --git a/package/x11r7/xapp_xbiff/xapp_xbiff.mk b/package/x11r7/xapp_xbiff/xapp_xbiff.mk
index ba6241d44..6ec538e22 100644
--- a/package/x11r7/xapp_xbiff/xapp_xbiff.mk
+++ b/package/x11r7/xapp_xbiff/xapp_xbiff.mk
@@ -8,6 +8,6 @@ XAPP_XBIFF_VERSION = 1.0.1
 XAPP_XBIFF_SOURCE = xbiff-$(XAPP_XBIFF_VERSION).tar.bz2
 XAPP_XBIFF_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XBIFF_AUTORECONF = YES
-XAPP_XBIFF_DEPENDANCIES = xlib_libXaw xdata_xbitmaps
+XAPP_XBIFF_DEPENDENCIES = xlib_libXaw xdata_xbitmaps
 
 $(eval $(call AUTOTARGETS,xapp_xbiff))
diff --git a/package/x11r7/xapp_xcalc/xapp_xcalc.mk b/package/x11r7/xapp_xcalc/xapp_xcalc.mk
index 0ce9c8a5d..49962bc21 100644
--- a/package/x11r7/xapp_xcalc/xapp_xcalc.mk
+++ b/package/x11r7/xapp_xcalc/xapp_xcalc.mk
@@ -8,6 +8,6 @@ XAPP_XCALC_VERSION = 1.0.1
 XAPP_XCALC_SOURCE = xcalc-$(XAPP_XCALC_VERSION).tar.bz2
 XAPP_XCALC_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XCALC_AUTORECONF = YES
-XAPP_XCALC_DEPENDANCIES = xlib_libXaw
+XAPP_XCALC_DEPENDENCIES = xlib_libXaw
 
 $(eval $(call AUTOTARGETS,xapp_xcalc))
diff --git a/package/x11r7/xapp_xclipboard/xapp_xclipboard.mk b/package/x11r7/xapp_xclipboard/xapp_xclipboard.mk
index 44ac7db4e..65a08901d 100644
--- a/package/x11r7/xapp_xclipboard/xapp_xclipboard.mk
+++ b/package/x11r7/xapp_xclipboard/xapp_xclipboard.mk
@@ -8,6 +8,6 @@ XAPP_XCLIPBOARD_VERSION = 1.0.1
 XAPP_XCLIPBOARD_SOURCE = xclipboard-$(XAPP_XCLIPBOARD_VERSION).tar.bz2
 XAPP_XCLIPBOARD_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XCLIPBOARD_AUTORECONF = YES
-XAPP_XCLIPBOARD_DEPENDANCIES = xlib_libXaw
+XAPP_XCLIPBOARD_DEPENDENCIES = xlib_libXaw
 
 $(eval $(call AUTOTARGETS,xapp_xclipboard))
diff --git a/package/x11r7/xapp_xclock/xapp_xclock.mk b/package/x11r7/xapp_xclock/xapp_xclock.mk
index 45f5f15bc..a171382df 100644
--- a/package/x11r7/xapp_xclock/xapp_xclock.mk
+++ b/package/x11r7/xapp_xclock/xapp_xclock.mk
@@ -8,6 +8,6 @@ XAPP_XCLOCK_VERSION = 1.0.2
 XAPP_XCLOCK_SOURCE = xclock-$(XAPP_XCLOCK_VERSION).tar.bz2
 XAPP_XCLOCK_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XCLOCK_AUTORECONF = YES
-XAPP_XCLOCK_DEPENDANCIES = xlib_libX11 xlib_libXaw xlib_libXft xlib_libXrender xlib_libxkbfile
+XAPP_XCLOCK_DEPENDENCIES = xlib_libX11 xlib_libXaw xlib_libXft xlib_libXrender xlib_libxkbfile
 
 $(eval $(call AUTOTARGETS,xapp_xclock))
diff --git a/package/x11r7/xapp_xcmsdb/xapp_xcmsdb.mk b/package/x11r7/xapp_xcmsdb/xapp_xcmsdb.mk
index 5299fcc66..66cdcff06 100644
--- a/package/x11r7/xapp_xcmsdb/xapp_xcmsdb.mk
+++ b/package/x11r7/xapp_xcmsdb/xapp_xcmsdb.mk
@@ -8,6 +8,6 @@ XAPP_XCMSDB_VERSION = 1.0.1
 XAPP_XCMSDB_SOURCE = xcmsdb-$(XAPP_XCMSDB_VERSION).tar.bz2
 XAPP_XCMSDB_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XCMSDB_AUTORECONF = YES
-XAPP_XCMSDB_DEPENDANCIES = xlib_libX11
+XAPP_XCMSDB_DEPENDENCIES = xlib_libX11
 
 $(eval $(call AUTOTARGETS,xapp_xcmsdb))
diff --git a/package/x11r7/xapp_xcursorgen/xapp_xcursorgen.mk b/package/x11r7/xapp_xcursorgen/xapp_xcursorgen.mk
index 94d82744d..fa8b02c9f 100644
--- a/package/x11r7/xapp_xcursorgen/xapp_xcursorgen.mk
+++ b/package/x11r7/xapp_xcursorgen/xapp_xcursorgen.mk
@@ -8,6 +8,6 @@ XAPP_XCURSORGEN_VERSION = 1.0.1
 XAPP_XCURSORGEN_SOURCE = xcursorgen-$(XAPP_XCURSORGEN_VERSION).tar.bz2
 XAPP_XCURSORGEN_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XCURSORGEN_AUTORECONF = YES
-XAPP_XCURSORGEN_DEPENDANCIES = libpng xlib_libX11 xlib_libXcursor
+XAPP_XCURSORGEN_DEPENDENCIES = libpng xlib_libX11 xlib_libXcursor
 
 $(eval $(call AUTOTARGETS,xapp_xcursorgen))
diff --git a/package/x11r7/xapp_xdbedizzy/xapp_xdbedizzy.mk b/package/x11r7/xapp_xdbedizzy/xapp_xdbedizzy.mk
index 6738ebf72..98807b1b1 100644
--- a/package/x11r7/xapp_xdbedizzy/xapp_xdbedizzy.mk
+++ b/package/x11r7/xapp_xdbedizzy/xapp_xdbedizzy.mk
@@ -8,6 +8,6 @@ XAPP_XDBEDIZZY_VERSION = 1.0.2
 XAPP_XDBEDIZZY_SOURCE = xdbedizzy-$(XAPP_XDBEDIZZY_VERSION).tar.bz2
 XAPP_XDBEDIZZY_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XDBEDIZZY_AUTORECONF = YES
-XAPP_XDBEDIZZY_DEPENDANCIES = xlib_libXext xlib_libXp xlib_libXprintUtil
+XAPP_XDBEDIZZY_DEPENDENCIES = xlib_libXext xlib_libXp xlib_libXprintUtil
 
 $(eval $(call AUTOTARGETS,xapp_xdbedizzy))
diff --git a/package/x11r7/xapp_xditview/xapp_xditview.mk b/package/x11r7/xapp_xditview/xapp_xditview.mk
index 714d19562..4a4a6fceb 100644
--- a/package/x11r7/xapp_xditview/xapp_xditview.mk
+++ b/package/x11r7/xapp_xditview/xapp_xditview.mk
@@ -8,6 +8,6 @@ XAPP_XDITVIEW_VERSION = 1.0.1
 XAPP_XDITVIEW_SOURCE = xditview-$(XAPP_XDITVIEW_VERSION).tar.bz2
 XAPP_XDITVIEW_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XDITVIEW_AUTORECONF = YES
-XAPP_XDITVIEW_DEPENDANCIES = xlib_libXaw
+XAPP_XDITVIEW_DEPENDENCIES = xlib_libXaw
 
 $(eval $(call AUTOTARGETS,xapp_xditview))
diff --git a/package/x11r7/xapp_xdm/xapp_xdm.mk b/package/x11r7/xapp_xdm/xapp_xdm.mk
index db8532743..2bb36490f 100644
--- a/package/x11r7/xapp_xdm/xapp_xdm.mk
+++ b/package/x11r7/xapp_xdm/xapp_xdm.mk
@@ -8,6 +8,6 @@ XAPP_XDM_VERSION = 1.1.3
 XAPP_XDM_SOURCE = xdm-$(XAPP_XDM_VERSION).tar.bz2
 XAPP_XDM_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XDM_AUTORECONF = YES
-XAPP_XDM_DEPENDANCIES = xapp_xinit xapp_sessreg xapp_xrdb xlib_libX11 xlib_libXaw xlib_libXdmcp xlib_libXinerama xlib_libXt xproto_xineramaproto xproto_xproto
+XAPP_XDM_DEPENDENCIES = xapp_xinit xapp_sessreg xapp_xrdb xlib_libX11 xlib_libXaw xlib_libXdmcp xlib_libXinerama xlib_libXt xproto_xineramaproto xproto_xproto
 
 $(eval $(call AUTOTARGETS,xapp_xdm))
diff --git a/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk b/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk
index 82d700460..ded013d92 100644
--- a/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk
+++ b/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk
@@ -8,6 +8,6 @@ XAPP_XDPYINFO_VERSION = 1.0.1
 XAPP_XDPYINFO_SOURCE = xdpyinfo-$(XAPP_XDPYINFO_VERSION).tar.bz2
 XAPP_XDPYINFO_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XDPYINFO_AUTORECONF = YES
-XAPP_XDPYINFO_DEPENDANCIES = xlib_libX11 xlib_libXext xlib_libXi xlib_libXp xlib_libXrender xlib_libXtst xlib_libXxf86dga xlib_libXxf86misc xlib_libXxf86vm xproto_inputproto xproto_kbproto xproto_printproto xproto_renderproto xproto_xf86dgaproto xproto_xf86miscproto xproto_xf86vidmodeproto
+XAPP_XDPYINFO_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXi xlib_libXp xlib_libXrender xlib_libXtst xlib_libXxf86dga xlib_libXxf86misc xlib_libXxf86vm xproto_inputproto xproto_kbproto xproto_printproto xproto_renderproto xproto_xf86dgaproto xproto_xf86miscproto xproto_xf86vidmodeproto
 
 $(eval $(call AUTOTARGETS,xapp_xdpyinfo))
diff --git a/package/x11r7/xapp_xdriinfo/xapp_xdriinfo.mk b/package/x11r7/xapp_xdriinfo/xapp_xdriinfo.mk
index 57cd49793..edd3c52f6 100644
--- a/package/x11r7/xapp_xdriinfo/xapp_xdriinfo.mk
+++ b/package/x11r7/xapp_xdriinfo/xapp_xdriinfo.mk
@@ -8,6 +8,6 @@ XAPP_XDRIINFO_VERSION = 1.0.1
 XAPP_XDRIINFO_SOURCE = xdriinfo-$(XAPP_XDRIINFO_VERSION).tar.bz2
 XAPP_XDRIINFO_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XDRIINFO_AUTORECONF = YES
-XAPP_XDRIINFO_DEPENDANCIES = xlib_libX11 xproto_glproto mesa3d
+XAPP_XDRIINFO_DEPENDENCIES = xlib_libX11 xproto_glproto mesa3d
 
 $(eval $(call AUTOTARGETS,xapp_xdriinfo))
diff --git a/package/x11r7/xapp_xedit/xapp_xedit.mk b/package/x11r7/xapp_xedit/xapp_xedit.mk
index c6ea58001..b959cc5d4 100644
--- a/package/x11r7/xapp_xedit/xapp_xedit.mk
+++ b/package/x11r7/xapp_xedit/xapp_xedit.mk
@@ -8,6 +8,6 @@ XAPP_XEDIT_VERSION = 1.0.2
 XAPP_XEDIT_SOURCE = xedit-$(XAPP_XEDIT_VERSION).tar.bz2
 XAPP_XEDIT_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XEDIT_AUTORECONF = YES
-XAPP_XEDIT_DEPENDANCIES = xlib_libXaw xlib_libXprintUtil
+XAPP_XEDIT_DEPENDENCIES = xlib_libXaw xlib_libXprintUtil
 
 $(eval $(call AUTOTARGETS,xapp_xedit))
diff --git a/package/x11r7/xapp_xev/xapp_xev.mk b/package/x11r7/xapp_xev/xapp_xev.mk
index 7e75a5dd7..16dc8e7ed 100644
--- a/package/x11r7/xapp_xev/xapp_xev.mk
+++ b/package/x11r7/xapp_xev/xapp_xev.mk
@@ -8,6 +8,6 @@ XAPP_XEV_VERSION = 1.0.1
 XAPP_XEV_SOURCE = xev-$(XAPP_XEV_VERSION).tar.bz2
 XAPP_XEV_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XEV_AUTORECONF = YES
-XAPP_XEV_DEPENDANCIES = xlib_libX11
+XAPP_XEV_DEPENDENCIES = xlib_libX11
 
 $(eval $(call AUTOTARGETS,xapp_xev))
diff --git a/package/x11r7/xapp_xeyes/xapp_xeyes.mk b/package/x11r7/xapp_xeyes/xapp_xeyes.mk
index fa74b2abb..aecb66189 100644
--- a/package/x11r7/xapp_xeyes/xapp_xeyes.mk
+++ b/package/x11r7/xapp_xeyes/xapp_xeyes.mk
@@ -8,6 +8,6 @@ XAPP_XEYES_VERSION = 1.0.1
 XAPP_XEYES_SOURCE = xeyes-$(XAPP_XEYES_VERSION).tar.bz2
 XAPP_XEYES_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XEYES_AUTORECONF = YES
-XAPP_XEYES_DEPENDANCIES = xlib_libX11 xlib_libXext xlib_libXmu xlib_libXt
+XAPP_XEYES_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXmu xlib_libXt
 
 $(eval $(call AUTOTARGETS,xapp_xeyes))
diff --git a/package/x11r7/xapp_xf86dga/xapp_xf86dga.mk b/package/x11r7/xapp_xf86dga/xapp_xf86dga.mk
index 404bc8e46..2e00c6e35 100644
--- a/package/x11r7/xapp_xf86dga/xapp_xf86dga.mk
+++ b/package/x11r7/xapp_xf86dga/xapp_xf86dga.mk
@@ -8,6 +8,6 @@ XAPP_XF86DGA_VERSION = 1.0.2
 XAPP_XF86DGA_SOURCE = xf86dga-$(XAPP_XF86DGA_VERSION).tar.bz2
 XAPP_XF86DGA_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XF86DGA_AUTORECONF = YES
-XAPP_XF86DGA_DEPENDANCIES = xlib_libX11 xlib_libXxf86dga
+XAPP_XF86DGA_DEPENDENCIES = xlib_libX11 xlib_libXxf86dga
 
 $(eval $(call AUTOTARGETS,xapp_xf86dga))
diff --git a/package/x11r7/xapp_xfd/xapp_xfd.mk b/package/x11r7/xapp_xfd/xapp_xfd.mk
index 722615f71..a2478110b 100644
--- a/package/x11r7/xapp_xfd/xapp_xfd.mk
+++ b/package/x11r7/xapp_xfd/xapp_xfd.mk
@@ -8,6 +8,6 @@ XAPP_XFD_VERSION = 1.0.1
 XAPP_XFD_SOURCE = xfd-$(XAPP_XFD_VERSION).tar.bz2
 XAPP_XFD_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XFD_AUTORECONF = YES
-XAPP_XFD_DEPENDANCIES = freetype fontconfig xlib_libXaw xlib_libXft
+XAPP_XFD_DEPENDENCIES = freetype fontconfig xlib_libXaw xlib_libXft
 
 $(eval $(call AUTOTARGETS,xapp_xfd))
diff --git a/package/x11r7/xapp_xfindproxy/xapp_xfindproxy.mk b/package/x11r7/xapp_xfindproxy/xapp_xfindproxy.mk
index 519e2eae3..4eef4297a 100644
--- a/package/x11r7/xapp_xfindproxy/xapp_xfindproxy.mk
+++ b/package/x11r7/xapp_xfindproxy/xapp_xfindproxy.mk
@@ -8,6 +8,6 @@ XAPP_XFINDPROXY_VERSION = 1.0.1
 XAPP_XFINDPROXY_SOURCE = xfindproxy-$(XAPP_XFINDPROXY_VERSION).tar.bz2
 XAPP_XFINDPROXY_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XFINDPROXY_AUTORECONF = YES
-XAPP_XFINDPROXY_DEPENDANCIES = xlib_libICE xlib_libX11 xlib_libXt
+XAPP_XFINDPROXY_DEPENDENCIES = xlib_libICE xlib_libX11 xlib_libXt
 
 $(eval $(call AUTOTARGETS,xapp_xfindproxy))
diff --git a/package/x11r7/xapp_xfontsel/xapp_xfontsel.mk b/package/x11r7/xapp_xfontsel/xapp_xfontsel.mk
index 7a74b34ad..ede4df5a4 100644
--- a/package/x11r7/xapp_xfontsel/xapp_xfontsel.mk
+++ b/package/x11r7/xapp_xfontsel/xapp_xfontsel.mk
@@ -8,6 +8,6 @@ XAPP_XFONTSEL_VERSION = 1.0.1
 XAPP_XFONTSEL_SOURCE = xfontsel-$(XAPP_XFONTSEL_VERSION).tar.bz2
 XAPP_XFONTSEL_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XFONTSEL_AUTORECONF = YES
-XAPP_XFONTSEL_DEPENDANCIES = xlib_libXaw
+XAPP_XFONTSEL_DEPENDENCIES = xlib_libXaw
 
 $(eval $(call AUTOTARGETS,xapp_xfontsel))
diff --git a/package/x11r7/xapp_xfs/xapp_xfs.mk b/package/x11r7/xapp_xfs/xapp_xfs.mk
index 0c47f0229..e22e08b93 100644
--- a/package/x11r7/xapp_xfs/xapp_xfs.mk
+++ b/package/x11r7/xapp_xfs/xapp_xfs.mk
@@ -8,6 +8,6 @@ XAPP_XFS_VERSION = 1.0.4
 XAPP_XFS_SOURCE = xfs-$(XAPP_XFS_VERSION).tar.bz2
 XAPP_XFS_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XFS_AUTORECONF = YES
-XAPP_XFS_DEPENDANCIES = xlib_libFS xlib_libXfont xproto_fontsproto
+XAPP_XFS_DEPENDENCIES = xlib_libFS xlib_libXfont xproto_fontsproto
 
 $(eval $(call AUTOTARGETS,xapp_xfs))
diff --git a/package/x11r7/xapp_xfsinfo/xapp_xfsinfo.mk b/package/x11r7/xapp_xfsinfo/xapp_xfsinfo.mk
index 589120cff..01afa80d5 100644
--- a/package/x11r7/xapp_xfsinfo/xapp_xfsinfo.mk
+++ b/package/x11r7/xapp_xfsinfo/xapp_xfsinfo.mk
@@ -8,6 +8,6 @@ XAPP_XFSINFO_VERSION = 1.0.1
 XAPP_XFSINFO_SOURCE = xfsinfo-$(XAPP_XFSINFO_VERSION).tar.bz2
 XAPP_XFSINFO_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XFSINFO_AUTORECONF = YES
-XAPP_XFSINFO_DEPENDANCIES = xlib_libFS xlib_libX11
+XAPP_XFSINFO_DEPENDENCIES = xlib_libFS xlib_libX11
 
 $(eval $(call AUTOTARGETS,xapp_xfsinfo))
diff --git a/package/x11r7/xapp_xfwp/xapp_xfwp.mk b/package/x11r7/xapp_xfwp/xapp_xfwp.mk
index 8e6c0bdd5..bafa99219 100644
--- a/package/x11r7/xapp_xfwp/xapp_xfwp.mk
+++ b/package/x11r7/xapp_xfwp/xapp_xfwp.mk
@@ -8,6 +8,6 @@ XAPP_XFWP_VERSION = 1.0.1
 XAPP_XFWP_SOURCE = xfwp-$(XAPP_XFWP_VERSION).tar.bz2
 XAPP_XFWP_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XFWP_AUTORECONF = YES
-XAPP_XFWP_DEPENDANCIES = xlib_libICE xlib_libX11 xproto_xproxymanagementprotocol
+XAPP_XFWP_DEPENDENCIES = xlib_libICE xlib_libX11 xproto_xproxymanagementprotocol
 
 $(eval $(call AUTOTARGETS,xapp_xfwp))
diff --git a/package/x11r7/xapp_xgamma/xapp_xgamma.mk b/package/x11r7/xapp_xgamma/xapp_xgamma.mk
index 4244aa237..b3a8b80ea 100644
--- a/package/x11r7/xapp_xgamma/xapp_xgamma.mk
+++ b/package/x11r7/xapp_xgamma/xapp_xgamma.mk
@@ -8,6 +8,6 @@ XAPP_XGAMMA_VERSION = 1.0.1
 XAPP_XGAMMA_SOURCE = xgamma-$(XAPP_XGAMMA_VERSION).tar.bz2
 XAPP_XGAMMA_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XGAMMA_AUTORECONF = YES
-XAPP_XGAMMA_DEPENDANCIES = xlib_libXxf86vm
+XAPP_XGAMMA_DEPENDENCIES = xlib_libXxf86vm
 
 $(eval $(call AUTOTARGETS,xapp_xgamma))
diff --git a/package/x11r7/xapp_xgc/xapp_xgc.mk b/package/x11r7/xapp_xgc/xapp_xgc.mk
index bbd1f52f8..6d250240d 100644
--- a/package/x11r7/xapp_xgc/xapp_xgc.mk
+++ b/package/x11r7/xapp_xgc/xapp_xgc.mk
@@ -8,6 +8,6 @@ XAPP_XGC_VERSION = 1.0.1
 XAPP_XGC_SOURCE = xgc-$(XAPP_XGC_VERSION).tar.bz2
 XAPP_XGC_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XGC_AUTORECONF = YES
-XAPP_XGC_DEPENDANCIES = xlib_libXaw
+XAPP_XGC_DEPENDENCIES = xlib_libXaw
 
 $(eval $(call AUTOTARGETS,xapp_xgc))
diff --git a/package/x11r7/xapp_xhost/xapp_xhost.mk b/package/x11r7/xapp_xhost/xapp_xhost.mk
index 1c1637993..69586f514 100644
--- a/package/x11r7/xapp_xhost/xapp_xhost.mk
+++ b/package/x11r7/xapp_xhost/xapp_xhost.mk
@@ -8,6 +8,6 @@ XAPP_XHOST_VERSION = 1.0.1
 XAPP_XHOST_SOURCE = xhost-$(XAPP_XHOST_VERSION).tar.bz2
 XAPP_XHOST_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XHOST_AUTORECONF = YES
-XAPP_XHOST_DEPENDANCIES = xlib_libX11 xlib_libXmu
+XAPP_XHOST_DEPENDENCIES = xlib_libX11 xlib_libXmu
 
 $(eval $(call AUTOTARGETS,xapp_xhost))
diff --git a/package/x11r7/xapp_xinit/xapp_xinit.mk b/package/x11r7/xapp_xinit/xapp_xinit.mk
index 2953dba4d..2e51f2a54 100644
--- a/package/x11r7/xapp_xinit/xapp_xinit.mk
+++ b/package/x11r7/xapp_xinit/xapp_xinit.mk
@@ -8,6 +8,6 @@ XAPP_XINIT_VERSION = 1.0.3
 XAPP_XINIT_SOURCE = xinit-$(XAPP_XINIT_VERSION).tar.bz2
 XAPP_XINIT_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XINIT_AUTORECONF = YES
-XAPP_XINIT_DEPENDANCIES = xapp_xauth xlib_libX11
+XAPP_XINIT_DEPENDENCIES = xapp_xauth xlib_libX11
 
 $(eval $(call AUTOTARGETS,xapp_xinit))
diff --git a/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk b/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk
index be1a08cb3..e455a3a16 100644
--- a/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk
+++ b/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk
@@ -8,6 +8,6 @@ XAPP_XKBCOMP_VERSION = 1.0.3
 XAPP_XKBCOMP_SOURCE = xkbcomp-$(XAPP_XKBCOMP_VERSION).tar.bz2
 XAPP_XKBCOMP_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XKBCOMP_AUTORECONF = YES
-XAPP_XKBCOMP_DEPENDANCIES = xlib_libX11 xlib_libxkbfile
+XAPP_XKBCOMP_DEPENDENCIES = xlib_libX11 xlib_libxkbfile
 
 $(eval $(call AUTOTARGETS,xapp_xkbcomp))
diff --git a/package/x11r7/xapp_xkbevd/xapp_xkbevd.mk b/package/x11r7/xapp_xkbevd/xapp_xkbevd.mk
index 3f05c063d..f1c03065d 100644
--- a/package/x11r7/xapp_xkbevd/xapp_xkbevd.mk
+++ b/package/x11r7/xapp_xkbevd/xapp_xkbevd.mk
@@ -8,6 +8,6 @@ XAPP_XKBEVD_VERSION = 1.0.2
 XAPP_XKBEVD_SOURCE = xkbevd-$(XAPP_XKBEVD_VERSION).tar.bz2
 XAPP_XKBEVD_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XKBEVD_AUTORECONF = YES
-XAPP_XKBEVD_DEPENDANCIES = xlib_libxkbfile
+XAPP_XKBEVD_DEPENDENCIES = xlib_libxkbfile
 
 $(eval $(call AUTOTARGETS,xapp_xkbevd))
diff --git a/package/x11r7/xapp_xkbprint/xapp_xkbprint.mk b/package/x11r7/xapp_xkbprint/xapp_xkbprint.mk
index d4ba26cb1..28c5d81c0 100644
--- a/package/x11r7/xapp_xkbprint/xapp_xkbprint.mk
+++ b/package/x11r7/xapp_xkbprint/xapp_xkbprint.mk
@@ -8,6 +8,6 @@ XAPP_XKBPRINT_VERSION = 1.0.1
 XAPP_XKBPRINT_SOURCE = xkbprint-$(XAPP_XKBPRINT_VERSION).tar.bz2
 XAPP_XKBPRINT_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XKBPRINT_AUTORECONF = YES
-XAPP_XKBPRINT_DEPENDANCIES = xlib_libxkbfile
+XAPP_XKBPRINT_DEPENDENCIES = xlib_libxkbfile
 
 $(eval $(call AUTOTARGETS,xapp_xkbprint))
diff --git a/package/x11r7/xapp_xkbutils/xapp_xkbutils.mk b/package/x11r7/xapp_xkbutils/xapp_xkbutils.mk
index 11fa30a0a..ba8e8b327 100644
--- a/package/x11r7/xapp_xkbutils/xapp_xkbutils.mk
+++ b/package/x11r7/xapp_xkbutils/xapp_xkbutils.mk
@@ -8,6 +8,6 @@ XAPP_XKBUTILS_VERSION = 1.0.1
 XAPP_XKBUTILS_SOURCE = xkbutils-$(XAPP_XKBUTILS_VERSION).tar.bz2
 XAPP_XKBUTILS_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XKBUTILS_AUTORECONF = YES
-XAPP_XKBUTILS_DEPENDANCIES = xlib_libXaw xlib_libxkbfile
+XAPP_XKBUTILS_DEPENDENCIES = xlib_libXaw xlib_libxkbfile
 
 $(eval $(call AUTOTARGETS,xapp_xkbutils))
diff --git a/package/x11r7/xapp_xkill/xapp_xkill.mk b/package/x11r7/xapp_xkill/xapp_xkill.mk
index a92750791..c939b63e3 100644
--- a/package/x11r7/xapp_xkill/xapp_xkill.mk
+++ b/package/x11r7/xapp_xkill/xapp_xkill.mk
@@ -8,6 +8,6 @@ XAPP_XKILL_VERSION = 1.0.1
 XAPP_XKILL_SOURCE = xkill-$(XAPP_XKILL_VERSION).tar.bz2
 XAPP_XKILL_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XKILL_AUTORECONF = YES
-XAPP_XKILL_DEPENDANCIES = xlib_libX11 xlib_libXmu
+XAPP_XKILL_DEPENDENCIES = xlib_libX11 xlib_libXmu
 
 $(eval $(call AUTOTARGETS,xapp_xkill))
diff --git a/package/x11r7/xapp_xload/xapp_xload.mk b/package/x11r7/xapp_xload/xapp_xload.mk
index ce0a1338e..9e7e805e0 100644
--- a/package/x11r7/xapp_xload/xapp_xload.mk
+++ b/package/x11r7/xapp_xload/xapp_xload.mk
@@ -8,6 +8,6 @@ XAPP_XLOAD_VERSION = 1.0.1
 XAPP_XLOAD_SOURCE = xload-$(XAPP_XLOAD_VERSION).tar.bz2
 XAPP_XLOAD_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XLOAD_AUTORECONF = YES
-XAPP_XLOAD_DEPENDANCIES = xlib_libXaw
+XAPP_XLOAD_DEPENDENCIES = xlib_libXaw
 
 $(eval $(call AUTOTARGETS,xapp_xload))
diff --git a/package/x11r7/xapp_xlogo/xapp_xlogo.mk b/package/x11r7/xapp_xlogo/xapp_xlogo.mk
index 106f4a21d..60c6761d5 100644
--- a/package/x11r7/xapp_xlogo/xapp_xlogo.mk
+++ b/package/x11r7/xapp_xlogo/xapp_xlogo.mk
@@ -8,6 +8,6 @@ XAPP_XLOGO_VERSION = 1.0.1
 XAPP_XLOGO_SOURCE = xlogo-$(XAPP_XLOGO_VERSION).tar.bz2
 XAPP_XLOGO_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XLOGO_AUTORECONF = YES
-XAPP_XLOGO_DEPENDANCIES = xlib_libXaw xlib_libXprintUtil xlib_libXrender
+XAPP_XLOGO_DEPENDENCIES = xlib_libXaw xlib_libXprintUtil xlib_libXrender
 
 $(eval $(call AUTOTARGETS,xapp_xlogo))
diff --git a/package/x11r7/xapp_xlsatoms/xapp_xlsatoms.mk b/package/x11r7/xapp_xlsatoms/xapp_xlsatoms.mk
index 571dbf054..d87245a70 100644
--- a/package/x11r7/xapp_xlsatoms/xapp_xlsatoms.mk
+++ b/package/x11r7/xapp_xlsatoms/xapp_xlsatoms.mk
@@ -8,6 +8,6 @@ XAPP_XLSATOMS_VERSION = 1.0.1
 XAPP_XLSATOMS_SOURCE = xlsatoms-$(XAPP_XLSATOMS_VERSION).tar.bz2
 XAPP_XLSATOMS_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XLSATOMS_AUTORECONF = YES
-XAPP_XLSATOMS_DEPENDANCIES = xlib_libX11 xlib_libXmu
+XAPP_XLSATOMS_DEPENDENCIES = xlib_libX11 xlib_libXmu
 
 $(eval $(call AUTOTARGETS,xapp_xlsatoms))
diff --git a/package/x11r7/xapp_xlsclients/xapp_xlsclients.mk b/package/x11r7/xapp_xlsclients/xapp_xlsclients.mk
index f42b12ca7..c717b7672 100644
--- a/package/x11r7/xapp_xlsclients/xapp_xlsclients.mk
+++ b/package/x11r7/xapp_xlsclients/xapp_xlsclients.mk
@@ -8,6 +8,6 @@ XAPP_XLSCLIENTS_VERSION = 1.0.1
 XAPP_XLSCLIENTS_SOURCE = xlsclients-$(XAPP_XLSCLIENTS_VERSION).tar.bz2
 XAPP_XLSCLIENTS_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XLSCLIENTS_AUTORECONF = YES
-XAPP_XLSCLIENTS_DEPENDANCIES = xlib_libX11 xlib_libXmu
+XAPP_XLSCLIENTS_DEPENDENCIES = xlib_libX11 xlib_libXmu
 
 $(eval $(call AUTOTARGETS,xapp_xlsclients))
diff --git a/package/x11r7/xapp_xlsfonts/xapp_xlsfonts.mk b/package/x11r7/xapp_xlsfonts/xapp_xlsfonts.mk
index f9a77cf1d..6b6a03ae0 100644
--- a/package/x11r7/xapp_xlsfonts/xapp_xlsfonts.mk
+++ b/package/x11r7/xapp_xlsfonts/xapp_xlsfonts.mk
@@ -8,6 +8,6 @@ XAPP_XLSFONTS_VERSION = 1.0.1
 XAPP_XLSFONTS_SOURCE = xlsfonts-$(XAPP_XLSFONTS_VERSION).tar.bz2
 XAPP_XLSFONTS_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XLSFONTS_AUTORECONF = YES
-XAPP_XLSFONTS_DEPENDANCIES = xlib_libX11
+XAPP_XLSFONTS_DEPENDENCIES = xlib_libX11
 
 $(eval $(call AUTOTARGETS,xapp_xlsfonts))
diff --git a/package/x11r7/xapp_xmag/xapp_xmag.mk b/package/x11r7/xapp_xmag/xapp_xmag.mk
index 41239971e..eeeb8a6d5 100644
--- a/package/x11r7/xapp_xmag/xapp_xmag.mk
+++ b/package/x11r7/xapp_xmag/xapp_xmag.mk
@@ -8,6 +8,6 @@ XAPP_XMAG_VERSION = 1.0.1
 XAPP_XMAG_SOURCE = xmag-$(XAPP_XMAG_VERSION).tar.bz2
 XAPP_XMAG_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XMAG_AUTORECONF = YES
-XAPP_XMAG_DEPENDANCIES = xlib_libXaw
+XAPP_XMAG_DEPENDENCIES = xlib_libXaw
 
 $(eval $(call AUTOTARGETS,xapp_xmag))
diff --git a/package/x11r7/xapp_xmessage/xapp_xmessage.mk b/package/x11r7/xapp_xmessage/xapp_xmessage.mk
index 113d472b5..31755a9f4 100644
--- a/package/x11r7/xapp_xmessage/xapp_xmessage.mk
+++ b/package/x11r7/xapp_xmessage/xapp_xmessage.mk
@@ -8,6 +8,6 @@ XAPP_XMESSAGE_VERSION = 1.0.1
 XAPP_XMESSAGE_SOURCE = xmessage-$(XAPP_XMESSAGE_VERSION).tar.bz2
 XAPP_XMESSAGE_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XMESSAGE_AUTORECONF = YES
-XAPP_XMESSAGE_DEPENDANCIES = xlib_libXaw
+XAPP_XMESSAGE_DEPENDENCIES = xlib_libXaw
 
 $(eval $(call AUTOTARGETS,xapp_xmessage))
diff --git a/package/x11r7/xapp_xmh/xapp_xmh.mk b/package/x11r7/xapp_xmh/xapp_xmh.mk
index bd40518fb..80ed97e60 100644
--- a/package/x11r7/xapp_xmh/xapp_xmh.mk
+++ b/package/x11r7/xapp_xmh/xapp_xmh.mk
@@ -8,6 +8,6 @@ XAPP_XMH_VERSION = 1.0.1
 XAPP_XMH_SOURCE = xmh-$(XAPP_XMH_VERSION).tar.bz2
 XAPP_XMH_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XMH_AUTORECONF = YES
-XAPP_XMH_DEPENDANCIES = xlib_libXaw
+XAPP_XMH_DEPENDENCIES = xlib_libXaw
 
 $(eval $(call AUTOTARGETS,xapp_xmh))
diff --git a/package/x11r7/xapp_xmodmap/xapp_xmodmap.mk b/package/x11r7/xapp_xmodmap/xapp_xmodmap.mk
index e7636119a..7f0146df0 100644
--- a/package/x11r7/xapp_xmodmap/xapp_xmodmap.mk
+++ b/package/x11r7/xapp_xmodmap/xapp_xmodmap.mk
@@ -8,6 +8,6 @@ XAPP_XMODMAP_VERSION = 1.0.2
 XAPP_XMODMAP_SOURCE = xmodmap-$(XAPP_XMODMAP_VERSION).tar.bz2
 XAPP_XMODMAP_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XMODMAP_AUTORECONF = YES
-XAPP_XMODMAP_DEPENDANCIES = xlib_libX11
+XAPP_XMODMAP_DEPENDENCIES = xlib_libX11
 
 $(eval $(call AUTOTARGETS,xapp_xmodmap))
diff --git a/package/x11r7/xapp_xmore/xapp_xmore.mk b/package/x11r7/xapp_xmore/xapp_xmore.mk
index 6ca081d5a..32e21cee3 100644
--- a/package/x11r7/xapp_xmore/xapp_xmore.mk
+++ b/package/x11r7/xapp_xmore/xapp_xmore.mk
@@ -8,6 +8,6 @@ XAPP_XMORE_VERSION = 1.0.1
 XAPP_XMORE_SOURCE = xmore-$(XAPP_XMORE_VERSION).tar.bz2
 XAPP_XMORE_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XMORE_AUTORECONF = YES
-XAPP_XMORE_DEPENDANCIES = xlib_libXprintUtil xlib_libXprintUtil
+XAPP_XMORE_DEPENDENCIES = xlib_libXprintUtil xlib_libXprintUtil
 
 $(eval $(call AUTOTARGETS,xapp_xmore))
diff --git a/package/x11r7/xapp_xphelloworld/xapp_xphelloworld.mk b/package/x11r7/xapp_xphelloworld/xapp_xphelloworld.mk
index 4d9725fcd..5c68df6ba 100644
--- a/package/x11r7/xapp_xphelloworld/xapp_xphelloworld.mk
+++ b/package/x11r7/xapp_xphelloworld/xapp_xphelloworld.mk
@@ -8,6 +8,6 @@ XAPP_XPHELLOWORLD_VERSION = 1.0.1
 XAPP_XPHELLOWORLD_SOURCE = xphelloworld-$(XAPP_XPHELLOWORLD_VERSION).tar.bz2
 XAPP_XPHELLOWORLD_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XPHELLOWORLD_AUTORECONF = YES
-XAPP_XPHELLOWORLD_DEPENDANCIES = xlib_libXaw xlib_libXprintAppUtil xlib_libXprintUtil xlib_libXt
+XAPP_XPHELLOWORLD_DEPENDENCIES = xlib_libXaw xlib_libXprintAppUtil xlib_libXprintUtil xlib_libXt
 
 $(eval $(call AUTOTARGETS,xapp_xphelloworld))
diff --git a/package/x11r7/xapp_xplsprinters/xapp_xplsprinters.mk b/package/x11r7/xapp_xplsprinters/xapp_xplsprinters.mk
index e35941a0a..4186f9d73 100644
--- a/package/x11r7/xapp_xplsprinters/xapp_xplsprinters.mk
+++ b/package/x11r7/xapp_xplsprinters/xapp_xplsprinters.mk
@@ -8,6 +8,6 @@ XAPP_XPLSPRINTERS_VERSION = 1.0.1
 XAPP_XPLSPRINTERS_SOURCE = xplsprinters-$(XAPP_XPLSPRINTERS_VERSION).tar.bz2
 XAPP_XPLSPRINTERS_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XPLSPRINTERS_AUTORECONF = YES
-XAPP_XPLSPRINTERS_DEPENDANCIES = xlib_libX11 xlib_libXp xlib_libXprintUtil
+XAPP_XPLSPRINTERS_DEPENDENCIES = xlib_libX11 xlib_libXp xlib_libXprintUtil
 
 $(eval $(call AUTOTARGETS,xapp_xplsprinters))
diff --git a/package/x11r7/xapp_xpr/xapp_xpr.mk b/package/x11r7/xapp_xpr/xapp_xpr.mk
index 3935fb50e..013845c3a 100644
--- a/package/x11r7/xapp_xpr/xapp_xpr.mk
+++ b/package/x11r7/xapp_xpr/xapp_xpr.mk
@@ -8,6 +8,6 @@ XAPP_XPR_VERSION = 1.0.1
 XAPP_XPR_SOURCE = xpr-$(XAPP_XPR_VERSION).tar.bz2
 XAPP_XPR_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XPR_AUTORECONF = YES
-XAPP_XPR_DEPENDANCIES = xlib_libX11 xlib_libXmu
+XAPP_XPR_DEPENDENCIES = xlib_libX11 xlib_libXmu
 
 $(eval $(call AUTOTARGETS,xapp_xpr))
diff --git a/package/x11r7/xapp_xprehashprinterlist/xapp_xprehashprinterlist.mk b/package/x11r7/xapp_xprehashprinterlist/xapp_xprehashprinterlist.mk
index c6c93f620..7218f6db6 100644
--- a/package/x11r7/xapp_xprehashprinterlist/xapp_xprehashprinterlist.mk
+++ b/package/x11r7/xapp_xprehashprinterlist/xapp_xprehashprinterlist.mk
@@ -8,6 +8,6 @@ XAPP_XPREHASHPRINTERLIST_VERSION = 1.0.1
 XAPP_XPREHASHPRINTERLIST_SOURCE = xprehashprinterlist-$(XAPP_XPREHASHPRINTERLIST_VERSION).tar.bz2
 XAPP_XPREHASHPRINTERLIST_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XPREHASHPRINTERLIST_AUTORECONF = YES
-XAPP_XPREHASHPRINTERLIST_DEPENDANCIES = xlib_libX11 xlib_libXp
+XAPP_XPREHASHPRINTERLIST_DEPENDENCIES = xlib_libX11 xlib_libXp
 
 $(eval $(call AUTOTARGETS,xapp_xprehashprinterlist))
diff --git a/package/x11r7/xapp_xprop/xapp_xprop.mk b/package/x11r7/xapp_xprop/xapp_xprop.mk
index bf8a227a1..300cdd81c 100644
--- a/package/x11r7/xapp_xprop/xapp_xprop.mk
+++ b/package/x11r7/xapp_xprop/xapp_xprop.mk
@@ -8,6 +8,6 @@ XAPP_XPROP_VERSION = 1.0.2
 XAPP_XPROP_SOURCE = xprop-$(XAPP_XPROP_VERSION).tar.bz2
 XAPP_XPROP_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XPROP_AUTORECONF = YES
-XAPP_XPROP_DEPENDANCIES = xlib_libX11 xlib_libXmu
+XAPP_XPROP_DEPENDENCIES = xlib_libX11 xlib_libXmu
 
 $(eval $(call AUTOTARGETS,xapp_xprop))
diff --git a/package/x11r7/xapp_xrandr/xapp_xrandr.mk b/package/x11r7/xapp_xrandr/xapp_xrandr.mk
index 7ffc1f60d..45c72781e 100644
--- a/package/x11r7/xapp_xrandr/xapp_xrandr.mk
+++ b/package/x11r7/xapp_xrandr/xapp_xrandr.mk
@@ -8,7 +8,7 @@ XAPP_XRANDR_VERSION = 1.0.2
 XAPP_XRANDR_SOURCE = xrandr-$(XAPP_XRANDR_VERSION).tar.bz2
 XAPP_XRANDR_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XRANDR_AUTORECONF = YES
-XAPP_XRANDR_DEPENDANCIES = xlib_libXrandr xlib_libX11
+XAPP_XRANDR_DEPENDENCIES = xlib_libXrandr xlib_libX11
 XAPP_XRANDR_CONF_OPT = --disable-malloc0returnsnull
 
 $(eval $(call AUTOTARGETS,xapp_xrandr))
diff --git a/package/x11r7/xapp_xrdb/xapp_xrdb.mk b/package/x11r7/xapp_xrdb/xapp_xrdb.mk
index 3d13b3a5a..50bda60dc 100644
--- a/package/x11r7/xapp_xrdb/xapp_xrdb.mk
+++ b/package/x11r7/xapp_xrdb/xapp_xrdb.mk
@@ -8,6 +8,6 @@ XAPP_XRDB_VERSION = 1.0.2
 XAPP_XRDB_SOURCE = xrdb-$(XAPP_XRDB_VERSION).tar.bz2
 XAPP_XRDB_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XRDB_AUTORECONF = YES
-XAPP_XRDB_DEPENDANCIES = xlib_libX11 xlib_libXmu
+XAPP_XRDB_DEPENDENCIES = xlib_libX11 xlib_libXmu
 
 $(eval $(call AUTOTARGETS,xapp_xrdb))
diff --git a/package/x11r7/xapp_xrefresh/xapp_xrefresh.mk b/package/x11r7/xapp_xrefresh/xapp_xrefresh.mk
index 2fcad03bc..3b9e4b4e6 100644
--- a/package/x11r7/xapp_xrefresh/xapp_xrefresh.mk
+++ b/package/x11r7/xapp_xrefresh/xapp_xrefresh.mk
@@ -8,6 +8,6 @@ XAPP_XREFRESH_VERSION = 1.0.2
 XAPP_XREFRESH_SOURCE = xrefresh-$(XAPP_XREFRESH_VERSION).tar.bz2
 XAPP_XREFRESH_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XREFRESH_AUTORECONF = YES
-XAPP_XREFRESH_DEPENDANCIES = xlib_libX11
+XAPP_XREFRESH_DEPENDENCIES = xlib_libX11
 
 $(eval $(call AUTOTARGETS,xapp_xrefresh))
diff --git a/package/x11r7/xapp_xrx/xapp_xrx.mk b/package/x11r7/xapp_xrx/xapp_xrx.mk
index a53e6d8da..8eff71462 100644
--- a/package/x11r7/xapp_xrx/xapp_xrx.mk
+++ b/package/x11r7/xapp_xrx/xapp_xrx.mk
@@ -8,6 +8,6 @@ XAPP_XRX_VERSION = 1.0.1
 XAPP_XRX_SOURCE = xrx-$(XAPP_XRX_VERSION).tar.bz2
 XAPP_XRX_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XRX_AUTORECONF = YES
-XAPP_XRX_DEPENDANCIES = xlib_libX11 xlib_libXext xlib_libXt
+XAPP_XRX_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXt
 
 $(eval $(call AUTOTARGETS,xapp_xrx))
diff --git a/package/x11r7/xapp_xset/xapp_xset.mk b/package/x11r7/xapp_xset/xapp_xset.mk
index 16f311b81..c4e119913 100644
--- a/package/x11r7/xapp_xset/xapp_xset.mk
+++ b/package/x11r7/xapp_xset/xapp_xset.mk
@@ -8,6 +8,6 @@ XAPP_XSET_VERSION = 1.0.2
 XAPP_XSET_SOURCE = xset-$(XAPP_XSET_VERSION).tar.bz2
 XAPP_XSET_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XSET_AUTORECONF = YES
-XAPP_XSET_DEPENDANCIES = xlib_libXfontcache xlib_libXmu
+XAPP_XSET_DEPENDENCIES = xlib_libXfontcache xlib_libXmu
 
 $(eval $(call AUTOTARGETS,xapp_xset))
diff --git a/package/x11r7/xapp_xsetmode/xapp_xsetmode.mk b/package/x11r7/xapp_xsetmode/xapp_xsetmode.mk
index 0e8970e8d..0172ab24d 100644
--- a/package/x11r7/xapp_xsetmode/xapp_xsetmode.mk
+++ b/package/x11r7/xapp_xsetmode/xapp_xsetmode.mk
@@ -8,6 +8,6 @@ XAPP_XSETMODE_VERSION = 1.0.0
 XAPP_XSETMODE_SOURCE = xsetmode-$(XAPP_XSETMODE_VERSION).tar.bz2
 XAPP_XSETMODE_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XSETMODE_AUTORECONF = YES
-XAPP_XSETMODE_DEPENDANCIES = xlib_libX11 xlib_libXi
+XAPP_XSETMODE_DEPENDENCIES = xlib_libX11 xlib_libXi
 
 $(eval $(call AUTOTARGETS,xapp_xsetmode))
diff --git a/package/x11r7/xapp_xsetpointer/xapp_xsetpointer.mk b/package/x11r7/xapp_xsetpointer/xapp_xsetpointer.mk
index 829714d42..c1987c768 100644
--- a/package/x11r7/xapp_xsetpointer/xapp_xsetpointer.mk
+++ b/package/x11r7/xapp_xsetpointer/xapp_xsetpointer.mk
@@ -8,6 +8,6 @@ XAPP_XSETPOINTER_VERSION = 1.0.0
 XAPP_XSETPOINTER_SOURCE = xsetpointer-$(XAPP_XSETPOINTER_VERSION).tar.bz2
 XAPP_XSETPOINTER_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XSETPOINTER_AUTORECONF = YES
-XAPP_XSETPOINTER_DEPENDANCIES = xproto_inputproto xlib_libX11 xlib_libXi
+XAPP_XSETPOINTER_DEPENDENCIES = xproto_inputproto xlib_libX11 xlib_libXi
 
 $(eval $(call AUTOTARGETS,xapp_xsetpointer))
diff --git a/package/x11r7/xapp_xsetroot/xapp_xsetroot.mk b/package/x11r7/xapp_xsetroot/xapp_xsetroot.mk
index 0adbdf365..addcf87b1 100644
--- a/package/x11r7/xapp_xsetroot/xapp_xsetroot.mk
+++ b/package/x11r7/xapp_xsetroot/xapp_xsetroot.mk
@@ -8,6 +8,6 @@ XAPP_XSETROOT_VERSION = 1.0.1
 XAPP_XSETROOT_SOURCE = xsetroot-$(XAPP_XSETROOT_VERSION).tar.bz2
 XAPP_XSETROOT_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XSETROOT_AUTORECONF = YES
-XAPP_XSETROOT_DEPENDANCIES = xlib_libX11 xlib_libXmu xdata_xbitmaps
+XAPP_XSETROOT_DEPENDENCIES = xlib_libX11 xlib_libXmu xdata_xbitmaps
 
 $(eval $(call AUTOTARGETS,xapp_xsetroot))
diff --git a/package/x11r7/xapp_xsm/xapp_xsm.mk b/package/x11r7/xapp_xsm/xapp_xsm.mk
index 1d9be2f1a..fdcb5b7a2 100644
--- a/package/x11r7/xapp_xsm/xapp_xsm.mk
+++ b/package/x11r7/xapp_xsm/xapp_xsm.mk
@@ -8,6 +8,6 @@ XAPP_XSM_VERSION = 1.0.1
 XAPP_XSM_SOURCE = xsm-$(XAPP_XSM_VERSION).tar.bz2
 XAPP_XSM_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XSM_AUTORECONF = YES
-XAPP_XSM_DEPENDANCIES = xlib_libXaw
+XAPP_XSM_DEPENDENCIES = xlib_libXaw
 
 $(eval $(call AUTOTARGETS,xapp_xsm))
diff --git a/package/x11r7/xapp_xstdcmap/xapp_xstdcmap.mk b/package/x11r7/xapp_xstdcmap/xapp_xstdcmap.mk
index ad53a8a1d..ed4ff649b 100644
--- a/package/x11r7/xapp_xstdcmap/xapp_xstdcmap.mk
+++ b/package/x11r7/xapp_xstdcmap/xapp_xstdcmap.mk
@@ -8,6 +8,6 @@ XAPP_XSTDCMAP_VERSION = 1.0.1
 XAPP_XSTDCMAP_SOURCE = xstdcmap-$(XAPP_XSTDCMAP_VERSION).tar.bz2
 XAPP_XSTDCMAP_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XSTDCMAP_AUTORECONF = YES
-XAPP_XSTDCMAP_DEPENDANCIES = xlib_libX11 xlib_libXmu
+XAPP_XSTDCMAP_DEPENDENCIES = xlib_libX11 xlib_libXmu
 
 $(eval $(call AUTOTARGETS,xapp_xstdcmap))
diff --git a/package/x11r7/xapp_xtrap/xapp_xtrap.mk b/package/x11r7/xapp_xtrap/xapp_xtrap.mk
index 1c59c284b..f55069fb4 100644
--- a/package/x11r7/xapp_xtrap/xapp_xtrap.mk
+++ b/package/x11r7/xapp_xtrap/xapp_xtrap.mk
@@ -8,6 +8,6 @@ XAPP_XTRAP_VERSION = 1.0.2
 XAPP_XTRAP_SOURCE = xtrap-$(XAPP_XTRAP_VERSION).tar.bz2
 XAPP_XTRAP_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XTRAP_AUTORECONF = YES
-XAPP_XTRAP_DEPENDANCIES = xlib_libX11 xlib_libXTrap
+XAPP_XTRAP_DEPENDENCIES = xlib_libX11 xlib_libXTrap
 
 $(eval $(call AUTOTARGETS,xapp_xtrap))
diff --git a/package/x11r7/xapp_xvidtune/xapp_xvidtune.mk b/package/x11r7/xapp_xvidtune/xapp_xvidtune.mk
index 0372634df..8bb1c4b81 100644
--- a/package/x11r7/xapp_xvidtune/xapp_xvidtune.mk
+++ b/package/x11r7/xapp_xvidtune/xapp_xvidtune.mk
@@ -8,6 +8,6 @@ XAPP_XVIDTUNE_VERSION = 1.0.1
 XAPP_XVIDTUNE_SOURCE = xvidtune-$(XAPP_XVIDTUNE_VERSION).tar.bz2
 XAPP_XVIDTUNE_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XVIDTUNE_AUTORECONF = YES
-XAPP_XVIDTUNE_DEPENDANCIES = xlib_libXaw xlib_libXxf86vm
+XAPP_XVIDTUNE_DEPENDENCIES = xlib_libXaw xlib_libXxf86vm
 
 $(eval $(call AUTOTARGETS,xapp_xvidtune))
diff --git a/package/x11r7/xapp_xvinfo/xapp_xvinfo.mk b/package/x11r7/xapp_xvinfo/xapp_xvinfo.mk
index 916bb8df3..308f45734 100644
--- a/package/x11r7/xapp_xvinfo/xapp_xvinfo.mk
+++ b/package/x11r7/xapp_xvinfo/xapp_xvinfo.mk
@@ -8,6 +8,6 @@ XAPP_XVINFO_VERSION = 1.0.1
 XAPP_XVINFO_SOURCE = xvinfo-$(XAPP_XVINFO_VERSION).tar.bz2
 XAPP_XVINFO_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XVINFO_AUTORECONF = YES
-XAPP_XVINFO_DEPENDANCIES = xlib_libX11 xlib_libXv
+XAPP_XVINFO_DEPENDENCIES = xlib_libX11 xlib_libXv
 
 $(eval $(call AUTOTARGETS,xapp_xvinfo))
diff --git a/package/x11r7/xapp_xwd/xapp_xwd.mk b/package/x11r7/xapp_xwd/xapp_xwd.mk
index 9c71c7c9f..9242a8a23 100644
--- a/package/x11r7/xapp_xwd/xapp_xwd.mk
+++ b/package/x11r7/xapp_xwd/xapp_xwd.mk
@@ -8,6 +8,6 @@ XAPP_XWD_VERSION = 1.0.1
 XAPP_XWD_SOURCE = xwd-$(XAPP_XWD_VERSION).tar.bz2
 XAPP_XWD_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XWD_AUTORECONF = YES
-XAPP_XWD_DEPENDANCIES = xlib_libX11 xlib_libXmu
+XAPP_XWD_DEPENDENCIES = xlib_libX11 xlib_libXmu
 
 $(eval $(call AUTOTARGETS,xapp_xwd))
diff --git a/package/x11r7/xapp_xwininfo/xapp_xwininfo.mk b/package/x11r7/xapp_xwininfo/xapp_xwininfo.mk
index 9bd0cebb7..a5d7a6360 100644
--- a/package/x11r7/xapp_xwininfo/xapp_xwininfo.mk
+++ b/package/x11r7/xapp_xwininfo/xapp_xwininfo.mk
@@ -8,6 +8,6 @@ XAPP_XWININFO_VERSION = 1.0.2
 XAPP_XWININFO_SOURCE = xwininfo-$(XAPP_XWININFO_VERSION).tar.bz2
 XAPP_XWININFO_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XWININFO_AUTORECONF = YES
-XAPP_XWININFO_DEPENDANCIES = xlib_libX11 xlib_libXmu
+XAPP_XWININFO_DEPENDENCIES = xlib_libX11 xlib_libXmu
 
 $(eval $(call AUTOTARGETS,xapp_xwininfo))
diff --git a/package/x11r7/xapp_xwud/xapp_xwud.mk b/package/x11r7/xapp_xwud/xapp_xwud.mk
index dd4f9cd11..7f003d271 100644
--- a/package/x11r7/xapp_xwud/xapp_xwud.mk
+++ b/package/x11r7/xapp_xwud/xapp_xwud.mk
@@ -8,6 +8,6 @@ XAPP_XWUD_VERSION = 1.0.1
 XAPP_XWUD_SOURCE = xwud-$(XAPP_XWUD_VERSION).tar.bz2
 XAPP_XWUD_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XWUD_AUTORECONF = YES
-XAPP_XWUD_DEPENDANCIES = xlib_libX11
+XAPP_XWUD_DEPENDENCIES = xlib_libX11
 
 $(eval $(call AUTOTARGETS,xapp_xwud))
diff --git a/package/x11r7/xdriver_xf86-input-acecad/xdriver_xf86-input-acecad.mk b/package/x11r7/xdriver_xf86-input-acecad/xdriver_xf86-input-acecad.mk
index 342f5fb3b..746da33db 100644
--- a/package/x11r7/xdriver_xf86-input-acecad/xdriver_xf86-input-acecad.mk
+++ b/package/x11r7/xdriver_xf86-input-acecad/xdriver_xf86-input-acecad.mk
@@ -8,6 +8,6 @@ XDRIVER_XF86_INPUT_ACECAD_VERSION = 1.1.0
 XDRIVER_XF86_INPUT_ACECAD_SOURCE = xf86-input-acecad-$(XDRIVER_XF86_INPUT_ACECAD_VERSION).tar.bz2
 XDRIVER_XF86_INPUT_ACECAD_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_INPUT_ACECAD_AUTORECONF = YES
-XDRIVER_XF86_INPUT_ACECAD_DEPENDANCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
+XDRIVER_XF86_INPUT_ACECAD_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
 
 $(eval $(call AUTOTARGETS,xdriver_xf86-input-acecad))
diff --git a/package/x11r7/xdriver_xf86-input-aiptek/xdriver_xf86-input-aiptek.mk b/package/x11r7/xdriver_xf86-input-aiptek/xdriver_xf86-input-aiptek.mk
index 5efc09385..a22e88ad8 100644
--- a/package/x11r7/xdriver_xf86-input-aiptek/xdriver_xf86-input-aiptek.mk
+++ b/package/x11r7/xdriver_xf86-input-aiptek/xdriver_xf86-input-aiptek.mk
@@ -8,6 +8,6 @@ XDRIVER_XF86_INPUT_AIPTEK_VERSION = 1.0.1
 XDRIVER_XF86_INPUT_AIPTEK_SOURCE = xf86-input-aiptek-$(XDRIVER_XF86_INPUT_AIPTEK_VERSION).tar.bz2
 XDRIVER_XF86_INPUT_AIPTEK_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_INPUT_AIPTEK_AUTORECONF = YES
-XDRIVER_XF86_INPUT_AIPTEK_DEPENDANCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
+XDRIVER_XF86_INPUT_AIPTEK_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
 
 $(eval $(call AUTOTARGETS,xdriver_xf86-input-aiptek))
diff --git a/package/x11r7/xdriver_xf86-input-calcomp/xdriver_xf86-input-calcomp.mk b/package/x11r7/xdriver_xf86-input-calcomp/xdriver_xf86-input-calcomp.mk
index 6efd6669d..4c7ce4d5f 100644
--- a/package/x11r7/xdriver_xf86-input-calcomp/xdriver_xf86-input-calcomp.mk
+++ b/package/x11r7/xdriver_xf86-input-calcomp/xdriver_xf86-input-calcomp.mk
@@ -8,6 +8,6 @@ XDRIVER_XF86_INPUT_CALCOMP_VERSION = 1.1.0
 XDRIVER_XF86_INPUT_CALCOMP_SOURCE = xf86-input-calcomp-$(XDRIVER_XF86_INPUT_CALCOMP_VERSION).tar.bz2
 XDRIVER_XF86_INPUT_CALCOMP_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_INPUT_CALCOMP_AUTORECONF = YES
-XDRIVER_XF86_INPUT_CALCOMP_DEPENDANCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
+XDRIVER_XF86_INPUT_CALCOMP_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
 
 $(eval $(call AUTOTARGETS,xdriver_xf86-input-calcomp))
diff --git a/package/x11r7/xdriver_xf86-input-citron/xdriver_xf86-input-citron.mk b/package/x11r7/xdriver_xf86-input-citron/xdriver_xf86-input-citron.mk
index 01ca2219e..a439fc4b6 100644
--- a/package/x11r7/xdriver_xf86-input-citron/xdriver_xf86-input-citron.mk
+++ b/package/x11r7/xdriver_xf86-input-citron/xdriver_xf86-input-citron.mk
@@ -8,6 +8,6 @@ XDRIVER_XF86_INPUT_CITRON_VERSION = 2.2.0
 XDRIVER_XF86_INPUT_CITRON_SOURCE = xf86-input-citron-$(XDRIVER_XF86_INPUT_CITRON_VERSION).tar.bz2
 XDRIVER_XF86_INPUT_CITRON_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_INPUT_CITRON_AUTORECONF = YES
-XDRIVER_XF86_INPUT_CITRON_DEPENDANCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
+XDRIVER_XF86_INPUT_CITRON_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
 
 $(eval $(call AUTOTARGETS,xdriver_xf86-input-citron))
diff --git a/package/x11r7/xdriver_xf86-input-digitaledge/xdriver_xf86-input-digitaledge.mk b/package/x11r7/xdriver_xf86-input-digitaledge/xdriver_xf86-input-digitaledge.mk
index 75ca404bb..5e995ee50 100644
--- a/package/x11r7/xdriver_xf86-input-digitaledge/xdriver_xf86-input-digitaledge.mk
+++ b/package/x11r7/xdriver_xf86-input-digitaledge/xdriver_xf86-input-digitaledge.mk
@@ -8,6 +8,6 @@ XDRIVER_XF86_INPUT_DIGITALEDGE_VERSION = 1.1.0
 XDRIVER_XF86_INPUT_DIGITALEDGE_SOURCE = xf86-input-digitaledge-$(XDRIVER_XF86_INPUT_DIGITALEDGE_VERSION).tar.bz2
 XDRIVER_XF86_INPUT_DIGITALEDGE_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_INPUT_DIGITALEDGE_AUTORECONF = YES
-XDRIVER_XF86_INPUT_DIGITALEDGE_DEPENDANCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
+XDRIVER_XF86_INPUT_DIGITALEDGE_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
 
 $(eval $(call AUTOTARGETS,xdriver_xf86-input-digitaledge))
diff --git a/package/x11r7/xdriver_xf86-input-dmc/xdriver_xf86-input-dmc.mk b/package/x11r7/xdriver_xf86-input-dmc/xdriver_xf86-input-dmc.mk
index 262d78d06..b0b516972 100644
--- a/package/x11r7/xdriver_xf86-input-dmc/xdriver_xf86-input-dmc.mk
+++ b/package/x11r7/xdriver_xf86-input-dmc/xdriver_xf86-input-dmc.mk
@@ -8,6 +8,6 @@ XDRIVER_XF86_INPUT_DMC_VERSION = 1.1.0
 XDRIVER_XF86_INPUT_DMC_SOURCE = xf86-input-dmc-$(XDRIVER_XF86_INPUT_DMC_VERSION).tar.bz2
 XDRIVER_XF86_INPUT_DMC_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_INPUT_DMC_AUTORECONF = YES
-XDRIVER_XF86_INPUT_DMC_DEPENDANCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
+XDRIVER_XF86_INPUT_DMC_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
 
 $(eval $(call AUTOTARGETS,xdriver_xf86-input-dmc))
diff --git a/package/x11r7/xdriver_xf86-input-dynapro/xdriver_xf86-input-dynapro.mk b/package/x11r7/xdriver_xf86-input-dynapro/xdriver_xf86-input-dynapro.mk
index 86efc68c3..3cb90e6d6 100644
--- a/package/x11r7/xdriver_xf86-input-dynapro/xdriver_xf86-input-dynapro.mk
+++ b/package/x11r7/xdriver_xf86-input-dynapro/xdriver_xf86-input-dynapro.mk
@@ -8,6 +8,6 @@ XDRIVER_XF86_INPUT_DYNAPRO_VERSION = 1.1.0
 XDRIVER_XF86_INPUT_DYNAPRO_SOURCE = xf86-input-dynapro-$(XDRIVER_XF86_INPUT_DYNAPRO_VERSION).tar.bz2
 XDRIVER_XF86_INPUT_DYNAPRO_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_INPUT_DYNAPRO_AUTORECONF = YES
-XDRIVER_XF86_INPUT_DYNAPRO_DEPENDANCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
+XDRIVER_XF86_INPUT_DYNAPRO_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
 
 $(eval $(call AUTOTARGETS,xdriver_xf86-input-dynapro))
diff --git a/package/x11r7/xdriver_xf86-input-elo2300/xdriver_xf86-input-elo2300.mk b/package/x11r7/xdriver_xf86-input-elo2300/xdriver_xf86-input-elo2300.mk
index f10df6f77..316a8a01c 100644
--- a/package/x11r7/xdriver_xf86-input-elo2300/xdriver_xf86-input-elo2300.mk
+++ b/package/x11r7/xdriver_xf86-input-elo2300/xdriver_xf86-input-elo2300.mk
@@ -8,6 +8,6 @@ XDRIVER_XF86_INPUT_ELO2300_VERSION = 1.1.0
 XDRIVER_XF86_INPUT_ELO2300_SOURCE = xf86-input-elo2300-$(XDRIVER_XF86_INPUT_ELO2300_VERSION).tar.bz2
 XDRIVER_XF86_INPUT_ELO2300_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_INPUT_ELO2300_AUTORECONF = YES
-XDRIVER_XF86_INPUT_ELO2300_DEPENDANCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
+XDRIVER_XF86_INPUT_ELO2300_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
 
 $(eval $(call AUTOTARGETS,xdriver_xf86-input-elo2300))
diff --git a/package/x11r7/xdriver_xf86-input-elographics/xdriver_xf86-input-elographics.mk b/package/x11r7/xdriver_xf86-input-elographics/xdriver_xf86-input-elographics.mk
index b17575225..343acb458 100644
--- a/package/x11r7/xdriver_xf86-input-elographics/xdriver_xf86-input-elographics.mk
+++ b/package/x11r7/xdriver_xf86-input-elographics/xdriver_xf86-input-elographics.mk
@@ -8,6 +8,6 @@ XDRIVER_XF86_INPUT_ELOGRAPHICS_VERSION = 1.0.0.5
 XDRIVER_XF86_INPUT_ELOGRAPHICS_SOURCE = xf86-input-elographics-$(XDRIVER_XF86_INPUT_ELOGRAPHICS_VERSION).tar.bz2
 XDRIVER_XF86_INPUT_ELOGRAPHICS_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_INPUT_ELOGRAPHICS_AUTORECONF = YES
-XDRIVER_XF86_INPUT_ELOGRAPHICS_DEPENDANCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
+XDRIVER_XF86_INPUT_ELOGRAPHICS_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
 
 $(eval $(call AUTOTARGETS,xdriver_xf86-input-elographics))
diff --git a/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev.mk b/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev.mk
index 3ed6b715c..7072cd175 100644
--- a/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev.mk
+++ b/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev.mk
@@ -8,6 +8,6 @@ XDRIVER_XF86_INPUT_EVDEV_VERSION = 1.1.2
 XDRIVER_XF86_INPUT_EVDEV_SOURCE = xf86-input-evdev-$(XDRIVER_XF86_INPUT_EVDEV_VERSION).tar.bz2
 XDRIVER_XF86_INPUT_EVDEV_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_INPUT_EVDEV_AUTORECONF = YES
-XDRIVER_XF86_INPUT_EVDEV_DEPENDANCIES = xproto_inputproto xserver_xorg-server xproto_randrproto xproto_xproto
+XDRIVER_XF86_INPUT_EVDEV_DEPENDENCIES = xproto_inputproto xserver_xorg-server xproto_randrproto xproto_xproto
 
 $(eval $(call AUTOTARGETS,xdriver_xf86-input-evdev))
diff --git a/package/x11r7/xdriver_xf86-input-fpit/xdriver_xf86-input-fpit.mk b/package/x11r7/xdriver_xf86-input-fpit/xdriver_xf86-input-fpit.mk
index 2a680ee09..424b79f2b 100644
--- a/package/x11r7/xdriver_xf86-input-fpit/xdriver_xf86-input-fpit.mk
+++ b/package/x11r7/xdriver_xf86-input-fpit/xdriver_xf86-input-fpit.mk
@@ -8,6 +8,6 @@ XDRIVER_XF86_INPUT_FPIT_VERSION = 1.1.0
 XDRIVER_XF86_INPUT_FPIT_SOURCE = xf86-input-fpit-$(XDRIVER_XF86_INPUT_FPIT_VERSION).tar.bz2
 XDRIVER_XF86_INPUT_FPIT_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_INPUT_FPIT_AUTORECONF = YES
-XDRIVER_XF86_INPUT_FPIT_DEPENDANCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
+XDRIVER_XF86_INPUT_FPIT_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
 
 $(eval $(call AUTOTARGETS,xdriver_xf86-input-fpit))
diff --git a/package/x11r7/xdriver_xf86-input-hyperpen/xdriver_xf86-input-hyperpen.mk b/package/x11r7/xdriver_xf86-input-hyperpen/xdriver_xf86-input-hyperpen.mk
index e2aae7f93..2a06ed86c 100644
--- a/package/x11r7/xdriver_xf86-input-hyperpen/xdriver_xf86-input-hyperpen.mk
+++ b/package/x11r7/xdriver_xf86-input-hyperpen/xdriver_xf86-input-hyperpen.mk
@@ -8,6 +8,6 @@ XDRIVER_XF86_INPUT_HYPERPEN_VERSION = 1.1.0
 XDRIVER_XF86_INPUT_HYPERPEN_SOURCE = xf86-input-hyperpen-$(XDRIVER_XF86_INPUT_HYPERPEN_VERSION).tar.bz2
 XDRIVER_XF86_INPUT_HYPERPEN_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_INPUT_HYPERPEN_AUTORECONF = YES
-XDRIVER_XF86_INPUT_HYPERPEN_DEPENDANCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
+XDRIVER_XF86_INPUT_HYPERPEN_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
 
 $(eval $(call AUTOTARGETS,xdriver_xf86-input-hyperpen))
diff --git a/package/x11r7/xdriver_xf86-input-jamstudio/xdriver_xf86-input-jamstudio.mk b/package/x11r7/xdriver_xf86-input-jamstudio/xdriver_xf86-input-jamstudio.mk
index 00819cff1..4d8a381f9 100644
--- a/package/x11r7/xdriver_xf86-input-jamstudio/xdriver_xf86-input-jamstudio.mk
+++ b/package/x11r7/xdriver_xf86-input-jamstudio/xdriver_xf86-input-jamstudio.mk
@@ -8,6 +8,6 @@ XDRIVER_XF86_INPUT_JAMSTUDIO_VERSION = 1.1.0
 XDRIVER_XF86_INPUT_JAMSTUDIO_SOURCE = xf86-input-jamstudio-$(XDRIVER_XF86_INPUT_JAMSTUDIO_VERSION).tar.bz2
 XDRIVER_XF86_INPUT_JAMSTUDIO_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_INPUT_JAMSTUDIO_AUTORECONF = YES
-XDRIVER_XF86_INPUT_JAMSTUDIO_DEPENDANCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
+XDRIVER_XF86_INPUT_JAMSTUDIO_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
 
 $(eval $(call AUTOTARGETS,xdriver_xf86-input-jamstudio))
diff --git a/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk b/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk
index 62ad6bfb3..7f4bbb15b 100644
--- a/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk
+++ b/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk
@@ -8,6 +8,6 @@ XDRIVER_XF86_INPUT_JOYSTICK_VERSION = 1.1.0
 XDRIVER_XF86_INPUT_JOYSTICK_SOURCE = xf86-input-joystick-$(XDRIVER_XF86_INPUT_JOYSTICK_VERSION).tar.bz2
 XDRIVER_XF86_INPUT_JOYSTICK_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_INPUT_JOYSTICK_AUTORECONF = YES
-XDRIVER_XF86_INPUT_JOYSTICK_DEPENDANCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
+XDRIVER_XF86_INPUT_JOYSTICK_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
 
 $(eval $(call AUTOTARGETS,xdriver_xf86-input-joystick))
diff --git a/package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.mk b/package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.mk
index dc3038e23..fa473552d 100644
--- a/package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.mk
+++ b/package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.mk
@@ -8,6 +8,6 @@ XDRIVER_XF86_INPUT_KEYBOARD_VERSION = 1.1.1
 XDRIVER_XF86_INPUT_KEYBOARD_SOURCE = xf86-input-keyboard-$(XDRIVER_XF86_INPUT_KEYBOARD_VERSION).tar.bz2
 XDRIVER_XF86_INPUT_KEYBOARD_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_INPUT_KEYBOARD_AUTORECONF = YES
-XDRIVER_XF86_INPUT_KEYBOARD_DEPENDANCIES = xserver_xorg-server xproto_inputproto xproto_kbproto xproto_randrproto xproto_xproto
+XDRIVER_XF86_INPUT_KEYBOARD_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_kbproto xproto_randrproto xproto_xproto
 
 $(eval $(call AUTOTARGETS,xdriver_xf86-input-keyboard))
diff --git a/package/x11r7/xdriver_xf86-input-magellan/xdriver_xf86-input-magellan.mk b/package/x11r7/xdriver_xf86-input-magellan/xdriver_xf86-input-magellan.mk
index 966a1117d..1aa17c644 100644
--- a/package/x11r7/xdriver_xf86-input-magellan/xdriver_xf86-input-magellan.mk
+++ b/package/x11r7/xdriver_xf86-input-magellan/xdriver_xf86-input-magellan.mk
@@ -8,6 +8,6 @@ XDRIVER_XF86_INPUT_MAGELLAN_VERSION = 1.1.0
 XDRIVER_XF86_INPUT_MAGELLAN_SOURCE = xf86-input-magellan-$(XDRIVER_XF86_INPUT_MAGELLAN_VERSION).tar.bz2
 XDRIVER_XF86_INPUT_MAGELLAN_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_INPUT_MAGELLAN_AUTORECONF = YES
-XDRIVER_XF86_INPUT_MAGELLAN_DEPENDANCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
+XDRIVER_XF86_INPUT_MAGELLAN_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
 
 $(eval $(call AUTOTARGETS,xdriver_xf86-input-magellan))
diff --git a/package/x11r7/xdriver_xf86-input-magictouch/xdriver_xf86-input-magictouch.mk b/package/x11r7/xdriver_xf86-input-magictouch/xdriver_xf86-input-magictouch.mk
index ab3a18520..11f373e15 100644
--- a/package/x11r7/xdriver_xf86-input-magictouch/xdriver_xf86-input-magictouch.mk
+++ b/package/x11r7/xdriver_xf86-input-magictouch/xdriver_xf86-input-magictouch.mk
@@ -8,6 +8,6 @@ XDRIVER_XF86_INPUT_MAGICTOUCH_VERSION = 1.0.0.5
 XDRIVER_XF86_INPUT_MAGICTOUCH_SOURCE = xf86-input-magictouch-$(XDRIVER_XF86_INPUT_MAGICTOUCH_VERSION).tar.bz2
 XDRIVER_XF86_INPUT_MAGICTOUCH_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_INPUT_MAGICTOUCH_AUTORECONF = YES
-XDRIVER_XF86_INPUT_MAGICTOUCH_DEPENDANCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
+XDRIVER_XF86_INPUT_MAGICTOUCH_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
 
 $(eval $(call AUTOTARGETS,xdriver_xf86-input-magictouch))
diff --git a/package/x11r7/xdriver_xf86-input-microtouch/xdriver_xf86-input-microtouch.mk b/package/x11r7/xdriver_xf86-input-microtouch/xdriver_xf86-input-microtouch.mk
index ca5094d28..75a9d3cb2 100644
--- a/package/x11r7/xdriver_xf86-input-microtouch/xdriver_xf86-input-microtouch.mk
+++ b/package/x11r7/xdriver_xf86-input-microtouch/xdriver_xf86-input-microtouch.mk
@@ -8,6 +8,6 @@ XDRIVER_XF86_INPUT_MICROTOUCH_VERSION = 1.1.0
 XDRIVER_XF86_INPUT_MICROTOUCH_SOURCE = xf86-input-microtouch-$(XDRIVER_XF86_INPUT_MICROTOUCH_VERSION).tar.bz2
 XDRIVER_XF86_INPUT_MICROTOUCH_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_INPUT_MICROTOUCH_AUTORECONF = YES
-XDRIVER_XF86_INPUT_MICROTOUCH_DEPENDANCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
+XDRIVER_XF86_INPUT_MICROTOUCH_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
 
 $(eval $(call AUTOTARGETS,xdriver_xf86-input-microtouch))
diff --git a/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk b/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk
index 42699a74b..b1f71534f 100644
--- a/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk
+++ b/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk
@@ -8,6 +8,6 @@ XDRIVER_XF86_INPUT_MOUSE_VERSION = 1.1.2
 XDRIVER_XF86_INPUT_MOUSE_SOURCE = xf86-input-mouse-$(XDRIVER_XF86_INPUT_MOUSE_VERSION).tar.bz2
 XDRIVER_XF86_INPUT_MOUSE_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_INPUT_MOUSE_AUTORECONF = YES
-XDRIVER_XF86_INPUT_MOUSE_DEPENDANCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
+XDRIVER_XF86_INPUT_MOUSE_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
 
 $(eval $(call AUTOTARGETS,xdriver_xf86-input-mouse))
diff --git a/package/x11r7/xdriver_xf86-input-mutouch/xdriver_xf86-input-mutouch.mk b/package/x11r7/xdriver_xf86-input-mutouch/xdriver_xf86-input-mutouch.mk
index 7edf110d5..cefd0da95 100644
--- a/package/x11r7/xdriver_xf86-input-mutouch/xdriver_xf86-input-mutouch.mk
+++ b/package/x11r7/xdriver_xf86-input-mutouch/xdriver_xf86-input-mutouch.mk
@@ -8,6 +8,6 @@ XDRIVER_XF86_INPUT_MUTOUCH_VERSION = 1.1.0
 XDRIVER_XF86_INPUT_MUTOUCH_SOURCE = xf86-input-mutouch-$(XDRIVER_XF86_INPUT_MUTOUCH_VERSION).tar.bz2
 XDRIVER_XF86_INPUT_MUTOUCH_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_INPUT_MUTOUCH_AUTORECONF = YES
-XDRIVER_XF86_INPUT_MUTOUCH_DEPENDANCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
+XDRIVER_XF86_INPUT_MUTOUCH_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
 
 $(eval $(call AUTOTARGETS,xdriver_xf86-input-mutouch))
diff --git a/package/x11r7/xdriver_xf86-input-palmax/xdriver_xf86-input-palmax.mk b/package/x11r7/xdriver_xf86-input-palmax/xdriver_xf86-input-palmax.mk
index 006cb2881..aa5563572 100644
--- a/package/x11r7/xdriver_xf86-input-palmax/xdriver_xf86-input-palmax.mk
+++ b/package/x11r7/xdriver_xf86-input-palmax/xdriver_xf86-input-palmax.mk
@@ -8,6 +8,6 @@ XDRIVER_XF86_INPUT_PALMAX_VERSION = 1.1.0
 XDRIVER_XF86_INPUT_PALMAX_SOURCE = xf86-input-palmax-$(XDRIVER_XF86_INPUT_PALMAX_VERSION).tar.bz2
 XDRIVER_XF86_INPUT_PALMAX_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_INPUT_PALMAX_AUTORECONF = YES
-XDRIVER_XF86_INPUT_PALMAX_DEPENDANCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
+XDRIVER_XF86_INPUT_PALMAX_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
 
 $(eval $(call AUTOTARGETS,xdriver_xf86-input-palmax))
diff --git a/package/x11r7/xdriver_xf86-input-penmount/xdriver_xf86-input-penmount.mk b/package/x11r7/xdriver_xf86-input-penmount/xdriver_xf86-input-penmount.mk
index e510b1380..cf5a66a3e 100644
--- a/package/x11r7/xdriver_xf86-input-penmount/xdriver_xf86-input-penmount.mk
+++ b/package/x11r7/xdriver_xf86-input-penmount/xdriver_xf86-input-penmount.mk
@@ -8,6 +8,6 @@ XDRIVER_XF86_INPUT_PENMOUNT_VERSION = 1.2.0
 XDRIVER_XF86_INPUT_PENMOUNT_SOURCE = xf86-input-penmount-$(XDRIVER_XF86_INPUT_PENMOUNT_VERSION).tar.bz2
 XDRIVER_XF86_INPUT_PENMOUNT_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_INPUT_PENMOUNT_AUTORECONF = YES
-XDRIVER_XF86_INPUT_PENMOUNT_DEPENDANCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
+XDRIVER_XF86_INPUT_PENMOUNT_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
 
 $(eval $(call AUTOTARGETS,xdriver_xf86-input-penmount))
diff --git a/package/x11r7/xdriver_xf86-input-spaceorb/xdriver_xf86-input-spaceorb.mk b/package/x11r7/xdriver_xf86-input-spaceorb/xdriver_xf86-input-spaceorb.mk
index 8beeb8399..7e756bca3 100644
--- a/package/x11r7/xdriver_xf86-input-spaceorb/xdriver_xf86-input-spaceorb.mk
+++ b/package/x11r7/xdriver_xf86-input-spaceorb/xdriver_xf86-input-spaceorb.mk
@@ -8,6 +8,6 @@ XDRIVER_XF86_INPUT_SPACEORB_VERSION = 1.1.0
 XDRIVER_XF86_INPUT_SPACEORB_SOURCE = xf86-input-spaceorb-$(XDRIVER_XF86_INPUT_SPACEORB_VERSION).tar.bz2
 XDRIVER_XF86_INPUT_SPACEORB_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_INPUT_SPACEORB_AUTORECONF = YES
-XDRIVER_XF86_INPUT_SPACEORB_DEPENDANCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
+XDRIVER_XF86_INPUT_SPACEORB_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
 
 $(eval $(call AUTOTARGETS,xdriver_xf86-input-spaceorb))
diff --git a/package/x11r7/xdriver_xf86-input-summa/xdriver_xf86-input-summa.mk b/package/x11r7/xdriver_xf86-input-summa/xdriver_xf86-input-summa.mk
index 6785b5eb0..9ffed199e 100644
--- a/package/x11r7/xdriver_xf86-input-summa/xdriver_xf86-input-summa.mk
+++ b/package/x11r7/xdriver_xf86-input-summa/xdriver_xf86-input-summa.mk
@@ -8,6 +8,6 @@ XDRIVER_XF86_INPUT_SUMMA_VERSION = 1.1.0
 XDRIVER_XF86_INPUT_SUMMA_SOURCE = xf86-input-summa-$(XDRIVER_XF86_INPUT_SUMMA_VERSION).tar.bz2
 XDRIVER_XF86_INPUT_SUMMA_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_INPUT_SUMMA_AUTORECONF = YES
-XDRIVER_XF86_INPUT_SUMMA_DEPENDANCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
+XDRIVER_XF86_INPUT_SUMMA_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
 
 $(eval $(call AUTOTARGETS,xdriver_xf86-input-summa))
diff --git a/package/x11r7/xdriver_xf86-input-tek4957/xdriver_xf86-input-tek4957.mk b/package/x11r7/xdriver_xf86-input-tek4957/xdriver_xf86-input-tek4957.mk
index 52d2e0c54..1716c559b 100644
--- a/package/x11r7/xdriver_xf86-input-tek4957/xdriver_xf86-input-tek4957.mk
+++ b/package/x11r7/xdriver_xf86-input-tek4957/xdriver_xf86-input-tek4957.mk
@@ -8,6 +8,6 @@ XDRIVER_XF86_INPUT_TEK4957_VERSION = 1.1.0
 XDRIVER_XF86_INPUT_TEK4957_SOURCE = xf86-input-tek4957-$(XDRIVER_XF86_INPUT_TEK4957_VERSION).tar.bz2
 XDRIVER_XF86_INPUT_TEK4957_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_INPUT_TEK4957_AUTORECONF = YES
-XDRIVER_XF86_INPUT_TEK4957_DEPENDANCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
+XDRIVER_XF86_INPUT_TEK4957_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
 
 $(eval $(call AUTOTARGETS,xdriver_xf86-input-tek4957))
diff --git a/package/x11r7/xdriver_xf86-input-ur98/xdriver_xf86-input-ur98.mk b/package/x11r7/xdriver_xf86-input-ur98/xdriver_xf86-input-ur98.mk
index 861a25daf..58689e988 100644
--- a/package/x11r7/xdriver_xf86-input-ur98/xdriver_xf86-input-ur98.mk
+++ b/package/x11r7/xdriver_xf86-input-ur98/xdriver_xf86-input-ur98.mk
@@ -8,6 +8,6 @@ XDRIVER_XF86_INPUT_UR98_VERSION = 1.1.0
 XDRIVER_XF86_INPUT_UR98_SOURCE = xf86-input-ur98-$(XDRIVER_XF86_INPUT_UR98_VERSION).tar.bz2
 XDRIVER_XF86_INPUT_UR98_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_INPUT_UR98_AUTORECONF = YES
-XDRIVER_XF86_INPUT_UR98_DEPENDANCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
+XDRIVER_XF86_INPUT_UR98_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
 
 $(eval $(call AUTOTARGETS,xdriver_xf86-input-ur98))
diff --git a/package/x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.mk b/package/x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.mk
index 1c154c6cf..74a6cb526 100644
--- a/package/x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.mk
+++ b/package/x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.mk
@@ -8,6 +8,6 @@ XDRIVER_XF86_INPUT_VMMOUSE_VERSION = 12.4.0
 XDRIVER_XF86_INPUT_VMMOUSE_SOURCE = xf86-input-vmmouse-$(XDRIVER_XF86_INPUT_VMMOUSE_VERSION).tar.bz2
 XDRIVER_XF86_INPUT_VMMOUSE_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_INPUT_VMMOUSE_AUTORECONF = YES
-XDRIVER_XF86_INPUT_VMMOUSE_DEPENDANCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
+XDRIVER_XF86_INPUT_VMMOUSE_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
 
 $(eval $(call AUTOTARGETS,xdriver_xf86-input-vmmouse))
diff --git a/package/x11r7/xdriver_xf86-input-void/xdriver_xf86-input-void.mk b/package/x11r7/xdriver_xf86-input-void/xdriver_xf86-input-void.mk
index eeb9e59a6..40a006c54 100644
--- a/package/x11r7/xdriver_xf86-input-void/xdriver_xf86-input-void.mk
+++ b/package/x11r7/xdriver_xf86-input-void/xdriver_xf86-input-void.mk
@@ -8,6 +8,6 @@ XDRIVER_XF86_INPUT_VOID_VERSION = 1.1.0
 XDRIVER_XF86_INPUT_VOID_SOURCE = xf86-input-void-$(XDRIVER_XF86_INPUT_VOID_VERSION).tar.bz2
 XDRIVER_XF86_INPUT_VOID_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_INPUT_VOID_AUTORECONF = YES
-XDRIVER_XF86_INPUT_VOID_DEPENDANCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
+XDRIVER_XF86_INPUT_VOID_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
 
 $(eval $(call AUTOTARGETS,xdriver_xf86-input-void))
diff --git a/package/x11r7/xdriver_xf86-video-apm/xdriver_xf86-video-apm.mk b/package/x11r7/xdriver_xf86-video-apm/xdriver_xf86-video-apm.mk
index c710cb79a..a315d374e 100644
--- a/package/x11r7/xdriver_xf86-video-apm/xdriver_xf86-video-apm.mk
+++ b/package/x11r7/xdriver_xf86-video-apm/xdriver_xf86-video-apm.mk
@@ -8,6 +8,6 @@ XDRIVER_XF86_VIDEO_APM_VERSION = 1.1.1
 XDRIVER_XF86_VIDEO_APM_SOURCE = xf86-video-apm-$(XDRIVER_XF86_VIDEO_APM_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_APM_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_APM_AUTORECONF = YES
-XDRIVER_XF86_VIDEO_APM_DEPENDANCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86rushproto xproto_xproto
+XDRIVER_XF86_VIDEO_APM_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86rushproto xproto_xproto
 
 $(eval $(call AUTOTARGETS,xdriver_xf86-video-apm))
diff --git a/package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.mk b/package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.mk
index 053edaf4f..51aa49898 100644
--- a/package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.mk
+++ b/package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.mk
@@ -8,6 +8,6 @@ XDRIVER_XF86_VIDEO_ARK_VERSION = 0.6.0
 XDRIVER_XF86_VIDEO_ARK_SOURCE = xf86-video-ark-$(XDRIVER_XF86_VIDEO_ARK_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_ARK_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_ARK_AUTORECONF = YES
-XDRIVER_XF86_VIDEO_ARK_DEPENDANCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xproto
+XDRIVER_XF86_VIDEO_ARK_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xproto
 
 $(eval $(call AUTOTARGETS,xdriver_xf86-video-ark))
diff --git a/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk b/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk
index 177145b11..8fbd1864a 100644
--- a/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk
+++ b/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk
@@ -8,6 +8,6 @@ XDRIVER_XF86_VIDEO_ATI_VERSION = 6.6.3
 XDRIVER_XF86_VIDEO_ATI_SOURCE = xf86-video-ati-$(XDRIVER_XF86_VIDEO_ATI_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_ATI_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_ATI_AUTORECONF = YES
-XDRIVER_XF86_VIDEO_ATI_DEPENDANCIES = xserver_xorg-server libdrm xproto_fontsproto xproto_glproto xproto_randrproto xproto_videoproto xproto_xextproto xproto_xf86driproto xproto_xf86miscproto xproto_xineramaproto xproto_xproto
+XDRIVER_XF86_VIDEO_ATI_DEPENDENCIES = xserver_xorg-server libdrm xproto_fontsproto xproto_glproto xproto_randrproto xproto_videoproto xproto_xextproto xproto_xf86driproto xproto_xf86miscproto xproto_xineramaproto xproto_xproto
 
 $(eval $(call AUTOTARGETS,xdriver_xf86-video-ati))
diff --git a/package/x11r7/xdriver_xf86-video-chips/xdriver_xf86-video-chips.mk b/package/x11r7/xdriver_xf86-video-chips/xdriver_xf86-video-chips.mk
index 32bd74d7c..68cce674b 100644
--- a/package/x11r7/xdriver_xf86-video-chips/xdriver_xf86-video-chips.mk
+++ b/package/x11r7/xdriver_xf86-video-chips/xdriver_xf86-video-chips.mk
@@ -8,6 +8,6 @@ XDRIVER_XF86_VIDEO_CHIPS_VERSION = 1.1.1
 XDRIVER_XF86_VIDEO_CHIPS_SOURCE = xf86-video-chips-$(XDRIVER_XF86_VIDEO_CHIPS_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_CHIPS_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_CHIPS_AUTORECONF = YES
-XDRIVER_XF86_VIDEO_CHIPS_DEPENDANCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xproto
+XDRIVER_XF86_VIDEO_CHIPS_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xproto
 
 $(eval $(call AUTOTARGETS,xdriver_xf86-video-chips))
diff --git a/package/x11r7/xdriver_xf86-video-cirrus/xdriver_xf86-video-cirrus.mk b/package/x11r7/xdriver_xf86-video-cirrus/xdriver_xf86-video-cirrus.mk
index 95dbc5f03..2266f2121 100644
--- a/package/x11r7/xdriver_xf86-video-cirrus/xdriver_xf86-video-cirrus.mk
+++ b/package/x11r7/xdriver_xf86-video-cirrus/xdriver_xf86-video-cirrus.mk
@@ -8,6 +8,6 @@ XDRIVER_XF86_VIDEO_CIRRUS_VERSION = 1.1.0
 XDRIVER_XF86_VIDEO_CIRRUS_SOURCE = xf86-video-cirrus-$(XDRIVER_XF86_VIDEO_CIRRUS_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_CIRRUS_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_CIRRUS_AUTORECONF = YES
-XDRIVER_XF86_VIDEO_CIRRUS_DEPENDANCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xproto
+XDRIVER_XF86_VIDEO_CIRRUS_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xproto
 
 $(eval $(call AUTOTARGETS,xdriver_xf86-video-cirrus))
diff --git a/package/x11r7/xdriver_xf86-video-cyrix/xdriver_xf86-video-cyrix.mk b/package/x11r7/xdriver_xf86-video-cyrix/xdriver_xf86-video-cyrix.mk
index 4b67dacb2..1fbadf11f 100644
--- a/package/x11r7/xdriver_xf86-video-cyrix/xdriver_xf86-video-cyrix.mk
+++ b/package/x11r7/xdriver_xf86-video-cyrix/xdriver_xf86-video-cyrix.mk
@@ -8,6 +8,6 @@ XDRIVER_XF86_VIDEO_CYRIX_VERSION = 1.1.0
 XDRIVER_XF86_VIDEO_CYRIX_SOURCE = xf86-video-cyrix-$(XDRIVER_XF86_VIDEO_CYRIX_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_CYRIX_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_CYRIX_AUTORECONF = YES
-XDRIVER_XF86_VIDEO_CYRIX_DEPENDANCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xf86dgaproto xproto_xproto
+XDRIVER_XF86_VIDEO_CYRIX_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xf86dgaproto xproto_xproto
 
 $(eval $(call AUTOTARGETS,xdriver_xf86-video-cyrix))
diff --git a/package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.mk b/package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.mk
index 2ba6de61a..3aec6a8cf 100644
--- a/package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.mk
+++ b/package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.mk
@@ -8,6 +8,6 @@ XDRIVER_XF86_VIDEO_DUMMY_VERSION = 0.2.0
 XDRIVER_XF86_VIDEO_DUMMY_SOURCE = xf86-video-dummy-$(XDRIVER_XF86_VIDEO_DUMMY_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_DUMMY_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_DUMMY_AUTORECONF = YES
-XDRIVER_XF86_VIDEO_DUMMY_DEPENDANCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xf86dgaproto xproto_xproto
+XDRIVER_XF86_VIDEO_DUMMY_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xf86dgaproto xproto_xproto
 
 $(eval $(call AUTOTARGETS,xdriver_xf86-video-dummy))
diff --git a/package/x11r7/xdriver_xf86-video-fbdev/xdriver_xf86-video-fbdev.mk b/package/x11r7/xdriver_xf86-video-fbdev/xdriver_xf86-video-fbdev.mk
index 42fa3ed8d..8a963b517 100644
--- a/package/x11r7/xdriver_xf86-video-fbdev/xdriver_xf86-video-fbdev.mk
+++ b/package/x11r7/xdriver_xf86-video-fbdev/xdriver_xf86-video-fbdev.mk
@@ -8,6 +8,6 @@ XDRIVER_XF86_VIDEO_FBDEV_VERSION = 0.3.1
 XDRIVER_XF86_VIDEO_FBDEV_SOURCE = xf86-video-fbdev-$(XDRIVER_XF86_VIDEO_FBDEV_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_FBDEV_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_FBDEV_AUTORECONF = YES
-XDRIVER_XF86_VIDEO_FBDEV_DEPENDANCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xproto
+XDRIVER_XF86_VIDEO_FBDEV_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xproto
 
 $(eval $(call AUTOTARGETS,xdriver_xf86-video-fbdev))
diff --git a/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.mk b/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.mk
index c3cc89c4f..0b42adf4f 100644
--- a/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.mk
+++ b/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.mk
@@ -8,6 +8,6 @@ XDRIVER_XF86_VIDEO_GLINT_VERSION = 1.1.1
 XDRIVER_XF86_VIDEO_GLINT_SOURCE = xf86-video-glint-$(XDRIVER_XF86_VIDEO_GLINT_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_GLINT_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_GLINT_AUTORECONF = YES
-XDRIVER_XF86_VIDEO_GLINT_DEPENDANCIES = xserver_xorg-server libdrm xproto_fontsproto xproto_glproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86dgaproto xproto_xf86driproto xproto_xproto
+XDRIVER_XF86_VIDEO_GLINT_DEPENDENCIES = xserver_xorg-server libdrm xproto_fontsproto xproto_glproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86dgaproto xproto_xf86driproto xproto_xproto
 
 $(eval $(call AUTOTARGETS,xdriver_xf86-video-glint))
diff --git a/package/x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.mk b/package/x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.mk
index 07e864e0e..676133ee3 100644
--- a/package/x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.mk
+++ b/package/x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.mk
@@ -8,6 +8,6 @@ XDRIVER_XF86_VIDEO_I128_VERSION = 1.2.1
 XDRIVER_XF86_VIDEO_I128_SOURCE = xf86-video-i128-$(XDRIVER_XF86_VIDEO_I128_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_I128_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_I128_AUTORECONF = YES
-XDRIVER_XF86_VIDEO_I128_DEPENDANCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xproto
+XDRIVER_XF86_VIDEO_I128_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xproto
 
 $(eval $(call AUTOTARGETS,xdriver_xf86-video-i128))
diff --git a/package/x11r7/xdriver_xf86-video-i740/xdriver_xf86-video-i740.mk b/package/x11r7/xdriver_xf86-video-i740/xdriver_xf86-video-i740.mk
index 4192b85d8..113f4a205 100644
--- a/package/x11r7/xdriver_xf86-video-i740/xdriver_xf86-video-i740.mk
+++ b/package/x11r7/xdriver_xf86-video-i740/xdriver_xf86-video-i740.mk
@@ -8,6 +8,6 @@ XDRIVER_XF86_VIDEO_I740_VERSION = 1.1.0
 XDRIVER_XF86_VIDEO_I740_SOURCE = xf86-video-i740-$(XDRIVER_XF86_VIDEO_I740_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_I740_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_I740_AUTORECONF = YES
-XDRIVER_XF86_VIDEO_I740_DEPENDANCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xproto
+XDRIVER_XF86_VIDEO_I740_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xproto
 
 $(eval $(call AUTOTARGETS,xdriver_xf86-video-i740))
diff --git a/package/x11r7/xdriver_xf86-video-i810/xdriver_xf86-video-i810.mk b/package/x11r7/xdriver_xf86-video-i810/xdriver_xf86-video-i810.mk
index 92c7476bf..3af3fe6a3 100644
--- a/package/x11r7/xdriver_xf86-video-i810/xdriver_xf86-video-i810.mk
+++ b/package/x11r7/xdriver_xf86-video-i810/xdriver_xf86-video-i810.mk
@@ -8,6 +8,6 @@ XDRIVER_XF86_VIDEO_I810_VERSION = 1.6.5
 XDRIVER_XF86_VIDEO_I810_SOURCE = xf86-video-i810-$(XDRIVER_XF86_VIDEO_I810_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_I810_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_I810_AUTORECONF = YES
-XDRIVER_XF86_VIDEO_I810_DEPENDANCIES = xserver_xorg-server libdrm xlib_libX11 xlib_libXvMC xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xf86driproto xproto_xproto
+XDRIVER_XF86_VIDEO_I810_DEPENDENCIES = xserver_xorg-server libdrm xlib_libX11 xlib_libXvMC xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xf86driproto xproto_xproto
 
 $(eval $(call AUTOTARGETS,xdriver_xf86-video-i810))
diff --git a/package/x11r7/xdriver_xf86-video-imstt/xdriver_xf86-video-imstt.mk b/package/x11r7/xdriver_xf86-video-imstt/xdriver_xf86-video-imstt.mk
index 67ee8abe9..e4c146702 100644
--- a/package/x11r7/xdriver_xf86-video-imstt/xdriver_xf86-video-imstt.mk
+++ b/package/x11r7/xdriver_xf86-video-imstt/xdriver_xf86-video-imstt.mk
@@ -8,6 +8,6 @@ XDRIVER_XF86_VIDEO_IMSTT_VERSION = 1.1.0
 XDRIVER_XF86_VIDEO_IMSTT_SOURCE = xf86-video-imstt-$(XDRIVER_XF86_VIDEO_IMSTT_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_IMSTT_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_IMSTT_AUTORECONF = YES
-XDRIVER_XF86_VIDEO_IMSTT_DEPENDANCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xproto
+XDRIVER_XF86_VIDEO_IMSTT_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xproto
 
 $(eval $(call AUTOTARGETS,xdriver_xf86-video-imstt))
diff --git a/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk b/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk
index 9281f64df..eaf0001b1 100644
--- a/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk
+++ b/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk
@@ -8,6 +8,6 @@ XDRIVER_XF86_VIDEO_MGA_VERSION = 1.4.6.1
 XDRIVER_XF86_VIDEO_MGA_SOURCE = xf86-video-mga-$(XDRIVER_XF86_VIDEO_MGA_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_MGA_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_MGA_AUTORECONF = YES
-XDRIVER_XF86_VIDEO_MGA_DEPENDANCIES = xserver_xorg-server libdrm xproto_fontsproto xproto_glproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86driproto xproto_xproto
+XDRIVER_XF86_VIDEO_MGA_DEPENDENCIES = xserver_xorg-server libdrm xproto_fontsproto xproto_glproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86driproto xproto_xproto
 
 $(eval $(call AUTOTARGETS,xdriver_xf86-video-mga))
diff --git a/package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.mk b/package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.mk
index 66e4e9c0a..01554544a 100644
--- a/package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.mk
+++ b/package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.mk
@@ -8,6 +8,6 @@ XDRIVER_XF86_VIDEO_NEOMAGIC_VERSION = 1.1.1
 XDRIVER_XF86_VIDEO_NEOMAGIC_SOURCE = xf86-video-neomagic-$(XDRIVER_XF86_VIDEO_NEOMAGIC_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_NEOMAGIC_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_NEOMAGIC_AUTORECONF = YES
-XDRIVER_XF86_VIDEO_NEOMAGIC_DEPENDANCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86dgaproto xproto_xproto
+XDRIVER_XF86_VIDEO_NEOMAGIC_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86dgaproto xproto_xproto
 
 $(eval $(call AUTOTARGETS,xdriver_xf86-video-neomagic))
diff --git a/package/x11r7/xdriver_xf86-video-newport/xdriver_xf86-video-newport.mk b/package/x11r7/xdriver_xf86-video-newport/xdriver_xf86-video-newport.mk
index f7c5166d7..306969325 100644
--- a/package/x11r7/xdriver_xf86-video-newport/xdriver_xf86-video-newport.mk
+++ b/package/x11r7/xdriver_xf86-video-newport/xdriver_xf86-video-newport.mk
@@ -8,6 +8,6 @@ XDRIVER_XF86_VIDEO_NEWPORT_VERSION = 0.2.1
 XDRIVER_XF86_VIDEO_NEWPORT_SOURCE = xf86-video-newport-$(XDRIVER_XF86_VIDEO_NEWPORT_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_NEWPORT_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_NEWPORT_AUTORECONF = YES
-XDRIVER_XF86_VIDEO_NEWPORT_DEPENDANCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xproto
+XDRIVER_XF86_VIDEO_NEWPORT_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xproto
 
 $(eval $(call AUTOTARGETS,xdriver_xf86-video-newport))
diff --git a/package/x11r7/xdriver_xf86-video-nsc/xdriver_xf86-video-nsc.mk b/package/x11r7/xdriver_xf86-video-nsc/xdriver_xf86-video-nsc.mk
index 72e05da3f..f1cefd060 100644
--- a/package/x11r7/xdriver_xf86-video-nsc/xdriver_xf86-video-nsc.mk
+++ b/package/x11r7/xdriver_xf86-video-nsc/xdriver_xf86-video-nsc.mk
@@ -8,6 +8,6 @@ XDRIVER_XF86_VIDEO_NSC_VERSION = 2.8.2
 XDRIVER_XF86_VIDEO_NSC_SOURCE = xf86-video-nsc-$(XDRIVER_XF86_VIDEO_NSC_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_NSC_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_NSC_AUTORECONF = YES
-XDRIVER_XF86_VIDEO_NSC_DEPENDANCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86dgaproto xproto_xproto
+XDRIVER_XF86_VIDEO_NSC_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86dgaproto xproto_xproto
 
 $(eval $(call AUTOTARGETS,xdriver_xf86-video-nsc))
diff --git a/package/x11r7/xdriver_xf86-video-nv/xdriver_xf86-video-nv.mk b/package/x11r7/xdriver_xf86-video-nv/xdriver_xf86-video-nv.mk
index f7db11032..4dd3d7611 100644
--- a/package/x11r7/xdriver_xf86-video-nv/xdriver_xf86-video-nv.mk
+++ b/package/x11r7/xdriver_xf86-video-nv/xdriver_xf86-video-nv.mk
@@ -8,6 +8,6 @@ XDRIVER_XF86_VIDEO_NV_VERSION = 1.2.2.1
 XDRIVER_XF86_VIDEO_NV_SOURCE = xf86-video-nv-$(XDRIVER_XF86_VIDEO_NV_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_NV_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_NV_AUTORECONF = YES
-XDRIVER_XF86_VIDEO_NV_DEPENDANCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xproto
+XDRIVER_XF86_VIDEO_NV_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xproto
 
 $(eval $(call AUTOTARGETS,xdriver_xf86-video-nv))
diff --git a/package/x11r7/xdriver_xf86-video-rendition/xdriver_xf86-video-rendition.mk b/package/x11r7/xdriver_xf86-video-rendition/xdriver_xf86-video-rendition.mk
index 2e8753636..46877fcbc 100644
--- a/package/x11r7/xdriver_xf86-video-rendition/xdriver_xf86-video-rendition.mk
+++ b/package/x11r7/xdriver_xf86-video-rendition/xdriver_xf86-video-rendition.mk
@@ -8,6 +8,6 @@ XDRIVER_XF86_VIDEO_RENDITION_VERSION = 4.1.3
 XDRIVER_XF86_VIDEO_RENDITION_SOURCE = xf86-video-rendition-$(XDRIVER_XF86_VIDEO_RENDITION_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_RENDITION_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_RENDITION_AUTORECONF = YES
-XDRIVER_XF86_VIDEO_RENDITION_DEPENDANCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xproto
+XDRIVER_XF86_VIDEO_RENDITION_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xproto
 
 $(eval $(call AUTOTARGETS,xdriver_xf86-video-rendition))
diff --git a/package/x11r7/xdriver_xf86-video-s3/xdriver_xf86-video-s3.mk b/package/x11r7/xdriver_xf86-video-s3/xdriver_xf86-video-s3.mk
index df0634402..4741d2a15 100644
--- a/package/x11r7/xdriver_xf86-video-s3/xdriver_xf86-video-s3.mk
+++ b/package/x11r7/xdriver_xf86-video-s3/xdriver_xf86-video-s3.mk
@@ -8,6 +8,6 @@ XDRIVER_XF86_VIDEO_S3_VERSION = 0.5.0
 XDRIVER_XF86_VIDEO_S3_SOURCE = xf86-video-s3-$(XDRIVER_XF86_VIDEO_S3_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_S3_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_S3_AUTORECONF = YES
-XDRIVER_XF86_VIDEO_S3_DEPENDANCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xproto
+XDRIVER_XF86_VIDEO_S3_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xproto
 
 $(eval $(call AUTOTARGETS,xdriver_xf86-video-s3))
diff --git a/package/x11r7/xdriver_xf86-video-s3virge/xdriver_xf86-video-s3virge.mk b/package/x11r7/xdriver_xf86-video-s3virge/xdriver_xf86-video-s3virge.mk
index a4e12966b..f080f6d10 100644
--- a/package/x11r7/xdriver_xf86-video-s3virge/xdriver_xf86-video-s3virge.mk
+++ b/package/x11r7/xdriver_xf86-video-s3virge/xdriver_xf86-video-s3virge.mk
@@ -8,6 +8,6 @@ XDRIVER_XF86_VIDEO_S3VIRGE_VERSION = 1.9.1
 XDRIVER_XF86_VIDEO_S3VIRGE_SOURCE = xf86-video-s3virge-$(XDRIVER_XF86_VIDEO_S3VIRGE_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_S3VIRGE_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_S3VIRGE_AUTORECONF = YES
-XDRIVER_XF86_VIDEO_S3VIRGE_DEPENDANCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xproto
+XDRIVER_XF86_VIDEO_S3VIRGE_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xproto
 
 $(eval $(call AUTOTARGETS,xdriver_xf86-video-s3virge))
diff --git a/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk b/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk
index 98cebad76..2cdf1c7f0 100644
--- a/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk
+++ b/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk
@@ -8,6 +8,6 @@ XDRIVER_XF86_VIDEO_SAVAGE_VERSION = 2.1.2
 XDRIVER_XF86_VIDEO_SAVAGE_SOURCE = xf86-video-savage-$(XDRIVER_XF86_VIDEO_SAVAGE_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_SAVAGE_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_SAVAGE_AUTORECONF = YES
-XDRIVER_XF86_VIDEO_SAVAGE_DEPENDANCIES = xserver_xorg-server libdrm xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86driproto xproto_xproto
+XDRIVER_XF86_VIDEO_SAVAGE_DEPENDENCIES = xserver_xorg-server libdrm xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86driproto xproto_xproto
 
 $(eval $(call AUTOTARGETS,xdriver_xf86-video-savage))
diff --git a/package/x11r7/xdriver_xf86-video-siliconmotion/xdriver_xf86-video-siliconmotion.mk b/package/x11r7/xdriver_xf86-video-siliconmotion/xdriver_xf86-video-siliconmotion.mk
index e103b114f..40ffcae75 100644
--- a/package/x11r7/xdriver_xf86-video-siliconmotion/xdriver_xf86-video-siliconmotion.mk
+++ b/package/x11r7/xdriver_xf86-video-siliconmotion/xdriver_xf86-video-siliconmotion.mk
@@ -8,6 +8,6 @@ XDRIVER_XF86_VIDEO_SILICONMOTION_VERSION = 1.4.2
 XDRIVER_XF86_VIDEO_SILICONMOTION_SOURCE = xf86-video-siliconmotion-$(XDRIVER_XF86_VIDEO_SILICONMOTION_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_SILICONMOTION_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_SILICONMOTION_AUTORECONF = YES
-XDRIVER_XF86_VIDEO_SILICONMOTION_DEPENDANCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xproto
+XDRIVER_XF86_VIDEO_SILICONMOTION_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xproto
 
 $(eval $(call AUTOTARGETS,xdriver_xf86-video-siliconmotion))
diff --git a/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.mk b/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.mk
index 9a2440571..4243b8a96 100644
--- a/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.mk
+++ b/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.mk
@@ -8,6 +8,6 @@ XDRIVER_XF86_VIDEO_SIS_VERSION = 0.9.3
 XDRIVER_XF86_VIDEO_SIS_SOURCE = xf86-video-sis-$(XDRIVER_XF86_VIDEO_SIS_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_SIS_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_SIS_AUTORECONF = YES
-XDRIVER_XF86_VIDEO_SIS_DEPENDANCIES = xserver_xorg-server libdrm xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86dgaproto xproto_xf86driproto xproto_xf86miscproto xproto_xineramaproto xproto_xproto
+XDRIVER_XF86_VIDEO_SIS_DEPENDENCIES = xserver_xorg-server libdrm xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86dgaproto xproto_xf86driproto xproto_xf86miscproto xproto_xineramaproto xproto_xproto
 
 $(eval $(call AUTOTARGETS,xdriver_xf86-video-sis))
diff --git a/package/x11r7/xdriver_xf86-video-sisusb/xdriver_xf86-video-sisusb.mk b/package/x11r7/xdriver_xf86-video-sisusb/xdriver_xf86-video-sisusb.mk
index b9a468bb6..3b0ea124a 100644
--- a/package/x11r7/xdriver_xf86-video-sisusb/xdriver_xf86-video-sisusb.mk
+++ b/package/x11r7/xdriver_xf86-video-sisusb/xdriver_xf86-video-sisusb.mk
@@ -8,6 +8,6 @@ XDRIVER_XF86_VIDEO_SISUSB_VERSION = 0.8.1
 XDRIVER_XF86_VIDEO_SISUSB_SOURCE = xf86-video-sisusb-$(XDRIVER_XF86_VIDEO_SISUSB_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_SISUSB_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_SISUSB_AUTORECONF = YES
-XDRIVER_XF86_VIDEO_SISUSB_DEPENDANCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86miscproto xproto_xineramaproto xproto_xproto
+XDRIVER_XF86_VIDEO_SISUSB_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86miscproto xproto_xineramaproto xproto_xproto
 
 $(eval $(call AUTOTARGETS,xdriver_xf86-video-sisusb))
diff --git a/package/x11r7/xdriver_xf86-video-sunbw2/xdriver_xf86-video-sunbw2.mk b/package/x11r7/xdriver_xf86-video-sunbw2/xdriver_xf86-video-sunbw2.mk
index c401383d9..662951552 100644
--- a/package/x11r7/xdriver_xf86-video-sunbw2/xdriver_xf86-video-sunbw2.mk
+++ b/package/x11r7/xdriver_xf86-video-sunbw2/xdriver_xf86-video-sunbw2.mk
@@ -8,6 +8,6 @@ XDRIVER_XF86_VIDEO_SUNBW2_VERSION = 1.1.0
 XDRIVER_XF86_VIDEO_SUNBW2_SOURCE = xf86-video-sunbw2-$(XDRIVER_XF86_VIDEO_SUNBW2_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_SUNBW2_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_SUNBW2_AUTORECONF = YES
-XDRIVER_XF86_VIDEO_SUNBW2_DEPENDANCIES = xserver_xorg-server xproto_randrproto xproto_xproto
+XDRIVER_XF86_VIDEO_SUNBW2_DEPENDENCIES = xserver_xorg-server xproto_randrproto xproto_xproto
 
 $(eval $(call AUTOTARGETS,xdriver_xf86-video-sunbw2))
diff --git a/package/x11r7/xdriver_xf86-video-suncg14/xdriver_xf86-video-suncg14.mk b/package/x11r7/xdriver_xf86-video-suncg14/xdriver_xf86-video-suncg14.mk
index 2010ff34c..67bf8e59a 100644
--- a/package/x11r7/xdriver_xf86-video-suncg14/xdriver_xf86-video-suncg14.mk
+++ b/package/x11r7/xdriver_xf86-video-suncg14/xdriver_xf86-video-suncg14.mk
@@ -8,6 +8,6 @@ XDRIVER_XF86_VIDEO_SUNCG14_VERSION = 1.1.0
 XDRIVER_XF86_VIDEO_SUNCG14_SOURCE = xf86-video-suncg14-$(XDRIVER_XF86_VIDEO_SUNCG14_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_SUNCG14_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_SUNCG14_AUTORECONF = YES
-XDRIVER_XF86_VIDEO_SUNCG14_DEPENDANCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xproto
+XDRIVER_XF86_VIDEO_SUNCG14_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xproto
 
 $(eval $(call AUTOTARGETS,xdriver_xf86-video-suncg14))
diff --git a/package/x11r7/xdriver_xf86-video-suncg3/xdriver_xf86-video-suncg3.mk b/package/x11r7/xdriver_xf86-video-suncg3/xdriver_xf86-video-suncg3.mk
index 07cae1f95..38c8f066d 100644
--- a/package/x11r7/xdriver_xf86-video-suncg3/xdriver_xf86-video-suncg3.mk
+++ b/package/x11r7/xdriver_xf86-video-suncg3/xdriver_xf86-video-suncg3.mk
@@ -8,6 +8,6 @@ XDRIVER_XF86_VIDEO_SUNCG3_VERSION = 1.1.0
 XDRIVER_XF86_VIDEO_SUNCG3_SOURCE = xf86-video-suncg3-$(XDRIVER_XF86_VIDEO_SUNCG3_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_SUNCG3_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_SUNCG3_AUTORECONF = YES
-XDRIVER_XF86_VIDEO_SUNCG3_DEPENDANCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xproto
+XDRIVER_XF86_VIDEO_SUNCG3_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xproto
 
 $(eval $(call AUTOTARGETS,xdriver_xf86-video-suncg3))
diff --git a/package/x11r7/xdriver_xf86-video-suncg6/xdriver_xf86-video-suncg6.mk b/package/x11r7/xdriver_xf86-video-suncg6/xdriver_xf86-video-suncg6.mk
index 0b5110c8b..b84781eae 100644
--- a/package/x11r7/xdriver_xf86-video-suncg6/xdriver_xf86-video-suncg6.mk
+++ b/package/x11r7/xdriver_xf86-video-suncg6/xdriver_xf86-video-suncg6.mk
@@ -8,6 +8,6 @@ XDRIVER_XF86_VIDEO_SUNCG6_VERSION = 1.1.0
 XDRIVER_XF86_VIDEO_SUNCG6_SOURCE = xf86-video-suncg6-$(XDRIVER_XF86_VIDEO_SUNCG6_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_SUNCG6_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_SUNCG6_AUTORECONF = YES
-XDRIVER_XF86_VIDEO_SUNCG6_DEPENDANCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xproto
+XDRIVER_XF86_VIDEO_SUNCG6_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xproto
 
 $(eval $(call AUTOTARGETS,xdriver_xf86-video-suncg6))
diff --git a/package/x11r7/xdriver_xf86-video-sunffb/xdriver_xf86-video-sunffb.mk b/package/x11r7/xdriver_xf86-video-sunffb/xdriver_xf86-video-sunffb.mk
index be4ea66d8..eb6c1831b 100644
--- a/package/x11r7/xdriver_xf86-video-sunffb/xdriver_xf86-video-sunffb.mk
+++ b/package/x11r7/xdriver_xf86-video-sunffb/xdriver_xf86-video-sunffb.mk
@@ -8,6 +8,6 @@ XDRIVER_XF86_VIDEO_SUNFFB_VERSION = 1.1.0
 XDRIVER_XF86_VIDEO_SUNFFB_SOURCE = xf86-video-sunffb-$(XDRIVER_XF86_VIDEO_SUNFFB_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_SUNFFB_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_SUNFFB_AUTORECONF = YES
-XDRIVER_XF86_VIDEO_SUNFFB_DEPENDANCIES = xserver_xorg-server libdrm xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xf86driproto xproto_xproto
+XDRIVER_XF86_VIDEO_SUNFFB_DEPENDENCIES = xserver_xorg-server libdrm xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xf86driproto xproto_xproto
 
 $(eval $(call AUTOTARGETS,xdriver_xf86-video-sunffb))
diff --git a/package/x11r7/xdriver_xf86-video-sunleo/xdriver_xf86-video-sunleo.mk b/package/x11r7/xdriver_xf86-video-sunleo/xdriver_xf86-video-sunleo.mk
index b27425ebd..bd9d6584d 100644
--- a/package/x11r7/xdriver_xf86-video-sunleo/xdriver_xf86-video-sunleo.mk
+++ b/package/x11r7/xdriver_xf86-video-sunleo/xdriver_xf86-video-sunleo.mk
@@ -8,6 +8,6 @@ XDRIVER_XF86_VIDEO_SUNLEO_VERSION = 1.1.0
 XDRIVER_XF86_VIDEO_SUNLEO_SOURCE = xf86-video-sunleo-$(XDRIVER_XF86_VIDEO_SUNLEO_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_SUNLEO_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_SUNLEO_AUTORECONF = YES
-XDRIVER_XF86_VIDEO_SUNLEO_DEPENDANCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xproto
+XDRIVER_XF86_VIDEO_SUNLEO_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xproto
 
 $(eval $(call AUTOTARGETS,xdriver_xf86-video-sunleo))
diff --git a/package/x11r7/xdriver_xf86-video-suntcx/xdriver_xf86-video-suntcx.mk b/package/x11r7/xdriver_xf86-video-suntcx/xdriver_xf86-video-suntcx.mk
index 493e1f2c1..ddfc3fb1d 100644
--- a/package/x11r7/xdriver_xf86-video-suntcx/xdriver_xf86-video-suntcx.mk
+++ b/package/x11r7/xdriver_xf86-video-suntcx/xdriver_xf86-video-suntcx.mk
@@ -8,6 +8,6 @@ XDRIVER_XF86_VIDEO_SUNTCX_VERSION = 1.1.0
 XDRIVER_XF86_VIDEO_SUNTCX_SOURCE = xf86-video-suntcx-$(XDRIVER_XF86_VIDEO_SUNTCX_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_SUNTCX_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_SUNTCX_AUTORECONF = YES
-XDRIVER_XF86_VIDEO_SUNTCX_DEPENDANCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xproto
+XDRIVER_XF86_VIDEO_SUNTCX_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xproto
 
 $(eval $(call AUTOTARGETS,xdriver_xf86-video-suntcx))
diff --git a/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk b/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk
index f51522e91..7915ee2ab 100644
--- a/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk
+++ b/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk
@@ -8,6 +8,6 @@ XDRIVER_XF86_VIDEO_TDFX_VERSION = 1.3.0
 XDRIVER_XF86_VIDEO_TDFX_SOURCE = xf86-video-tdfx-$(XDRIVER_XF86_VIDEO_TDFX_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_TDFX_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_TDFX_AUTORECONF = YES
-XDRIVER_XF86_VIDEO_TDFX_DEPENDANCIES = xserver_xorg-server libdrm xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86driproto xproto_xproto
+XDRIVER_XF86_VIDEO_TDFX_DEPENDENCIES = xserver_xorg-server libdrm xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86driproto xproto_xproto
 
 $(eval $(call AUTOTARGETS,xdriver_xf86-video-tdfx))
diff --git a/package/x11r7/xdriver_xf86-video-tga/xdriver_xf86-video-tga.mk b/package/x11r7/xdriver_xf86-video-tga/xdriver_xf86-video-tga.mk
index 4c70a360c..4efe7175a 100644
--- a/package/x11r7/xdriver_xf86-video-tga/xdriver_xf86-video-tga.mk
+++ b/package/x11r7/xdriver_xf86-video-tga/xdriver_xf86-video-tga.mk
@@ -8,6 +8,6 @@ XDRIVER_XF86_VIDEO_TGA_VERSION = 1.1.0
 XDRIVER_XF86_VIDEO_TGA_SOURCE = xf86-video-tga-$(XDRIVER_XF86_VIDEO_TGA_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_TGA_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_TGA_AUTORECONF = YES
-XDRIVER_XF86_VIDEO_TGA_DEPENDANCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86dgaproto xproto_xproto
+XDRIVER_XF86_VIDEO_TGA_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86dgaproto xproto_xproto
 
 $(eval $(call AUTOTARGETS,xdriver_xf86-video-tga))
diff --git a/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk b/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk
index 2055f09b4..7866ee6b3 100644
--- a/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk
+++ b/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk
@@ -8,6 +8,6 @@ XDRIVER_XF86_VIDEO_TRIDENT_VERSION = 1.2.3
 XDRIVER_XF86_VIDEO_TRIDENT_SOURCE = xf86-video-trident-$(XDRIVER_XF86_VIDEO_TRIDENT_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_TRIDENT_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_TRIDENT_AUTORECONF = YES
-XDRIVER_XF86_VIDEO_TRIDENT_DEPENDANCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86dgaproto xproto_xproto
+XDRIVER_XF86_VIDEO_TRIDENT_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86dgaproto xproto_xproto
 
 $(eval $(call AUTOTARGETS,xdriver_xf86-video-trident))
diff --git a/package/x11r7/xdriver_xf86-video-tseng/xdriver_xf86-video-tseng.mk b/package/x11r7/xdriver_xf86-video-tseng/xdriver_xf86-video-tseng.mk
index 8f2080c9d..4a889e7d1 100644
--- a/package/x11r7/xdriver_xf86-video-tseng/xdriver_xf86-video-tseng.mk
+++ b/package/x11r7/xdriver_xf86-video-tseng/xdriver_xf86-video-tseng.mk
@@ -8,6 +8,6 @@ XDRIVER_XF86_VIDEO_TSENG_VERSION = 1.1.1
 XDRIVER_XF86_VIDEO_TSENG_SOURCE = xf86-video-tseng-$(XDRIVER_XF86_VIDEO_TSENG_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_TSENG_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_TSENG_AUTORECONF = YES
-XDRIVER_XF86_VIDEO_TSENG_DEPENDANCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xproto
+XDRIVER_XF86_VIDEO_TSENG_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xproto
 
 $(eval $(call AUTOTARGETS,xdriver_xf86-video-tseng))
diff --git a/package/x11r7/xdriver_xf86-video-v4l/xdriver_xf86-video-v4l.mk b/package/x11r7/xdriver_xf86-video-v4l/xdriver_xf86-video-v4l.mk
index 53ea31b70..abb41f24b 100644
--- a/package/x11r7/xdriver_xf86-video-v4l/xdriver_xf86-video-v4l.mk
+++ b/package/x11r7/xdriver_xf86-video-v4l/xdriver_xf86-video-v4l.mk
@@ -8,6 +8,6 @@ XDRIVER_XF86_VIDEO_V4L_VERSION = 0.1.1
 XDRIVER_XF86_VIDEO_V4L_SOURCE = xf86-video-v4l-$(XDRIVER_XF86_VIDEO_V4L_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_V4L_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_V4L_AUTORECONF = YES
-XDRIVER_XF86_VIDEO_V4L_DEPENDANCIES = xserver_xorg-server xproto_randrproto xproto_videoproto xproto_xproto
+XDRIVER_XF86_VIDEO_V4L_DEPENDENCIES = xserver_xorg-server xproto_randrproto xproto_videoproto xproto_xproto
 
 $(eval $(call AUTOTARGETS,xdriver_xf86-video-v4l))
diff --git a/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.mk b/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.mk
index 9a1e2bcdd..4df953360 100644
--- a/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.mk
+++ b/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.mk
@@ -8,6 +8,6 @@ XDRIVER_XF86_VIDEO_VESA_VERSION = 1.3.0
 XDRIVER_XF86_VIDEO_VESA_SOURCE = xf86-video-vesa-$(XDRIVER_XF86_VIDEO_VESA_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_VESA_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_VESA_AUTORECONF = YES
-XDRIVER_XF86_VIDEO_VESA_DEPENDANCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xproto
+XDRIVER_XF86_VIDEO_VESA_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xproto
 
 $(eval $(call AUTOTARGETS,xdriver_xf86-video-vesa))
diff --git a/package/x11r7/xdriver_xf86-video-vga/xdriver_xf86-video-vga.mk b/package/x11r7/xdriver_xf86-video-vga/xdriver_xf86-video-vga.mk
index 0b429e50e..bdb50c0e2 100644
--- a/package/x11r7/xdriver_xf86-video-vga/xdriver_xf86-video-vga.mk
+++ b/package/x11r7/xdriver_xf86-video-vga/xdriver_xf86-video-vga.mk
@@ -8,6 +8,6 @@ XDRIVER_XF86_VIDEO_VGA_VERSION = 4.1.0
 XDRIVER_XF86_VIDEO_VGA_SOURCE = xf86-video-vga-$(XDRIVER_XF86_VIDEO_VGA_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_VGA_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_VGA_AUTORECONF = YES
-XDRIVER_XF86_VIDEO_VGA_DEPENDANCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xproto
+XDRIVER_XF86_VIDEO_VGA_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xproto
 
 $(eval $(call AUTOTARGETS,xdriver_xf86-video-vga))
diff --git a/package/x11r7/xdriver_xf86-video-via/xdriver_xf86-video-via.mk b/package/x11r7/xdriver_xf86-video-via/xdriver_xf86-video-via.mk
index 5dea3dc79..4ee2dc519 100644
--- a/package/x11r7/xdriver_xf86-video-via/xdriver_xf86-video-via.mk
+++ b/package/x11r7/xdriver_xf86-video-via/xdriver_xf86-video-via.mk
@@ -8,6 +8,6 @@ XDRIVER_XF86_VIDEO_VIA_VERSION = 0.2.2
 XDRIVER_XF86_VIDEO_VIA_SOURCE = xf86-video-via-$(XDRIVER_XF86_VIDEO_VIA_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_VIA_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_VIA_AUTORECONF = YES
-XDRIVER_XF86_VIDEO_VIA_DEPENDANCIES = xserver_xorg-server libdrm xlib_libX11 xlib_libXvMC xproto_fontsproto xproto_glproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xf86driproto xproto_xproto
+XDRIVER_XF86_VIDEO_VIA_DEPENDENCIES = xserver_xorg-server libdrm xlib_libX11 xlib_libXvMC xproto_fontsproto xproto_glproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xf86driproto xproto_xproto
 
 $(eval $(call AUTOTARGETS,xdriver_xf86-video-via))
diff --git a/package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.mk b/package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.mk
index b9bf1d1cf..9bea5c656 100644
--- a/package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.mk
+++ b/package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.mk
@@ -8,6 +8,6 @@ XDRIVER_XF86_VIDEO_VMWARE_VERSION = 10.14.1
 XDRIVER_XF86_VIDEO_VMWARE_SOURCE = xf86-video-vmware-$(XDRIVER_XF86_VIDEO_VMWARE_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_VMWARE_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_VMWARE_AUTORECONF = YES
-XDRIVER_XF86_VIDEO_VMWARE_DEPENDANCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xineramaproto xproto_xproto
+XDRIVER_XF86_VIDEO_VMWARE_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xineramaproto xproto_xproto
 
 $(eval $(call AUTOTARGETS,xdriver_xf86-video-vmware))
diff --git a/package/x11r7/xdriver_xf86-video-voodoo/xdriver_xf86-video-voodoo.mk b/package/x11r7/xdriver_xf86-video-voodoo/xdriver_xf86-video-voodoo.mk
index 93f9599c1..07c0dc3dc 100644
--- a/package/x11r7/xdriver_xf86-video-voodoo/xdriver_xf86-video-voodoo.mk
+++ b/package/x11r7/xdriver_xf86-video-voodoo/xdriver_xf86-video-voodoo.mk
@@ -8,6 +8,6 @@ XDRIVER_XF86_VIDEO_VOODOO_VERSION = 1.1.1
 XDRIVER_XF86_VIDEO_VOODOO_SOURCE = xf86-video-voodoo-$(XDRIVER_XF86_VIDEO_VOODOO_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_VOODOO_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_VOODOO_AUTORECONF = YES
-XDRIVER_XF86_VIDEO_VOODOO_DEPENDANCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xf86dgaproto xproto_xproto
+XDRIVER_XF86_VIDEO_VOODOO_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xf86dgaproto xproto_xproto
 
 $(eval $(call AUTOTARGETS,xdriver_xf86-video-voodoo))
diff --git a/package/x11r7/xlib_libFS/xlib_libFS.mk b/package/x11r7/xlib_libFS/xlib_libFS.mk
index 9b1f2ef22..099d61ef9 100644
--- a/package/x11r7/xlib_libFS/xlib_libFS.mk
+++ b/package/x11r7/xlib_libFS/xlib_libFS.mk
@@ -9,7 +9,7 @@ XLIB_LIBFS_SOURCE = libFS-$(XLIB_LIBFS_VERSION).tar.bz2
 XLIB_LIBFS_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBFS_AUTORECONF = YES
 XLIB_LIBFS_INSTALL_STAGING = YES
-XLIB_LIBFS_DEPENDANCIES = xlib_xtrans xproto_xproto xproto_fontsproto
+XLIB_LIBFS_DEPENDENCIES = xlib_xtrans xproto_xproto xproto_fontsproto
 XLIB_LIBFS_CONF_OPT = --disable-malloc0returnsnull --enable-shared --disable-static
 
 $(eval $(call AUTOTARGETS,xlib_libFS))
diff --git a/package/x11r7/xlib_libICE/xlib_libICE.mk b/package/x11r7/xlib_libICE/xlib_libICE.mk
index ad8bb7c35..e6d8bb76d 100644
--- a/package/x11r7/xlib_libICE/xlib_libICE.mk
+++ b/package/x11r7/xlib_libICE/xlib_libICE.mk
@@ -9,7 +9,7 @@ XLIB_LIBICE_SOURCE = libICE-$(XLIB_LIBICE_VERSION).tar.bz2
 XLIB_LIBICE_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBICE_AUTORECONF = YES
 XLIB_LIBICE_INSTALL_STAGING = YES
-XLIB_LIBICE_DEPENDANCIES = xlib_xtrans xproto_xproto
+XLIB_LIBICE_DEPENDENCIES = xlib_xtrans xproto_xproto
 XLIB_LIBICE_CONF_OPT = --enable-shared --disable-static
 
 $(eval $(call AUTOTARGETS,xlib_libICE))
diff --git a/package/x11r7/xlib_libSM/xlib_libSM.mk b/package/x11r7/xlib_libSM/xlib_libSM.mk
index c3790c3e2..eef6ce04f 100644
--- a/package/x11r7/xlib_libSM/xlib_libSM.mk
+++ b/package/x11r7/xlib_libSM/xlib_libSM.mk
@@ -9,7 +9,7 @@ XLIB_LIBSM_SOURCE = libSM-$(XLIB_LIBSM_VERSION).tar.bz2
 XLIB_LIBSM_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBSM_AUTORECONF = YES
 XLIB_LIBSM_INSTALL_STAGING = YES
-XLIB_LIBSM_DEPENDANCIES = xlib_libICE xlib_xtrans xproto_xproto
+XLIB_LIBSM_DEPENDENCIES = xlib_libICE xlib_xtrans xproto_xproto
 XLIB_LIBSM_CONF_OPT = --enable-shared --disable-static
 
 $(eval $(call AUTOTARGETS,xlib_libSM))
diff --git a/package/x11r7/xlib_libX11/xlib_libX11.mk b/package/x11r7/xlib_libX11/xlib_libX11.mk
index 0e458ed59..0517213c2 100644
--- a/package/x11r7/xlib_libX11/xlib_libX11.mk
+++ b/package/x11r7/xlib_libX11/xlib_libX11.mk
@@ -9,7 +9,7 @@ XLIB_LIBX11_SOURCE = libX11-$(XLIB_LIBX11_VERSION).tar.bz2
 XLIB_LIBX11_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBX11_AUTORECONF = YES
 XLIB_LIBX11_INSTALL_STAGING = YES
-XLIB_LIBX11_DEPENDANCIES = libxcb xutil_util-macros xlib_xtrans xlib_libXau xlib_libXdmcp xproto_kbproto xproto_xproto xproto_xextproto xproto_inputproto xproto_xf86bigfontproto xproto_bigreqsproto xproto_xcmiscproto
+XLIB_LIBX11_DEPENDENCIES = libxcb xutil_util-macros xlib_xtrans xlib_libXau xlib_libXdmcp xproto_kbproto xproto_xproto xproto_xextproto xproto_inputproto xproto_xf86bigfontproto xproto_bigreqsproto xproto_xcmiscproto
 XLIB_LIBX11_CONF_ENV = ac_cv_func_mmap_fixed_mapped=yes CC_FOR_BUILD="/usr/bin/gcc -I$(STAGING_DIR)/usr/include"
 XLIB_LIBX11_CONF_OPT = --disable-malloc0returnsnull --with-xcb --enable-shared --disable-static
 
diff --git a/package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.mk b/package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.mk
index 127137d41..17001b141 100644
--- a/package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.mk
+++ b/package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.mk
@@ -9,7 +9,7 @@ XLIB_LIBXSCRNSAVER_SOURCE = libXScrnSaver-$(XLIB_LIBXSCRNSAVER_VERSION).tar.bz2
 XLIB_LIBXSCRNSAVER_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXSCRNSAVER_AUTORECONF = YES
 XLIB_LIBXSCRNSAVER_INSTALL_STAGING = YES
-XLIB_LIBXSCRNSAVER_DEPENDANCIES = xlib_libX11 xlib_libXext xproto_scrnsaverproto
+XLIB_LIBXSCRNSAVER_DEPENDENCIES = xlib_libX11 xlib_libXext xproto_scrnsaverproto
 XLIB_LIBXSCRNSAVER_CONF_OPT = --disable-malloc0returnsnull --enable-shared --disable-static
 
 $(eval $(call AUTOTARGETS,xlib_libXScrnSaver))
diff --git a/package/x11r7/xlib_libXTrap/xlib_libXTrap.mk b/package/x11r7/xlib_libXTrap/xlib_libXTrap.mk
index 388105673..645a6005c 100644
--- a/package/x11r7/xlib_libXTrap/xlib_libXTrap.mk
+++ b/package/x11r7/xlib_libXTrap/xlib_libXTrap.mk
@@ -9,7 +9,7 @@ XLIB_LIBXTRAP_SOURCE = libXTrap-$(XLIB_LIBXTRAP_VERSION).tar.bz2
 XLIB_LIBXTRAP_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXTRAP_AUTORECONF = YES
 XLIB_LIBXTRAP_INSTALL_STAGING = YES
-XLIB_LIBXTRAP_DEPENDANCIES = xlib_libX11 xlib_libXt xlib_libXext xproto_trapproto
+XLIB_LIBXTRAP_DEPENDENCIES = xlib_libX11 xlib_libXt xlib_libXext xproto_trapproto
 XLIB_LIBXTRAP_CONF_OPT = --enable-shared --disable-static
 
 $(eval $(call AUTOTARGETS,xlib_libXTrap))
diff --git a/package/x11r7/xlib_libXau/xlib_libXau.mk b/package/x11r7/xlib_libXau/xlib_libXau.mk
index 5a214b32a..94ddbcf70 100644
--- a/package/x11r7/xlib_libXau/xlib_libXau.mk
+++ b/package/x11r7/xlib_libXau/xlib_libXau.mk
@@ -9,7 +9,7 @@ XLIB_LIBXAU_SOURCE = libXau-$(XLIB_LIBXAU_VERSION).tar.bz2
 XLIB_LIBXAU_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXAU_AUTORECONF = YES
 XLIB_LIBXAU_INSTALL_STAGING = YES
-XLIB_LIBXAU_DEPENDANCIES = xproto_xproto xproto_xproto xutil_util-macros
+XLIB_LIBXAU_DEPENDENCIES = xproto_xproto xproto_xproto xutil_util-macros
 XLIB_LIBXAU_CONF_OPT = --enable-shared --disable-static
 
 $(eval $(call AUTOTARGETS,xlib_libXau))
diff --git a/package/x11r7/xlib_libXaw/xlib_libXaw.mk b/package/x11r7/xlib_libXaw/xlib_libXaw.mk
index b85ac2f7b..93f57e688 100644
--- a/package/x11r7/xlib_libXaw/xlib_libXaw.mk
+++ b/package/x11r7/xlib_libXaw/xlib_libXaw.mk
@@ -9,7 +9,7 @@ XLIB_LIBXAW_SOURCE = libXaw-$(XLIB_LIBXAW_VERSION).tar.bz2
 XLIB_LIBXAW_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXAW_AUTORECONF = YES
 XLIB_LIBXAW_INSTALL_STAGING = YES
-XLIB_LIBXAW_DEPENDANCIES = xlib_libX11 xlib_libXt xlib_libXmu xlib_libXpm xproto_xproto xlib_libXp
+XLIB_LIBXAW_DEPENDENCIES = xlib_libX11 xlib_libXt xlib_libXmu xlib_libXpm xproto_xproto xlib_libXp
 XLIB_LIBXAW_CONF_OPT = --enable-shared --disable-static
 
 $(eval $(call AUTOTARGETS,xlib_libXaw))
diff --git a/package/x11r7/xlib_libXcomposite/xlib_libXcomposite.mk b/package/x11r7/xlib_libXcomposite/xlib_libXcomposite.mk
index f5704ca15..7a8f65484 100644
--- a/package/x11r7/xlib_libXcomposite/xlib_libXcomposite.mk
+++ b/package/x11r7/xlib_libXcomposite/xlib_libXcomposite.mk
@@ -9,7 +9,7 @@ XLIB_LIBXCOMPOSITE_SOURCE = libXcomposite-$(XLIB_LIBXCOMPOSITE_VERSION).tar.bz2
 XLIB_LIBXCOMPOSITE_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXCOMPOSITE_AUTORECONF = YES
 XLIB_LIBXCOMPOSITE_INSTALL_STAGING = YES
-XLIB_LIBXCOMPOSITE_DEPENDANCIES = xproto_compositeproto xlib_libX11 xlib_libXext xlib_libXfixes xproto_xproto
+XLIB_LIBXCOMPOSITE_DEPENDENCIES = xproto_compositeproto xlib_libX11 xlib_libXext xlib_libXfixes xproto_xproto
 XLIB_LIBXCOMPOSITE_CONF_OPT = --enable-shared --disable-static
 
 $(eval $(call AUTOTARGETS,xlib_libXcomposite))
diff --git a/package/x11r7/xlib_libXcursor/xlib_libXcursor.mk b/package/x11r7/xlib_libXcursor/xlib_libXcursor.mk
index c38556c29..846bcf174 100644
--- a/package/x11r7/xlib_libXcursor/xlib_libXcursor.mk
+++ b/package/x11r7/xlib_libXcursor/xlib_libXcursor.mk
@@ -9,7 +9,7 @@ XLIB_LIBXCURSOR_SOURCE = libXcursor-$(XLIB_LIBXCURSOR_VERSION).tar.bz2
 XLIB_LIBXCURSOR_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXCURSOR_AUTORECONF = YES
 XLIB_LIBXCURSOR_INSTALL_STAGING = YES
-XLIB_LIBXCURSOR_DEPENDANCIES = xlib_libX11 xlib_libXfixes xlib_libXrender xproto_xproto
+XLIB_LIBXCURSOR_DEPENDENCIES = xlib_libX11 xlib_libXfixes xlib_libXrender xproto_xproto
 XLIB_LIBXCURSOR_CONF_OPT = --enable-shared --disable-static
 
 $(eval $(call AUTOTARGETS,xlib_libXcursor))
diff --git a/package/x11r7/xlib_libXdamage/xlib_libXdamage.mk b/package/x11r7/xlib_libXdamage/xlib_libXdamage.mk
index 7d65a86d1..d54acc7c7 100644
--- a/package/x11r7/xlib_libXdamage/xlib_libXdamage.mk
+++ b/package/x11r7/xlib_libXdamage/xlib_libXdamage.mk
@@ -9,7 +9,7 @@ XLIB_LIBXDAMAGE_SOURCE = libXdamage-$(XLIB_LIBXDAMAGE_VERSION).tar.bz2
 XLIB_LIBXDAMAGE_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXDAMAGE_AUTORECONF = YES
 XLIB_LIBXDAMAGE_INSTALL_STAGING = YES
-XLIB_LIBXDAMAGE_DEPENDANCIES = xproto_damageproto xlib_libX11 xlib_libXfixes xproto_xproto
+XLIB_LIBXDAMAGE_DEPENDENCIES = xproto_damageproto xlib_libX11 xlib_libXfixes xproto_xproto
 XLIB_LIBXDAMAGE_CONF_OPT = --enable-shared --disable-static
 
 $(eval $(call AUTOTARGETS,xlib_libXdamage))
diff --git a/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk b/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk
index c374dd5cb..0b1982e8f 100644
--- a/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk
+++ b/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk
@@ -9,7 +9,7 @@ XLIB_LIBXDMCP_SOURCE = libXdmcp-$(XLIB_LIBXDMCP_VERSION).tar.bz2
 XLIB_LIBXDMCP_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXDMCP_AUTORECONF = YES
 XLIB_LIBXDMCP_INSTALL_STAGING = YES
-XLIB_LIBXDMCP_DEPENDANCIES = xutil_util-macros xproto_xproto
+XLIB_LIBXDMCP_DEPENDENCIES = xutil_util-macros xproto_xproto
 XLIB_LIBXDMCP_CONF_OPT = --enable-shared --disable-static
 
 $(eval $(call AUTOTARGETS,xlib_libXdmcp))
diff --git a/package/x11r7/xlib_libXevie/xlib_libXevie.mk b/package/x11r7/xlib_libXevie/xlib_libXevie.mk
index 2d4c78075..1eafca93a 100644
--- a/package/x11r7/xlib_libXevie/xlib_libXevie.mk
+++ b/package/x11r7/xlib_libXevie/xlib_libXevie.mk
@@ -9,7 +9,7 @@ XLIB_LIBXEVIE_SOURCE = libXevie-$(XLIB_LIBXEVIE_VERSION).tar.bz2
 XLIB_LIBXEVIE_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXEVIE_AUTORECONF = YES
 XLIB_LIBXEVIE_INSTALL_STAGING = YES
-XLIB_LIBXEVIE_DEPENDANCIES = xlib_libX11 xlib_libXext xproto_evieext xproto_xproto
+XLIB_LIBXEVIE_DEPENDENCIES = xlib_libX11 xlib_libXext xproto_evieext xproto_xproto
 XLIB_LIBXEVIE_CONF_OPT = --disable-malloc0returnsnull --enable-shared --disable-static
 
 $(eval $(call AUTOTARGETS,xlib_libXevie))
diff --git a/package/x11r7/xlib_libXext/xlib_libXext.mk b/package/x11r7/xlib_libXext/xlib_libXext.mk
index abad40f28..8da2d631f 100644
--- a/package/x11r7/xlib_libXext/xlib_libXext.mk
+++ b/package/x11r7/xlib_libXext/xlib_libXext.mk
@@ -9,7 +9,7 @@ XLIB_LIBXEXT_SOURCE = libXext-$(XLIB_LIBXEXT_VERSION).tar.bz2
 XLIB_LIBXEXT_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXEXT_AUTORECONF = YES
 XLIB_LIBXEXT_INSTALL_STAGING = YES
-XLIB_LIBXEXT_DEPENDANCIES = xlib_libX11 xproto_xextproto xproto_xproto
+XLIB_LIBXEXT_DEPENDENCIES = xlib_libX11 xproto_xextproto xproto_xproto
 XLIB_LIBXEXT_CONF_OPT = --disable-malloc0returnsnull --enable-shared --disable-static
 
 $(eval $(call AUTOTARGETS,xlib_libXext))
diff --git a/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk b/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk
index aec404452..186e7226c 100644
--- a/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk
+++ b/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk
@@ -9,7 +9,7 @@ XLIB_LIBXFIXES_SOURCE = libXfixes-$(XLIB_LIBXFIXES_VERSION).tar.bz2
 XLIB_LIBXFIXES_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXFIXES_AUTORECONF = YES
 XLIB_LIBXFIXES_INSTALL_STAGING = YES
-XLIB_LIBXFIXES_DEPENDANCIES = xproto_fixesproto xlib_libX11 xproto_xextproto xproto_xproto
+XLIB_LIBXFIXES_DEPENDENCIES = xproto_fixesproto xlib_libX11 xproto_xextproto xproto_xproto
 XLIB_LIBXFIXES_CONF_OPT = --enable-shared --disable-static
 
 $(eval $(call AUTOTARGETS,xlib_libXfixes))
diff --git a/package/x11r7/xlib_libXfont/xlib_libXfont.mk b/package/x11r7/xlib_libXfont/xlib_libXfont.mk
index 48cdbd396..4c3ce2ff8 100644
--- a/package/x11r7/xlib_libXfont/xlib_libXfont.mk
+++ b/package/x11r7/xlib_libXfont/xlib_libXfont.mk
@@ -9,7 +9,7 @@ XLIB_LIBXFONT_SOURCE = libXfont-$(XLIB_LIBXFONT_VERSION).tar.bz2
 XLIB_LIBXFONT_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXFONT_AUTORECONF = YES
 XLIB_LIBXFONT_INSTALL_STAGING = YES
-XLIB_LIBXFONT_DEPENDANCIES = freetype xlib_libfontenc xlib_xtrans xproto_fontcacheproto xproto_fontsproto xproto_xproto xfont_encodings
+XLIB_LIBXFONT_DEPENDENCIES = freetype xlib_libfontenc xlib_xtrans xproto_fontcacheproto xproto_fontsproto xproto_xproto xfont_encodings
 XLIB_LIBXFONT_CONF_OPT = --enable-shared --disable-static
 
 $(eval $(call AUTOTARGETS,xlib_libXfont))
diff --git a/package/x11r7/xlib_libXfontcache/xlib_libXfontcache.mk b/package/x11r7/xlib_libXfontcache/xlib_libXfontcache.mk
index 99b702935..d969b27bc 100644
--- a/package/x11r7/xlib_libXfontcache/xlib_libXfontcache.mk
+++ b/package/x11r7/xlib_libXfontcache/xlib_libXfontcache.mk
@@ -9,7 +9,7 @@ XLIB_LIBXFONTCACHE_SOURCE = libXfontcache-$(XLIB_LIBXFONTCACHE_VERSION).tar.bz2
 XLIB_LIBXFONTCACHE_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXFONTCACHE_AUTORECONF = YES
 XLIB_LIBXFONTCACHE_INSTALL_STAGING = YES
-XLIB_LIBXFONTCACHE_DEPENDANCIES = xlib_libX11 xlib_libXext xproto_fontcacheproto
+XLIB_LIBXFONTCACHE_DEPENDENCIES = xlib_libX11 xlib_libXext xproto_fontcacheproto
 XLIB_LIBXFONTCACHE_CONF_OPT = --disable-malloc0returnsnull --enable-shared --disable-static
 
 $(eval $(call AUTOTARGETS,xlib_libXfontcache))
diff --git a/package/x11r7/xlib_libXft/xlib_libXft.mk b/package/x11r7/xlib_libXft/xlib_libXft.mk
index 1d9290a7e..be2ed4ffd 100644
--- a/package/x11r7/xlib_libXft/xlib_libXft.mk
+++ b/package/x11r7/xlib_libXft/xlib_libXft.mk
@@ -9,7 +9,7 @@ XLIB_LIBXFT_SOURCE = libXft-$(XLIB_LIBXFT_VERSION).tar.bz2
 XLIB_LIBXFT_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXFT_AUTORECONF = YES
 XLIB_LIBXFT_INSTALL_STAGING = YES
-XLIB_LIBXFT_DEPENDANCIES = fontconfig freetype xlib_libX11 xlib_libXext xlib_libXrender xproto_xproto
+XLIB_LIBXFT_DEPENDENCIES = fontconfig freetype xlib_libX11 xlib_libXext xlib_libXrender xproto_xproto
 XLIB_LIBXFT_CONF_OPT = --enable-shared --disable-static
 
 $(eval $(call AUTOTARGETS,xlib_libXft))
diff --git a/package/x11r7/xlib_libXi/xlib_libXi.mk b/package/x11r7/xlib_libXi/xlib_libXi.mk
index b2b6a9e54..d7f9da90a 100644
--- a/package/x11r7/xlib_libXi/xlib_libXi.mk
+++ b/package/x11r7/xlib_libXi/xlib_libXi.mk
@@ -9,7 +9,7 @@ XLIB_LIBXI_SOURCE = libXi-$(XLIB_LIBXI_VERSION).tar.bz2
 XLIB_LIBXI_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXI_AUTORECONF = YES
 XLIB_LIBXI_INSTALL_STAGING = YES
-XLIB_LIBXI_DEPENDANCIES = xproto_inputproto xlib_libX11 xlib_libXext xproto_xproto
+XLIB_LIBXI_DEPENDENCIES = xproto_inputproto xlib_libX11 xlib_libXext xproto_xproto
 XLIB_LIBXI_CONF_OPT = --disable-malloc0returnsnull --enable-shared --disable-static
 
 $(eval $(call AUTOTARGETS,xlib_libXi))
diff --git a/package/x11r7/xlib_libXinerama/xlib_libXinerama.mk b/package/x11r7/xlib_libXinerama/xlib_libXinerama.mk
index 80d5c6ff6..579abd5ad 100644
--- a/package/x11r7/xlib_libXinerama/xlib_libXinerama.mk
+++ b/package/x11r7/xlib_libXinerama/xlib_libXinerama.mk
@@ -9,7 +9,7 @@ XLIB_LIBXINERAMA_SOURCE = libXinerama-$(XLIB_LIBXINERAMA_VERSION).tar.bz2
 XLIB_LIBXINERAMA_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXINERAMA_AUTORECONF = YES
 XLIB_LIBXINERAMA_INSTALL_STAGING = YES
-XLIB_LIBXINERAMA_DEPENDANCIES = xlib_libX11 xlib_libXext xproto_xineramaproto
+XLIB_LIBXINERAMA_DEPENDENCIES = xlib_libX11 xlib_libXext xproto_xineramaproto
 XLIB_LIBXINERAMA_CONF_OPT = --disable-malloc0returnsnull --enable-shared --disable-static
 
 $(eval $(call AUTOTARGETS,xlib_libXinerama))
diff --git a/package/x11r7/xlib_libXmu/xlib_libXmu.mk b/package/x11r7/xlib_libXmu/xlib_libXmu.mk
index e17832eed..4fd6b7959 100644
--- a/package/x11r7/xlib_libXmu/xlib_libXmu.mk
+++ b/package/x11r7/xlib_libXmu/xlib_libXmu.mk
@@ -9,7 +9,7 @@ XLIB_LIBXMU_SOURCE = libXmu-$(XLIB_LIBXMU_VERSION).tar.bz2
 XLIB_LIBXMU_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXMU_AUTORECONF = YES
 XLIB_LIBXMU_INSTALL_STAGING = YES
-XLIB_LIBXMU_DEPENDANCIES = xlib_libX11 xlib_libXext xlib_libXt xproto_xproto
+XLIB_LIBXMU_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXt xproto_xproto
 XLIB_LIBXMU_CONF_OPT = --enable-shared --disable-static
 
 $(eval $(call AUTOTARGETS,xlib_libXmu))
diff --git a/package/x11r7/xlib_libXp/xlib_libXp.mk b/package/x11r7/xlib_libXp/xlib_libXp.mk
index 38cae343d..e1ad8aade 100644
--- a/package/x11r7/xlib_libXp/xlib_libXp.mk
+++ b/package/x11r7/xlib_libXp/xlib_libXp.mk
@@ -9,7 +9,7 @@ XLIB_LIBXP_SOURCE = libXp-$(XLIB_LIBXP_VERSION).tar.bz2
 XLIB_LIBXP_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXP_AUTORECONF = YES
 XLIB_LIBXP_INSTALL_STAGING = YES
-XLIB_LIBXP_DEPENDANCIES = xlib_libX11 xlib_libXau xlib_libXext xproto_printproto
+XLIB_LIBXP_DEPENDENCIES = xlib_libX11 xlib_libXau xlib_libXext xproto_printproto
 XLIB_LIBXP_CONF_OPT = --disable-malloc0returnsnull --enable-shared --disable-static
 
 $(eval $(call AUTOTARGETS,xlib_libXp))
diff --git a/package/x11r7/xlib_libXpm/xlib_libXpm.mk b/package/x11r7/xlib_libXpm/xlib_libXpm.mk
index 7a7bec781..65a4e50f6 100644
--- a/package/x11r7/xlib_libXpm/xlib_libXpm.mk
+++ b/package/x11r7/xlib_libXpm/xlib_libXpm.mk
@@ -9,7 +9,7 @@ XLIB_LIBXPM_SOURCE = libXpm-$(XLIB_LIBXPM_VERSION).tar.bz2
 XLIB_LIBXPM_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXPM_AUTORECONF = YES
 XLIB_LIBXPM_INSTALL_STAGING = YES
-XLIB_LIBXPM_DEPENDANCIES = xlib_libX11 xlib_libXext xlib_libXt xproto_xproto
+XLIB_LIBXPM_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXt xproto_xproto
 XLIB_LIBXPM_CONF_OPT = --enable-shared --disable-static
 
 $(eval $(call AUTOTARGETS,xlib_libXpm))
diff --git a/package/x11r7/xlib_libXprintAppUtil/xlib_libXprintAppUtil.mk b/package/x11r7/xlib_libXprintAppUtil/xlib_libXprintAppUtil.mk
index 2ac8562f1..d9e69cdd7 100644
--- a/package/x11r7/xlib_libXprintAppUtil/xlib_libXprintAppUtil.mk
+++ b/package/x11r7/xlib_libXprintAppUtil/xlib_libXprintAppUtil.mk
@@ -9,7 +9,7 @@ XLIB_LIBXPRINTAPPUTIL_SOURCE = libXprintAppUtil-$(XLIB_LIBXPRINTAPPUTIL_VERSION)
 XLIB_LIBXPRINTAPPUTIL_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXPRINTAPPUTIL_AUTORECONF = YES
 XLIB_LIBXPRINTAPPUTIL_INSTALL_STAGING = YES
-XLIB_LIBXPRINTAPPUTIL_DEPENDANCIES = xlib_libX11 xlib_libXp xlib_libXprintUtil
+XLIB_LIBXPRINTAPPUTIL_DEPENDENCIES = xlib_libX11 xlib_libXp xlib_libXprintUtil
 XLIB_LIBXPRINTAPPUTIL_CONF_OPT = --enable-shared --disable-static
 
 $(eval $(call AUTOTARGETS,xlib_libXprintAppUtil))
diff --git a/package/x11r7/xlib_libXprintUtil/xlib_libXprintUtil.mk b/package/x11r7/xlib_libXprintUtil/xlib_libXprintUtil.mk
index 19fdeaf9b..a70379dfb 100644
--- a/package/x11r7/xlib_libXprintUtil/xlib_libXprintUtil.mk
+++ b/package/x11r7/xlib_libXprintUtil/xlib_libXprintUtil.mk
@@ -9,7 +9,7 @@ XLIB_LIBXPRINTUTIL_SOURCE = libXprintUtil-$(XLIB_LIBXPRINTUTIL_VERSION).tar.bz2
 XLIB_LIBXPRINTUTIL_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXPRINTUTIL_AUTORECONF = YES
 XLIB_LIBXPRINTUTIL_INSTALL_STAGING = YES
-XLIB_LIBXPRINTUTIL_DEPENDANCIES = xlib_libX11 xlib_libXp xlib_libXt xproto_printproto
+XLIB_LIBXPRINTUTIL_DEPENDENCIES = xlib_libX11 xlib_libXp xlib_libXt xproto_printproto
 XLIB_LIBXPRINTUTIL_CONF_OPT = --enable-shared --disable-static
 
 $(eval $(call AUTOTARGETS,xlib_libXprintUtil))
diff --git a/package/x11r7/xlib_libXrandr/xlib_libXrandr.mk b/package/x11r7/xlib_libXrandr/xlib_libXrandr.mk
index 69285e184..b23057977 100644
--- a/package/x11r7/xlib_libXrandr/xlib_libXrandr.mk
+++ b/package/x11r7/xlib_libXrandr/xlib_libXrandr.mk
@@ -9,7 +9,7 @@ XLIB_LIBXRANDR_SOURCE = libXrandr-$(XLIB_LIBXRANDR_VERSION).tar.bz2
 XLIB_LIBXRANDR_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXRANDR_AUTORECONF = YES
 XLIB_LIBXRANDR_INSTALL_STAGING = YES
-XLIB_LIBXRANDR_DEPENDANCIES = xproto_randrproto xlib_libX11 xlib_libXext xlib_libXrender xproto_renderproto xproto_xproto
+XLIB_LIBXRANDR_DEPENDENCIES = xproto_randrproto xlib_libX11 xlib_libXext xlib_libXrender xproto_renderproto xproto_xproto
 XLIB_LIBXRANDR_CONF_OPT = --disable-malloc0returnsnull --enable-shared --disable-static
 
 $(eval $(call AUTOTARGETS,xlib_libXrandr))
diff --git a/package/x11r7/xlib_libXrender/xlib_libXrender.mk b/package/x11r7/xlib_libXrender/xlib_libXrender.mk
index 2e3858b9f..75289672b 100644
--- a/package/x11r7/xlib_libXrender/xlib_libXrender.mk
+++ b/package/x11r7/xlib_libXrender/xlib_libXrender.mk
@@ -9,7 +9,7 @@ XLIB_LIBXRENDER_SOURCE = libXrender-$(XLIB_LIBXRENDER_VERSION).tar.bz2
 XLIB_LIBXRENDER_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXRENDER_AUTORECONF = YES
 XLIB_LIBXRENDER_INSTALL_STAGING = YES
-XLIB_LIBXRENDER_DEPENDANCIES = xlib_libX11 xproto_renderproto xproto_xproto
+XLIB_LIBXRENDER_DEPENDENCIES = xlib_libX11 xproto_renderproto xproto_xproto
 XLIB_LIBXRENDER_CONF_OPT = --disable-malloc0returnsnull --enable-shared --disable-static
 
 $(eval $(call AUTOTARGETS,xlib_libXrender))
diff --git a/package/x11r7/xlib_libXres/xlib_libXres.mk b/package/x11r7/xlib_libXres/xlib_libXres.mk
index 53bd6327c..b63350e58 100644
--- a/package/x11r7/xlib_libXres/xlib_libXres.mk
+++ b/package/x11r7/xlib_libXres/xlib_libXres.mk
@@ -9,7 +9,7 @@ XLIB_LIBXRES_SOURCE = libXres-$(XLIB_LIBXRES_VERSION).tar.bz2
 XLIB_LIBXRES_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXRES_AUTORECONF = YES
 XLIB_LIBXRES_INSTALL_STAGING = YES
-XLIB_LIBXRES_DEPENDANCIES = xlib_libX11 xlib_libXext xproto_resourceproto xproto_xproto
+XLIB_LIBXRES_DEPENDENCIES = xlib_libX11 xlib_libXext xproto_resourceproto xproto_xproto
 XLIB_LIBXRES_CONF_OPT = --disable-malloc0returnsnull --enable-shared --disable-static
 
 $(eval $(call AUTOTARGETS,xlib_libXres))
diff --git a/package/x11r7/xlib_libXt/xlib_libXt.mk b/package/x11r7/xlib_libXt/xlib_libXt.mk
index 828e3810b..c02b1b1b5 100644
--- a/package/x11r7/xlib_libXt/xlib_libXt.mk
+++ b/package/x11r7/xlib_libXt/xlib_libXt.mk
@@ -9,7 +9,7 @@ XLIB_LIBXT_SOURCE = libXt-$(XLIB_LIBXT_VERSION).tar.bz2
 XLIB_LIBXT_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXT_AUTORECONF = YES
 XLIB_LIBXT_INSTALL_STAGING = YES
-XLIB_LIBXT_DEPENDANCIES = xlib_libSM xlib_libX11 xproto_kbproto xproto_xproto xcb-proto libxcb
+XLIB_LIBXT_DEPENDENCIES = xlib_libSM xlib_libX11 xproto_kbproto xproto_xproto xcb-proto libxcb
 XLIB_LIBXT_CONF_ENV = CC_FOR_BUILD="/usr/bin/gcc -I$(STAGING_DIR)/usr/include"
 XLIB_LIBXT_CONF_OPT = --disable-malloc0returnsnull --enable-shared --disable-static
 
diff --git a/package/x11r7/xlib_libXtst/xlib_libXtst.mk b/package/x11r7/xlib_libXtst/xlib_libXtst.mk
index cac9e23fe..a28636a2f 100644
--- a/package/x11r7/xlib_libXtst/xlib_libXtst.mk
+++ b/package/x11r7/xlib_libXtst/xlib_libXtst.mk
@@ -9,7 +9,7 @@ XLIB_LIBXTST_SOURCE = libXtst-$(XLIB_LIBXTST_VERSION).tar.bz2
 XLIB_LIBXTST_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXTST_AUTORECONF = YES
 XLIB_LIBXTST_INSTALL_STAGING = YES
-XLIB_LIBXTST_DEPENDANCIES = xlib_libX11 xlib_libXext xproto_recordproto
+XLIB_LIBXTST_DEPENDENCIES = xlib_libX11 xlib_libXext xproto_recordproto
 XLIB_LIBXTST_CONF_OPT = --enable-shared --disable-static
 
 $(eval $(call AUTOTARGETS,xlib_libXtst))
diff --git a/package/x11r7/xlib_libXv/xlib_libXv.mk b/package/x11r7/xlib_libXv/xlib_libXv.mk
index 9b2b44dd0..4709cf907 100644
--- a/package/x11r7/xlib_libXv/xlib_libXv.mk
+++ b/package/x11r7/xlib_libXv/xlib_libXv.mk
@@ -9,7 +9,7 @@ XLIB_LIBXV_SOURCE = libXv-$(XLIB_LIBXV_VERSION).tar.bz2
 XLIB_LIBXV_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXV_AUTORECONF = YES
 XLIB_LIBXV_INSTALL_STAGING = YES
-XLIB_LIBXV_DEPENDANCIES = xlib_libX11 xlib_libXext xproto_videoproto xproto_xproto
+XLIB_LIBXV_DEPENDENCIES = xlib_libX11 xlib_libXext xproto_videoproto xproto_xproto
 XLIB_LIBXV_CONF_OPT = --disable-malloc0returnsnull --enable-shared --disable-static
 
 $(eval $(call AUTOTARGETS,xlib_libXv))
diff --git a/package/x11r7/xlib_libXvMC/xlib_libXvMC.mk b/package/x11r7/xlib_libXvMC/xlib_libXvMC.mk
index 79392e425..2e05f07e3 100644
--- a/package/x11r7/xlib_libXvMC/xlib_libXvMC.mk
+++ b/package/x11r7/xlib_libXvMC/xlib_libXvMC.mk
@@ -9,7 +9,7 @@ XLIB_LIBXVMC_SOURCE = libXvMC-$(XLIB_LIBXVMC_VERSION).tar.bz2
 XLIB_LIBXVMC_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXVMC_AUTORECONF = YES
 XLIB_LIBXVMC_INSTALL_STAGING = YES
-XLIB_LIBXVMC_DEPENDANCIES = xlib_libX11 xlib_libXext xlib_libXv xproto_videoproto xproto_xproto
+XLIB_LIBXVMC_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXv xproto_videoproto xproto_xproto
 XLIB_LIBXVMC_CONF_OPT = --disable-malloc0returnsnull --enable-shared --disable-static
 
 $(eval $(call AUTOTARGETS,xlib_libXvMC))
diff --git a/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk b/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk
index a38e24d46..202219163 100644
--- a/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk
+++ b/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk
@@ -9,7 +9,7 @@ XLIB_LIBXXF86DGA_SOURCE = libXxf86dga-$(XLIB_LIBXXF86DGA_VERSION).tar.bz2
 XLIB_LIBXXF86DGA_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXXF86DGA_AUTORECONF = YES
 XLIB_LIBXXF86DGA_INSTALL_STAGING = YES
-XLIB_LIBXXF86DGA_DEPENDANCIES = xlib_libX11 xlib_libXext xproto_xf86dgaproto xproto_xproto
+XLIB_LIBXXF86DGA_DEPENDENCIES = xlib_libX11 xlib_libXext xproto_xf86dgaproto xproto_xproto
 XLIB_LIBXXF86DGA_CONF_OPT = --disable-malloc0returnsnull --enable-shared --disable-static
 
 $(eval $(call AUTOTARGETS,xlib_libXxf86dga))
diff --git a/package/x11r7/xlib_libXxf86misc/xlib_libXxf86misc.mk b/package/x11r7/xlib_libXxf86misc/xlib_libXxf86misc.mk
index 441b6f79d..3f344052c 100644
--- a/package/x11r7/xlib_libXxf86misc/xlib_libXxf86misc.mk
+++ b/package/x11r7/xlib_libXxf86misc/xlib_libXxf86misc.mk
@@ -9,7 +9,7 @@ XLIB_LIBXXF86MISC_SOURCE = libXxf86misc-$(XLIB_LIBXXF86MISC_VERSION).tar.bz2
 XLIB_LIBXXF86MISC_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXXF86MISC_AUTORECONF = YES
 XLIB_LIBXXF86MISC_INSTALL_STAGING = YES
-XLIB_LIBXXF86MISC_DEPENDANCIES = xlib_libX11 xlib_libXext xproto_xf86miscproto xproto_xproto
+XLIB_LIBXXF86MISC_DEPENDENCIES = xlib_libX11 xlib_libXext xproto_xf86miscproto xproto_xproto
 XLIB_LIBXXF86MISC_CONF_OPT = --disable-malloc0returnsnull --enable-shared --disable-static
 
 $(eval $(call AUTOTARGETS,xlib_libXxf86misc))
diff --git a/package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk b/package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk
index 538613116..32c27caae 100644
--- a/package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk
+++ b/package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk
@@ -9,7 +9,7 @@ XLIB_LIBXXF86VM_SOURCE = libXxf86vm-$(XLIB_LIBXXF86VM_VERSION).tar.bz2
 XLIB_LIBXXF86VM_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXXF86VM_AUTORECONF = YES
 XLIB_LIBXXF86VM_INSTALL_STAGING = YES
-XLIB_LIBXXF86VM_DEPENDANCIES = xlib_libX11 xlib_libXext xproto_xf86vidmodeproto xproto_xproto
+XLIB_LIBXXF86VM_DEPENDENCIES = xlib_libX11 xlib_libXext xproto_xf86vidmodeproto xproto_xproto
 XLIB_LIBXXF86VM_CONF_OPT = --disable-malloc0returnsnull --enable-shared --disable-static
 
 $(eval $(call AUTOTARGETS,xlib_libXxf86vm))
diff --git a/package/x11r7/xlib_libdmx/xlib_libdmx.mk b/package/x11r7/xlib_libdmx/xlib_libdmx.mk
index 3b72c8d2d..7a29c5891 100644
--- a/package/x11r7/xlib_libdmx/xlib_libdmx.mk
+++ b/package/x11r7/xlib_libdmx/xlib_libdmx.mk
@@ -9,7 +9,7 @@ XLIB_LIBDMX_SOURCE = libdmx-$(XLIB_LIBDMX_VERSION).tar.bz2
 XLIB_LIBDMX_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBDMX_AUTORECONF = YES
 XLIB_LIBDMX_INSTALL_STAGING = YES
-XLIB_LIBDMX_DEPENDANCIES = xlib_libX11 xlib_libXext xproto_dmxproto
+XLIB_LIBDMX_DEPENDENCIES = xlib_libX11 xlib_libXext xproto_dmxproto
 XLIB_LIBDMX_CONF_OPT = --disable-malloc0returnsnull --enable-shared --disable-static
 
 $(eval $(call AUTOTARGETS,xlib_libdmx))
diff --git a/package/x11r7/xlib_libfontenc/xlib_libfontenc.mk b/package/x11r7/xlib_libfontenc/xlib_libfontenc.mk
index 06ce711f3..6672d282d 100644
--- a/package/x11r7/xlib_libfontenc/xlib_libfontenc.mk
+++ b/package/x11r7/xlib_libfontenc/xlib_libfontenc.mk
@@ -9,7 +9,7 @@ XLIB_LIBFONTENC_SOURCE = libfontenc-$(XLIB_LIBFONTENC_VERSION).tar.bz2
 XLIB_LIBFONTENC_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBFONTENC_AUTORECONF = YES
 XLIB_LIBFONTENC_INSTALL_STAGING = YES
-XLIB_LIBFONTENC_DEPENDANCIES = xproto_xproto
+XLIB_LIBFONTENC_DEPENDENCIES = xproto_xproto
 XLIB_LIBFONTENC_CONF_OPT = --enable-shared --disable-static
 
 $(eval $(call AUTOTARGETS,xlib_libfontenc))
diff --git a/package/x11r7/xlib_liblbxutil/xlib_liblbxutil.mk b/package/x11r7/xlib_liblbxutil/xlib_liblbxutil.mk
index de1ca6d26..aefaf50da 100644
--- a/package/x11r7/xlib_liblbxutil/xlib_liblbxutil.mk
+++ b/package/x11r7/xlib_liblbxutil/xlib_liblbxutil.mk
@@ -9,7 +9,7 @@ XLIB_LIBLBXUTIL_SOURCE = liblbxutil-$(XLIB_LIBLBXUTIL_VERSION).tar.bz2
 XLIB_LIBLBXUTIL_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBLBXUTIL_AUTORECONF = YES
 XLIB_LIBLBXUTIL_INSTALL_STAGING = YES
-XLIB_LIBLBXUTIL_DEPENDANCIES = xproto_xextproto
+XLIB_LIBLBXUTIL_DEPENDENCIES = xproto_xextproto
 XLIB_LIBLBXUTIL_CONF_OPT = --enable-shared --disable-static
 
 $(eval $(call AUTOTARGETS,xlib_liblbxutil))
diff --git a/package/x11r7/xlib_liboldX/xlib_liboldX.mk b/package/x11r7/xlib_liboldX/xlib_liboldX.mk
index 1b70041ac..5c5df0819 100644
--- a/package/x11r7/xlib_liboldX/xlib_liboldX.mk
+++ b/package/x11r7/xlib_liboldX/xlib_liboldX.mk
@@ -9,7 +9,7 @@ XLIB_LIBOLDX_SOURCE = liboldX-$(XLIB_LIBOLDX_VERSION).tar.bz2
 XLIB_LIBOLDX_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBOLDX_AUTORECONF = YES
 XLIB_LIBOLDX_INSTALL_STAGING = YES
-XLIB_LIBOLDX_DEPENDANCIES = xlib_libX11
+XLIB_LIBOLDX_DEPENDENCIES = xlib_libX11
 XLIB_LIBOLDX_CONF_OPT = --disable-malloc0returnsnull --enable-shared --disable-static
 
 $(eval $(call AUTOTARGETS,xlib_liboldX))
diff --git a/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk b/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk
index 37f98b025..7843fd17f 100644
--- a/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk
+++ b/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk
@@ -9,7 +9,7 @@ XLIB_LIBXKBFILE_SOURCE = libxkbfile-$(XLIB_LIBXKBFILE_VERSION).tar.bz2
 XLIB_LIBXKBFILE_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXKBFILE_AUTORECONF = YES
 XLIB_LIBXKBFILE_INSTALL_STAGING = YES
-XLIB_LIBXKBFILE_DEPENDANCIES = xlib_libX11 xproto_kbproto
+XLIB_LIBXKBFILE_DEPENDENCIES = xlib_libX11 xproto_kbproto
 XLIB_LIBXKBFILE_CONF_OPT = --enable-shared --disable-static
 
 $(eval $(call AUTOTARGETS,xlib_libxkbfile))
diff --git a/package/x11r7/xlib_libxkbui/xlib_libxkbui.mk b/package/x11r7/xlib_libxkbui/xlib_libxkbui.mk
index c0224cc88..74820bfdd 100644
--- a/package/x11r7/xlib_libxkbui/xlib_libxkbui.mk
+++ b/package/x11r7/xlib_libxkbui/xlib_libxkbui.mk
@@ -9,7 +9,7 @@ XLIB_LIBXKBUI_SOURCE = libxkbui-$(XLIB_LIBXKBUI_VERSION).tar.bz2
 XLIB_LIBXKBUI_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXKBUI_AUTORECONF = YES
 XLIB_LIBXKBUI_INSTALL_STAGING = YES
-XLIB_LIBXKBUI_DEPENDANCIES = xlib_libxkbfile xlib_libXt xproto_kbproto
+XLIB_LIBXKBUI_DEPENDENCIES = xlib_libxkbfile xlib_libXt xproto_kbproto
 XLIB_LIBXKBUI_CONF_OPT = --enable-shared --disable-static
 
 $(eval $(call AUTOTARGETS,xlib_libxkbui))
diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
index ae8183dd0..78f6d5ba4 100644
--- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
+++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
@@ -9,7 +9,7 @@ XSERVER_XORG_SERVER_SOURCE = xorg-server-$(XSERVER_XORG_SERVER_VERSION).tar.bz2
 XSERVER_XORG_SERVER_SITE = http://xorg.freedesktop.org/releases/individual/xserver
 XSERVER_XORG_SERVER_AUTORECONF = YES
 XSERVER_XORG_SERVER_INSTALL_STAGING = YES
-XSERVER_XORG_SERVER_DEPENDANCIES = xlib_libXfont libdrm xlib_libxkbui xproto_compositeproto xproto_damageproto xproto_fixesproto xproto_glproto xproto_kbproto xproto_randrproto freetype xlib_libX11 xlib_libXau xlib_libXaw xlib_libXdmcp xlib_libXext xlib_libXfixes xlib_libXi xlib_libXmu xlib_libXpm xlib_libXrender xlib_libXres xlib_libXtst xlib_libXxf86misc xlib_libXxf86vm xlib_liblbxutil xlib_libxkbfile xlib_xtrans xdata_xbitmaps xproto_bigreqsproto xproto_evieext xproto_fontsproto xproto_inputproto xproto_recordproto xproto_renderproto xproto_resourceproto xproto_trapproto xproto_videoproto xproto_xcmiscproto xproto_xextproto xproto_xf86bigfontproto xproto_xf86dgaproto xproto_xf86driproto xproto_xf86miscproto xproto_xf86rushproto xproto_xf86vidmodeproto xproto_xproto
+XSERVER_XORG_SERVER_DEPENDENCIES = xlib_libXfont libdrm xlib_libxkbui xproto_compositeproto xproto_damageproto xproto_fixesproto xproto_glproto xproto_kbproto xproto_randrproto freetype xlib_libX11 xlib_libXau xlib_libXaw xlib_libXdmcp xlib_libXext xlib_libXfixes xlib_libXi xlib_libXmu xlib_libXpm xlib_libXrender xlib_libXres xlib_libXtst xlib_libXxf86misc xlib_libXxf86vm xlib_liblbxutil xlib_libxkbfile xlib_xtrans xdata_xbitmaps xproto_bigreqsproto xproto_evieext xproto_fontsproto xproto_inputproto xproto_recordproto xproto_renderproto xproto_resourceproto xproto_trapproto xproto_videoproto xproto_xcmiscproto xproto_xextproto xproto_xf86bigfontproto xproto_xf86dgaproto xproto_xf86driproto xproto_xf86miscproto xproto_xf86rushproto xproto_xf86vidmodeproto xproto_xproto
 XSERVER_XORG_SERVER_CONF_OPT = --disable-xprint --disable-xinerama --disable-xnest --disable-xvfb --disable-dmx --enable-dri --disable-xdmcp --disable-screensaver
 
 $(eval $(call AUTOTARGETS,xserver_xorg-server))