From 7c70c68091b5d311d7685d45fcf4808fc85c7b9e Mon Sep 17 00:00:00 2001 From: lars Date: Wed, 3 Sep 2008 21:59:13 +0000 Subject: [PATCH] More X package dependecy fixes. git-svn-id: svn://svn.openwrt.org/openwrt/packages@12523 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- XOrg/app/packages | 18 +++++++++--------- XOrg/app/template.mk | 2 +- XOrg/app/xcalc/Makefile | 2 +- XOrg/app/xclipboard/Makefile | 2 +- XOrg/app/xdm/Makefile | 2 +- XOrg/app/xeyes/Makefile | 2 +- XOrg/app/xinit/Makefile | 2 +- XOrg/app/xlogo/Makefile | 2 +- XOrg/app/xmessage/Makefile | 2 +- XOrg/app/xset/Makefile | 2 +- XOrg/app/xsetroot/Makefile | 2 +- 11 files changed, 19 insertions(+), 19 deletions(-) diff --git a/XOrg/app/packages b/XOrg/app/packages index 904bfa1e2..8237c16c4 100644 --- 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 d6d18690b..d65055872 100644 --- 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 7220d06ef..d2abb1bf3 100644 --- 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 a09155c3d..7eab19146 100644 --- 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 3b45e4dfe..169a3c1ef 100644 --- 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 3acc212ea..d0c6b7e52 100644 --- 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 94d9bbb05..1fcd55cb2 100644 --- 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 dbf4ddb54..f0a261815 100644 --- 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 91f17f029..5e4db1c57 100644 --- 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 bad4d2a71..dbab0be71 100644 --- 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 ea2a64a65..bad5149b1 100644 --- 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 -- 2.11.0