More X package dependecy fixes.

git-svn-id: svn://svn.openwrt.org/openwrt/packages@12523 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/XOrg/app/packages b/XOrg/app/packages
index 904bfa1..8237c16 100644 (file)
--- a/XOrg/app/packages
+++ b/XOrg/app/packages
@@ -1,9 +1,9 @@
-xcalc-1.0.2|+font-misc-misc
-xclipboard-1.0.1|
-xdm-1.1.6|
-xeyes-1.0.1|
-xinit-1.0.5|
-xlogo-1.0.1|
-xmessage-1.0.2|
-xset-1.0.3|
-xsetroot-1.0.2|
+xcalc-1.0.2|+libX11+font-misc-misc
+xclipboard-1.0.1|+libX11
+xdm-1.1.6|+libX11
+xeyes-1.0.1|+libX11
+xinit-1.0.5|+libX11
+xlogo-1.0.1|+libX11
+xmessage-1.0.2|+libX11
+xset-1.0.3|+libX11
+xsetroot-1.0.2|+libX11

diff --git a/XOrg/app/template.mk b/XOrg/app/template.mk
index d6d1869..d650558 100644 (file)
--- a/XOrg/app/template.mk
+++ b/XOrg/app/template.mk
@@ -14,7 +14,7 @@ PKG_RELEASE:=2
 PKG_VERSION:=@VER@
 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)/
+PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
 
 _DEPEND:=@DEP@
 ifneq (@NAME@,xinit)

diff --git a/XOrg/app/xcalc/Makefile b/XOrg/app/xcalc/Makefile
index 7220d06..d2abb1b 100644 (file)
--- a/XOrg/app/xcalc/Makefile
+++ b/XOrg/app/xcalc/Makefile
@@ -16,7 +16,7 @@ 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:= +font-misc-misc
+_DEPEND:= +libX11 +font-misc-misc
 ifneq (xcalc,xinit)
 _DEPEND+=xorg-server-essentials
 endif

diff --git a/XOrg/app/xclipboard/Makefile b/XOrg/app/xclipboard/Makefile
index a09155c..7eab191 100644 (file)
--- a/XOrg/app/xclipboard/Makefile
+++ b/XOrg/app/xclipboard/Makefile
@@ -16,7 +16,7 @@ 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:=
+_DEPEND:= +libX11
 ifneq (xclipboard,xinit)
 _DEPEND+=xorg-server-essentials
 endif

diff --git a/XOrg/app/xdm/Makefile b/XOrg/app/xdm/Makefile
index 3b45e4d..169a3c1 100644 (file)
--- a/XOrg/app/xdm/Makefile
+++ b/XOrg/app/xdm/Makefile
@@ -16,7 +16,7 @@ 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:=
+_DEPEND:= +libX11
 ifneq (xdm,xinit)
 _DEPEND+=xorg-server-essentials
 endif

diff --git a/XOrg/app/xeyes/Makefile b/XOrg/app/xeyes/Makefile
index 3acc212..d0c6b7e 100644 (file)
--- a/XOrg/app/xeyes/Makefile
+++ b/XOrg/app/xeyes/Makefile
@@ -16,7 +16,7 @@ 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:=
+_DEPEND:= +libX11
 ifneq (xeyes,xinit)
 _DEPEND+=xorg-server-essentials
 endif

diff --git a/XOrg/app/xinit/Makefile b/XOrg/app/xinit/Makefile
index 94d9bbb..1fcd55c 100644 (file)
--- a/XOrg/app/xinit/Makefile
+++ b/XOrg/app/xinit/Makefile
@@ -16,7 +16,7 @@ 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:=
+_DEPEND:= +libX11
 ifneq (xinit,xinit)
 _DEPEND+=xorg-server-essentials
 endif

diff --git a/XOrg/app/xlogo/Makefile b/XOrg/app/xlogo/Makefile
index dbf4ddb..f0a2618 100644 (file)
--- a/XOrg/app/xlogo/Makefile
+++ b/XOrg/app/xlogo/Makefile
@@ -16,7 +16,7 @@ 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:=
+_DEPEND:= +libX11
 ifneq (xlogo,xinit)
 _DEPEND+=xorg-server-essentials
 endif

diff --git a/XOrg/app/xmessage/Makefile b/XOrg/app/xmessage/Makefile
index 91f17f0..5e4db1c 100644 (file)
--- a/XOrg/app/xmessage/Makefile
+++ b/XOrg/app/xmessage/Makefile
@@ -16,7 +16,7 @@ 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:=
+_DEPEND:= +libX11
 ifneq (xmessage,xinit)
 _DEPEND+=xorg-server-essentials
 endif

diff --git a/XOrg/app/xset/Makefile b/XOrg/app/xset/Makefile
index bad4d2a..dbab0be 100644 (file)
--- a/XOrg/app/xset/Makefile
+++ b/XOrg/app/xset/Makefile
@@ -16,7 +16,7 @@ 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:=
+_DEPEND:= +libX11
 ifneq (xset,xinit)
 _DEPEND+=xorg-server-essentials
 endif

diff --git a/XOrg/app/xsetroot/Makefile b/XOrg/app/xsetroot/Makefile
index ea2a64a..bad5149 100644 (file)
--- a/XOrg/app/xsetroot/Makefile
+++ b/XOrg/app/xsetroot/Makefile
@@ -16,7 +16,7 @@ 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:=
+_DEPEND:= +libX11
 ifneq (xsetroot,xinit)
 _DEPEND+=xorg-server-essentials
 endif