Cleanup xorg packages dependencies.

Make all dependecies on proto packages build dependencies as those packages only contain header files. Let only the xservers depend on DISPLAY_SUPPORT. git-svn-id: svn://svn.openwrt.org/openwrt/packages@13460 3c298f89-4303-0410-b956-a3cf2f4a3e73
2008-12-01 23:07:01 +00:00 · 2008-12-01 23:07:01 +00:00 · 38d3e9283b
commit 38d3e9283b
parent 59fd287723
76 changed files with 312 additions and 288 deletions
--- a/Xorg/app/eterm/Makefile
+++ b/Xorg/app/eterm/Makefile
@ -1,5 +1,5 @@
-# 
-# Copyright (C) 2007 OpenWrt.org
+#
+# Copyright (C) 2007-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@ -28,7 +28,7 @@ endef
 define Package/eterm
 $(call Package/eterm/Default)  
  TITLE:=eterm
-  DEPENDS:=+libX11 +libXcursor +imlib2 +libast +libiconv @DISPLAY_SUPPORT
+  DEPENDS:=+libX11 +libXcursor +imlib2 +libast +libiconv
 endef

 define Package/esetroot
--- a/Xorg/app/fluxbox/Makefile
+++ b/Xorg/app/fluxbox/Makefile
@ -1,5 +1,5 @@
-# 
-# Copyright (C) 2007 OpenWrt.org
+#
+# Copyright (C) 2007-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@ -31,7 +31,7 @@ endef

 define Package/fluxbox
 $(call Package/fluxbox/Default)
-  DEPENDS:=+uclibcxx +libXt @DISPLAY_SUPPORT
+  DEPENDS:=+uclibcxx +libXt
  TITLE:=fluxbox window manager
  MENU:=1
 endef
--- a/Xorg/app/font-util/Makefile
+++ b/Xorg/app/font-util/Makefile
@ -1,5 +1,5 @@
-# 
-# Copyright (C) 2006 OpenWrt.org
+#
+# Copyright (C) 2006-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@ -22,7 +22,7 @@ define Package/font-util
  CATEGORY:=Xorg
  SUBMENU:=app
  TITLE:=misc tool to generate x fonts
-  DEPENDS:=+xserver @DISPLAY_SUPPORT
+  DEPENDS:=+xserver
 endef

 define Build/Configure
--- a/Xorg/app/fontconfig/Makefile
+++ b/Xorg/app/fontconfig/Makefile
@ -1,4 +1,4 @@
-# 
+#
 # Copyright (C) 2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
--- a/Xorg/app/iceauth/Makefile
+++ b/Xorg/app/iceauth/Makefile
@ -16,11 +16,7 @@ PKG_VERSION:=1.0.2
 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/app
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
-
-_DEPEND:=
-ifneq (iceauth,xinit)
-_DEPEND+=xorg-server-essentials
-endif
+PKG_BUILD_DEPENDS:=xproto

 include $(INCLUDE_DIR)/package.mk

@ -32,7 +28,7 @@ define Package/iceauth
  SECTION:=xorg-app
  CATEGORY:=Xorg
  SUBMENU:=app
-  DEPENDS:= @DISPLAY_SUPPORT
+  DEPENDS:=+libICE
  TITLE:=iceauth
  URL:=http://xorg.freedesktop.org/
 endef
@ -47,10 +43,4 @@ define Package/iceauth/install
 	rm -rf $(1)/usr/man/
 endef

-define Package/xinit/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/xinit $(1)/usr/bin/xinit
-	cd $(1)/usr/bin/; ln -s xinit startx
-endef
-
 $(eval $(call BuildPackage,iceauth))
--- a/Xorg/app/matchbox/Makefile
+++ b/Xorg/app/matchbox/Makefile
@ -1,5 +1,5 @@
-# 
-# Copyright (C) 2007 OpenWrt.org
+#
+# Copyright (C) 2007-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
--- a/Xorg/app/xcalc/Makefile
+++ b/Xorg/app/xcalc/Makefile
@ -1,10 +1,10 @@
-# 
-# Copyright (C) 2007 OpenWrt.org
+#
+# Copyright (C) 2007-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# blogic@openwrt.org 
+# blogic@openwrt.org

 include $(TOPDIR)/rules.mk

@ -22,7 +22,7 @@ define Package/xcalc
  SECTION:=xorg-app
  CATEGORY:=Xorg
  SUBMENU:=app
-  DEPENDS:=+libXaw @DISPLAY_SUPPORT
+  DEPENDS:=+libXaw
  TITLE:=xcalc
  URL:=http://xorg.freedesktop.org/
 endef
--- a/Xorg/app/xclipboard/Makefile
+++ b/Xorg/app/xclipboard/Makefile
@ -1,10 +1,10 @@
-# 
-# Copyright (C) 2007 OpenWrt.org
+#
+# Copyright (C) 2007-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# blogic@openwrt.org 
+# blogic@openwrt.org

 include $(TOPDIR)/rules.mk

@ -22,7 +22,7 @@ define Package/xclipboard
  SECTION:=xorg-app
  CATEGORY:=Xorg
  SUBMENU:=app
-  DEPENDS:=@DISPLAY_SUPPORT
+  DEPENDS:=
  TITLE:=xclipboard
  URL:=http://xorg.freedesktop.org/
 endef
--- a/Xorg/app/xdm/Makefile
+++ b/Xorg/app/xdm/Makefile
@ -1,10 +1,10 @@
-# 
-# Copyright (C) 2007 OpenWrt.org
+#
+# Copyright (C) 2007-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# blogic@openwrt.org 
+# blogic@openwrt.org

 include $(TOPDIR)/rules.mk

@ -22,7 +22,7 @@ define Package/xdm
  SECTION:=xorg-app
  CATEGORY:=Xorg
  SUBMENU:=app
-  DEPENDS:=@DISPLAY_SUPPORT
+  DEPENDS:=
  TITLE:=xdm
  URL:=http://xorg.freedesktop.org/
 endef
--- a/Xorg/app/xine-ui/Makefile
+++ b/Xorg/app/xine-ui/Makefile
@ -1,5 +1,5 @@
-# 
-# Copyright (C) 2006 OpenWrt.org
+#
+# Copyright (C) 2006-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
--- a/Xorg/app/xmessage/Makefile
+++ b/Xorg/app/xmessage/Makefile
@ -1,10 +1,10 @@
-# 
-# Copyright (C) 2007 OpenWrt.org
+#
+# Copyright (C) 2007-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# blogic@openwrt.org 
+# blogic@openwrt.org

 include $(TOPDIR)/rules.mk

@ -22,7 +22,7 @@ define Package/xmessage
  SECTION:=xorg-app
  CATEGORY:=Xorg
  SUBMENU:=app
-  DEPENDS:=@DISPLAY_SUPPORT
+  DEPENDS:=
  TITLE:=xmessage
  URL:=http://xorg.freedesktop.org/
 endef
--- a/Xorg/app/xset/Makefile
+++ b/Xorg/app/xset/Makefile
@ -25,7 +25,7 @@ define Package/xset
  SECTION:=xorg-app
  CATEGORY:=Xorg
  SUBMENU:=app
-  DEPENDS:=@DISPLAY_SUPPORT
+  DEPENDS:=
  TITLE:=xset
  URL:=http://xorg.freedesktop.org/
 endef
--- a/Xorg/app/xterm-233/Makefile
+++ b/Xorg/app/xterm-233/Makefile
@ -1,5 +1,5 @@
-# 
-# Copyright (C) 2007 OpenWrt.org
+#
+# Copyright (C) 2007-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@ -22,7 +22,7 @@ define Package/xterm
  CATEGORY:=Xorg
  SUBMENU:=terminals
  TITLE:=xterm
-  DEPENDS:=+libX11 +libncurses +libXaw @DISPLAY_SUPPORT
+  DEPENDS:=+libX11 +libncurses +libXaw
 endef

 define Build/Configure
--- a/Xorg/data/xbitmaps/Makefile
+++ b/Xorg/data/xbitmaps/Makefile
@ -1,9 +1,10 @@
-# 
+#
 # Copyright (C) 2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
+
 include $(TOPDIR)/rules.mk

 PKG_BASE_NAME:=xbitmaps
@ -12,9 +13,7 @@ PKG_RELEASE:=1
 PKG_VERSION:=1.0.1
 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/data/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
-
-#PKG_FIXUP = libtool
+PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/

 include $(INCLUDE_DIR)/package.mk

@ -22,7 +21,7 @@ define Package/xbitmaps
  SECTION:=xorg-data
  CATEGORY:=Xorg
  SUBMENU:=data
-  DEPENDS:=@DISPLAY_SUPPORT
+  DEPENDS:=
  TITLE:=xbitmaps
  URL:=http://xorg.freedesktop.org/
 endef
--- a/Xorg/driver/xf86-video-intel/Makefile
+++ b/Xorg/driver/xf86-video-intel/Makefile
@ -14,6 +14,7 @@ PKG_VERSION:=2.4.2
 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/driver
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
+PKG_BUILD_DEPENDS:=xf86driproto glproto

 include $(INCLUDE_DIR)/package.mk

--- a/Xorg/lib/libICE/Makefile
+++ b/Xorg/lib/libICE/Makefile
@ -1,10 +1,11 @@
-# 
-# Copyright (C) 2007 OpenWrt.org
+#
+# Copyright (C) 2007-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# blogic@openwrt.org 
+# blogic@openwrt.org
+
 include $(TOPDIR)/rules.mk

 PKG_BASE_NAME:=libICE
@ -13,7 +14,8 @@ PKG_RELEASE:=2
 PKG_VERSION:=1.0.4
 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
+PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
+PKG_BUILD_DEPENDS:=xproto

 include $(INCLUDE_DIR)/package.mk

@ -21,7 +23,7 @@ define Package/libICE
  SECTION:=xorg-lib
  CATEGORY:=Xorg
  SUBMENU:=lib
-  DEPENDS:= +xproto +xtrans @DISPLAY_SUPPORT
+  DEPENDS:=+xtrans
  TITLE:=libICE
  URL:=http://xorg.freedesktop.org/
 endef
--- a/Xorg/lib/libSM/Makefile
+++ b/Xorg/lib/libSM/Makefile
@ -1,10 +1,11 @@
-# 
-# Copyright (C) 2007 OpenWrt.org
+#
+# Copyright (C) 2007-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# blogic@openwrt.org 
+# blogic@openwrt.org
+
 include $(TOPDIR)/rules.mk

 PKG_BASE_NAME:=libSM
@ -13,7 +14,8 @@ PKG_RELEASE:=2
 PKG_VERSION:=1.0.3
 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
+PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
+PKG_BUILD_DEPENDS:=xproto

 include $(INCLUDE_DIR)/package.mk

@ -21,7 +23,7 @@ define Package/libSM
  SECTION:=xorg-lib
  CATEGORY:=Xorg
  SUBMENU:=lib
-  DEPENDS:= +xproto +xtrans +libICE @DISPLAY_SUPPORT
+  DEPENDS:=+xtrans +libICE
  TITLE:=libSM
  URL:=http://xorg.freedesktop.org/
 endef
--- a/Xorg/lib/libX11/Makefile
+++ b/Xorg/lib/libX11/Makefile
@ -1,10 +1,11 @@
-# 
-# Copyright (C) 2007 OpenWrt.org
+#
+# Copyright (C) 2007-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# blogic@openwrt.org 
+# blogic@openwrt.org
+
 include $(TOPDIR)/rules.mk

 PKG_BASE_NAME:=libX11
@ -13,7 +14,9 @@ PKG_RELEASE:=2
 PKG_VERSION:=1.1.5
 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
+PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
+PKG_BUILD_DEPENDS:=bigreqsproto xproto xextproto xcmiscproto xf86bigfontproto \
+                   kbproto inputproto

 include $(INCLUDE_DIR)/package.mk

@ -21,7 +24,7 @@ define Package/libX11
  SECTION:=xorg-lib
  CATEGORY:=Xorg
  SUBMENU:=lib
-  DEPENDS:=+bigreqsproto +xproto +xextproto +xtrans +xcmiscproto +libXdmcp +xf86bigfontproto +kbproto +inputproto +libXau @DISPLAY_SUPPORT
+  DEPENDS:=+xtrans +libXdmcp +libXau
  TITLE:=libX11
  URL:=http://xorg.freedesktop.org/
 endef
--- a/Xorg/lib/libXau/Makefile
+++ b/Xorg/lib/libXau/Makefile
@ -1,10 +1,11 @@
-# 
-# Copyright (C) 2007 OpenWrt.org
+#
+# Copyright (C) 2007-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# blogic@openwrt.org 
+# blogic@openwrt.org
+
 include $(TOPDIR)/rules.mk

 PKG_BASE_NAME:=libXau
@ -13,7 +14,8 @@ PKG_RELEASE:=2
 PKG_VERSION:=1.0.4
 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
+PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
+PKG_BUILD_DEPENDS:=xproto

 include $(INCLUDE_DIR)/package.mk

@ -21,7 +23,7 @@ define Package/libXau
  SECTION:=xorg-lib
  CATEGORY:=Xorg
  SUBMENU:=lib
-  DEPENDS:= +xproto @DISPLAY_SUPPORT
+  DEPENDS:=
  TITLE:=libXau
  URL:=http://xorg.freedesktop.org/
 endef
--- a/Xorg/lib/libXaw/Makefile
+++ b/Xorg/lib/libXaw/Makefile
@ -1,10 +1,11 @@
-# 
-# Copyright (C) 2007 OpenWrt.org
+#
+# Copyright (C) 2007-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# blogic@openwrt.org 
+# blogic@openwrt.org
+
 include $(TOPDIR)/rules.mk

 PKG_BASE_NAME:=libXaw
@ -13,7 +14,8 @@ PKG_RELEASE:=2
 PKG_VERSION:=1.0.4
 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
+PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
+PKG_BUILD_DEPENDS:=xproto xextproto printproto

 include $(INCLUDE_DIR)/package.mk

@ -21,7 +23,7 @@ define Package/libXaw
  SECTION:=xorg-lib
  CATEGORY:=Xorg
  SUBMENU:=lib
-  DEPENDS:= +xproto +libX11 +libXext +xextproto +libXt +libXmu +libXpm +printproto +libXau @DISPLAY_SUPPORT
+  DEPENDS:=+libX11 +libXext +libXt +libXmu +libXpm +libXau
  TITLE:=libXaw
  URL:=http://xorg.freedesktop.org/
 endef
--- a/Xorg/lib/libXcursor/Makefile
+++ b/Xorg/lib/libXcursor/Makefile
@ -1,10 +1,11 @@
-# 
-# Copyright (C) 2007 OpenWrt.org
+#
+# Copyright (C) 2007-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# blogic@openwrt.org 
+# blogic@openwrt.org
+
 include $(TOPDIR)/rules.mk

 PKG_BASE_NAME:=libXcursor
@ -13,7 +14,7 @@ PKG_RELEASE:=2
 PKG_VERSION:=1.1.9
 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
+PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/

 include $(INCLUDE_DIR)/package.mk

@ -21,7 +22,7 @@ define Package/libXcursor
  SECTION:=xorg-lib
  CATEGORY:=Xorg
  SUBMENU:=lib
-  DEPENDS:= +libXrender +libXfixes @DISPLAY_SUPPORT
+  DEPENDS:=+libXrender +libXfixes
  TITLE:=libXcursor
  URL:=http://xorg.freedesktop.org/
 endef
--- a/Xorg/lib/libXdmcp/Makefile
+++ b/Xorg/lib/libXdmcp/Makefile
@ -1,10 +1,11 @@
-# 
-# Copyright (C) 2007 OpenWrt.org
+#
+# Copyright (C) 2007-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# blogic@openwrt.org 
+# blogic@openwrt.org
+
 include $(TOPDIR)/rules.mk

 PKG_BASE_NAME:=libXdmcp
@ -13,7 +14,8 @@ PKG_RELEASE:=2
 PKG_VERSION:=1.0.2
 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
+PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
+PKG_BUILD_DEPENDS:=xproto

 include $(INCLUDE_DIR)/package.mk

@ -21,7 +23,7 @@ define Package/libXdmcp
  SECTION:=xorg-lib
  CATEGORY:=Xorg
  SUBMENU:=lib
-  DEPENDS:= +xproto @DISPLAY_SUPPORT
+  DEPENDS:=
  TITLE:=libXdmcp
  URL:=http://xorg.freedesktop.org/
 endef
--- a/Xorg/lib/libXext/Makefile
+++ b/Xorg/lib/libXext/Makefile
@ -1,10 +1,11 @@
-# 
-# Copyright (C) 2007 OpenWrt.org
+#
+# Copyright (C) 2007-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# blogic@openwrt.org 
+# blogic@openwrt.org
+
 include $(TOPDIR)/rules.mk

 PKG_BASE_NAME:=libXext
@ -13,7 +14,8 @@ PKG_RELEASE:=2
 PKG_VERSION:=1.0.4
 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
+PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
+PKG_BUILD_DEPENDS:=xproto xextproto

 include $(INCLUDE_DIR)/package.mk

@ -21,7 +23,7 @@ define Package/libXext
  SECTION:=xorg-lib
  CATEGORY:=Xorg
  SUBMENU:=lib
-  DEPENDS:= +xproto +xextproto +libX11 +libXau @DISPLAY_SUPPORT
+  DEPENDS:=+libX11 +libXau
  TITLE:=libXext
  URL:=http://xorg.freedesktop.org/
 endef
--- a/Xorg/lib/libXfixes/Makefile
+++ b/Xorg/lib/libXfixes/Makefile
@ -1,10 +1,11 @@
-# 
-# Copyright (C) 2007 OpenWrt.org
+#
+# Copyright (C) 2007-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# blogic@openwrt.org 
+# blogic@openwrt.org
+
 include $(TOPDIR)/rules.mk

 PKG_BASE_NAME:=libXfixes
@ -13,7 +14,8 @@ PKG_RELEASE:=2
 PKG_VERSION:=4.0.3
 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
+PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
+PKG_BUILD_DEPENDS:=xproto fixesproto xextproto

 include $(INCLUDE_DIR)/package.mk

@ -21,7 +23,7 @@ define Package/libXfixes
  SECTION:=xorg-lib
  CATEGORY:=Xorg
  SUBMENU:=lib
-  DEPENDS:= +xproto +fixesproto +xextproto +libX11 @DISPLAY_SUPPORT
+  DEPENDS:=+libX11
  TITLE:=libXfixes
  URL:=http://xorg.freedesktop.org/
 endef
--- a/Xorg/lib/libXfont/Makefile
+++ b/Xorg/lib/libXfont/Makefile
@ -1,10 +1,11 @@
-# 
-# Copyright (C) 2007 OpenWrt.org
+#
+# Copyright (C) 2007-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# blogic@openwrt.org 
+# blogic@openwrt.org
+
 include $(TOPDIR)/rules.mk

 PKG_BASE_NAME:=libXfont
@ -13,7 +14,8 @@ PKG_RELEASE:=2
 PKG_VERSION:=1.3.3
 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
+PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
+PKG_BUILD_DEPENDS:=xproto fontcacheproto fontsproto

 include $(INCLUDE_DIR)/package.mk

@ -21,7 +23,7 @@ define Package/libXfont
  SECTION:=xorg-lib
  CATEGORY:=Xorg
  SUBMENU:=lib
-  DEPENDS:= +zlib +xproto +xtrans +libfontenc +fontcacheproto +fontsproto +libfreetype @DISPLAY_SUPPORT
+  DEPENDS:= +zlib +xtrans +libfontenc +libfreetype
  TITLE:=libXfont
  URL:=http://xorg.freedesktop.org/
 endef
--- a/Xorg/lib/libXft/Makefile
+++ b/Xorg/lib/libXft/Makefile
@ -1,5 +1,5 @@
 # 
-# Copyright (C) 2007 OpenWrt.org
+# Copyright (C) 2007-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@ -13,7 +13,7 @@ PKG_RELEASE:=1
 PKG_VERSION:=2.1.13
 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
+PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/

 PKG_FIXUP=libtool

--- a/Xorg/lib/libXi/Makefile
+++ b/Xorg/lib/libXi/Makefile
@ -1,5 +1,5 @@
 #
-# Copyright (C) 2007 OpenWrt.org
+# Copyright (C) 2007-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@ -13,8 +13,9 @@ PKG_RELEASE:=1
 PKG_VERSION:=1.1.3
 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
+PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
 PKG_FIXUP:=libtool
+PKG_BUILD_DEPENDS:=xproto xextproto inputproto

 include $(INCLUDE_DIR)/package.mk

@ -24,7 +25,7 @@ define Package/libXi
  SECTION:=xorg-libraries
  CATEGORY:=Xorg
  SUBMENU:=libraries
-  DEPENDS:=+xproto +xextproto +inputproto +libX11 +libXext @DISPLAY_SUPPORT
+  DEPENDS:=+libX11 +libXext
  TITLE:=libXi
  URL:=http://xorg.freedesktop.org/
 endef
--- a/Xorg/lib/libXpm/Makefile
+++ b/Xorg/lib/libXpm/Makefile
@ -1,10 +1,11 @@
-# 
-# Copyright (C) 2007 OpenWrt.org
+#
+# Copyright (C) 2007-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# blogic@openwrt.org 
+# blogic@openwrt.org
+
 include $(TOPDIR)/rules.mk

 PKG_BASE_NAME:=libXpm
@ -13,7 +14,8 @@ PKG_RELEASE:=2
 PKG_VERSION:=3.5.7
 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
+PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
+PKG_BUID_DEPENDS:=xproto

 include $(INCLUDE_DIR)/package.mk

@ -21,7 +23,7 @@ define Package/libXpm
  SECTION:=xorg-lib
  CATEGORY:=Xorg
  SUBMENU:=lib
-  DEPENDS:= +xproto +libX11 @DISPLAY_SUPPORT
+  DEPENDS:=+libX11
  TITLE:=libXpm
  URL:=http://xorg.freedesktop.org/
 endef
--- a/Xorg/lib/libXrandr/Makefile
+++ b/Xorg/lib/libXrandr/Makefile
@ -1,10 +1,11 @@
-# 
-# Copyright (C) 2007 OpenWrt.org
+#
+# Copyright (C) 2007-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# blogic@openwrt.org 
+# blogic@openwrt.org
+
 include $(TOPDIR)/rules.mk

 PKG_BASE_NAME:=libXrandr
@ -13,7 +14,8 @@ PKG_RELEASE:=2
 PKG_VERSION:=1.2.3
 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
+PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
+PKG_BUILD_DEPENDS:=randrproto renderproto xextproto

 include $(INCLUDE_DIR)/package.mk

@ -21,7 +23,7 @@ define Package/libXrandr
  SECTION:=xorg-lib
  CATEGORY:=Xorg
  SUBMENU:=lib
-  DEPENDS:= +libXext +libXrender +randrproto +renderproto +xextproto +libX11 @DISPLAY_SUPPORT
+  DEPENDS:=+libXext +libXrender +libX11
  TITLE:=libXrandr
  URL:=http://xorg.freedesktop.org/
 endef
--- a/Xorg/lib/libXrender/Makefile
+++ b/Xorg/lib/libXrender/Makefile
@ -1,10 +1,11 @@
-# 
-# Copyright (C) 2007 OpenWrt.org
+#
+# Copyright (C) 2007-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# blogic@openwrt.org 
+# blogic@openwrt.org
+
 include $(TOPDIR)/rules.mk

 PKG_BASE_NAME:=libXrender
@ -13,7 +14,8 @@ PKG_RELEASE:=2
 PKG_VERSION:=0.9.4
 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
+PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
+PKG_BUILD_DEPENDS:=renderproto

 include $(INCLUDE_DIR)/package.mk

@ -21,7 +23,7 @@ define Package/libXrender
  SECTION:=xorg-lib
  CATEGORY:=Xorg
  SUBMENU:=lib
-  DEPENDS:= +libX11 +renderproto @DISPLAY_SUPPORT
+  DEPENDS:=+libX11
  TITLE:=libXrender
  URL:=http://xorg.freedesktop.org/
 endef
--- a/Xorg/lib/libXt/Makefile
+++ b/Xorg/lib/libXt/Makefile
@ -1,10 +1,11 @@
-# 
-# Copyright (C) 2007 OpenWrt.org
+#
+# Copyright (C) 2007-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# blogic@openwrt.org 
+# blogic@openwrt.org
+
 include $(TOPDIR)/rules.mk

 PKG_BASE_NAME:=libXt
@ -13,7 +14,8 @@ PKG_RELEASE:=2
 PKG_VERSION:=1.0.5
 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
+PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
+PKG_BUILD_DEPENDS:=xproto kbproto

 include $(INCLUDE_DIR)/package.mk

@ -21,7 +23,7 @@ define Package/libXt
  SECTION:=xorg-lib
  CATEGORY:=Xorg
  SUBMENU:=lib
-  DEPENDS:= +libSM +libX11 +xproto +kbproto @DISPLAY_SUPPORT
+  DEPENDS:=+libSM +libX11
  TITLE:=libXt
  URL:=http://xorg.freedesktop.org/
 endef
--- a/Xorg/lib/libXtst/Makefile
+++ b/Xorg/lib/libXtst/Makefile
@ -1,10 +1,11 @@
-# 
-# Copyright (C) 2007 OpenWrt.org
+#
+# Copyright (C) 2007-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# blogic@openwrt.org 
+# blogic@openwrt.org
+
 include $(TOPDIR)/rules.mk

 PKG_BASE_NAME:=libXtst
@ -13,7 +14,8 @@ PKG_RELEASE:=2
 PKG_VERSION:=1.0.3
 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
+PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
+PKG_BUILD_DEPENDS:=recordproto xextproto inputproto

 include $(INCLUDE_DIR)/package.mk

@ -21,7 +23,7 @@ define Package/libXtst
  SECTION:=xorg-lib
  CATEGORY:=Xorg
  SUBMENU:=lib
-  DEPENDS:= +libX11 +libXext +recordproto +xextproto +inputproto @DISPLAY_SUPPORT
+  DEPENDS:=+libX11 +libXext
  TITLE:=libXtst
  URL:=http://xorg.freedesktop.org/
 endef
--- a/Xorg/lib/libXv/Makefile
+++ b/Xorg/lib/libXv/Makefile
@ -1,10 +1,11 @@
-# 
-# Copyright (C) 2007 OpenWrt.org
+#
+# Copyright (C) 2007-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# blogic@openwrt.org 
+# blogic@openwrt.org
+
 include $(TOPDIR)/rules.mk

 PKG_BASE_NAME:=libXv
@ -13,7 +14,8 @@ PKG_RELEASE:=2
 PKG_VERSION:=1.0.4
 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
+PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
+PKG_BUILD_DEPENDS:=videoproto

 include $(INCLUDE_DIR)/package.mk

@ -21,7 +23,7 @@ define Package/libXv
  SECTION:=xorg-lib
  CATEGORY:=Xorg
  SUBMENU:=lib
-  DEPENDS:= +libXext +videoproto @DISPLAY_SUPPORT
+  DEPENDS:=+libXext
  TITLE:=libXv
  URL:=http://xorg.freedesktop.org/
 endef
--- a/Xorg/lib/libXvMC/Makefile
+++ b/Xorg/lib/libXvMC/Makefile
@ -1,10 +1,11 @@
-# 
-# Copyright (C) 2007 OpenWrt.org
+#
+# Copyright (C) 2007-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# blogic@openwrt.org 
+# blogic@openwrt.org
+
 include $(TOPDIR)/rules.mk

 PKG_BASE_NAME:=libXvMC
@ -13,7 +14,8 @@ PKG_RELEASE:=2
 PKG_VERSION:=1.0.4
 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
+PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
+PKG_BUILD_DEPENDS:=videoproto

 include $(INCLUDE_DIR)/package.mk

@ -21,7 +23,7 @@ define Package/libXvMC
  SECTION:=xorg-lib
  CATEGORY:=Xorg
  SUBMENU:=lib
-  DEPENDS:= +libXext +videoproto +libXv @DISPLAY_SUPPORT
+  DEPENDS:=+libXext +libXv
  TITLE:=libXvMC
  URL:=http://xorg.freedesktop.org/
 endef
--- a/Xorg/lib/libXxf86misc/Makefile
+++ b/Xorg/lib/libXxf86misc/Makefile
@ -1,10 +1,11 @@
-# 
-# Copyright (C) 2007 OpenWrt.org
+#
+# Copyright (C) 2007-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# blogic@openwrt.org 
+# blogic@openwrt.org
+
 include $(TOPDIR)/rules.mk

 PKG_BASE_NAME:=libXxf86misc
@ -13,7 +14,8 @@ PKG_RELEASE:=2
 PKG_VERSION:=1.0.1
 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
+PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
+PKG_BUILD_DEPENDS:=xproto xextproto xf86miscproto

 include $(INCLUDE_DIR)/package.mk

@ -21,7 +23,7 @@ define Package/libXxf86misc
  SECTION:=xorg-lib
  CATEGORY:=Xorg
  SUBMENU:=lib
-  DEPENDS:= +xproto +libX11 +xextproto +libXext +xf86miscproto @DISPLAY_SUPPORT
+  DEPENDS:=+libX11 +libXext
  TITLE:=libXxf86misc
  URL:=http://xorg.freedesktop.org/
 endef
--- a/Xorg/lib/libXxf86vm/Makefile
+++ b/Xorg/lib/libXxf86vm/Makefile
@ -1,10 +1,11 @@
-# 
-# Copyright (C) 2007 OpenWrt.org
+#
+# Copyright (C) 2007-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# blogic@openwrt.org 
+# blogic@openwrt.org
+
 include $(TOPDIR)/rules.mk

 PKG_BASE_NAME:=libXxf86vm
@ -13,7 +14,8 @@ PKG_RELEASE:=2
 PKG_VERSION:=1.0.2
 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
+PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
+PKG_BUILD_DEPENDS:=xproto xextproto xf86vidmodeproto

 include $(INCLUDE_DIR)/package.mk

@ -21,7 +23,7 @@ define Package/libXxf86vm
  SECTION:=xorg-lib
  CATEGORY:=Xorg
  SUBMENU:=lib
-  DEPENDS:= +xproto +libX11 +xextproto +libXext +xf86vidmodeproto @DISPLAY_SUPPORT
+  DEPENDS:=+libX11 +libXext
  TITLE:=libXxf86vm
  URL:=http://xorg.freedesktop.org/
 endef
--- a/Xorg/lib/libdrm/Makefile
+++ b/Xorg/lib/libdrm/Makefile
@ -1,10 +1,11 @@
-# 
-# Copyright (C) 2007 OpenWrt.org
+#
+# Copyright (C) 2007-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# blogic@openwrt.org 
+# blogic@openwrt.org
+
 include $(TOPDIR)/rules.mk

 PKG_BASE_NAME:=libdrm
@ -13,7 +14,7 @@ PKG_RELEASE:=2
 PKG_VERSION:=2.3.1
 PKG_SOURCE_URL:=http://dri.freedesktop.org/libdrm
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
+PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/

 include $(INCLUDE_DIR)/package.mk

@ -21,7 +22,7 @@ define Package/libdrm
  SECTION:=xorg-lib
  CATEGORY:=Xorg
  SUBMENU:=lib
-  DEPENDS:=@DISPLAY_SUPPORT
+  DEPENDS:=
  TITLE:=libdrm
  URL:=http://dri.freedesktop.org/
 endef
--- a/Xorg/lib/libfontenc/Makefile
+++ b/Xorg/lib/libfontenc/Makefile
@ -1,10 +1,11 @@
-# 
-# Copyright (C) 2007 OpenWrt.org
+#
+# Copyright (C) 2007-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# blogic@openwrt.org 
+# blogic@openwrt.org
+
 include $(TOPDIR)/rules.mk

 PKG_BASE_NAME:=libfontenc
@ -13,7 +14,8 @@ PKG_RELEASE:=2
 PKG_VERSION:=1.0.4
 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
+PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
+PKG_BUILD_DEPENDS:=xproto

 include $(INCLUDE_DIR)/package.mk

@ -21,7 +23,7 @@ define Package/libfontenc
  SECTION:=xorg-lib
  CATEGORY:=Xorg
  SUBMENU:=lib
-  DEPENDS:= +xproto +zlib @DISPLAY_SUPPORT
+  DEPENDS:=+zlib
  TITLE:=libfontenc
  URL:=http://xorg.freedesktop.org/
 endef
--- a/Xorg/lib/libmatchbox/Makefile
+++ b/Xorg/lib/libmatchbox/Makefile
@ -14,7 +14,7 @@ PKG_VERSION:=1.9
 PKG_SOURCE_URL:=http://matchbox-project.org/sources/libmatchbox/$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_MD5SUM:=9f73e7515cc4679171a5db180dc1343b
-PKG_BUILD_DIR=$(BUILD_DIR)/${PKG_NAME}-$(PKG_VERSION)
+PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_FIXUP:=libtool

 EXTRA_LDFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib/
--- a/Xorg/lib/libpciaccess/Makefile
+++ b/Xorg/lib/libpciaccess/Makefile
@ -13,7 +13,7 @@ PKG_RELEASE:=1
 PKG_VERSION:=0.10.3
 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
+PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
 PKG_FIXUP:=libtool

 include $(INCLUDE_DIR)/package.mk
--- a/Xorg/lib/libxkbfile/Makefile
+++ b/Xorg/lib/libxkbfile/Makefile
@ -1,10 +1,11 @@
-# 
-# Copyright (C) 2007 OpenWrt.org
+#
+# Copyright (C) 2007-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# blogic@openwrt.org 
+# blogic@openwrt.org
+
 include $(TOPDIR)/rules.mk

 PKG_BASE_NAME:=libxkbfile
@ -13,7 +14,8 @@ PKG_RELEASE:=2
 PKG_VERSION:=1.0.5
 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
+PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
+PKG_BUILD_DEPENDS:=kbproto

 include $(INCLUDE_DIR)/package.mk

@ -21,7 +23,7 @@ define Package/libxkbfile
  SECTION:=xorg-lib
  CATEGORY:=Xorg
  SUBMENU:=lib
-  DEPENDS:= +libX11 +kbproto @DISPLAY_SUPPORT
+  DEPENDS:=+libX11
  TITLE:=libxkbfile
  URL:=http://xorg.freedesktop.org/
 endef
--- a/Xorg/lib/xtrans/Makefile
+++ b/Xorg/lib/xtrans/Makefile
@ -1,10 +1,11 @@
-# 
-# Copyright (C) 2007 OpenWrt.org
+#
+# Copyright (C) 2007-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# blogic@openwrt.org 
+# blogic@openwrt.org
+
 include $(TOPDIR)/rules.mk

 PKG_BASE_NAME:=xtrans
@ -13,7 +14,7 @@ PKG_RELEASE:=2
 PKG_VERSION:=1.2.1
 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
+PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/

 include $(INCLUDE_DIR)/package.mk

@ -21,7 +22,7 @@ define Package/xtrans
  SECTION:=xorg-lib
  CATEGORY:=Xorg
  SUBMENU:=lib
-  DEPENDS:= @DISPLAY_SUPPORT
+  DEPENDS:=
  TITLE:=xtrans
  URL:=http://xorg.freedesktop.org/
 endef
--- a/Xorg/proto/applewmproto/Makefile
+++ b/Xorg/proto/applewmproto/Makefile
@ -1,5 +1,5 @@
 # 
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@ -12,7 +12,7 @@ PKG_RELEASE:=3
 PKG_VERSION:=1.0.3
 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/proto/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
+PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/

 include $(INCLUDE_DIR)/package.mk

@ -20,7 +20,7 @@ define Package/applewmproto
  SECTION:=xorg-proto
  CATEGORY:=Xorg
  SUBMENU:=proto
-  DEPENDS:= @DISPLAY_SUPPORT
+  DEPENDS:=
  TITLE:=applewmproto
  URL:=http://xorg.freedesktop.org/
 endef
--- a/Xorg/proto/bigreqsproto/Makefile
+++ b/Xorg/proto/bigreqsproto/Makefile
@ -1,5 +1,5 @@
 # 
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@ -12,7 +12,7 @@ PKG_RELEASE:=3
 PKG_VERSION:=1.0.2
 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/proto/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
+PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/

 include $(INCLUDE_DIR)/package.mk

@ -20,7 +20,7 @@ define Package/bigreqsproto
  SECTION:=xorg-proto
  CATEGORY:=Xorg
  SUBMENU:=proto
-  DEPENDS:= @DISPLAY_SUPPORT
+  DEPENDS:=
  TITLE:=bigreqsproto
  URL:=http://xorg.freedesktop.org/
 endef
--- a/Xorg/proto/calibrateproto/Makefile
+++ b/Xorg/proto/calibrateproto/Makefile
@ -1,5 +1,5 @@
 # 
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@ -19,7 +19,7 @@ define Package/calibrateproto
  SECTION:=xorg-proto
  CATEGORY:=Xorg
  SUBMENU:=proto
-  DEPENDS:=@DISPLAY_SUPPORT
+  DEPENDS:=
  TITLE:=calibrateproto
  URL:=http://xorg.freedesktop.org/
 endef
--- a/Xorg/proto/compositeproto/Makefile
+++ b/Xorg/proto/compositeproto/Makefile
@ -1,5 +1,5 @@
 # 
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@ -12,7 +12,7 @@ PKG_RELEASE:=3
 PKG_VERSION:=0.4
 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/proto/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
+PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/

 include $(INCLUDE_DIR)/package.mk

@ -20,7 +20,7 @@ define Package/compositeproto
  SECTION:=xorg-proto
  CATEGORY:=Xorg
  SUBMENU:=proto
-  DEPENDS:= @DISPLAY_SUPPORT
+  DEPENDS:=
  TITLE:=compositeproto
  URL:=http://xorg.freedesktop.org/
 endef
--- a/Xorg/proto/damageproto/Makefile
+++ b/Xorg/proto/damageproto/Makefile
@ -1,5 +1,5 @@
 # 
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@ -12,7 +12,7 @@ PKG_RELEASE:=3
 PKG_VERSION:=1.1.0
 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/proto/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
+PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/

 include $(INCLUDE_DIR)/package.mk

@ -20,7 +20,7 @@ define Package/damageproto
  SECTION:=xorg-proto
  CATEGORY:=Xorg
  SUBMENU:=proto
-  DEPENDS:= @DISPLAY_SUPPORT
+  DEPENDS:=
  TITLE:=damageproto
  URL:=http://xorg.freedesktop.org/
 endef
--- a/Xorg/proto/dmxproto/Makefile
+++ b/Xorg/proto/dmxproto/Makefile
@ -1,5 +1,5 @@
 # 
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@ -12,7 +12,7 @@ PKG_RELEASE:=3
 PKG_VERSION:=2.2.2
 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/proto/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
+PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/

 include $(INCLUDE_DIR)/package.mk

@ -20,7 +20,7 @@ define Package/dmxproto
  SECTION:=xorg-proto
  CATEGORY:=Xorg
  SUBMENU:=proto
-  DEPENDS:= @DISPLAY_SUPPORT
+  DEPENDS:=
  TITLE:=dmxproto
  URL:=http://xorg.freedesktop.org/
 endef
--- a/Xorg/proto/evieext/Makefile
+++ b/Xorg/proto/evieext/Makefile
@ -1,5 +1,5 @@
 # 
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@ -12,7 +12,7 @@ PKG_RELEASE:=3
 PKG_VERSION:=1.0.2
 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/proto/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
+PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/

 include $(INCLUDE_DIR)/package.mk

@ -20,7 +20,7 @@ define Package/evieext
  SECTION:=xorg-proto
  CATEGORY:=Xorg
  SUBMENU:=proto
-  DEPENDS:= @DISPLAY_SUPPORT
+  DEPENDS:=
  TITLE:=evieext
  URL:=http://xorg.freedesktop.org/
 endef
--- a/Xorg/proto/fixesproto/Makefile
+++ b/Xorg/proto/fixesproto/Makefile
@ -1,5 +1,5 @@
 # 
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@ -12,7 +12,7 @@ PKG_RELEASE:=3
 PKG_VERSION:=4.0
 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/proto/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
+PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/

 include $(INCLUDE_DIR)/package.mk

@ -20,7 +20,7 @@ define Package/fixesproto
  SECTION:=xorg-proto
  CATEGORY:=Xorg
  SUBMENU:=proto
-  DEPENDS:= @DISPLAY_SUPPORT
+  DEPENDS:=
  TITLE:=fixesproto
  URL:=http://xorg.freedesktop.org/
 endef
--- a/Xorg/proto/fontcacheproto/Makefile
+++ b/Xorg/proto/fontcacheproto/Makefile
@ -1,5 +1,5 @@
 # 
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@ -12,7 +12,7 @@ PKG_RELEASE:=3
 PKG_VERSION:=0.1.2
 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/proto/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
+PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/

 include $(INCLUDE_DIR)/package.mk

@ -20,7 +20,7 @@ define Package/fontcacheproto
  SECTION:=xorg-proto
  CATEGORY:=Xorg
  SUBMENU:=proto
-  DEPENDS:= @DISPLAY_SUPPORT
+  DEPENDS:=
  TITLE:=fontcacheproto
  URL:=http://xorg.freedesktop.org/
 endef
--- a/Xorg/proto/fontsproto/Makefile
+++ b/Xorg/proto/fontsproto/Makefile
@ -1,5 +1,5 @@
 # 
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@ -12,7 +12,7 @@ PKG_RELEASE:=3
 PKG_VERSION:=2.0.2
 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/proto/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
+PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/

 include $(INCLUDE_DIR)/package.mk

@ -20,7 +20,7 @@ define Package/fontsproto
  SECTION:=xorg-proto
  CATEGORY:=Xorg
  SUBMENU:=proto
-  DEPENDS:= @DISPLAY_SUPPORT
+  DEPENDS:=
  TITLE:=fontsproto
  URL:=http://xorg.freedesktop.org/
 endef
--- a/Xorg/proto/glproto/Makefile
+++ b/Xorg/proto/glproto/Makefile
@ -1,5 +1,5 @@
 # 
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@ -12,7 +12,7 @@ PKG_RELEASE:=3
 PKG_VERSION:=1.4.9
 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/proto/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
+PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/

 include $(INCLUDE_DIR)/package.mk

@ -20,7 +20,7 @@ define Package/glproto
  SECTION:=xorg-proto
  CATEGORY:=Xorg
  SUBMENU:=proto
-  DEPENDS:= @DISPLAY_SUPPORT
+  DEPENDS:=
  TITLE:=glproto
  URL:=http://xorg.freedesktop.org/
 endef
--- a/Xorg/proto/inputproto/Makefile
+++ b/Xorg/proto/inputproto/Makefile
@ -1,5 +1,5 @@
 # 
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@ -12,7 +12,7 @@ PKG_RELEASE:=3
 PKG_VERSION:=1.4.4
 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/proto/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
+PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/

 include $(INCLUDE_DIR)/package.mk

@ -20,7 +20,7 @@ define Package/inputproto
  SECTION:=xorg-proto
  CATEGORY:=Xorg
  SUBMENU:=proto
-  DEPENDS:= @DISPLAY_SUPPORT
+  DEPENDS:=
  TITLE:=inputproto
  URL:=http://xorg.freedesktop.org/
 endef
--- a/Xorg/proto/kbproto/Makefile
+++ b/Xorg/proto/kbproto/Makefile
@ -1,5 +1,5 @@
 # 
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@ -12,7 +12,7 @@ PKG_RELEASE:=3
 PKG_VERSION:=1.0.3
 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/proto/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
+PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/

 include $(INCLUDE_DIR)/package.mk

@ -20,7 +20,7 @@ define Package/kbproto
  SECTION:=xorg-proto
  CATEGORY:=Xorg
  SUBMENU:=proto
-  DEPENDS:= @DISPLAY_SUPPORT
+  DEPENDS:=
  TITLE:=kbproto
  URL:=http://xorg.freedesktop.org/
 endef
--- a/Xorg/proto/printproto/Makefile
+++ b/Xorg/proto/printproto/Makefile
@ -1,5 +1,5 @@
 # 
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@ -12,7 +12,7 @@ PKG_RELEASE:=3
 PKG_VERSION:=1.0.3
 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/proto/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
+PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/

 include $(INCLUDE_DIR)/package.mk

@ -20,7 +20,7 @@ define Package/printproto
  SECTION:=xorg-proto
  CATEGORY:=Xorg
  SUBMENU:=proto
-  DEPENDS:= @DISPLAY_SUPPORT
+  DEPENDS:=
  TITLE:=printproto
  URL:=http://xorg.freedesktop.org/
 endef
--- a/Xorg/proto/randrproto/Makefile
+++ b/Xorg/proto/randrproto/Makefile
@ -1,5 +1,5 @@
 # 
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@ -12,7 +12,7 @@ PKG_RELEASE:=3
 PKG_VERSION:=1.2.1
 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/proto/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
+PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/

 include $(INCLUDE_DIR)/package.mk

@ -20,7 +20,7 @@ define Package/randrproto
  SECTION:=xorg-proto
  CATEGORY:=Xorg
  SUBMENU:=proto
-  DEPENDS:= @DISPLAY_SUPPORT
+  DEPENDS:=
  TITLE:=randrproto
  URL:=http://xorg.freedesktop.org/
 endef
--- a/Xorg/proto/recordproto/Makefile
+++ b/Xorg/proto/recordproto/Makefile
@ -1,5 +1,5 @@
 # 
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@ -12,7 +12,7 @@ PKG_RELEASE:=3
 PKG_VERSION:=1.13.2
 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/proto/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
+PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/

 include $(INCLUDE_DIR)/package.mk

@ -20,7 +20,7 @@ define Package/recordproto
  SECTION:=xorg-proto
  CATEGORY:=Xorg
  SUBMENU:=proto
-  DEPENDS:= @DISPLAY_SUPPORT
+  DEPENDS:=
  TITLE:=recordproto
  URL:=http://xorg.freedesktop.org/
 endef
--- a/Xorg/proto/renderproto/Makefile
+++ b/Xorg/proto/renderproto/Makefile
@ -1,5 +1,5 @@
 # 
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@ -12,7 +12,7 @@ PKG_RELEASE:=3
 PKG_VERSION:=0.9.3
 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/proto/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
+PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/

 include $(INCLUDE_DIR)/package.mk

@ -20,7 +20,7 @@ define Package/renderproto
  SECTION:=xorg-proto
  CATEGORY:=Xorg
  SUBMENU:=proto
-  DEPENDS:= @DISPLAY_SUPPORT
+  DEPENDS:=
  TITLE:=renderproto
  URL:=http://xorg.freedesktop.org/
 endef
--- a/Xorg/proto/resourceproto/Makefile
+++ b/Xorg/proto/resourceproto/Makefile
@ -1,5 +1,5 @@
 # 
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@ -12,7 +12,7 @@ PKG_RELEASE:=3
 PKG_VERSION:=1.0.2
 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/proto/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
+PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/

 include $(INCLUDE_DIR)/package.mk

@ -20,7 +20,7 @@ define Package/resourceproto
  SECTION:=xorg-proto
  CATEGORY:=Xorg
  SUBMENU:=proto
-  DEPENDS:= @DISPLAY_SUPPORT
+  DEPENDS:=
  TITLE:=resourceproto
  URL:=http://xorg.freedesktop.org/
 endef
--- a/Xorg/proto/scrnsaverproto/Makefile
+++ b/Xorg/proto/scrnsaverproto/Makefile
@ -1,5 +1,5 @@
 # 
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@ -12,7 +12,7 @@ PKG_RELEASE:=3
 PKG_VERSION:=1.1.0
 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/proto/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
+PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/

 include $(INCLUDE_DIR)/package.mk

@ -20,7 +20,7 @@ define Package/scrnsaverproto
  SECTION:=xorg-proto
  CATEGORY:=Xorg
  SUBMENU:=proto
-  DEPENDS:= @DISPLAY_SUPPORT
+  DEPENDS:=
  TITLE:=scrnsaverproto
  URL:=http://xorg.freedesktop.org/
 endef
--- a/Xorg/proto/trapproto/Makefile
+++ b/Xorg/proto/trapproto/Makefile
@ -1,5 +1,5 @@
 # 
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@ -12,7 +12,7 @@ PKG_RELEASE:=3
 PKG_VERSION:=3.4.3
 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/proto/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
+PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/

 include $(INCLUDE_DIR)/package.mk

@ -20,7 +20,7 @@ define Package/trapproto
  SECTION:=xorg-proto
  CATEGORY:=Xorg
  SUBMENU:=proto
-  DEPENDS:= @DISPLAY_SUPPORT
+  DEPENDS:=
  TITLE:=trapproto
  URL:=http://xorg.freedesktop.org/
 endef
--- a/Xorg/proto/videoproto/Makefile
+++ b/Xorg/proto/videoproto/Makefile
@ -1,5 +1,5 @@
 # 
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@ -12,7 +12,7 @@ PKG_RELEASE:=3
 PKG_VERSION:=2.2.2
 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/proto/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
+PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/

 include $(INCLUDE_DIR)/package.mk

@ -20,7 +20,7 @@ define Package/videoproto
  SECTION:=xorg-proto
  CATEGORY:=Xorg
  SUBMENU:=proto
-  DEPENDS:= @DISPLAY_SUPPORT
+  DEPENDS:=
  TITLE:=videoproto
  URL:=http://xorg.freedesktop.org/
 endef
--- a/Xorg/proto/windowswmproto/Makefile
+++ b/Xorg/proto/windowswmproto/Makefile
@ -1,5 +1,5 @@
 # 
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@ -12,7 +12,7 @@ PKG_RELEASE:=3
 PKG_VERSION:=1.0.3
 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/proto/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
+PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/

 include $(INCLUDE_DIR)/package.mk

@ -20,7 +20,7 @@ define Package/windowswmproto
  SECTION:=xorg-proto
  CATEGORY:=Xorg
  SUBMENU:=proto
-  DEPENDS:= @DISPLAY_SUPPORT
+  DEPENDS:=
  TITLE:=windowswmproto
  URL:=http://xorg.freedesktop.org/
 endef
--- a/Xorg/proto/xcmiscproto/Makefile
+++ b/Xorg/proto/xcmiscproto/Makefile
@ -1,5 +1,5 @@
 # 
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@ -12,7 +12,7 @@ PKG_RELEASE:=3
 PKG_VERSION:=1.1.2
 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/proto/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
+PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/

 include $(INCLUDE_DIR)/package.mk

@ -20,7 +20,7 @@ define Package/xcmiscproto
  SECTION:=xorg-proto
  CATEGORY:=Xorg
  SUBMENU:=proto
-  DEPENDS:= @DISPLAY_SUPPORT
+  DEPENDS:=
  TITLE:=xcmiscproto
  URL:=http://xorg.freedesktop.org/
 endef
--- a/Xorg/proto/xextproto/Makefile
+++ b/Xorg/proto/xextproto/Makefile
@ -1,5 +1,5 @@
 # 
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@ -12,7 +12,7 @@ PKG_RELEASE:=3
 PKG_VERSION:=7.0.3
 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/proto/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
+PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/

 include $(INCLUDE_DIR)/package.mk

@ -20,7 +20,7 @@ define Package/xextproto
  SECTION:=xorg-proto
  CATEGORY:=Xorg
  SUBMENU:=proto
-  DEPENDS:= @DISPLAY_SUPPORT
+  DEPENDS:=
  TITLE:=xextproto
  URL:=http://xorg.freedesktop.org/
 endef
--- a/Xorg/proto/xf86bigfontproto/Makefile
+++ b/Xorg/proto/xf86bigfontproto/Makefile
@ -1,5 +1,5 @@
 # 
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@ -12,7 +12,7 @@ PKG_RELEASE:=3
 PKG_VERSION:=1.1.2
 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/proto/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
+PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/

 include $(INCLUDE_DIR)/package.mk

@ -20,7 +20,7 @@ define Package/xf86bigfontproto
  SECTION:=xorg-proto
  CATEGORY:=Xorg
  SUBMENU:=proto
-  DEPENDS:= @DISPLAY_SUPPORT
+  DEPENDS:=
  TITLE:=xf86bigfontproto
  URL:=http://xorg.freedesktop.org/
 endef
--- a/Xorg/proto/xf86dgaproto/Makefile
+++ b/Xorg/proto/xf86dgaproto/Makefile
@ -1,5 +1,5 @@
 # 
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@ -12,7 +12,7 @@ PKG_RELEASE:=3
 PKG_VERSION:=2.0.3
 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/proto/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
+PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/

 include $(INCLUDE_DIR)/package.mk

@ -20,7 +20,7 @@ define Package/xf86dgaproto
  SECTION:=xorg-proto
  CATEGORY:=Xorg
  SUBMENU:=proto
-  DEPENDS:= @DISPLAY_SUPPORT
+  DEPENDS:=
  TITLE:=xf86dgaproto
  URL:=http://xorg.freedesktop.org/
 endef
--- a/Xorg/proto/xf86driproto/Makefile
+++ b/Xorg/proto/xf86driproto/Makefile
@ -1,5 +1,5 @@
 # 
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@ -12,7 +12,7 @@ PKG_RELEASE:=3
 PKG_VERSION:=2.0.4
 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/proto/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
+PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/

 include $(INCLUDE_DIR)/package.mk

@ -20,7 +20,7 @@ define Package/xf86driproto
  SECTION:=xorg-proto
  CATEGORY:=Xorg
  SUBMENU:=proto
-  DEPENDS:= @DISPLAY_SUPPORT
+  DEPENDS:=
  TITLE:=xf86driproto
  URL:=http://xorg.freedesktop.org/
 endef
--- a/Xorg/proto/xf86miscproto/Makefile
+++ b/Xorg/proto/xf86miscproto/Makefile
@ -1,5 +1,5 @@
 # 
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@ -12,7 +12,7 @@ PKG_RELEASE:=3
 PKG_VERSION:=0.9.2
 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/proto/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
+PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/

 include $(INCLUDE_DIR)/package.mk

@ -20,7 +20,7 @@ define Package/xf86miscproto
  SECTION:=xorg-proto
  CATEGORY:=Xorg
  SUBMENU:=proto
-  DEPENDS:= @DISPLAY_SUPPORT
+  DEPENDS:=
  TITLE:=xf86miscproto
  URL:=http://xorg.freedesktop.org/
 endef
--- a/Xorg/proto/xf86rushproto/Makefile
+++ b/Xorg/proto/xf86rushproto/Makefile
@ -1,5 +1,5 @@
 # 
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@ -12,7 +12,7 @@ PKG_RELEASE:=3
 PKG_VERSION:=1.1.2
 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/proto/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
+PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/

 include $(INCLUDE_DIR)/package.mk

@ -20,7 +20,7 @@ define Package/xf86rushproto
  SECTION:=xorg-proto
  CATEGORY:=Xorg
  SUBMENU:=proto
-  DEPENDS:= @DISPLAY_SUPPORT
+  DEPENDS:=
  TITLE:=xf86rushproto
  URL:=http://xorg.freedesktop.org/
 endef
--- a/Xorg/proto/xf86vidmodeproto/Makefile
+++ b/Xorg/proto/xf86vidmodeproto/Makefile
@ -1,5 +1,5 @@
 # 
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@ -12,7 +12,7 @@ PKG_RELEASE:=3
 PKG_VERSION:=2.2.2
 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/proto/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
+PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/

 include $(INCLUDE_DIR)/package.mk

@ -20,7 +20,7 @@ define Package/xf86vidmodeproto
  SECTION:=xorg-proto
  CATEGORY:=Xorg
  SUBMENU:=proto
-  DEPENDS:= @DISPLAY_SUPPORT
+  DEPENDS:=
  TITLE:=xf86vidmodeproto
  URL:=http://xorg.freedesktop.org/
 endef
--- a/Xorg/proto/xineramaproto/Makefile
+++ b/Xorg/proto/xineramaproto/Makefile
@ -1,5 +1,5 @@
 # 
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@ -12,7 +12,7 @@ PKG_RELEASE:=3
 PKG_VERSION:=1.1.2
 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/proto/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
+PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/

 include $(INCLUDE_DIR)/package.mk

@ -20,7 +20,7 @@ define Package/xineramaproto
  SECTION:=xorg-proto
  CATEGORY:=Xorg
  SUBMENU:=proto
-  DEPENDS:= @DISPLAY_SUPPORT
+  DEPENDS:=
  TITLE:=xineramaproto
  URL:=http://xorg.freedesktop.org/
 endef
--- a/Xorg/proto/xproto/Makefile
+++ b/Xorg/proto/xproto/Makefile
@ -1,5 +1,5 @@
 # 
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@ -12,7 +12,7 @@ PKG_RELEASE:=3
 PKG_VERSION:=7.0.13
 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/proto/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
+PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/

 include $(INCLUDE_DIR)/package.mk

@ -20,7 +20,7 @@ define Package/xproto
  SECTION:=xorg-proto
  CATEGORY:=Xorg
  SUBMENU:=proto
-  DEPENDS:= @DISPLAY_SUPPORT
+  DEPENDS:=
  TITLE:=xproto
  URL:=http://xorg.freedesktop.org/
 endef
--- a/Xorg/util/util-macros/Makefile
+++ b/Xorg/util/util-macros/Makefile
@ -1,10 +1,11 @@
-# 
-# Copyright (C) 2006 OpenWrt.org
+#
+# Copyright (C) 2006-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 # blogic@openwrt.org
+
 include $(TOPDIR)/rules.mk

 PKG_NAME:=util-macros
@ -12,7 +13,7 @@ PKG_RELEASE:=1
 PKG_VERSION:=1.1.6
 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/util/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
+PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/

 include $(INCLUDE_DIR)/package.mk

@ -20,7 +21,7 @@ define Package/util-macros
  SECTION:=xorg-utils
  CATEGORY:=Xorg
  SUBMENU:=utils
-  DEPENDS:= @DISPLAY_SUPPORT
+  DEPENDS:=
  TITLE:=${PKG_NAME}
  URL:=http://xorg.freedesktop.org/
 endef
--- a/Xorg/xserver/xorg-xserver/Makefile
+++ b/Xorg/xserver/xorg-xserver/Makefile
@ -14,6 +14,10 @@ PKG_VERSION:=1.5.1
 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/xserver/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/xserver/xorg-server-$(PKG_VERSION)/
+PKG_BUILD_DEPENDS:=randrproto renderproto fixesproto damageproto xcmiscproto \
+                   xextproto xproto scrnsaverproto bigreqsproto resourceproto \
+                   fontsproto inputproto kbproto videoproto resourceproto \
+                   xf86dgaproto

 include $(INCLUDE_DIR)/package.mk

@ -124,22 +128,6 @@ define Package/xserver/Default
 $(call Package/xorg/Default)
  DEPENDS:=+xserver-common \
  +libpthread \
-  +randrproto \
-  +renderproto \
-  +fixesproto \
-  +damageproto \
-  +xcmiscproto \
-  +xextproto \
-  +xproto \
-  +scrnsaverproto \
-  +bigreqsproto \
-  +resourceproto \
-  +fontsproto \
-  +inputproto \
-  +kbproto \
-  +videoproto \
-  +resourceproto \
-  +xf86dgaproto \
  +xtrans \
  +libxkbfile \
  +libXfont \