- global whitespace trimming

28 files changed, 52 insertions, 52 deletions

diff --git a/package/x11r7/mesa3d/mesa3d.mk b/package/x11r7/mesa3d/mesa3d.mk
index 476b9ed75..35dfea60f 100644
--- a/package/x11r7/mesa3d/mesa3d.mk
+++ b/package/x11r7/mesa3d/mesa3d.mk
@@ -59,15 +59,15 @@ $(MESA3D_DIR)/.installed: $(MESA3D_DIR)/.built
 	rm -Rf $(TARGET_DIR)/usr/include/GL
 	touch $@
 
-mesa3d-depends:   xproto_glproto xproto_xf86vidmodeproto xlib_libXxf86vm xlib_libXmu xlib_libXdamage libdrm
-mesa3d-source:    $(DL_DIR)/$(MESA3D_SOURCE)
+mesa3d-depends: xproto_glproto xproto_xf86vidmodeproto xlib_libXxf86vm xlib_libXmu xlib_libXdamage libdrm
+mesa3d-source: $(DL_DIR)/$(MESA3D_SOURCE)
 mesa3d-configure: $(MESA3D_DIR)/.configured
-mesa3d-build:     $(MESA3D_DIR)/.built
-mesa3d:           mesa3d-depends $(MESA3D_DIR)/.installed	
+mesa3d-build: $(MESA3D_DIR)/.built
+mesa3d: mesa3d-depends $(MESA3D_DIR)/.installed
 
 mesa3d-clean:
 	$(MAKE) prefix=$(STAGING_DIR)/usr -C $(MESA3D_DIR) uninstall
-	$(MAKE) prefix=$(TARGET_DIR)/usr  -C $(MESA3D_DIR) uninstall
+	$(MAKE) prefix=$(TARGET_DIR)/usr -C $(MESA3D_DIR) uninstall
 	-$(MAKE) -C $(MESA3D_DIR) clean
 
 mesa3d-dirclean:
diff --git a/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk b/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk
index 479675f59..82d700460 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_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
 
 $(eval $(call AUTOTARGETS,xapp_xdpyinfo))
diff --git a/package/x11r7/xapp_xman/xapp_xman.mk b/package/x11r7/xapp_xman/xapp_xman.mk
index 5e06bc410..ee5866e56 100644
--- a/package/x11r7/xapp_xman/xapp_xman.mk
+++ b/package/x11r7/xapp_xman/xapp_xman.mk
@@ -29,7 +29,7 @@ $(XAPP_XMAN_DIR)/.configured: $(XAPP_XMAN_DIR)/.patched
 		CFLAGS="$(TARGET_CFLAGS)" \
 		LDFLAGS="$(TARGET_LDFLAGS)" \
 		STAGING_DIR=$(STAGING_DIR) \
-		 \
+ \
 		./configure \
 		--target=$(GNU_TARGET_NAME) \
 		--host=$(GNU_TARGET_NAME) \
@@ -40,24 +40,24 @@ $(XAPP_XMAN_DIR)/.configured: $(XAPP_XMAN_DIR)/.patched
 		--disable-static \
 		--disable-IPv6 \
 		$(DISABLE_NLS) \
-		 \
+ \
 	)
 	touch $@
 
 $(XAPP_XMAN_DIR)/.built: $(XAPP_XMAN_DIR)/.configured
-	$(MAKE) CC=$(TARGET_CC) CXX=$(TARGET_CC)  -C $(XAPP_XMAN_DIR)
+	$(MAKE) CC=$(TARGET_CC) CXX=$(TARGET_CC) -C $(XAPP_XMAN_DIR)
 	touch $@
 
 $(XAPP_XMAN_DIR)/.installed: $(XAPP_XMAN_DIR)/.built
-	$(MAKE) prefix=$(TARGET_DIR)/usr    -C $(XAPP_XMAN_DIR) install-exec
-	$(MAKE) prefix=$(STAGING_DIR)/usr  -C $(XAPP_XMAN_DIR) install
+	$(MAKE) prefix=$(TARGET_DIR)/usr -C $(XAPP_XMAN_DIR) install-exec
+	$(MAKE) prefix=$(STAGING_DIR)/usr -C $(XAPP_XMAN_DIR) install
 	toolchain/replace.sh $(STAGING_DIR)/usr/lib ".*\.la" "\(['= ]\)/usr" "\\1$(STAGING_DIR)/usr"
 	find $(TARGET_DIR)/usr -name '*.la' -print -delete
 	touch $@
 
 xapp_xman-clean:
-	$(MAKE) prefix=$(STAGING_DIR)/usr  -C $(XAPP_XMAN_DIR) uninstall
-	$(MAKE) prefix=$(TARGET_DIR)/usr    -C $(XAPP_XMAN_DIR) uninstall
+	$(MAKE) prefix=$(STAGING_DIR)/usr -C $(XAPP_XMAN_DIR) uninstall
+	$(MAKE) prefix=$(TARGET_DIR)/usr -C $(XAPP_XMAN_DIR) uninstall
 	-$(MAKE) -C $(XAPP_XMAN_DIR) clean
 	-rm $(XAPP_XMAN_DIR)/.installed
 	-rm $(XAPP_XMAN_DIR)/.built
@@ -65,11 +65,11 @@ xapp_xman-clean:
 xapp_xman-dirclean:
 	rm -rf $(XAPP_XMAN_DIR)
 
-xapp_xman-depends:   xlib_libXprintUtil xlib_libXprintUtil
-xapp_xman-source:    $(XAPP_XMAN_DIR)/.extracted
-xapp_xman-patch:     $(XAPP_XMAN_DIR)/.patched
+xapp_xman-depends: xlib_libXprintUtil xlib_libXprintUtil
+xapp_xman-source: $(XAPP_XMAN_DIR)/.extracted
+xapp_xman-patch: $(XAPP_XMAN_DIR)/.patched
 xapp_xman-configure: $(XAPP_XMAN_DIR)/.configured
-xapp_xman-build:     $(XAPP_XMAN_DIR)/.built
+xapp_xman-build: $(XAPP_XMAN_DIR)/.built
 
 xapp_xman: xapp_xman-depends $(XAPP_XMAN_DIR)/.installed
 
diff --git a/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk b/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk
index 3ae4410e4..f9140ca91 100644
--- a/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk
+++ b/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk
@@ -29,7 +29,7 @@ $(XDATA_XCURSOR_THEMES_DIR)/.configured: $(XDATA_XCURSOR_THEMES_DIR)/.patched
 		CFLAGS="$(TARGET_CFLAGS)" \
 		LDFLAGS="$(TARGET_LDFLAGS)" \
 		STAGING_DIR=$(STAGING_DIR) \
-		 \
+ \
 		./configure \
 		--target=$(GNU_TARGET_NAME) \
 		--host=$(GNU_TARGET_NAME) \
@@ -40,24 +40,24 @@ $(XDATA_XCURSOR_THEMES_DIR)/.configured: $(XDATA_XCURSOR_THEMES_DIR)/.patched
 		--disable-static \
 		--disable-IPv6 \
 		$(DISABLE_NLS) \
-		 \
+ \
 	)
 	touch $@
 
 $(XDATA_XCURSOR_THEMES_DIR)/.built: $(XDATA_XCURSOR_THEMES_DIR)/.configured
-	$(MAKE) CC=$(TARGET_CC) CXX=$(TARGET_CC)  -C $(XDATA_XCURSOR_THEMES_DIR)
+	$(MAKE) CC=$(TARGET_CC) CXX=$(TARGET_CC) -C $(XDATA_XCURSOR_THEMES_DIR)
 	touch $@
 
 $(XDATA_XCURSOR_THEMES_DIR)/.installed: $(XDATA_XCURSOR_THEMES_DIR)/.built
-	$(MAKE) prefix=$(TARGET_DIR)/usr    -C $(XDATA_XCURSOR_THEMES_DIR) install-exec
-	$(MAKE) prefix=$(STAGING_DIR)/usr  -C $(XDATA_XCURSOR_THEMES_DIR) install
+	$(MAKE) prefix=$(TARGET_DIR)/usr -C $(XDATA_XCURSOR_THEMES_DIR) install-exec
+	$(MAKE) prefix=$(STAGING_DIR)/usr -C $(XDATA_XCURSOR_THEMES_DIR) install
 	toolchain/replace.sh $(STAGING_DIR)/usr/lib ".*\.la" "\(['= ]\)/usr" "\\1$(STAGING_DIR)/usr"
 	find $(TARGET_DIR)/usr -name '*.la' -print -delete
 	touch $@
 
 xdata_xcursor-themes-clean:
-	$(MAKE) prefix=$(STAGING_DIR)/usr  -C $(XDATA_XCURSOR_THEMES_DIR) uninstall
-	$(MAKE) prefix=$(TARGET_DIR)/usr    -C $(XDATA_XCURSOR_THEMES_DIR) uninstall
+	$(MAKE) prefix=$(STAGING_DIR)/usr -C $(XDATA_XCURSOR_THEMES_DIR) uninstall
+	$(MAKE) prefix=$(TARGET_DIR)/usr -C $(XDATA_XCURSOR_THEMES_DIR) uninstall
 	-$(MAKE) -C $(XDATA_XCURSOR_THEMES_DIR) clean
 	-rm $(XDATA_XCURSOR_THEMES_DIR)/.installed
 	-rm $(XDATA_XCURSOR_THEMES_DIR)/.built
@@ -65,11 +65,11 @@ xdata_xcursor-themes-clean:
 xdata_xcursor-themes-dirclean:
 	rm -rf $(XDATA_XCURSOR_THEMES_DIR)
 
-xdata_xcursor-themes-depends:   
-xdata_xcursor-themes-source:    $(XDATA_XCURSOR_THEMES_DIR)/.extracted
-xdata_xcursor-themes-patch:     $(XDATA_XCURSOR_THEMES_DIR)/.patched
+xdata_xcursor-themes-depends:
+xdata_xcursor-themes-source: $(XDATA_XCURSOR_THEMES_DIR)/.extracted
+xdata_xcursor-themes-patch: $(XDATA_XCURSOR_THEMES_DIR)/.patched
 xdata_xcursor-themes-configure: $(XDATA_XCURSOR_THEMES_DIR)/.configured
-xdata_xcursor-themes-build:     $(XDATA_XCURSOR_THEMES_DIR)/.built
+xdata_xcursor-themes-build: $(XDATA_XCURSOR_THEMES_DIR)/.built
 
 xdata_xcursor-themes: xdata_xcursor-themes-depends $(XDATA_XCURSOR_THEMES_DIR)/.installed
 
diff --git a/package/x11r7/xfont_encodings/xfont_encodings.mk b/package/x11r7/xfont_encodings/xfont_encodings.mk
index 808f992c1..85a9afe11 100644
--- a/package/x11r7/xfont_encodings/xfont_encodings.mk
+++ b/package/x11r7/xfont_encodings/xfont_encodings.mk
@@ -8,6 +8,6 @@ XFONT_ENCODINGS_VERSION = 1.0.2
 XFONT_ENCODINGS_SOURCE = encodings-$(XFONT_ENCODINGS_VERSION).tar.bz2
 XFONT_ENCODINGS_SITE = http://xorg.freedesktop.org/releases/individual/font
 XFONT_ENCODINGS_AUTORECONF = YES
-XFONT_ENCODINGS_MAKE_OPT = 
+XFONT_ENCODINGS_MAKE_OPT =
 
 $(eval $(call AUTOTARGETS,xfont_encodings))
diff --git a/package/x11r7/xlib_libICE/xlib_libICE.mk b/package/x11r7/xlib_libICE/xlib_libICE.mk
index 1bfd39556..ad8bb7c35 100644
--- a/package/x11r7/xlib_libICE/xlib_libICE.mk
+++ b/package/x11r7/xlib_libICE/xlib_libICE.mk
@@ -10,6 +10,6 @@ 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_CONF_OPT =  --enable-shared --disable-static
+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 2bbf2dcfd..c3790c3e2 100644
--- a/package/x11r7/xlib_libSM/xlib_libSM.mk
+++ b/package/x11r7/xlib_libSM/xlib_libSM.mk
@@ -10,6 +10,6 @@ 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_CONF_OPT =  --enable-shared --disable-static
+XLIB_LIBSM_CONF_OPT = --enable-shared --disable-static
 
 $(eval $(call AUTOTARGETS,xlib_libSM))
diff --git a/package/x11r7/xlib_libXTrap/xlib_libXTrap.mk b/package/x11r7/xlib_libXTrap/xlib_libXTrap.mk
index 1ed7a62f0..388105673 100644
--- a/package/x11r7/xlib_libXTrap/xlib_libXTrap.mk
+++ b/package/x11r7/xlib_libXTrap/xlib_libXTrap.mk
@@ -10,6 +10,6 @@ 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_CONF_OPT =  --enable-shared --disable-static
+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 fd62c5e57..5a214b32a 100644
--- a/package/x11r7/xlib_libXau/xlib_libXau.mk
+++ b/package/x11r7/xlib_libXau/xlib_libXau.mk
@@ -10,6 +10,6 @@ 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_CONF_OPT =  --enable-shared --disable-static
+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 6eacaa761..b85ac2f7b 100644
--- a/package/x11r7/xlib_libXaw/xlib_libXaw.mk
+++ b/package/x11r7/xlib_libXaw/xlib_libXaw.mk
@@ -10,6 +10,6 @@ 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_CONF_OPT =  --enable-shared --disable-static
+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 0c0748635..f5704ca15 100644
--- a/package/x11r7/xlib_libXcomposite/xlib_libXcomposite.mk
+++ b/package/x11r7/xlib_libXcomposite/xlib_libXcomposite.mk
@@ -10,6 +10,6 @@ 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_CONF_OPT =  --enable-shared --disable-static
+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 681aa6853..c38556c29 100644
--- a/package/x11r7/xlib_libXcursor/xlib_libXcursor.mk
+++ b/package/x11r7/xlib_libXcursor/xlib_libXcursor.mk
@@ -10,6 +10,6 @@ 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_CONF_OPT =  --enable-shared --disable-static
+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 8f6b61a36..7d65a86d1 100644
--- a/package/x11r7/xlib_libXdamage/xlib_libXdamage.mk
+++ b/package/x11r7/xlib_libXdamage/xlib_libXdamage.mk
@@ -10,6 +10,6 @@ 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_CONF_OPT =  --enable-shared --disable-static
+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 ba191e5dc..c374dd5cb 100644
--- a/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk
+++ b/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk
@@ -10,6 +10,6 @@ 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_CONF_OPT =  --enable-shared --disable-static
+XLIB_LIBXDMCP_CONF_OPT = --enable-shared --disable-static
 
 $(eval $(call AUTOTARGETS,xlib_libXdmcp))
diff --git a/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk b/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk
index b7694063c..aec404452 100644
--- a/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk
+++ b/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk
@@ -10,6 +10,6 @@ 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_CONF_OPT =  --enable-shared --disable-static
+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 eef50e863..48cdbd396 100644
--- a/package/x11r7/xlib_libXfont/xlib_libXfont.mk
+++ b/package/x11r7/xlib_libXfont/xlib_libXfont.mk
@@ -10,6 +10,6 @@ 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_CONF_OPT =  --enable-shared --disable-static
+XLIB_LIBXFONT_CONF_OPT = --enable-shared --disable-static
 
 $(eval $(call AUTOTARGETS,xlib_libXfont))
diff --git a/package/x11r7/xlib_libXft/xlib_libXft.mk b/package/x11r7/xlib_libXft/xlib_libXft.mk
index 77afd4a72..1d9290a7e 100644
--- a/package/x11r7/xlib_libXft/xlib_libXft.mk
+++ b/package/x11r7/xlib_libXft/xlib_libXft.mk
@@ -10,6 +10,6 @@ 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_CONF_OPT =  --enable-shared --disable-static
+XLIB_LIBXFT_CONF_OPT = --enable-shared --disable-static
 
 $(eval $(call AUTOTARGETS,xlib_libXft))
diff --git a/package/x11r7/xlib_libXmu/xlib_libXmu.mk b/package/x11r7/xlib_libXmu/xlib_libXmu.mk
index 18c4b2d34..e17832eed 100644
--- a/package/x11r7/xlib_libXmu/xlib_libXmu.mk
+++ b/package/x11r7/xlib_libXmu/xlib_libXmu.mk
@@ -10,6 +10,6 @@ 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_CONF_OPT =  --enable-shared --disable-static
+XLIB_LIBXMU_CONF_OPT = --enable-shared --disable-static
 
 $(eval $(call AUTOTARGETS,xlib_libXmu))
diff --git a/package/x11r7/xlib_libXpm/xlib_libXpm.mk b/package/x11r7/xlib_libXpm/xlib_libXpm.mk
index aa00a6697..7a7bec781 100644
--- a/package/x11r7/xlib_libXpm/xlib_libXpm.mk
+++ b/package/x11r7/xlib_libXpm/xlib_libXpm.mk
@@ -10,6 +10,6 @@ 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_CONF_OPT =  --enable-shared --disable-static
+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 3c69c190e..2ac8562f1 100644
--- a/package/x11r7/xlib_libXprintAppUtil/xlib_libXprintAppUtil.mk
+++ b/package/x11r7/xlib_libXprintAppUtil/xlib_libXprintAppUtil.mk
@@ -10,6 +10,6 @@ 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_CONF_OPT =  --enable-shared --disable-static
+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 5eed49754..19fdeaf9b 100644
--- a/package/x11r7/xlib_libXprintUtil/xlib_libXprintUtil.mk
+++ b/package/x11r7/xlib_libXprintUtil/xlib_libXprintUtil.mk
@@ -10,6 +10,6 @@ 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_CONF_OPT =  --enable-shared --disable-static
+XLIB_LIBXPRINTUTIL_CONF_OPT = --enable-shared --disable-static
 
 $(eval $(call AUTOTARGETS,xlib_libXprintUtil))
diff --git a/package/x11r7/xlib_libXtst/xlib_libXtst.mk b/package/x11r7/xlib_libXtst/xlib_libXtst.mk
index d27b5321d..cac9e23fe 100644
--- a/package/x11r7/xlib_libXtst/xlib_libXtst.mk
+++ b/package/x11r7/xlib_libXtst/xlib_libXtst.mk
@@ -10,6 +10,6 @@ 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_CONF_OPT =  --enable-shared --disable-static
+XLIB_LIBXTST_CONF_OPT = --enable-shared --disable-static
 
 $(eval $(call AUTOTARGETS,xlib_libXtst))
diff --git a/package/x11r7/xlib_libfontenc/xlib_libfontenc.mk b/package/x11r7/xlib_libfontenc/xlib_libfontenc.mk
index 6e8e1e544..06ce711f3 100644
--- a/package/x11r7/xlib_libfontenc/xlib_libfontenc.mk
+++ b/package/x11r7/xlib_libfontenc/xlib_libfontenc.mk
@@ -10,6 +10,6 @@ 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_CONF_OPT =  --enable-shared --disable-static
+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 2f505c4c5..de1ca6d26 100644
--- a/package/x11r7/xlib_liblbxutil/xlib_liblbxutil.mk
+++ b/package/x11r7/xlib_liblbxutil/xlib_liblbxutil.mk
@@ -10,6 +10,6 @@ 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_CONF_OPT =  --enable-shared --disable-static
+XLIB_LIBLBXUTIL_CONF_OPT = --enable-shared --disable-static
 
 $(eval $(call AUTOTARGETS,xlib_liblbxutil))
diff --git a/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk b/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk
index fe195477c..37f98b025 100644
--- a/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk
+++ b/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk
@@ -10,6 +10,6 @@ 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_CONF_OPT =  --enable-shared --disable-static
+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 25643647f..c0224cc88 100644
--- a/package/x11r7/xlib_libxkbui/xlib_libxkbui.mk
+++ b/package/x11r7/xlib_libxkbui/xlib_libxkbui.mk
@@ -10,6 +10,6 @@ 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_CONF_OPT =  --enable-shared --disable-static
+XLIB_LIBXKBUI_CONF_OPT = --enable-shared --disable-static
 
 $(eval $(call AUTOTARGETS,xlib_libxkbui))
diff --git a/package/x11r7/xlib_xtrans/xlib_xtrans.mk b/package/x11r7/xlib_xtrans/xlib_xtrans.mk
index 7d4c3e388..897adf710 100644
--- a/package/x11r7/xlib_xtrans/xlib_xtrans.mk
+++ b/package/x11r7/xlib_xtrans/xlib_xtrans.mk
@@ -9,6 +9,6 @@ XLIB_XTRANS_SOURCE = xtrans-$(XLIB_XTRANS_VERSION).tar.bz2
 XLIB_XTRANS_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_XTRANS_AUTORECONF = YES
 XLIB_XTRANS_INSTALL_STAGING = YES
-XLIB_XTRANS_CONF_OPT =  --enable-shared --disable-static
+XLIB_XTRANS_CONF_OPT = --enable-shared --disable-static
 
 $(eval $(call AUTOTARGETS,xlib_xtrans))
diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
index 942456a68..ae8183dd0 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_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_CONF_OPT = --disable-xprint --disable-xinerama --disable-xnest --disable-xvfb --disable-dmx --enable-dri --disable-xdmcp --disable-screensaver
 
 $(eval $(call AUTOTARGETS,xserver_xorg-server))