summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--packages/bzflag/bzflag_1.10.6.20040515.bb2
-rw-r--r--packages/cairo/cairo_0.5.0.bb4
-rw-r--r--packages/cairo/cairo_0.5.2.bb4
-rw-r--r--packages/cairo/cairo_0.9.2.bb2
-rw-r--r--packages/cairo/cairo_1.0.0.bb2
-rw-r--r--packages/cairo/cairo_1.0.2.bb2
-rw-r--r--packages/cairo/cairo_cvs.bb4
-rw-r--r--packages/classpath/classpath_0.14.bb2
-rw-r--r--packages/classpath/classpath_0.15.bb2
-rw-r--r--packages/classpath/classpath_0.17.bb2
-rw-r--r--packages/classpath/classpath_0.18.bb2
-rw-r--r--packages/classpath/classpath_0.19.bb2
-rw-r--r--packages/classpath/classpath_0.20.bb2
-rw-r--r--packages/classpath/classpath_cvs.bb2
-rw-r--r--packages/dasher/dasher-gpe_0.0cvs20040828.bb2
-rw-r--r--packages/detect-stylus/detect-stylus_0.10.bb2
-rw-r--r--packages/detect-stylus/detect-stylus_0.13.bb2
-rw-r--r--packages/efl/evas-x11_0.9.9.023.bb2
-rw-r--r--packages/efl/evas-x11_20060113.bb2
-rw-r--r--packages/efl/imlib2-x11_1.2.1.010.bb2
-rw-r--r--packages/efl/imlib2-x11_20060128.bb2
-rw-r--r--packages/feh/feh_1.2.6.bb2
-rw-r--r--packages/feh/feh_1.2.7.bb2
-rw-r--r--packages/fs/fs_cvs.bb2
-rw-r--r--packages/gkrellm/gkrellm_2.2.7.bb2
-rw-r--r--packages/gnokii/gnokii_0.6.4.bb2
-rw-r--r--packages/gnuplot/gnuplot_4.0.0.bb2
-rw-r--r--packages/gpe-autostarter/gpe-autostarter_0.11.bb2
-rw-r--r--packages/gpe-autostarter/gpe-autostarter_0.7.bb2
-rw-r--r--packages/gpe-soundserver/gpe-soundserver_0.4-1.bb2
-rw-r--r--packages/gpe-what/gpe-what_0.30.bb2
-rw-r--r--packages/gpe-what/gpe-what_0.31.bb2
-rw-r--r--packages/gpe-what/gpe-what_0.33.bb2
-rw-r--r--packages/gpe-what/gpe-what_0.41.bb2
-rw-r--r--packages/gpe-what/gpe-what_0.42.bb2
-rw-r--r--packages/gpe-what/gpe-what_cvs.bb2
-rw-r--r--packages/gtk+/gtk+-1.2_1.2.10.bb2
-rw-r--r--packages/gtk+/gtk+-native-1.2_1.2.10.bb2
-rw-r--r--packages/gtk+/gtk+_2.2.4.bb2
-rw-r--r--packages/gtk+/gtk+_2.4.13.bb2
-rw-r--r--packages/gtk+/gtk+_2.4.4.bb2
-rw-r--r--packages/gtk+/gtk+_2.6.10.bb2
-rw-r--r--packages/gtk+/gtk+_2.6.3.bb2
-rw-r--r--packages/gtk+/gtk+_2.6.4-1.osso7.bb2
-rw-r--r--packages/gtk+/gtk+_2.6.7.bb2
-rw-r--r--packages/gtk+/gtk+_2.8.9.bb2
-rw-r--r--packages/icewm/icewm_1.2.20.bb2
-rw-r--r--packages/ion/ion3_0.0+ds20041104.bb2
-rw-r--r--packages/ipaq-sleep/ipaq-sleep_0.7-9.bb2
-rw-r--r--packages/ipaq-sleep/ipaq-sleep_0.8.bb2
-rw-r--r--packages/ipaq-sleep/ipaq-sleep_0.9.bb2
-rw-r--r--packages/kaffe/kaffe-gtk_1.1.5.bb2
-rw-r--r--packages/kaffe/kaffe-gtk_cvs.bb2
-rw-r--r--packages/keylaunch/keylaunch_2.0.7.bb2
-rw-r--r--packages/libfakekey/libfakekey_svn.bb2
-rw-r--r--packages/libmatchbox/libmatchbox.inc2
-rw-r--r--packages/libpixman/libpixman_0.1.5.bb2
-rw-r--r--packages/libpixman/libpixman_0.1.6.bb2
-rw-r--r--packages/libpixman/libpixman_cvs.bb2
-rw-r--r--packages/libsdl/libsdl-x11_1.2.7.bb2
-rw-r--r--packages/libvncserver/x11vnc_0.7.1.bb2
-rw-r--r--packages/libxine/libxine-x11_1.0.bb2
-rw-r--r--packages/libxine/libxine_1.1.0.bb2
-rw-r--r--packages/libxsettings-client/libxsettings-client_0.12.bb2
-rw-r--r--packages/libxsettings-client/libxsettings-client_0.13.bb2
-rw-r--r--packages/libxsettings-client/libxsettings-client_0.14.bb2
-rw-r--r--packages/libxsettings-client/libxsettings-client_0.16.bb2
-rw-r--r--packages/libxsettings/libxsettings_0.11.bb2
-rw-r--r--packages/lineak/lineak_0.8.3.bb2
-rw-r--r--packages/links/links-x11_2.1pre20.bb2
-rw-r--r--packages/lirc/lirc_0.7.1.bb2
-rw-r--r--packages/lirc/lirc_0.8.0.bb2
-rw-r--r--packages/maemo/hildon-fm_0.9.1-2.bb2
-rw-r--r--packages/maemo/hildon-lgpl_0.9.14-2.bb2
-rw-r--r--packages/maemo/osso-af-utils_0.4.bb2
-rw-r--r--packages/maemo/xpext_1.0-5.bb2
-rw-r--r--packages/maemo/xsp_1.0.0-8.bb2
-rw-r--r--packages/matchbox-panel/matchbox-panel.inc2
-rw-r--r--packages/matchbox-panel/matchbox-panel_0.8.1.bb2
-rw-r--r--packages/matchbox-panel/matchbox-panel_0.8.3.bb2
-rw-r--r--packages/matchbox-panel/matchbox-panel_0.8.bb2
-rw-r--r--packages/matchbox-panel/matchbox-panel_0.9.1.bb2
-rw-r--r--packages/matchbox-panel/matchbox-panel_0.9.bb2
-rw-r--r--packages/matchbox-wm/matchbox-wm_0.8.3.bb2
-rw-r--r--packages/matchbox-wm/matchbox-wm_0.8.4.bb2
-rw-r--r--packages/matchbox-wm/matchbox-wm_0.9.2.bb2
-rw-r--r--packages/matchbox-wm/matchbox-wm_0.9.3.bb2
-rw-r--r--packages/matchbox-wm/matchbox-wm_0.9.4.bb2
-rw-r--r--packages/matchbox-wm/matchbox-wm_0.9.5.bb2
-rw-r--r--packages/matchbox-wm/matchbox-wm_0.9.bb2
-rw-r--r--packages/matchbox-wm/matchbox-wm_svn.bb2
-rw-r--r--packages/miniclipboard/miniclipboard_0.3.bb2
-rw-r--r--packages/minipredict/minipredict.bb2
-rw-r--r--packages/mrxvt/mrxvt_0.4.1.bb2
-rw-r--r--packages/mythtv/mythtv_0.18.1.bb2
-rw-r--r--packages/pango/pango_1.10.0.bb2
-rw-r--r--packages/pango/pango_1.10.2.bb2
-rw-r--r--packages/pango/pango_1.2.5.bb2
-rw-r--r--packages/pango/pango_1.4.0.bb2
-rw-r--r--packages/pango/pango_1.4.1.bb2
-rw-r--r--packages/pango/pango_1.8.0.bb2
-rw-r--r--packages/pango/pango_1.8.1.bb2
-rw-r--r--packages/pango/pango_1.8.2.bb2
-rw-r--r--packages/pango/pango_1.9.1.bb2
-rw-r--r--packages/qt/qt-x11-free_3.3.5.bb2
-rw-r--r--packages/qt/qt-x11-free_4.0.1.bb2
-rw-r--r--packages/rdesktop/rdesktop_1.3.1.bb2
-rw-r--r--packages/rdesktop/rdesktop_1.4.1.bb2
-rw-r--r--packages/rdesktop/rdesktop_cvs.bb2
-rw-r--r--packages/rosetta/rosetta_cvs.bb2
-rw-r--r--packages/rxvt-unicode/rxvt-unicode_4.8.bb2
-rw-r--r--packages/rxvt-unicode/rxvt-unicode_4.9.bb2
-rw-r--r--packages/rxvt-unicode/rxvt-unicode_5.2.bb2
-rw-r--r--packages/rxvt-unicode/rxvt-unicode_5.3.bb2
-rw-r--r--packages/rxvt-unicode/rxvt-unicode_5.4.bb2
-rw-r--r--packages/rxvt-unicode/rxvt-unicode_5.6.bb2
-rw-r--r--packages/rxvt-unicode/rxvt-unicode_cvs.bb2
-rw-r--r--packages/rxvt/rxvt_2.7.9.bb2
-rw-r--r--packages/sablevm/sablevm-classpath_1.1.9.bb2
-rw-r--r--packages/sablevm/sablevm-classpath_1.11.3.bb2
-rw-r--r--packages/sablevm/sablevm-classpath_1.12.bb2
-rw-r--r--packages/skippy/skippy-xd_0.5.0.bb2
-rw-r--r--packages/startup-monitor/startup-monitor_0.18-2.bb2
-rw-r--r--packages/startup-notification/startup-notification_0.5.bb2
-rw-r--r--packages/startup-notification/startup-notification_0.8.bb2
-rw-r--r--packages/synergy/synergy_1.2.7.bb2
-rw-r--r--packages/tcltk/tk_8.4.11.bb2
-rw-r--r--packages/tetex/tetex_3.0.bb2
-rw-r--r--packages/v4l2apps/v4l2apps_20020317.bb2
-rw-r--r--packages/vnc/tightvnc_1.3dev7.bb2
-rw-r--r--packages/vnc/vnc_3.3.7.bb2
-rw-r--r--packages/waimea/waimea_cvs.bb2
-rw-r--r--packages/xauth/xauth_cvs.bb2
-rw-r--r--packages/xawtv/xawtv_3.93.bb2
-rw-r--r--packages/xcalibrate/xcalibrate_cvs.bb2
-rw-r--r--packages/xcompmgr/xcompmgr_cvs.bb2
-rw-r--r--packages/xdemineur/xdemineur_2.1.1.bb2
-rw-r--r--packages/xdpyinfo/xdpyinfo_cvs.bb2
-rw-r--r--packages/xev/xev_cvs.bb2
-rw-r--r--packages/xfcalendar/xfcalendar_4.2.0.bb2
-rw-r--r--packages/xfdesktop/xfdesktop_4.2.0.bb2
-rw-r--r--packages/xfwm4/xfwm4_4.2.0.bb2
-rw-r--r--packages/xhost/xhost_20040413.bb2
-rw-r--r--packages/xkbd/xkbd_0.8.15.bb2
-rw-r--r--packages/xmodmap/xmodmap_cvs.bb2
-rw-r--r--packages/xmonobut/xmonobut_0.4.1.bb2
-rw-r--r--packages/xmonobut/xmonobut_0.4.bb2
-rw-r--r--packages/xprop/xprop_cvs.bb2
-rw-r--r--packages/xqt/xqt_0.0.9.bb2
-rw-r--r--packages/xrandr/xrandr_cvs.bb2
-rw-r--r--packages/xrdb/xrdb_cvs.bb2
-rw-r--r--packages/xscreensaver/xscreensaver_4.16.bb2
-rw-r--r--packages/xscreensaver/xscreensaver_4.22.bb2
-rw-r--r--packages/xserver/xserver-kdrive-omap_6.6.3.bb2
-rw-r--r--packages/xserver/xserver-kdrive_20050207.bb2
-rw-r--r--packages/xserver/xserver-kdrive_20050624.bb2
-rw-r--r--packages/xserver/xserver-kdrive_cvs.bb2
-rw-r--r--packages/xserver/xserver-xorg_6.8.99.10.bb2
-rw-r--r--packages/xserver/xserver-xorg_6.8.99.11.bb2
-rw-r--r--packages/xserver/xserver-xorg_cvs.bb2
-rw-r--r--packages/xset/xset_20040817.bb2
-rw-r--r--packages/xstroke/xstroke_0.6.bb2
-rw-r--r--packages/xstroke/xstroke_cvs.bb2
-rw-r--r--packages/xtscal/xtscal_0.4.bb2
-rw-r--r--packages/xtscal/xtscal_0.5.1.bb2
-rw-r--r--packages/xtscal/xtscal_0.5.bb2
-rw-r--r--packages/xtscal/xtscal_0.6.3.bb2
167 files changed, 170 insertions, 170 deletions
diff --git a/packages/bzflag/bzflag_1.10.6.20040515.bb b/packages/bzflag/bzflag_1.10.6.20040515.bb
index 5976fa0903..145b70bf95 100644
--- a/packages/bzflag/bzflag_1.10.6.20040515.bb
+++ b/packages/bzflag/bzflag_1.10.6.20040515.bb
@@ -1,4 +1,4 @@
-DEPENDS = "adns ncurses x11"
+DEPENDS = "adns ncurses libx11"
SECTION = "x11/games"
LICENSE = "LGPL"
SRC_URI = "${SOURCEFORGE_MIRROR}/bzflag/bzflag-${PV}.tar.bz2"
diff --git a/packages/cairo/cairo_0.5.0.bb b/packages/cairo/cairo_0.5.0.bb
index 260541c39f..733aed045a 100644
--- a/packages/cairo/cairo_0.5.0.bb
+++ b/packages/cairo/cairo_0.5.0.bb
@@ -1,8 +1,8 @@
SECTION = "libs"
PRIORITY = "optional"
MAINTAINER = "Phil Blundell <pb@debian.org>"
-# DEPENDS = "x11 libpixman libpng fontconfig libxrender xcb glitz"
-DEPENDS = "x11 libpixman libpng fontconfig libxrender"
+# DEPENDS = "libx11 libpixman libpng fontconfig libxrender xcb glitz"
+DEPENDS = "libx11 libpixman libpng fontconfig libxrender"
DESCRIPTION = "Cairo graphics library"
LICENSE = "MPL LGPL"
PR = "r0"
diff --git a/packages/cairo/cairo_0.5.2.bb b/packages/cairo/cairo_0.5.2.bb
index 260541c39f..733aed045a 100644
--- a/packages/cairo/cairo_0.5.2.bb
+++ b/packages/cairo/cairo_0.5.2.bb
@@ -1,8 +1,8 @@
SECTION = "libs"
PRIORITY = "optional"
MAINTAINER = "Phil Blundell <pb@debian.org>"
-# DEPENDS = "x11 libpixman libpng fontconfig libxrender xcb glitz"
-DEPENDS = "x11 libpixman libpng fontconfig libxrender"
+# DEPENDS = "libx11 libpixman libpng fontconfig libxrender xcb glitz"
+DEPENDS = "libx11 libpixman libpng fontconfig libxrender"
DESCRIPTION = "Cairo graphics library"
LICENSE = "MPL LGPL"
PR = "r0"
diff --git a/packages/cairo/cairo_0.9.2.bb b/packages/cairo/cairo_0.9.2.bb
index 1e61594ba3..7d258cfb81 100644
--- a/packages/cairo/cairo_0.9.2.bb
+++ b/packages/cairo/cairo_0.9.2.bb
@@ -1,7 +1,7 @@
SECTION = "libs"
PRIORITY = "optional"
MAINTAINER = "Phil Blundell <pb@debian.org>"
-DEPENDS = "x11 libpng fontconfig libxrender"
+DEPENDS = "libx11 libpng fontconfig libxrender"
DESCRIPTION = "Cairo graphics library"
LICENSE = "MPL LGPL"
PR = "r1"
diff --git a/packages/cairo/cairo_1.0.0.bb b/packages/cairo/cairo_1.0.0.bb
index 84cb581174..10603e3f2f 100644
--- a/packages/cairo/cairo_1.0.0.bb
+++ b/packages/cairo/cairo_1.0.0.bb
@@ -1,7 +1,7 @@
SECTION = "libs"
PRIORITY = "optional"
MAINTAINER = "Phil Blundell <pb@debian.org>"
-DEPENDS = "x11 libpng fontconfig libxrender"
+DEPENDS = "libx11 libpng fontconfig libxrender"
DESCRIPTION = "Cairo graphics library"
LICENSE = "MPL LGPL"
PR = "r1"
diff --git a/packages/cairo/cairo_1.0.2.bb b/packages/cairo/cairo_1.0.2.bb
index 5db0dd127d..51116b3757 100644
--- a/packages/cairo/cairo_1.0.2.bb
+++ b/packages/cairo/cairo_1.0.2.bb
@@ -1,6 +1,6 @@
SECTION = "libs"
PRIORITY = "optional"
-DEPENDS = "x11 libpng fontconfig libxrender"
+DEPENDS = "libx11 libpng fontconfig libxrender"
DESCRIPTION = "Cairo graphics library"
LICENSE = "MPL LGPL"
PR = "r0"
diff --git a/packages/cairo/cairo_cvs.bb b/packages/cairo/cairo_cvs.bb
index 1a53d5a03a..c4908dafe6 100644
--- a/packages/cairo/cairo_cvs.bb
+++ b/packages/cairo/cairo_cvs.bb
@@ -2,8 +2,8 @@ PV = "0.0+cvs${SRCDATE}"
SECTION = "libs"
PRIORITY = "optional"
MAINTAINER = "Phil Blundell <pb@debian.org>"
-# DEPENDS = "x11 libpixman libpng fontconfig libxrender xcb glitz"
-DEPENDS = "x11 libpixman libpng fontconfig libxrender"
+# DEPENDS = "libx11 libpixman libpng fontconfig libxrender xcb glitz"
+DEPENDS = "libx11 libpixman libpng fontconfig libxrender"
DESCRIPTION = "Cairo graphics library"
LICENSE = "MPL LGPL"
PR = "r2"
diff --git a/packages/classpath/classpath_0.14.bb b/packages/classpath/classpath_0.14.bb
index c1c266c994..97a4272201 100644
--- a/packages/classpath/classpath_0.14.bb
+++ b/packages/classpath/classpath_0.14.bb
@@ -6,7 +6,7 @@ MAINTAINER = "Rene Wagner <rw@handhelds.org>"
SECTION = "libs"
PR = "r1"
-DEPENDS = "glib-2.0 gtk+ libart-lgpl pango xtst jikes-native zip-native"
+DEPENDS = "glib-2.0 gtk+ libart-lgpl pango libxtst jikes-native zip-native"
RDEPENDS_${PN} = "${PN}-common (${PV})"
SRC_URI = "${GNU_MIRROR}/${PN}/${P}.tar.gz \
diff --git a/packages/classpath/classpath_0.15.bb b/packages/classpath/classpath_0.15.bb
index c1c266c994..97a4272201 100644
--- a/packages/classpath/classpath_0.15.bb
+++ b/packages/classpath/classpath_0.15.bb
@@ -6,7 +6,7 @@ MAINTAINER = "Rene Wagner <rw@handhelds.org>"
SECTION = "libs"
PR = "r1"
-DEPENDS = "glib-2.0 gtk+ libart-lgpl pango xtst jikes-native zip-native"
+DEPENDS = "glib-2.0 gtk+ libart-lgpl pango libxtst jikes-native zip-native"
RDEPENDS_${PN} = "${PN}-common (${PV})"
SRC_URI = "${GNU_MIRROR}/${PN}/${P}.tar.gz \
diff --git a/packages/classpath/classpath_0.17.bb b/packages/classpath/classpath_0.17.bb
index fb41d7e9d8..f17292a6fb 100644
--- a/packages/classpath/classpath_0.17.bb
+++ b/packages/classpath/classpath_0.17.bb
@@ -6,7 +6,7 @@ MAINTAINER = "Rene Wagner <rw@handhelds.org>"
SECTION = "libs"
PR = "r1"
-DEPENDS = "glib-2.0 gtk+ libart-lgpl pango xtst jikes-native zip-native"
+DEPENDS = "glib-2.0 gtk+ libart-lgpl pango libxtst jikes-native zip-native"
RDEPENDS_${PN} = "${PN}-common (${PV})"
SRC_URI = "${GNU_MIRROR}/${PN}/${P}.tar.gz \
diff --git a/packages/classpath/classpath_0.18.bb b/packages/classpath/classpath_0.18.bb
index 028e16185c..e08e69501d 100644
--- a/packages/classpath/classpath_0.18.bb
+++ b/packages/classpath/classpath_0.18.bb
@@ -5,7 +5,7 @@ PRIORITY = "optional"
MAINTAINER = "Rene Wagner <rw@handhelds.org>"
SECTION = "libs"
-DEPENDS = "glib-2.0 gtk+ libart-lgpl pango xtst jikes-native zip-native"
+DEPENDS = "glib-2.0 gtk+ libart-lgpl pango libxtst jikes-native zip-native"
RDEPENDS_${PN} = "${PN}-common (>= ${PV})"
SRC_URI = "${GNU_MIRROR}/${PN}/${P}.tar.gz \
diff --git a/packages/classpath/classpath_0.19.bb b/packages/classpath/classpath_0.19.bb
index 028e16185c..e08e69501d 100644
--- a/packages/classpath/classpath_0.19.bb
+++ b/packages/classpath/classpath_0.19.bb
@@ -5,7 +5,7 @@ PRIORITY = "optional"
MAINTAINER = "Rene Wagner <rw@handhelds.org>"
SECTION = "libs"
-DEPENDS = "glib-2.0 gtk+ libart-lgpl pango xtst jikes-native zip-native"
+DEPENDS = "glib-2.0 gtk+ libart-lgpl pango libxtst jikes-native zip-native"
RDEPENDS_${PN} = "${PN}-common (>= ${PV})"
SRC_URI = "${GNU_MIRROR}/${PN}/${P}.tar.gz \
diff --git a/packages/classpath/classpath_0.20.bb b/packages/classpath/classpath_0.20.bb
index 028e16185c..e08e69501d 100644
--- a/packages/classpath/classpath_0.20.bb
+++ b/packages/classpath/classpath_0.20.bb
@@ -5,7 +5,7 @@ PRIORITY = "optional"
MAINTAINER = "Rene Wagner <rw@handhelds.org>"
SECTION = "libs"
-DEPENDS = "glib-2.0 gtk+ libart-lgpl pango xtst jikes-native zip-native"
+DEPENDS = "glib-2.0 gtk+ libart-lgpl pango libxtst jikes-native zip-native"
RDEPENDS_${PN} = "${PN}-common (>= ${PV})"
SRC_URI = "${GNU_MIRROR}/${PN}/${P}.tar.gz \
diff --git a/packages/classpath/classpath_cvs.bb b/packages/classpath/classpath_cvs.bb
index d40dc12a9f..061fa4df90 100644
--- a/packages/classpath/classpath_cvs.bb
+++ b/packages/classpath/classpath_cvs.bb
@@ -8,7 +8,7 @@ PV = "0.20+cvs${SRCDATE}"
DEFAULT_PREFERENCE = "-1"
-DEPENDS = "glib-2.0 gtk+ libart-lgpl pango xtst jikes-native zip-native"
+DEPENDS = "glib-2.0 gtk+ libart-lgpl pango libxtst jikes-native zip-native"
RDEPENDS_${PN} = "${PN}-common (>= ${PV})"
SRC_URI = "cvs://anoncvs@cvs.gnu.org/cvsroot/classpath;method=pserver;rsh=ssh;module=classpath \
diff --git a/packages/dasher/dasher-gpe_0.0cvs20040828.bb b/packages/dasher/dasher-gpe_0.0cvs20040828.bb
index ceb9425e29..7e515feae7 100644
--- a/packages/dasher/dasher-gpe_0.0cvs20040828.bb
+++ b/packages/dasher/dasher-gpe_0.0cvs20040828.bb
@@ -1,7 +1,7 @@
LICENSE="GPL"
PR = "r1"
-DEPENDS = "libxsettings-client libglade xtst gconf gtk+"
+DEPENDS = "libxsettings-client libglade libxtst gconf gtk+"
SECTION = "gpe"
SRC_URI = "cvs://anonymous@anoncvs.gnome.org/cvs/gnome;module=dasher;date=20040828 \
file://configure-lossage.patch;patch=1"
diff --git a/packages/detect-stylus/detect-stylus_0.10.bb b/packages/detect-stylus/detect-stylus_0.10.bb
index d4cec0efd7..bc7103cb24 100644
--- a/packages/detect-stylus/detect-stylus_0.10.bb
+++ b/packages/detect-stylus/detect-stylus_0.10.bb
@@ -3,7 +3,7 @@ LICENSE = "GPL"
PR = "r2"
-DEPENDS = "x11 xrdb xcursor-transparent-theme"
+DEPENDS = "libx11 xrdb xcursor-transparent-theme"
RDEPENDS = "xrdb xcursor-transparent-theme"
SECTION = "gpe"
diff --git a/packages/detect-stylus/detect-stylus_0.13.bb b/packages/detect-stylus/detect-stylus_0.13.bb
index c0ece8754e..793cbef849 100644
--- a/packages/detect-stylus/detect-stylus_0.13.bb
+++ b/packages/detect-stylus/detect-stylus_0.13.bb
@@ -3,7 +3,7 @@ LICENSE = "GPL"
PR = "r2"
-DEPENDS = "x11 xcursor-transparent-theme xrdb"
+DEPENDS = "libx11 xcursor-transparent-theme xrdb"
SECTION = "gpe"
RDEPENDS = "xrdb"
diff --git a/packages/efl/evas-x11_0.9.9.023.bb b/packages/efl/evas-x11_0.9.9.023.bb
index ba8b74aae2..4b833d8d9c 100644
--- a/packages/efl/evas-x11_0.9.9.023.bb
+++ b/packages/efl/evas-x11_0.9.9.023.bb
@@ -1,5 +1,5 @@
include evas.inc
-DEPENDS += "x11 xext freetype"
+DEPENDS += "libx11 libxext freetype"
PR = "r4"
EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \
diff --git a/packages/efl/evas-x11_20060113.bb b/packages/efl/evas-x11_20060113.bb
index 06111c467c..dab078a9bc 100644
--- a/packages/efl/evas-x11_20060113.bb
+++ b/packages/efl/evas-x11_20060113.bb
@@ -1,5 +1,5 @@
include evas.inc
-DEPENDS += "x11 xext freetype"
+DEPENDS += "libx11 libxext freetype"
PR = "r4"
SRC_URI = "cvs://anonymous@thinktux.net/root;module=e17/libs/evas;date=${PV}"
diff --git a/packages/efl/imlib2-x11_1.2.1.010.bb b/packages/efl/imlib2-x11_1.2.1.010.bb
index d13d24165a..fec8b32205 100644
--- a/packages/efl/imlib2-x11_1.2.1.010.bb
+++ b/packages/efl/imlib2-x11_1.2.1.010.bb
@@ -1,5 +1,5 @@
include imlib2.inc
-DEPENDS += "x11 xext"
+DEPENDS += "libx11 libxext"
PR = "r1"
EXTRA_OECONF = "--disable-mmx \
diff --git a/packages/efl/imlib2-x11_20060128.bb b/packages/efl/imlib2-x11_20060128.bb
index 1fab5cb292..f77fa6498c 100644
--- a/packages/efl/imlib2-x11_20060128.bb
+++ b/packages/efl/imlib2-x11_20060128.bb
@@ -3,7 +3,7 @@ include imlib2.inc
SRC_URI = "cvs://anonymous@thinktux.net/root;module=e17/libs/imlib2;date=${PV}"
S = "${WORKDIR}/imlib2"
-DEPENDS += "x11 xext"
+DEPENDS += "libx11 libxext"
EXTRA_OECONF = "--disable-mmx \
--with-x \
diff --git a/packages/feh/feh_1.2.6.bb b/packages/feh/feh_1.2.6.bb
index 372c2d3d2a..1d2fcaaf07 100644
--- a/packages/feh/feh_1.2.6.bb
+++ b/packages/feh/feh_1.2.6.bb
@@ -2,7 +2,7 @@ SECTION = "x11/utils"
DESCRIPTION = "feh is a fast, lightweight image viewer which uses imlib2."
MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
LICENSE = "MIT"
-DEPENDS = "imlib2 giblib jpeg x11 xext xt"
+DEPENDS = "imlib2 giblib jpeg libx11 libxext libxt"
SRC_URI = "http://linuxbrit.co.uk/downloads/feh-${PV}.tar.gz \
file://cross.patch;patch=1"
diff --git a/packages/feh/feh_1.2.7.bb b/packages/feh/feh_1.2.7.bb
index 372c2d3d2a..1d2fcaaf07 100644
--- a/packages/feh/feh_1.2.7.bb
+++ b/packages/feh/feh_1.2.7.bb
@@ -2,7 +2,7 @@ SECTION = "x11/utils"
DESCRIPTION = "feh is a fast, lightweight image viewer which uses imlib2."
MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
LICENSE = "MIT"
-DEPENDS = "imlib2 giblib jpeg x11 xext xt"
+DEPENDS = "imlib2 giblib jpeg libx11 libxext libxt"
SRC_URI = "http://linuxbrit.co.uk/downloads/feh-${PV}.tar.gz \
file://cross.patch;patch=1"
diff --git a/packages/fs/fs_cvs.bb b/packages/fs/fs_cvs.bb
index 6bab1d8c3b..2a6722c422 100644
--- a/packages/fs/fs_cvs.bb
+++ b/packages/fs/fs_cvs.bb
@@ -2,7 +2,7 @@ PV = "0.0+cvs${SRCDATE}"
LICENSE = "BSD-X"
SECTION = "libs"
PRIORITY = "optional"
-DEPENDS = "xfont xtrans"
+DEPENDS = "libxfont xtrans"
SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=FS"
S = "${WORKDIR}/FS"
diff --git a/packages/gkrellm/gkrellm_2.2.7.bb b/packages/gkrellm/gkrellm_2.2.7.bb
index 01f68482ef..c2bf9ab10a 100644
--- a/packages/gkrellm/gkrellm_2.2.7.bb
+++ b/packages/gkrellm/gkrellm_2.2.7.bb
@@ -2,7 +2,7 @@ SECTION = "x11/utils"
DESCRIPTION = "GKrellM is a GTK-based stacked monitor program."
MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
LICENSE = "GPL"
-DEPENDS = "gtk+ glib-2.0 libsm ice"
+DEPENDS = "gtk+ glib-2.0 libsm libice"
SRC_URI = "http://members.dslextreme.com/users/billw/gkrellm/gkrellm-${PV}.tar.bz2"
diff --git a/packages/gnokii/gnokii_0.6.4.bb b/packages/gnokii/gnokii_0.6.4.bb
index 4a62ffc2d5..f04086a758 100644
--- a/packages/gnokii/gnokii_0.6.4.bb
+++ b/packages/gnokii/gnokii_0.6.4.bb
@@ -4,7 +4,7 @@ SRC_URI = "http://www.gnokii.org/download/gnokii/0.6.x/gnokii-${PV}.tar.bz2 \
file://configure.patch;patch=1"
MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-DEPENDS = "xpm"
+DEPENDS = "libxpm"
inherit autotools pkgconfig
diff --git a/packages/gnuplot/gnuplot_4.0.0.bb b/packages/gnuplot/gnuplot_4.0.0.bb
index 0fead5ff4c..f5bc5fc740 100644
--- a/packages/gnuplot/gnuplot_4.0.0.bb
+++ b/packages/gnuplot/gnuplot_4.0.0.bb
@@ -4,7 +4,7 @@ SECTION = "console/scientific"
LICENSE = "BSD-4"
PRIORITY = "optional"
MAINTAINER = "Philip Frampton"
-DEPENDS = "x11 libpng gd readline"
+DEPENDS = "libx11 libpng gd readline"
PR = "r3"
SRC_URI = "ftp://ftp.gnuplot.info/pub/gnuplot/gnuplot-${PV}.tar.gz \
diff --git a/packages/gpe-autostarter/gpe-autostarter_0.11.bb b/packages/gpe-autostarter/gpe-autostarter_0.11.bb
index e670c168d3..0921ec25a4 100644
--- a/packages/gpe-autostarter/gpe-autostarter_0.11.bb
+++ b/packages/gpe-autostarter/gpe-autostarter_0.11.bb
@@ -1,5 +1,5 @@
SECTION = "gpe"
-DEPENDS = "glib-2.0 dbus hotplug-dbus x11"
+DEPENDS = "glib-2.0 dbus hotplug-dbus libx11"
RDEPENDS = "hotplug-dbus"
LICENSE = "GPL"
diff --git a/packages/gpe-autostarter/gpe-autostarter_0.7.bb b/packages/gpe-autostarter/gpe-autostarter_0.7.bb
index 8b003b405a..847e961cce 100644
--- a/packages/gpe-autostarter/gpe-autostarter_0.7.bb
+++ b/packages/gpe-autostarter/gpe-autostarter_0.7.bb
@@ -1,6 +1,6 @@
LICENSE = "GPL"
SECTION = "gpe"
-DEPENDS = "glib-2.0 dbus hotplug-dbus x11"
+DEPENDS = "glib-2.0 dbus hotplug-dbus libx11"
RDEPENDS = "hotplug-dbus"
inherit gpe
diff --git a/packages/gpe-soundserver/gpe-soundserver_0.4-1.bb b/packages/gpe-soundserver/gpe-soundserver_0.4-1.bb
index 859166b576..253eda0502 100644
--- a/packages/gpe-soundserver/gpe-soundserver_0.4-1.bb
+++ b/packages/gpe-soundserver/gpe-soundserver_0.4-1.bb
@@ -2,7 +2,7 @@ LICENSE = "GPL"
SECTION = "gpe"
inherit gpe
-DEPENDS = "x11 esound-gpe"
+DEPENDS = "libx11 esound-gpe"
RDEPENDS_${PN} = "esd"
SRC_URI += "file://makefile-breakage.patch;patch=1"
diff --git a/packages/gpe-what/gpe-what_0.30.bb b/packages/gpe-what/gpe-what_0.30.bb
index c5d4ed8b42..4bd9e5e779 100644
--- a/packages/gpe-what/gpe-what_0.30.bb
+++ b/packages/gpe-what/gpe-what_0.30.bb
@@ -3,7 +3,7 @@ SECTION = "gpe"
inherit gpe
DESCRIPTION = "GPE modal help"
-DEPENDS = "x11"
+DEPENDS = "libx11"
MAINTAINER = "Phil Blundell <pb@handhelds.org>"
do_compile_prepend() {
diff --git a/packages/gpe-what/gpe-what_0.31.bb b/packages/gpe-what/gpe-what_0.31.bb
index 5268c2cded..e660eea21b 100644
--- a/packages/gpe-what/gpe-what_0.31.bb
+++ b/packages/gpe-what/gpe-what_0.31.bb
@@ -3,5 +3,5 @@ SECTION = "gpe"
inherit gpe
DESCRIPTION = "GPE modal help"
-DEPENDS = "x11 xpm libmatchbox"
+DEPENDS = "libx11 libxpm libmatchbox"
MAINTAINER = "Phil Blundell <pb@handhelds.org>"
diff --git a/packages/gpe-what/gpe-what_0.33.bb b/packages/gpe-what/gpe-what_0.33.bb
index 062a7c6db1..98710f551f 100644
--- a/packages/gpe-what/gpe-what_0.33.bb
+++ b/packages/gpe-what/gpe-what_0.33.bb
@@ -5,5 +5,5 @@ inherit gpe
SRC_URI += "file://makefile-fix.patch;patch=1"
DESCRIPTION = "GPE modal help"
-DEPENDS = "x11 xpm libmatchbox"
+DEPENDS = "libx11 libxpm libmatchbox"
MAINTAINER = "Phil Blundell <pb@handhelds.org>"
diff --git a/packages/gpe-what/gpe-what_0.41.bb b/packages/gpe-what/gpe-what_0.41.bb
index b7f8d17201..383e31995f 100644
--- a/packages/gpe-what/gpe-what_0.41.bb
+++ b/packages/gpe-what/gpe-what_0.41.bb
@@ -1,6 +1,6 @@
LICENSE = "GPL"
DESCRIPTION = "GPE modal help"
-DEPENDS = "x11 gtk+"
+DEPENDS = "libx11 gtk+"
GPE_TARBALL_SUFFIX= "bz2"
diff --git a/packages/gpe-what/gpe-what_0.42.bb b/packages/gpe-what/gpe-what_0.42.bb
index b7f8d17201..383e31995f 100644
--- a/packages/gpe-what/gpe-what_0.42.bb
+++ b/packages/gpe-what/gpe-what_0.42.bb
@@ -1,6 +1,6 @@
LICENSE = "GPL"
DESCRIPTION = "GPE modal help"
-DEPENDS = "x11 gtk+"
+DEPENDS = "libx11 gtk+"
GPE_TARBALL_SUFFIX= "bz2"
diff --git a/packages/gpe-what/gpe-what_cvs.bb b/packages/gpe-what/gpe-what_cvs.bb
index 0cc7c96016..3da6662afb 100644
--- a/packages/gpe-what/gpe-what_cvs.bb
+++ b/packages/gpe-what/gpe-what_cvs.bb
@@ -10,4 +10,4 @@ inherit autotools gpe
SRC_URI = "${HANDHELDS_CVS};module=gpe/base/${PN}"
DESCRIPTION = "GPE modal help"
-DEPENDS = "x11 gtk+"
+DEPENDS = "libx11 gtk+"
diff --git a/packages/gtk+/gtk+-1.2_1.2.10.bb b/packages/gtk+/gtk+-1.2_1.2.10.bb
index 2056567cc8..f54980f03f 100644
--- a/packages/gtk+/gtk+-1.2_1.2.10.bb
+++ b/packages/gtk+/gtk+-1.2_1.2.10.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "http://www.gtk.org"
SECTION = "libs"
PRIORITY = "optional"
MAINTAINER = "Rob Taylor <robtaylor@fastmail.fm>"
-DEPENDS = "glib-1.2 jpeg libpng xext"
+DEPENDS = "glib-1.2 jpeg libpng libxext"
PR = "r2"
SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v1.2/gtk+-${PV}.tar.gz \
diff --git a/packages/gtk+/gtk+-native-1.2_1.2.10.bb b/packages/gtk+/gtk+-native-1.2_1.2.10.bb
index cd6e496a31..bf776494c6 100644
--- a/packages/gtk+/gtk+-native-1.2_1.2.10.bb
+++ b/packages/gtk+/gtk+-native-1.2_1.2.10.bb
@@ -4,7 +4,7 @@ SECTION = "libs"
LICENSE = "LGPL"
PRIORITY = "optional"
MAINTAINER = "Rob Taylor <robtaylor@fastmail.fm>"
-DEPENDS = "glib-1.2 jpeg libpng xext"
+DEPENDS = "glib-1.2 jpeg libpng libxext"
PR = "r0"
SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v1.2/gtk+-${PV}.tar.gz \
diff --git a/packages/gtk+/gtk+_2.2.4.bb b/packages/gtk+/gtk+_2.2.4.bb
index 962eb55895..f54db4cdcf 100644
--- a/packages/gtk+/gtk+_2.2.4.bb
+++ b/packages/gtk+/gtk+_2.2.4.bb
@@ -5,7 +5,7 @@ HOMEPAGE = "http://www.gtk.org"
SECTION = "libs"
PRIORITY = "optional"
MAINTAINER = "Philip Blundell <pb@handhelds.org>"
-DEPENDS = "pango atk jpeg libpng xext"
+DEPENDS = "pango atk jpeg libpng libxext"
SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/2.2/gtk+-${PV}.tar.bz2 \
http://handhelds.org/packages/gtk-2.0/gtk+-2.2.4.diff.bz2;patch=1;pnum=1 \
diff --git a/packages/gtk+/gtk+_2.4.13.bb b/packages/gtk+/gtk+_2.4.13.bb
index 3ea34fe702..e32bb93a64 100644
--- a/packages/gtk+/gtk+_2.4.13.bb
+++ b/packages/gtk+/gtk+_2.4.13.bb
@@ -5,7 +5,7 @@ HOMEPAGE = "http://www.gtk.org"
SECTION = "libs"
PRIORITY = "optional"
MAINTAINER = "Philip Blundell <pb@handhelds.org>"
-DEPENDS = "glib-2.0 pango atk jpeg libpng xext libxcursor"
+DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor"
PR = "r6"
SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.4/gtk+-${PV}.tar.bz2 \
diff --git a/packages/gtk+/gtk+_2.4.4.bb b/packages/gtk+/gtk+_2.4.4.bb
index dfd8b8922a..7e358a16f5 100644
--- a/packages/gtk+/gtk+_2.4.4.bb
+++ b/packages/gtk+/gtk+_2.4.4.bb
@@ -5,7 +5,7 @@ HOMEPAGE = "http://www.gtk.org"
SECTION = "libs"
PRIORITY = "optional"
MAINTAINER = "Philip Blundell <pb@handhelds.org>"
-DEPENDS = "glib-2.0 pango atk jpeg libpng xext libxcursor"
+DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor"
PR = "r7"
SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.4/gtk+-${PV}.tar.bz2 \
diff --git a/packages/gtk+/gtk+_2.6.10.bb b/packages/gtk+/gtk+_2.6.10.bb
index 374dba0a31..e9e6db921b 100644
--- a/packages/gtk+/gtk+_2.6.10.bb
+++ b/packages/gtk+/gtk+_2.6.10.bb
@@ -5,7 +5,7 @@ HOMEPAGE = "http://www.gtk.org"
SECTION = "libs"
PRIORITY = "optional"
MAINTAINER = "Philip Blundell <pb@handhelds.org>"
-DEPENDS = "glib-2.0 pango atk jpeg libpng xext libxcursor gtk-doc libgcrypt"
+DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt"
PR = "r2"
SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/gtk+-${PV}.tar.bz2 \
diff --git a/packages/gtk+/gtk+_2.6.3.bb b/packages/gtk+/gtk+_2.6.3.bb
index 32e3fba5e1..38263836b9 100644
--- a/packages/gtk+/gtk+_2.6.3.bb
+++ b/packages/gtk+/gtk+_2.6.3.bb
@@ -5,7 +5,7 @@ HOMEPAGE = "http://www.gtk.org"
SECTION = "libs"
PRIORITY = "optional"
MAINTAINER = "Philip Blundell <pb@handhelds.org>"
-DEPENDS = "glib-2.0 pango atk jpeg libpng xext libxcursor gtk-doc libgcrypt"
+DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt"
PR = "r1"
SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/gtk+-${PV}.tar.bz2 \
diff --git a/packages/gtk+/gtk+_2.6.4-1.osso7.bb b/packages/gtk+/gtk+_2.6.4-1.osso7.bb
index fbebed2e45..e2065b3faa 100644
--- a/packages/gtk+/gtk+_2.6.4-1.osso7.bb
+++ b/packages/gtk+/gtk+_2.6.4-1.osso7.bb
@@ -5,7 +5,7 @@ HOMEPAGE = "http://www.gtk.org"
SECTION = "libs"
PRIORITY = "optional"
MAINTAINER = "Koen Kooi <koen@handhelds.org>"
-DEPENDS = "glib-2.0 pango atk jpeg libpng xext libxcursor gtk-doc libgcrypt"
+DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt"
PR = "r1"
S = "${WORKDIR}/gtk+2.0-2.6.4/upstream/tarballs/gtk+-2.6.4/"
diff --git a/packages/gtk+/gtk+_2.6.7.bb b/packages/gtk+/gtk+_2.6.7.bb
index 65f1402fa7..4f43fdfecf 100644
--- a/packages/gtk+/gtk+_2.6.7.bb
+++ b/packages/gtk+/gtk+_2.6.7.bb
@@ -4,7 +4,7 @@ set of widgets, GTK+ is suitable for projects ranging from small one-off project
HOMEPAGE = "http://www.gtk.org"
SECTION = "libs"
PRIORITY = "optional"
-DEPENDS = "glib-2.0 pango atk jpeg libpng xext libxcursor gtk-doc libgcrypt"
+DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt"
PR = "r1"
SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/gtk+-${PV}.tar.bz2 \
diff --git a/packages/gtk+/gtk+_2.8.9.bb b/packages/gtk+/gtk+_2.8.9.bb
index 7ece5ca519..4b63a376c2 100644
--- a/packages/gtk+/gtk+_2.8.9.bb
+++ b/packages/gtk+/gtk+_2.8.9.bb
@@ -4,7 +4,7 @@ set of widgets, GTK+ is suitable for projects ranging from small one-off project
HOMEPAGE = "http://www.gtk.org"
SECTION = "libs"
PRIORITY = "optional"
-DEPENDS = "glib-2.0 pango atk jpeg libpng xext libxcursor gtk-doc libgcrypt cairo"
+DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt cairo"
PR = "r0"
SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.8/gtk+-${PV}.tar.bz2 \
diff --git a/packages/icewm/icewm_1.2.20.bb b/packages/icewm/icewm_1.2.20.bb
index 3d6eba69f0..ff6434279b 100644
--- a/packages/icewm/icewm_1.2.20.bb
+++ b/packages/icewm/icewm_1.2.20.bb
@@ -1,7 +1,7 @@
SECTION = "x11/wm"
DESCRIPTION = "IceWM Window Manager"
LICENSE = "GPL"
-DEPENDS = "x11 xext xcomposite libxfixes xdamage libxrender xinerama xpm xrandr xft"
+DEPENDS = "libx11 libxext libxcomposite libxfixes libxdamage libxrender libxinerama libxpm xrandr xft"
PR = "r1"
SRC_URI = "${SOURCEFORGE_MIRROR}/icewm/icewm-${PV}.tar.gz \
diff --git a/packages/ion/ion3_0.0+ds20041104.bb b/packages/ion/ion3_0.0+ds20041104.bb
index 81af3169fd..1c80cdf2fa 100644
--- a/packages/ion/ion3_0.0+ds20041104.bb
+++ b/packages/ion/ion3_0.0+ds20041104.bb
@@ -1,7 +1,7 @@
BROKEN = "1"
# is unfetchable now - upstream updated to 20050728
-DEPENDS += "lua-native lua x11 xext"
+DEPENDS += "lua-native lua libx11 libxext"
DESCRIPTION = "Ion is a tiling tabbed window manager designed with keyboard \
users in mind."
HOMEPAGE = "http://modeemi.fi/~tuomov/ion/"
diff --git a/packages/ipaq-sleep/ipaq-sleep_0.7-9.bb b/packages/ipaq-sleep/ipaq-sleep_0.7-9.bb
index 6895fee058..bdf0295c98 100644
--- a/packages/ipaq-sleep/ipaq-sleep_0.7-9.bb
+++ b/packages/ipaq-sleep/ipaq-sleep_0.7-9.bb
@@ -4,7 +4,7 @@ PR = "r3"
inherit gpe pkgconfig
-DEPENDS = "apmd virtual/xserver xextensions x11 xau xscrnsaverh libxss"
+DEPENDS = "apmd virtual/xserver xextensions libx11 libxau xscrnsaverh libxss"
SECTION = "x11/base"
RDEPENDS = "apm"
diff --git a/packages/ipaq-sleep/ipaq-sleep_0.8.bb b/packages/ipaq-sleep/ipaq-sleep_0.8.bb
index 7bb4c7209f..a63ec83a7c 100644
--- a/packages/ipaq-sleep/ipaq-sleep_0.8.bb
+++ b/packages/ipaq-sleep/ipaq-sleep_0.8.bb
@@ -2,7 +2,7 @@
LICENSE = "GPL"
inherit gpe pkgconfig
-DEPENDS = "apmd virtual/xserver xextensions x11 xau xscrnsaverh libxss"
+DEPENDS = "apmd virtual/xserver xextensions libx11 libxau xscrnsaverh libxss"
SECTION = "x11/base"
RDEPENDS = "apm"
diff --git a/packages/ipaq-sleep/ipaq-sleep_0.9.bb b/packages/ipaq-sleep/ipaq-sleep_0.9.bb
index 7bb4c7209f..a63ec83a7c 100644
--- a/packages/ipaq-sleep/ipaq-sleep_0.9.bb
+++ b/packages/ipaq-sleep/ipaq-sleep_0.9.bb
@@ -2,7 +2,7 @@
LICENSE = "GPL"
inherit gpe pkgconfig
-DEPENDS = "apmd virtual/xserver xextensions x11 xau xscrnsaverh libxss"
+DEPENDS = "apmd virtual/xserver xextensions libx11 libxau xscrnsaverh libxss"
SECTION = "x11/base"
RDEPENDS = "apm"
diff --git a/packages/kaffe/kaffe-gtk_1.1.5.bb b/packages/kaffe/kaffe-gtk_1.1.5.bb
index d4c2be9f5c..2bcec9a929 100644
--- a/packages/kaffe/kaffe-gtk_1.1.5.bb
+++ b/packages/kaffe/kaffe-gtk_1.1.5.bb
@@ -5,6 +5,6 @@ S = "${WORKDIR}/kaffe-${PV}"
include kaffe.inc
-DEPENDS += "glib-2.0 gmp gtk+ libart-lgpl pango zlib xtst kaffeh-native"
+DEPENDS += "glib-2.0 gmp gtk+ libart-lgpl pango zlib libxtst kaffeh-native"
EXTRA_OECONF += ""
diff --git a/packages/kaffe/kaffe-gtk_cvs.bb b/packages/kaffe/kaffe-gtk_cvs.bb
index 07d26b75ce..c8ff718396 100644
--- a/packages/kaffe/kaffe-gtk_cvs.bb
+++ b/packages/kaffe/kaffe-gtk_cvs.bb
@@ -8,6 +8,6 @@ S = "${WORKDIR}/kaffe"
include kaffe.inc
-DEPENDS += "glib-2.0 gmp gtk+ libart-lgpl pango zlib xtst kaffeh-native"
+DEPENDS += "glib-2.0 gmp gtk+ libart-lgpl pango zlib libxtst kaffeh-native"
EXTRA_OECONF += ""
diff --git a/packages/keylaunch/keylaunch_2.0.7.bb b/packages/keylaunch/keylaunch_2.0.7.bb
index 5f05f140c3..37b1dbcf46 100644
--- a/packages/keylaunch/keylaunch_2.0.7.bb
+++ b/packages/keylaunch/keylaunch_2.0.7.bb
@@ -1,6 +1,6 @@
inherit gpe
-DEPENDS = "virtual/xserver xtst xau xpm"
+DEPENDS = "virtual/xserver libxtst libxau libxpm"
SECTION = "gpe"
LICENSE = "GPL"
DESCRIPTION = "A small utility for binding commands to a hot key.\
diff --git a/packages/libfakekey/libfakekey_svn.bb b/packages/libfakekey/libfakekey_svn.bb
index 7cdd557463..eec4d6506d 100644
--- a/packages/libfakekey/libfakekey_svn.bb
+++ b/packages/libfakekey/libfakekey_svn.bb
@@ -1,6 +1,6 @@
DESCRIPTION = "Matchbox keyboard"
LICENSE = "GPL"
-DEPENDS = "xtst"
+DEPENDS = "libxtst"
SECTION = "x11/wm"
PR="r1"
PV = "0.0+svn${SRCDATE}"
diff --git a/packages/libmatchbox/libmatchbox.inc b/packages/libmatchbox/libmatchbox.inc
index 44d2efde71..cd6625687d 100644
--- a/packages/libmatchbox/libmatchbox.inc
+++ b/packages/libmatchbox/libmatchbox.inc
@@ -1,7 +1,7 @@
SECTION = "x11/libs"
DESCRIPTION = "Matchbox window manager core library"
LICENSE = "GPL"
-DEPENDS = "x11 xext expat libxft pango jpeg libpng zlib libxsettings-client"
+DEPENDS = "libx11 libxext expat libxft pango jpeg libpng zlib libxsettings-client"
PR="r1"
inherit autotools pkgconfig
diff --git a/packages/libpixman/libpixman_0.1.5.bb b/packages/libpixman/libpixman_0.1.5.bb
index 2d69d14381..5427c90864 100644
--- a/packages/libpixman/libpixman_0.1.5.bb
+++ b/packages/libpixman/libpixman_0.1.5.bb
@@ -1,7 +1,7 @@
SECTION = "libs"
PRIORITY = "optional"
MAINTAINER = "Phil Blundell <pb@debian.org>"
-DEPENDS = "x11"
+DEPENDS = "libx11"
DESCRIPTION = "Cairo support library"
LICENSE = "X11"
SRC_URI = "http://cairographics.org/snapshots/libpixman-${PV}.tar.gz"
diff --git a/packages/libpixman/libpixman_0.1.6.bb b/packages/libpixman/libpixman_0.1.6.bb
index 2d69d14381..5427c90864 100644
--- a/packages/libpixman/libpixman_0.1.6.bb
+++ b/packages/libpixman/libpixman_0.1.6.bb
@@ -1,7 +1,7 @@
SECTION = "libs"
PRIORITY = "optional"
MAINTAINER = "Phil Blundell <pb@debian.org>"
-DEPENDS = "x11"
+DEPENDS = "libx11"
DESCRIPTION = "Cairo support library"
LICENSE = "X11"
SRC_URI = "http://cairographics.org/snapshots/libpixman-${PV}.tar.gz"
diff --git a/packages/libpixman/libpixman_cvs.bb b/packages/libpixman/libpixman_cvs.bb
index 549c149fad..1f04e51fad 100644
--- a/packages/libpixman/libpixman_cvs.bb
+++ b/packages/libpixman/libpixman_cvs.bb
@@ -2,7 +2,7 @@ PV = "0.0+cvs${SRCDATE}"
SECTION = "libs"
PRIORITY = "optional"
MAINTAINER = "Phil Blundell <pb@debian.org>"
-DEPENDS = "x11"
+DEPENDS = "libx11"
DESCRIPTION = "Cairo support library"
LICENSE = "X11"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.cairographics.org/cvs/cairo;module=libpixman"
diff --git a/packages/libsdl/libsdl-x11_1.2.7.bb b/packages/libsdl/libsdl-x11_1.2.7.bb
index e65fe4fba3..b2060cd0fd 100644
--- a/packages/libsdl/libsdl-x11_1.2.7.bb
+++ b/packages/libsdl/libsdl-x11_1.2.7.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Simple DirectMedia Layer - X11 Edition"
SECTION = "libs"
PRIORITY = "optional"
MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-DEPENDS = "x11 xext"
+DEPENDS = "libx11 libxext"
PROVIDES = "virtual/libsdl"
LICENSE = "LGPL"
diff --git a/packages/libvncserver/x11vnc_0.7.1.bb b/packages/libvncserver/x11vnc_0.7.1.bb
index 735cfaed08..61647eb571 100644
--- a/packages/libvncserver/x11vnc_0.7.1.bb
+++ b/packages/libvncserver/x11vnc_0.7.1.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "X11 VNC server"
SECTION = "x11"
PRIORITY = "optional"
-DEPENDS = "zlib jpeg x11"
+DEPENDS = "zlib jpeg libx11"
LICENSE = "GPL"
SRC_URI = "${SOURCEFORGE_MIRROR}/libvncserver/LibVNCServer-${PV}.tar.gz"
diff --git a/packages/libxine/libxine-x11_1.0.bb b/packages/libxine/libxine-x11_1.0.bb
index b8f22e7dc4..ea70778517 100644
--- a/packages/libxine/libxine-x11_1.0.bb
+++ b/packages/libxine/libxine-x11_1.0.bb
@@ -3,7 +3,7 @@ This version is configued for the usage with X11"
SECTION = "libs"
PRIORITY = "optional"
LICENSE = "GPL"
-DEPENDS = "zlib libogg libvorbis tremor libmad libmodplug esound-gpe x11 xext"
+DEPENDS = "zlib libogg libvorbis tremor libmad libmodplug esound-gpe libx11 libxext"
PROVIDES = "virtual/libxine"
PR = "r0"
diff --git a/packages/libxine/libxine_1.1.0.bb b/packages/libxine/libxine_1.1.0.bb
index af5561d68a..824c381a92 100644
--- a/packages/libxine/libxine_1.1.0.bb
+++ b/packages/libxine/libxine_1.1.0.bb
@@ -3,7 +3,7 @@ This version is configued for the usage with X11"
SECTION = "libs"
PRIORITY = "optional"
LICENSE = "GPL"
-DEPENDS = "zlib libogg libvorbis tremor libmad libmodplug esound-gpe x11 xext"
+DEPENDS = "zlib libogg libvorbis tremor libmad libmodplug esound-gpe libx11 libxext"
PROVIDES = "virtual/libxine"
PR = "r0"
diff --git a/packages/libxsettings-client/libxsettings-client_0.12.bb b/packages/libxsettings-client/libxsettings-client_0.12.bb
index efef97dfb1..3c3103722b 100644
--- a/packages/libxsettings-client/libxsettings-client_0.12.bb
+++ b/packages/libxsettings-client/libxsettings-client_0.12.bb
@@ -1,7 +1,7 @@
SECTION = "gpe/libs"
LICENSE = "BSD-X"
PRIORITY = "optional"
-DEPENDS = "libgpewidget libxsettings x11"
+DEPENDS = "libgpewidget libxsettings libx11"
inherit pkgconfig gpe
diff --git a/packages/libxsettings-client/libxsettings-client_0.13.bb b/packages/libxsettings-client/libxsettings-client_0.13.bb
index 10659e384b..1eed6f7db1 100644
--- a/packages/libxsettings-client/libxsettings-client_0.13.bb
+++ b/packages/libxsettings-client/libxsettings-client_0.13.bb
@@ -1,7 +1,7 @@
SECTION = "gpe/libs"
LICENSE = "BSD-X"
PRIORITY = "optional"
-DEPENDS = "libgpewidget libxsettings x11"
+DEPENDS = "libgpewidget libxsettings libx11"
inherit pkgconfig gpe
diff --git a/packages/libxsettings-client/libxsettings-client_0.14.bb b/packages/libxsettings-client/libxsettings-client_0.14.bb
index 11d0d3497b..0e8ff6d1cb 100644
--- a/packages/libxsettings-client/libxsettings-client_0.14.bb
+++ b/packages/libxsettings-client/libxsettings-client_0.14.bb
@@ -1,7 +1,7 @@
SECTION = "gpe/libs"
LICENSE = "BSD-X"
PRIORITY = "optional"
-DEPENDS = "libxsettings x11"
+DEPENDS = "libxsettings libx11"
inherit autotools pkgconfig gpe
diff --git a/packages/libxsettings-client/libxsettings-client_0.16.bb b/packages/libxsettings-client/libxsettings-client_0.16.bb
index 0e54f6088b..c668971de8 100644
--- a/packages/libxsettings-client/libxsettings-client_0.16.bb
+++ b/packages/libxsettings-client/libxsettings-client_0.16.bb
@@ -1,7 +1,7 @@
SECTION = "gpe/libs"
LICENSE = "BSD-X"
PRIORITY = "optional"
-DEPENDS = "libxsettings x11"
+DEPENDS = "libxsettings libx11"
MAINTAINER = "Florian Boor <florian@kernelconcepts.de>"
PR="r1"
diff --git a/packages/libxsettings/libxsettings_0.11.bb b/packages/libxsettings/libxsettings_0.11.bb
index 6ff786e3bd..caf2bc67ae 100644
--- a/packages/libxsettings/libxsettings_0.11.bb
+++ b/packages/libxsettings/libxsettings_0.11.bb
@@ -3,7 +3,7 @@ SECTION = "gpe/libs"
LICENSE = "BSD-X"
PRIORITY = "optional"
MAINTAINER = "Philip Blundell <pb@handhelds.org>"
-DEPENDS = "x11"
+DEPENDS = "libx11"
inherit gpe
diff --git a/packages/lineak/lineak_0.8.3.bb b/packages/lineak/lineak_0.8.3.bb
index fe6778179c..111708d732 100644
--- a/packages/lineak/lineak_0.8.3.bb
+++ b/packages/lineak/lineak_0.8.3.bb
@@ -3,7 +3,7 @@ SECTION = "gpe/multimedia"
HOMEPAGE = "http://lineak.sourceforge.net"
LICENSE = "GPLv2"
MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
-DEPENDS = "x11 xext"
+DEPENDS = "libx11 libxext"
PR = "r0"
SRC_URI = "${SOURCEFORGE_MIRROR}/lineak/lineakd-${PV}.tar.gz \
diff --git a/packages/links/links-x11_2.1pre20.bb b/packages/links/links-x11_2.1pre20.bb
index ab2b71cd12..f763df7f60 100644
--- a/packages/links/links-x11_2.1pre20.bb
+++ b/packages/links/links-x11_2.1pre20.bb
@@ -1,6 +1,6 @@
LICENSE = "GPL"
SECTION = "console/network"
-DEPENDS = "jpeg libpng flex openssl zlib x11"
+DEPENDS = "jpeg libpng flex openssl zlib libx11"
DESCRIPTION = "Links is graphics and text mode WWW \
browser, similar to Lynx."
RCONFLICTS = "links"
diff --git a/packages/lirc/lirc_0.7.1.bb b/packages/lirc/lirc_0.7.1.bb
index c3eaa3aa87..cd65dcedae 100644
--- a/packages/lirc/lirc_0.7.1.bb
+++ b/packages/lirc/lirc_0.7.1.bb
@@ -3,7 +3,7 @@ SECTION = "console/network"
PRIORITY = "optional"
MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
LICENSE = "GPL"
-DEPENDS = "virtual/kernel x11 xau libsm ice"
+DEPENDS = "virtual/kernel libx11 libxau libsm libice"
PR = "r5"
SRC_URI = "${SOURCEFORGE_MIRROR}/lirc/lirc-${PV}.tar.gz \
diff --git a/packages/lirc/lirc_0.8.0.bb b/packages/lirc/lirc_0.8.0.bb
index 62ef3b5d3d..69d054ceae 100644
--- a/packages/lirc/lirc_0.8.0.bb
+++ b/packages/lirc/lirc_0.8.0.bb
@@ -8,7 +8,7 @@ SECTION = "console/network"
PRIORITY = "optional"
MAINTAINER = "Matthias Goebl <matthias.goebl@goebl.net>"
LICENSE = "GPL"
-DEPENDS = "virtual/kernel libx11 libxau libsm ice"
+DEPENDS = "virtual/kernel libx11 libxau libsm libice"
DEPENDS_nslu2 = "virtual/kernel lirc-modules"
RDEPENDS = "lirc-modules"
RDEPENDS_lirc-x = "lirc"
diff --git a/packages/maemo/hildon-fm_0.9.1-2.bb b/packages/maemo/hildon-fm_0.9.1-2.bb
index f5346286c0..93bf0cbfa2 100644
--- a/packages/maemo/hildon-fm_0.9.1-2.bb
+++ b/packages/maemo/hildon-fm_0.9.1-2.bb
@@ -2,7 +2,7 @@ PR = "r1"
LICENSE = "GPL/LGPL"
MAINTAINER = "Koen Kooi <koen@handhelds.org>"
-DEPENDS = "gtk+-2.6.4-1.osso7 outo libxi xt libpng gconf hildon-lgpl osso-thumbnail osso-gwconnect"
+DEPENDS = "gtk+-2.6.4-1.osso7 outo libxi libxt libpng gconf hildon-lgpl osso-thumbnail osso-gwconnect"
SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/h/hildon-fm/hildon-fm_${PV}.tar.gz"
S = "${WORKDIR}/hildon-fm-0.9.1"
diff --git a/packages/maemo/hildon-lgpl_0.9.14-2.bb b/packages/maemo/hildon-lgpl_0.9.14-2.bb
index f3ef59c8dc..9656fd85b6 100644
--- a/packages/maemo/hildon-lgpl_0.9.14-2.bb
+++ b/packages/maemo/hildon-lgpl_0.9.14-2.bb
@@ -1,7 +1,7 @@
LICENSE = "LGPL"
MAINTAINER = "Koen Kooi <koen@handhelds.org>"
-DEPENDS = "gtk+-2.6.4-1.osso7 outo xtst libmatchbox libxi xt libpng gconf"
+DEPENDS = "gtk+-2.6.4-1.osso7 outo libxtst libmatchbox libxi libxt libpng gconf"
SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/h/hildon-lgpl/hildon-lgpl_${PV}.tar.gz \
file://hildon-lgpl-noWerror.patch;patch=1"
diff --git a/packages/maemo/osso-af-utils_0.4.bb b/packages/maemo/osso-af-utils_0.4.bb
index 070d2e0c66..54f2305b17 100644
--- a/packages/maemo/osso-af-utils_0.4.bb
+++ b/packages/maemo/osso-af-utils_0.4.bb
@@ -1,7 +1,7 @@
LICENSE = "LGPL"
MAINTAINER= "Koen Kooi <koen@handhelds.org>"
-DEPENDS = "x11 dbus libosso"
+DEPENDS = "libx11 dbus libosso"
SRC_URI = "http://stage.maemo.org:80/pool/maemo/ossw/source/o/osso-af-utils/osso-af-utils_${PV}-1.tar.gz"
inherit autotools pkgconfig
diff --git a/packages/maemo/xpext_1.0-5.bb b/packages/maemo/xpext_1.0-5.bb
index cd5aec2d13..75b7903e84 100644
--- a/packages/maemo/xpext_1.0-5.bb
+++ b/packages/maemo/xpext_1.0-5.bb
@@ -3,7 +3,7 @@ LICENSE= "MIT"
DESCRIPTION = "X Server Nokia 770 extensions library"
SECTION = "x11/libs"
PRIORITY = "optional"
-DEPENDS = "x11 xextensions xext"
+DEPENDS = "libx11 xextensions libxext"
SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/x/${PN}/${PN}_${PV}.tar.gz \
file://auxdir.patch;patch=1;pnum=0"
diff --git a/packages/maemo/xsp_1.0.0-8.bb b/packages/maemo/xsp_1.0.0-8.bb
index 0c4a4c62f8..068193c6aa 100644
--- a/packages/maemo/xsp_1.0.0-8.bb
+++ b/packages/maemo/xsp_1.0.0-8.bb
@@ -3,7 +3,7 @@ LICENSE= "MIT"
DESCRIPTION = "X Server Nokia 770 extensions library"
SECTION = "x11/libs"
PRIORITY = "optional"
-DEPENDS = "x11 xextensions xext xpext"
+DEPENDS = "libx11 xextensions libxext xpext"
SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/x/xsp/${PN}_${PV}.tar.gz"
S = "${WORKDIR}/Xsp"
diff --git a/packages/matchbox-panel/matchbox-panel.inc b/packages/matchbox-panel/matchbox-panel.inc
index 78360a54e5..f82b66a0e9 100644
--- a/packages/matchbox-panel/matchbox-panel.inc
+++ b/packages/matchbox-panel/matchbox-panel.inc
@@ -1,6 +1,6 @@
DESCRIPTION = "Matchbox Window Manager Panel"
LICENSE = "GPL"
-DEPENDS = "libmatchbox x11 xext xpm apmd startup-notification virtual/kernel wireless-tools"
+DEPENDS = "libmatchbox libx11 libxext libxpm apmd startup-notification virtual/kernel wireless-tools"
SECTION = "x11/wm"
inherit autotools pkgconfig gettext
diff --git a/packages/matchbox-panel/matchbox-panel_0.8.1.bb b/packages/matchbox-panel/matchbox-panel_0.8.1.bb
index 5844cad1f1..75609a598e 100644
--- a/packages/matchbox-panel/matchbox-panel_0.8.1.bb
+++ b/packages/matchbox-panel/matchbox-panel_0.8.1.bb
@@ -2,7 +2,7 @@ SECTION = "x11/utils"
PR = "r4"
DESCRIPTION = "Matchbox panel"
LICENSE = "GPL"
-DEPENDS = "libmatchbox x11 xext xpm apmd startup-notification virtual/kernel"
+DEPENDS = "libmatchbox libx11 libxext libxpm apmd startup-notification virtual/kernel"
SRC_URI = "ftp://ftp.handhelds.org/matchbox/sources/matchbox-panel/0.8/matchbox-panel-${PV}.tar.bz2 \
file://automake-lossage.patch;patch=1 \
diff --git a/packages/matchbox-panel/matchbox-panel_0.8.3.bb b/packages/matchbox-panel/matchbox-panel_0.8.3.bb
index 1566cce487..8726982c70 100644
--- a/packages/matchbox-panel/matchbox-panel_0.8.3.bb
+++ b/packages/matchbox-panel/matchbox-panel_0.8.3.bb
@@ -1,6 +1,6 @@
DESCRIPTION = "Matchbox Window Manager Panel"
LICENSE = "GPL"
-DEPENDS = "libmatchbox x11 xext xpm apmd startup-notification virtual/kernel"
+DEPENDS = "libmatchbox libx11 libxext libxpm apmd startup-notification virtual/kernel"
SECTION = "x11/wm"
PR = "r1"
diff --git a/packages/matchbox-panel/matchbox-panel_0.8.bb b/packages/matchbox-panel/matchbox-panel_0.8.bb
index fd31832b39..331c049468 100644
--- a/packages/matchbox-panel/matchbox-panel_0.8.bb
+++ b/packages/matchbox-panel/matchbox-panel_0.8.bb
@@ -1,7 +1,7 @@
SECTION = "x11/utils"
DESCRIPTION = "Matchbox panel"
LICENSE = "GPL"
-DEPENDS = "libmatchbox x11 xext xpm"
+DEPENDS = "libmatchbox libx11 libxext libxpm"
RDEPENDS = "libmatchbox matchbox-common"
SRC_URI = "ftp://ftp.handhelds.org/matchbox/sources/matchbox-panel/${PV}/matchbox-panel-${PV}.tar.bz2"
diff --git a/packages/matchbox-panel/matchbox-panel_0.9.1.bb b/packages/matchbox-panel/matchbox-panel_0.9.1.bb
index d22391ea1c..d1c263db38 100644
--- a/packages/matchbox-panel/matchbox-panel_0.9.1.bb
+++ b/packages/matchbox-panel/matchbox-panel_0.9.1.bb
@@ -1,6 +1,6 @@
DESCRIPTION = "Matchbox Window Manager Panel"
LICENSE = "GPL"
-DEPENDS = "libmatchbox x11 xext xpm apmd startup-notification virtual/kernel"
+DEPENDS = "libmatchbox libx11 libxext libxpm apmd startup-notification virtual/kernel"
SECTION = "x11/wm"
PR = "r2"
diff --git a/packages/matchbox-panel/matchbox-panel_0.9.bb b/packages/matchbox-panel/matchbox-panel_0.9.bb
index c54af97626..725fe257e1 100644
--- a/packages/matchbox-panel/matchbox-panel_0.9.bb
+++ b/packages/matchbox-panel/matchbox-panel_0.9.bb
@@ -1,6 +1,6 @@
DESCRIPTION = "Matchbox Window Manager Panel"
LICENSE = "GPL"
-DEPENDS = "libmatchbox x11 xext xpm apmd startup-notification virtual/kernel"
+DEPENDS = "libmatchbox libx11 libxext libxpm apmd startup-notification virtual/kernel"
SECTION = "x11/wm"
SRC_URI = "http://projects.o-hand.com/matchbox/sources/${PN}/${PV}/${PN}-${PV}.tar.gz"
diff --git a/packages/matchbox-wm/matchbox-wm_0.8.3.bb b/packages/matchbox-wm/matchbox-wm_0.8.3.bb
index 0a005d1f81..5db605cd0d 100644
--- a/packages/matchbox-wm/matchbox-wm_0.8.3.bb
+++ b/packages/matchbox-wm/matchbox-wm_0.8.3.bb
@@ -1,7 +1,7 @@
SECTION = "x11/wm"
DESCRIPTION = "Matchbox window manager"
LICENSE = "GPL"
-DEPENDS = "libmatchbox x11 xext xcomposite libxfixes xdamage libxrender startup-notification expat gconf matchbox-common"
+DEPENDS = "libmatchbox libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common"
RDEPENDS = "matchbox-common"
SRC_URI = "ftp://ftp.handhelds.org/matchbox/sources/matchbox-window-manager/0.8/matchbox-window-manager-${PV}.tar.bz2 \
diff --git a/packages/matchbox-wm/matchbox-wm_0.8.4.bb b/packages/matchbox-wm/matchbox-wm_0.8.4.bb
index 0a005d1f81..5db605cd0d 100644
--- a/packages/matchbox-wm/matchbox-wm_0.8.4.bb
+++ b/packages/matchbox-wm/matchbox-wm_0.8.4.bb
@@ -1,7 +1,7 @@
SECTION = "x11/wm"
DESCRIPTION = "Matchbox window manager"
LICENSE = "GPL"
-DEPENDS = "libmatchbox x11 xext xcomposite libxfixes xdamage libxrender startup-notification expat gconf matchbox-common"
+DEPENDS = "libmatchbox libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common"
RDEPENDS = "matchbox-common"
SRC_URI = "ftp://ftp.handhelds.org/matchbox/sources/matchbox-window-manager/0.8/matchbox-window-manager-${PV}.tar.bz2 \
diff --git a/packages/matchbox-wm/matchbox-wm_0.9.2.bb b/packages/matchbox-wm/matchbox-wm_0.9.2.bb
index 9bf7be1e69..359ab819ec 100644
--- a/packages/matchbox-wm/matchbox-wm_0.9.2.bb
+++ b/packages/matchbox-wm/matchbox-wm_0.9.2.bb
@@ -1,7 +1,7 @@
SECTION = "x11/wm"
DESCRIPTION = "Matchbox window manager"
LICENSE = "GPL"
-DEPENDS = "libmatchbox x11 xext xcomposite libxfixes xdamage libxrender startup-notification expat gconf matchbox-common"
+DEPENDS = "libmatchbox libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common"
RDEPENDS = "matchbox-common"
PR = "r1"
diff --git a/packages/matchbox-wm/matchbox-wm_0.9.3.bb b/packages/matchbox-wm/matchbox-wm_0.9.3.bb
index 11447fe78a..1e8779fa34 100644
--- a/packages/matchbox-wm/matchbox-wm_0.9.3.bb
+++ b/packages/matchbox-wm/matchbox-wm_0.9.3.bb
@@ -1,7 +1,7 @@
SECTION = "x11/wm"
DESCRIPTION = "Matchbox window manager"
LICENSE = "GPL"
-DEPENDS = "libmatchbox x11 xext xcomposite libxfixes xdamage libxrender startup-notification expat gconf matchbox-common"
+DEPENDS = "libmatchbox libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common"
RDEPENDS = "matchbox-common"
PR = "r2"
diff --git a/packages/matchbox-wm/matchbox-wm_0.9.4.bb b/packages/matchbox-wm/matchbox-wm_0.9.4.bb
index cff86dc7ef..0ee65e689d 100644
--- a/packages/matchbox-wm/matchbox-wm_0.9.4.bb
+++ b/packages/matchbox-wm/matchbox-wm_0.9.4.bb
@@ -1,7 +1,7 @@
SECTION = "x11/wm"
DESCRIPTION = "Matchbox window manager"
LICENSE = "GPL"
-DEPENDS = "libmatchbox x11 xext xcomposite libxfixes xdamage libxrender startup-notification expat gconf matchbox-common"
+DEPENDS = "libmatchbox libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common"
RDEPENDS = "matchbox-common"
diff --git a/packages/matchbox-wm/matchbox-wm_0.9.5.bb b/packages/matchbox-wm/matchbox-wm_0.9.5.bb
index 69bddc3544..358e62a9de 100644
--- a/packages/matchbox-wm/matchbox-wm_0.9.5.bb
+++ b/packages/matchbox-wm/matchbox-wm_0.9.5.bb
@@ -1,7 +1,7 @@
SECTION = "x11/wm"
DESCRIPTION = "Matchbox window manager"
LICENSE = "GPL"
-DEPENDS = "libmatchbox x11 xext xcomposite libxfixes xdamage libxrender startup-notification expat gconf matchbox-common"
+DEPENDS = "libmatchbox libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common"
RDEPENDS = "matchbox-common"
PR="r0"
diff --git a/packages/matchbox-wm/matchbox-wm_0.9.bb b/packages/matchbox-wm/matchbox-wm_0.9.bb
index 8a581b0c93..4db68fcf94 100644
--- a/packages/matchbox-wm/matchbox-wm_0.9.bb
+++ b/packages/matchbox-wm/matchbox-wm_0.9.bb
@@ -1,7 +1,7 @@
SECTION = "x11/wm"
DESCRIPTION = "Matchbox window manager"
LICENSE = "GPL"
-DEPENDS = "libmatchbox x11 xext xcomposite libxfixes xdamage libxrender startup-notification expat gconf matchbox-common"
+DEPENDS = "libmatchbox libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common"
RDEPENDS = "matchbox-common"
SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/${PV}/matchbox-window-manager-${PV}.tar.gz"
diff --git a/packages/matchbox-wm/matchbox-wm_svn.bb b/packages/matchbox-wm/matchbox-wm_svn.bb
index d8084b006e..7654ebd94c 100644
--- a/packages/matchbox-wm/matchbox-wm_svn.bb
+++ b/packages/matchbox-wm/matchbox-wm_svn.bb
@@ -1,7 +1,7 @@
SECTION = "x11/wm"
DESCRIPTION = "Matchbox window manager"
LICENSE = "GPL"
-DEPENDS = "libmatchbox x11 xext xcomposite libxfixes xdamage libxrender startup-notification expat gconf matchbox-common"
+DEPENDS = "libmatchbox libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common"
RDEPENDS = "matchbox-common"
PV = "0.9.5+svn${SRCDATE}"
PR = "r1"
diff --git a/packages/miniclipboard/miniclipboard_0.3.bb b/packages/miniclipboard/miniclipboard_0.3.bb
index 9b741d9e2b..885f5a7d20 100644
--- a/packages/miniclipboard/miniclipboard_0.3.bb
+++ b/packages/miniclipboard/miniclipboard_0.3.bb
@@ -2,7 +2,7 @@ SECTION = "x11/utils"
inherit gpe
LICENSE = "LGPL"
DESCRIPTION = "Clipboard management application"
-DEPENDS = "x11"
+DEPENDS = "libx11"
RDEPENDS = "gdk-pixbuf-loader-xpm"
MAINTAINER = "Phil Blundell <pb@handhelds.org>"
PR = "r1"
diff --git a/packages/minipredict/minipredict.bb b/packages/minipredict/minipredict.bb
index 7dc6e92d49..ded01f503e 100644
--- a/packages/minipredict/minipredict.bb
+++ b/packages/minipredict/minipredict.bb
@@ -1,7 +1,7 @@
inherit gpe pkgconfig
DESCRIPTION = "Minipredict is a app that sits above the dock, e.g. mbdock, and suggests words for completion."
-DEPENDS = "x11 xext gtk+ libdictionary zlib"
+DEPENDS = "libx11 libxext gtk+ libdictionary zlib"
SECTION = "gpe"
PRIORITY = "optional"
diff --git a/packages/mrxvt/mrxvt_0.4.1.bb b/packages/mrxvt/mrxvt_0.4.1.bb
index 1efbf58d9d..09ea06f98d 100644
--- a/packages/mrxvt/mrxvt_0.4.1.bb
+++ b/packages/mrxvt/mrxvt_0.4.1.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://materm.sourceforge.net"
AUTHOR = "Jimmy Zhou <jimmyzhou@users.sf.net>"
LICENSE = "GPL"
SECTION = "x11/apps"
-DEPENDS = "x11 xext xpm jpeg libpng"
+DEPENDS = "libx11 libxext libxpm jpeg libpng"
PR = "r0"
SRC_URI = "${SOURCEFORGE_MIRROR}/materm/mrxvt-${PV}.tar.gz \
diff --git a/packages/mythtv/mythtv_0.18.1.bb b/packages/mythtv/mythtv_0.18.1.bb
index 09aa63062f..37b75b6a23 100644
--- a/packages/mythtv/mythtv_0.18.1.bb
+++ b/packages/mythtv/mythtv_0.18.1.bb
@@ -9,7 +9,7 @@ SRC_URI = "http://www.mythtv.org/mc/mythtv-${PV}.tar.bz2 \
file://msmpeg-underscore-pic.patch;patch=1 \
file://settings.pro"
-DEPENDS = "xinerama lame libxv libxxf86vm libxvmc lirc"
+DEPENDS = "libxinerama lame libxv libxxf86vm libxvmc lirc"
RDEPENDS = "qt-x11-plugins"
inherit qmake qt3x11
diff --git a/packages/pango/pango_1.10.0.bb b/packages/pango/pango_1.10.0.bb
index dda4df2fda..869b146d56 100644
--- a/packages/pango/pango_1.10.0.bb
+++ b/packages/pango/pango_1.10.0.bb
@@ -1,7 +1,7 @@
LICENSE = "LGPL"
SECTION = "x11/libs"
# Xt needed to keep autoconf's check for X11 happy
-DEPENDS = "glib-2.0 fontconfig freetype zlib x11 libxft xt gtk-doc cairo"
+DEPENDS = "glib-2.0 fontconfig freetype zlib libx11 libxft libxt gtk-doc cairo"
DESCRIPTION = "The goal of the Pango project is to provide an \
Open Source framework for the layout and rendering of \
internationalized text."
diff --git a/packages/pango/pango_1.10.2.bb b/packages/pango/pango_1.10.2.bb
index 0f2c8fdb7a..068eeafddf 100644
--- a/packages/pango/pango_1.10.2.bb
+++ b/packages/pango/pango_1.10.2.bb
@@ -1,7 +1,7 @@
LICENSE = "LGPL"
SECTION = "x11/libs"
# Xt needed to keep autoconf's check for X11 happy
-DEPENDS = "glib-2.0 fontconfig freetype zlib x11 libxft xt gtk-doc cairo"
+DEPENDS = "glib-2.0 fontconfig freetype zlib libx11 libxft libxt gtk-doc cairo"
DESCRIPTION = "The goal of the Pango project is to provide an \
Open Source framework for the layout and rendering of \
internationalized text."
diff --git a/packages/pango/pango_1.2.5.bb b/packages/pango/pango_1.2.5.bb
index ed71f43370..1380a6af52 100644
--- a/packages/pango/pango_1.2.5.bb
+++ b/packages/pango/pango_1.2.5.bb
@@ -1,6 +1,6 @@
LICENSE = "LGPL"
SECTION = "x11/libs"
-DEPENDS = "glib-2.0 fontconfig freetype zlib x11 libxft xt"
+DEPENDS = "glib-2.0 fontconfig freetype zlib libx11 libxft libxt"
DESCRIPTION = "The goal of the Pango project is to provide an \
Open Source framework for the layout and rendering of \
internationalized text."
diff --git a/packages/pango/pango_1.4.0.bb b/packages/pango/pango_1.4.0.bb
index 93c8cc6d94..8d165989c8 100644
--- a/packages/pango/pango_1.4.0.bb
+++ b/packages/pango/pango_1.4.0.bb
@@ -1,7 +1,7 @@
LICENSE = "LGPL"
SECTION = "x11/libs"
# Xt needed to keep autoconf's check for X11 happy
-DEPENDS = "glib-2.0 fontconfig freetype zlib x11 libxft xt"
+DEPENDS = "glib-2.0 fontconfig freetype zlib libx11 libxft libxt"
DESCRIPTION = "The goal of the Pango project is to provide an \
Open Source framework for the layout and rendering of \
internationalized text."
diff --git a/packages/pango/pango_1.4.1.bb b/packages/pango/pango_1.4.1.bb
index 8cd251049c..10e5bc3f69 100644
--- a/packages/pango/pango_1.4.1.bb
+++ b/packages/pango/pango_1.4.1.bb
@@ -1,7 +1,7 @@
LICENSE = "LGPL"
SECTION = "x11/libs"
# Xt needed to keep autoconf's check for X11 happy
-DEPENDS = "glib-2.0 fontconfig freetype zlib x11 libxft xt gtk-doc"
+DEPENDS = "glib-2.0 fontconfig freetype zlib libx11 libxft libxt gtk-doc"
DESCRIPTION = "The goal of the Pango project is to provide an \
Open Source framework for the layout and rendering of \
internationalized text."
diff --git a/packages/pango/pango_1.8.0.bb b/packages/pango/pango_1.8.0.bb
index 1d2638f0ec..a692fd7299 100644
--- a/packages/pango/pango_1.8.0.bb
+++ b/packages/pango/pango_1.8.0.bb
@@ -1,7 +1,7 @@
LICENSE = "LGPL"
SECTION = "x11/libs"
# Xt needed to keep autoconf's check for X11 happy
-DEPENDS = "glib-2.0 fontconfig freetype zlib x11 libxft xt gtk-doc"
+DEPENDS = "glib-2.0 fontconfig freetype zlib libx11 libxft libxt gtk-doc"
DESCRIPTION = "The goal of the Pango project is to provide an \
Open Source framework for the layout and rendering of \
internationalized text."
diff --git a/packages/pango/pango_1.8.1.bb b/packages/pango/pango_1.8.1.bb
index 1d2638f0ec..a692fd7299 100644
--- a/packages/pango/pango_1.8.1.bb
+++ b/packages/pango/pango_1.8.1.bb
@@ -1,7 +1,7 @@
LICENSE = "LGPL"
SECTION = "x11/libs"
# Xt needed to keep autoconf's check for X11 happy
-DEPENDS = "glib-2.0 fontconfig freetype zlib x11 libxft xt gtk-doc"
+DEPENDS = "glib-2.0 fontconfig freetype zlib libx11 libxft libxt gtk-doc"
DESCRIPTION = "The goal of the Pango project is to provide an \
Open Source framework for the layout and rendering of \
internationalized text."
diff --git a/packages/pango/pango_1.8.2.bb b/packages/pango/pango_1.8.2.bb
index 4163c0c4a7..2b0322a5be 100644
--- a/packages/pango/pango_1.8.2.bb
+++ b/packages/pango/pango_1.8.2.bb
@@ -1,7 +1,7 @@
LICENSE = "LGPL"
SECTION = "x11/libs"
# Xt needed to keep autoconf's check for X11 happy
-DEPENDS = "glib-2.0 fontconfig freetype zlib x11 libxft xt gtk-doc"
+DEPENDS = "glib-2.0 fontconfig freetype zlib libx11 libxft libxt gtk-doc"
DESCRIPTION = "The goal of the Pango project is to provide an \
Open Source framework for the layout and rendering of \
internationalized text."
diff --git a/packages/pango/pango_1.9.1.bb b/packages/pango/pango_1.9.1.bb
index e66b65f367..db01079fe1 100644
--- a/packages/pango/pango_1.9.1.bb
+++ b/packages/pango/pango_1.9.1.bb
@@ -1,7 +1,7 @@
LICENSE = "LGPL"
SECTION = "x11/libs"
# Xt needed to keep autoconf's check for X11 happy
-DEPENDS = "glib-2.0 fontconfig freetype zlib x11 libxft xt gtk-doc"
+DEPENDS = "glib-2.0 fontconfig freetype zlib libx11 libxft libxt gtk-doc"
DESCRIPTION = "The goal of the Pango project is to provide an \
Open Source framework for the layout and rendering of \
internationalized text."
diff --git a/packages/qt/qt-x11-free_3.3.5.bb b/packages/qt/qt-x11-free_3.3.5.bb
index afa33f98af..0f57314971 100644
--- a/packages/qt/qt-x11-free_3.3.5.bb
+++ b/packages/qt/qt-x11-free_3.3.5.bb
@@ -4,7 +4,7 @@ PRIORITY = "optional"
LICENSE = "GPL QPL"
HOMEPAGE = "http://www.trolltech.com"
MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
-DEPENDS = "uicmoc3-native freetype x11 xft xext libxrender libxrandr libxcursor mysql"
+DEPENDS = "uicmoc3-native freetype libx11 xft libxext libxrender libxrandr libxcursor mysql"
PROVIDES = "qt3x11"
PR = "r10"
diff --git a/packages/qt/qt-x11-free_4.0.1.bb b/packages/qt/qt-x11-free_4.0.1.bb
index e08fc23ea0..32ddca6158 100644
--- a/packages/qt/qt-x11-free_4.0.1.bb
+++ b/packages/qt/qt-x11-free_4.0.1.bb
@@ -4,7 +4,7 @@ PRIORITY = "optional"
HOMEPAGE = "http://www.trolltech.com"
LICENSE = "GPL QPL"
MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
-DEPENDS = "uicmoc4-native freetype jpeg x11 xft xext libxrender libxrandr libxcursor mysql"
+DEPENDS = "uicmoc4-native freetype jpeg libx11 xft libxext libxrender libxrandr libxcursor mysql"
PROVIDES = "qt4x11"
# FIXME: Make it use 'our' qmake
# DEPENDS += "qmake-native-2.00a"
diff --git a/packages/rdesktop/rdesktop_1.3.1.bb b/packages/rdesktop/rdesktop_1.3.1.bb
index 5a0d679a74..43cee1b303 100644
--- a/packages/rdesktop/rdesktop_1.3.1.bb
+++ b/packages/rdesktop/rdesktop_1.3.1.bb
@@ -5,7 +5,7 @@
DESCRIPTION = "RDesktop is a X11 based RDP client"
HOMEPAGE = "http://www.rdesktop.org/"
LICENSE = "GPL"
-DEPENDS = "x11 openssl"
+DEPENDS = "libx11 openssl"
RDEPENDS= "openssl"
SECTION = "x11/network"
diff --git a/packages/rdesktop/rdesktop_1.4.1.bb b/packages/rdesktop/rdesktop_1.4.1.bb
index f25e7145fb..fd60ac5b13 100644
--- a/packages/rdesktop/rdesktop_1.4.1.bb
+++ b/packages/rdesktop/rdesktop_1.4.1.bb
@@ -1,5 +1,5 @@
DESCRIPTION = "Rdesktop rdp client for X"
-DEPENDS = "x11 openssl"
+DEPENDS = "libx11 openssl"
HOMEPAGE = "http://www.rdesktop.org"
SECTION = "x11/network"
MAINTAINER = "Adrian Davey <ade@beth2.org>"
diff --git a/packages/rdesktop/rdesktop_cvs.bb b/packages/rdesktop/rdesktop_cvs.bb
index 0dabdf3f3b..00c2423f85 100644
--- a/packages/rdesktop/rdesktop_cvs.bb
+++ b/packages/rdesktop/rdesktop_cvs.bb
@@ -1,5 +1,5 @@
DESCRIPTION = "Rdesktop rdp client for X"
-DEPENDS = "x11 openssl"
+DEPENDS = "libx11 openssl"
HOMEPAGE = "http://www.rdesktop.org"
SECTION = "x11/network"
MAINTAINER = "Adrian Davey <ade@beth2.org>"
diff --git a/packages/rosetta/rosetta_cvs.bb b/packages/rosetta/rosetta_cvs.bb
index b634315335..ff320a96b5 100644
--- a/packages/rosetta/rosetta_cvs.bb
+++ b/packages/rosetta/rosetta_cvs.bb
@@ -1,6 +1,6 @@
SECTION = "x11/utils"
PV = "0.0+cvs${SRCDATE}"
-DEPENDS = "gtk+ libgpewidget x11 libxrandr libxft xtst xext xau \
+DEPENDS = "gtk+ libgpewidget libx11 libxrandr libxft libxtst libxext libxau \
virtual/libintl"
DESCRIPTION = "Multistroke / full word handwriting recognition for X"
LICENSE = "GPL"
diff --git a/packages/rxvt-unicode/rxvt-unicode_4.8.bb b/packages/rxvt-unicode/rxvt-unicode_4.8.bb
index 94bd63e9d3..2174ccb6d6 100644
--- a/packages/rxvt-unicode/rxvt-unicode_4.8.bb
+++ b/packages/rxvt-unicode/rxvt-unicode_4.8.bb
@@ -1,5 +1,5 @@
SECTION = "x11/utils"
-DEPENDS = "x11 xt libxft"
+DEPENDS = "libx11 libxt libxft"
DESCRIPTION = "rxvt-unicode is a clone of the well known \
terminal emulator rxvt, modified to store text in Unicode \
(either UCS-2 or UCS-4) and to use locale-correct input and \
diff --git a/packages/rxvt-unicode/rxvt-unicode_4.9.bb b/packages/rxvt-unicode/rxvt-unicode_4.9.bb
index 61582491d5..6dbedf2c83 100644
--- a/packages/rxvt-unicode/rxvt-unicode_4.9.bb
+++ b/packages/rxvt-unicode/rxvt-unicode_4.9.bb
@@ -1,5 +1,5 @@
SECTION = "x11/utils"
-DEPENDS = "x11 xt libxft"
+DEPENDS = "libx11 libxt libxft"
DESCRIPTION = "rxvt-unicode is a clone of the well known \
terminal emulator rxvt, modified to store text in Unicode \
(either UCS-2 or UCS-4) and to use locale-correct input and \
diff --git a/packages/rxvt-unicode/rxvt-unicode_5.2.bb b/packages/rxvt-unicode/rxvt-unicode_5.2.bb
index fc39d1109d..ac891b6a3b 100644
--- a/packages/rxvt-unicode/rxvt-unicode_5.2.bb
+++ b/packages/rxvt-unicode/rxvt-unicode_5.2.bb
@@ -1,5 +1,5 @@
SECTION = "x11/utils"
-DEPENDS = "x11 xt libxft"
+DEPENDS = "libx11 libxt libxft"
DESCRIPTION = "rxvt-unicode is a clone of the well known \
terminal emulator rxvt, modified to store text in Unicode \
(either UCS-2 or UCS-4) and to use locale-correct input and \
diff --git a/packages/rxvt-unicode/rxvt-unicode_5.3.bb b/packages/rxvt-unicode/rxvt-unicode_5.3.bb
index 92915bf872..6ceefddd89 100644
--- a/packages/rxvt-unicode/rxvt-unicode_5.3.bb
+++ b/packages/rxvt-unicode/rxvt-unicode_5.3.bb
@@ -1,5 +1,5 @@
SECTION = "x11/utils"
-DEPENDS = "x11 xt libxft"
+DEPENDS = "libx11 libxt libxft"
DESCRIPTION = "rxvt-unicode is a clone of the well known \
terminal emulator rxvt, modified to store text in Unicode \
(either UCS-2 or UCS-4) and to use locale-correct input and \
diff --git a/packages/rxvt-unicode/rxvt-unicode_5.4.bb b/packages/rxvt-unicode/rxvt-unicode_5.4.bb
index 92915bf872..6ceefddd89 100644
--- a/packages/rxvt-unicode/rxvt-unicode_5.4.bb
+++ b/packages/rxvt-unicode/rxvt-unicode_5.4.bb
@@ -1,5 +1,5 @@
SECTION = "x11/utils"
-DEPENDS = "x11 xt libxft"
+DEPENDS = "libx11 libxt libxft"
DESCRIPTION = "rxvt-unicode is a clone of the well known \
terminal emulator rxvt, modified to store text in Unicode \
(either UCS-2 or UCS-4) and to use locale-correct input and \
diff --git a/packages/rxvt-unicode/rxvt-unicode_5.6.bb b/packages/rxvt-unicode/rxvt-unicode_5.6.bb
index 43d9d0c14a..9351a96a98 100644
--- a/packages/rxvt-unicode/rxvt-unicode_5.6.bb
+++ b/packages/rxvt-unicode/rxvt-unicode_5.6.bb
@@ -1,5 +1,5 @@
SECTION = "x11/utils"
-DEPENDS = "x11 xt libxft"
+DEPENDS = "libx11 libxt libxft"
DESCRIPTION = "rxvt-unicode is a clone of the well known \
terminal emulator rxvt, modified to store text in Unicode \
(either UCS-2 or UCS-4) and to use locale-correct input and \
diff --git a/packages/rxvt-unicode/rxvt-unicode_cvs.bb b/packages/rxvt-unicode/rxvt-unicode_cvs.bb
index ceee7cd51a..8059c5d489 100644
--- a/packages/rxvt-unicode/rxvt-unicode_cvs.bb
+++ b/packages/rxvt-unicode/rxvt-unicode_cvs.bb
@@ -1,5 +1,5 @@
SECTION = "x11/utils"
-DEPENDS = "x11 xt libxft"
+DEPENDS = "libx11 libxt libxft"
DESCRIPTION = "rxvt-unicode is a clone of the well known \
terminal emulator rxvt, modified to store text in Unicode \
(either UCS-2 or UCS-4) and to use locale-correct input and \
diff --git a/packages/rxvt/rxvt_2.7.9.bb b/packages/rxvt/rxvt_2.7.9.bb
index c201d16f8a..20b3e28ff7 100644
--- a/packages/rxvt/rxvt_2.7.9.bb
+++ b/packages/rxvt/rxvt_2.7.9.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "Well known terminal emulator"
SECTION = "x11/utils"
PR = "r1"
-DEPENDS = "x11 libxft"
+DEPENDS = "libx11 libxft"
LICENSE = "GPL"
SRC_URI = "${HANDHELDS_CVS};module=apps/rxvt \
file://include.patch;patch=1"
diff --git a/packages/sablevm/sablevm-classpath_1.1.9.bb b/packages/sablevm/sablevm-classpath_1.1.9.bb
index 3ca91fa8d5..1c1c3a11ce 100644
--- a/packages/sablevm/sablevm-classpath_1.1.9.bb
+++ b/packages/sablevm/sablevm-classpath_1.1.9.bb
@@ -6,7 +6,7 @@ MAINTAINER = "Rene Wagner <rw@handhelds.org>"
SECTION = "libs"
PR = "r1"
-DEPENDS = "glib-2.0 gtk+ libart-lgpl pango xtst jikes-native fastjar-native"
+DEPENDS = "glib-2.0 gtk+ libart-lgpl pango libxtst jikes-native fastjar-native"
RDEPENDS_${PN} = "${PN}-native"
SRC_URI = "http://sablevm.org/download/release/${PV}/${PN}-${PV}.tar.gz \
diff --git a/packages/sablevm/sablevm-classpath_1.11.3.bb b/packages/sablevm/sablevm-classpath_1.11.3.bb
index b712816326..ee6c58138c 100644
--- a/packages/sablevm/sablevm-classpath_1.11.3.bb
+++ b/packages/sablevm/sablevm-classpath_1.11.3.bb
@@ -5,7 +5,7 @@ PRIORITY = "optional"
MAINTAINER = "Rene Wagner <rw@handhelds.org>"
SECTION = "libs"
-DEPENDS = "glib-2.0 gtk+ libart-lgpl pango xtst jikes-native zip-native"
+DEPENDS = "glib-2.0 gtk+ libart-lgpl pango libxtst jikes-native zip-native"
RDEPENDS_${PN} = "${PN}-native (>= ${PV})"
SRC_URI = "http://sablevm.org/download/release/${PV}/${PN}-${PV}.tar.gz \
diff --git a/packages/sablevm/sablevm-classpath_1.12.bb b/packages/sablevm/sablevm-classpath_1.12.bb
index b712816326..ee6c58138c 100644
--- a/packages/sablevm/sablevm-classpath_1.12.bb
+++ b/packages/sablevm/sablevm-classpath_1.12.bb
@@ -5,7 +5,7 @@ PRIORITY = "optional"
MAINTAINER = "Rene Wagner <rw@handhelds.org>"
SECTION = "libs"
-DEPENDS = "glib-2.0 gtk+ libart-lgpl pango xtst jikes-native zip-native"
+DEPENDS = "glib-2.0 gtk+ libart-lgpl pango libxtst jikes-native zip-native"
RDEPENDS_${PN} = "${PN}-native (>= ${PV})"
SRC_URI = "http://sablevm.org/download/release/${PV}/${PN}-${PV}.tar.gz \
diff --git a/packages/skippy/skippy-xd_0.5.0.bb b/packages/skippy/skippy-xd_0.5.0.bb
index 39d8266ca1..167310d4ec 100644
--- a/packages/skippy/skippy-xd_0.5.0.bb
+++ b/packages/skippy/skippy-xd_0.5.0.bb
@@ -2,7 +2,7 @@ LICENSE = "GPLV2"
DESCRIPTION = "Skippy is a full-screen task-switcher for X11."
SECTION = "x11"
MAINTAINER = "Chris Lord <cwiiis@handhelds.org>"
-DEPENDS = "virtual/xserver xdamage xcomposite"
+DEPENDS = "virtual/xserver libxdamage libxcomposite"
inherit pkgconfig
diff --git a/packages/startup-monitor/startup-monitor_0.18-2.bb b/packages/startup-monitor/startup-monitor_0.18-2.bb
index cee61003b5..9eb48b6369 100644
--- a/packages/startup-monitor/startup-monitor_0.18-2.bb
+++ b/packages/startup-monitor/startup-monitor_0.18-2.bb
@@ -3,7 +3,7 @@ LICENSE = "GPL"
SECTION = "libs"
PRIORITY = "optional"
MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"
-DEPENDS = "x11 startup-notification glib-2.0 libmatchbox"
+DEPENDS = "libx11 startup-notification glib-2.0 libmatchbox"
inherit gpe pkgconfig
diff --git a/packages/startup-notification/startup-notification_0.5.bb b/packages/startup-notification/startup-notification_0.5.bb
index 7b1d50acb1..e59056ab56 100644
--- a/packages/startup-notification/startup-notification_0.5.bb
+++ b/packages/startup-notification/startup-notification_0.5.bb
@@ -3,7 +3,7 @@ LICENSE = "LGPL"
SECTION = "libs"
PRIORITY = "optional"
MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-DEPENDS = "x11"
+DEPENDS = "libx11"
inherit autotools pkgconfig
diff --git a/packages/startup-notification/startup-notification_0.8.bb b/packages/startup-notification/startup-notification_0.8.bb
index e6f934ddeb..e7649bd65d 100644
--- a/packages/startup-notification/startup-notification_0.8.bb
+++ b/packages/startup-notification/startup-notification_0.8.bb
@@ -3,7 +3,7 @@ LICENSE = "LGPL"
SECTION = "libs"
PRIORITY = "optional"
MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-DEPENDS = "x11"
+DEPENDS = "libx11"
inherit autotools pkgconfig
diff --git a/packages/synergy/synergy_1.2.7.bb b/packages/synergy/synergy_1.2.7.bb
index 0bd27f5e06..738139428d 100644
--- a/packages/synergy/synergy_1.2.7.bb
+++ b/packages/synergy/synergy_1.2.7.bb
@@ -4,7 +4,7 @@ LICENSE = "GPLv2"
MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
SECTION = "x11"
# NOTE: This depends on full x11, not diet-x11
-DEPENDS = "x11 xtst"
+DEPENDS = "libx11 libxtst"
PR = "r0"
SRC_URI = "${SOURCEFORGE_MIRROR}/synergy2/synergy-${PV}.tar.gz"
diff --git a/packages/tcltk/tk_8.4.11.bb b/packages/tcltk/tk_8.4.11.bb
index ed72f336da..b993a4be03 100644
--- a/packages/tcltk/tk_8.4.11.bb
+++ b/packages/tcltk/tk_8.4.11.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Tool Command Language ToolKit Extension"
LICENSE = "tcl"
SECTION = "devel/tcltk"
HOMEPAGE = "http://tcl.sourceforge.net"
-DEPENDS = "tcl x11"
+DEPENDS = "tcl libx11"
RDEPENDS = "tcl"
PR = "r2"
diff --git a/packages/tetex/tetex_3.0.bb b/packages/tetex/tetex_3.0.bb
index c3f52751e7..5f9fa62f79 100644
--- a/packages/tetex/tetex_3.0.bb
+++ b/packages/tetex/tetex_3.0.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "teTeX is a complete TeX distribution for UNIX compatible systems"
LICENSE = "GPL"
SECTION = "console/utils"
-DEPENDS = "tetex-native flex gd ncurses libpng t1lib x11 xau xext xt zlib"
+DEPENDS = "tetex-native flex gd ncurses libpng t1lib libx11 libxau libxext libxt zlib"
TETEX_BUILDSYSTEM_TAMER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
PR = "r2"
diff --git a/packages/v4l2apps/v4l2apps_20020317.bb b/packages/v4l2apps/v4l2apps_20020317.bb
index 67ab643b2d..779372a775 100644
--- a/packages/v4l2apps/v4l2apps_20020317.bb
+++ b/packages/v4l2apps/v4l2apps_20020317.bb
@@ -1,7 +1,7 @@
SECTION = "console/utils"
DESCRIPTION = "Video4linux Two sample applications"
LICENSE = "PD"
-DEPENDS = "xaw x11 xt"
+DEPENDS = "libxaw libx11 libxt"
SRC_URI = "http://www.thedirks.org/pub/v4l2/apps/apps${PV}.tgz"
S = "${WORKDIR}"
diff --git a/packages/vnc/tightvnc_1.3dev7.bb b/packages/vnc/tightvnc_1.3dev7.bb
index 8866176b8f..54503ee408 100644
--- a/packages/vnc/tightvnc_1.3dev7.bb
+++ b/packages/vnc/tightvnc_1.3dev7.bb
@@ -1,6 +1,6 @@
DESCRIPTION = "A Unix VNC client"
HOMEPAGE = "http://www.tightvnc.com/"
-DEPENDS = "x11 zlib xmu xaw"
+DEPENDS = "libx11 zlib libxmu libxaw"
LICENSE = "GPL"
MAINTAINER = "Graeme Gregory <dp@xora.org.uk>"
diff --git a/packages/vnc/vnc_3.3.7.bb b/packages/vnc/vnc_3.3.7.bb
index abccb07228..06fa0fedf2 100644
--- a/packages/vnc/vnc_3.3.7.bb
+++ b/packages/vnc/vnc_3.3.7.bb
@@ -4,7 +4,7 @@
DESCRIPTION = "A Unix VNC client"
HOMEPAGE = "http://www.realvnc.com/"
-DEPENDS = "zlib xmu xaw"
+DEPENDS = "zlib libxmu libxaw"
LICENSE="GPL"
SRC_URI="http://www.realvnc.com/dist/vnc-${PV}-unixsrc.tar.gz"
diff --git a/packages/waimea/waimea_cvs.bb b/packages/waimea/waimea_cvs.bb
index 3d35dfffab..05cce5d1ce 100644
--- a/packages/waimea/waimea_cvs.bb
+++ b/packages/waimea/waimea_cvs.bb
@@ -2,7 +2,7 @@ SECTION = "x11/wm"
DESCRIPTION = "Waimea is a highly customizable window manager for the X Window \
system conforming to the latest EWMH specification."
MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
-DEPENDS = "cairo libpng xrandr libsvg-cairo xext"
+DEPENDS = "cairo libpng xrandr libsvg-cairo libxext"
PV = "0.0+cvs${SRCDATE}"
LICENSE = "GPL"
SRC_URI = "cvs://anoncvs:@cvs.waimea.org/cvs/waimea;module=waimea;method=pserver"
diff --git a/packages/xauth/xauth_cvs.bb b/packages/xauth/xauth_cvs.bb
index 1243fce1d8..54700574b7 100644
--- a/packages/xauth/xauth_cvs.bb
+++ b/packages/xauth/xauth_cvs.bb
@@ -1,6 +1,6 @@
PV = "0.0+cvs${SRCDATE}"
LICENSE = "MIT"
-DEPENDS = "x11 xau xmu xext"
+DEPENDS = "libx11 libxau libxmu libxext"
DESCRIPTION = "X authority file utility"
MAINTAINER = "Rene Wagner <rw@handhelds.org>"
SECTION = "x11/base"
diff --git a/packages/xawtv/xawtv_3.93.bb b/packages/xawtv/xawtv_3.93.bb
index e22851c994..d2bd5d2a93 100644
--- a/packages/xawtv/xawtv_3.93.bb
+++ b/packages/xawtv/xawtv_3.93.bb
@@ -4,7 +4,7 @@ DESCRIPTION = "XawTV is a simple Xaw-based TV program which uses the bttw \
driver or video4linux. It also contains various command-line utilities for \
grabbing images and AVI movies, tuning in TV stations, etc."
MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
-DEPENDS = "xaw xmu xt xpm xext x11 ncurses libxft fs jpeg"
+DEPENDS = "libxaw libxmu libxt libxpm libxext libx11 ncurses libxft fs jpeg"
SRC_URI = "http://dl.bytesex.org/releases/xawtv/xawtv-${PV}.tar.gz \
file://make.patch;patch=1"
diff --git a/packages/xcalibrate/xcalibrate_cvs.bb b/packages/xcalibrate/xcalibrate_cvs.bb
index e254348e4f..ab2b076079 100644
--- a/packages/xcalibrate/xcalibrate_cvs.bb
+++ b/packages/xcalibrate/xcalibrate_cvs.bb
@@ -2,7 +2,7 @@ PV = "0.0+cvs${SRCDATE}"
LICENSE = "BSD-X"
SECTION = "x11/libs"
PRIORITY = "optional"
-DEPENDS = "x11 xcalibrateext xext"
+DEPENDS = "libx11 xcalibrateext libxext"
DESCRIPTION = "XCalibrate client-side library"
SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=XCalibrate"
diff --git a/packages/xcompmgr/xcompmgr_cvs.bb b/packages/xcompmgr/xcompmgr_cvs.bb
index 51fbf403d4..451f289611 100644
--- a/packages/xcompmgr/xcompmgr_cvs.bb
+++ b/packages/xcompmgr/xcompmgr_cvs.bb
@@ -3,7 +3,7 @@ LICENSE = "BSD-X"
SECTION = "x11"
PRIORITY = "optional"
MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-DEPENDS = "x11 xdamage xcomposite libxrender"
+DEPENDS = "libx11 libxdamage libxcomposite libxrender"
DESCRIPTION = "X Compositing Manager"
SRC_URI = "${FREEDESKTOP_CVS}/xapps;module=xcompmgr"
diff --git a/packages/xdemineur/xdemineur_2.1.1.bb b/packages/xdemineur/xdemineur_2.1.1.bb
index 58d6dd8dc6..2e4b59151c 100644
--- a/packages/xdemineur/xdemineur_2.1.1.bb
+++ b/packages/xdemineur/xdemineur_2.1.1.bb
@@ -1,7 +1,7 @@
inherit gpe
LICENSE = "BSD-X"
-DEPENDS = "x11 xpm"
+DEPENDS = "libx11 libxpm"
SECTION = "gpe"
DESCRIPTION = "Mine-sweeper game for GPE."
PRIORITY = "optional"
diff --git a/packages/xdpyinfo/xdpyinfo_cvs.bb b/packages/xdpyinfo/xdpyinfo_cvs.bb
index bd1047c63e..eb63ae7f4d 100644
--- a/packages/xdpyinfo/xdpyinfo_cvs.bb
+++ b/packages/xdpyinfo/xdpyinfo_cvs.bb
@@ -1,6 +1,6 @@
PV = "0.0+cvs${SRCDATE}"
LICENSE = "MIT"
-DEPENDS = "x11 xext xtst"
+DEPENDS = "libx11 libxext libxtst"
DESCRIPTION = "X display information utility"
MAINTAINER = "Phil Blundell <pb@handhelds.org>"
SECTION = "x11/base"
diff --git a/packages/xev/xev_cvs.bb b/packages/xev/xev_cvs.bb
index 50c190c173..3ea9d05c63 100644
--- a/packages/xev/xev_cvs.bb
+++ b/packages/xev/xev_cvs.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "http://freedesktop.org/wiki/Software_2fxapps"
LICENSE = "MIT"
MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
SECTION = "x11/base"
-DEPENDS = "x11 xau"
+DEPENDS = "libx11 libxau"
PR = "r1"
SRC_URI = "${FREEDESKTOP_CVS}/xapps;module=xev \
diff --git a/packages/xfcalendar/xfcalendar_4.2.0.bb b/packages/xfcalendar/xfcalendar_4.2.0.bb
index 9dc7b6ef53..07b9b75000 100644
--- a/packages/xfcalendar/xfcalendar_4.2.0.bb
+++ b/packages/xfcalendar/xfcalendar_4.2.0.bb
@@ -4,5 +4,5 @@
DESCRIPTION="XFCE Calendar"
SECTION = "x11"
-DEPENDS="x11 libxfcegui4 libxfce4mcs"
+DEPENDS="libx11 libxfcegui4 libxfce4mcs"
inherit xfce
diff --git a/packages/xfdesktop/xfdesktop_4.2.0.bb b/packages/xfdesktop/xfdesktop_4.2.0.bb
index d2e1489205..e053a47fc0 100644
--- a/packages/xfdesktop/xfdesktop_4.2.0.bb
+++ b/packages/xfdesktop/xfdesktop_4.2.0.bb
@@ -4,7 +4,7 @@
DESCRIPTION="xfce4 Desktop Background Manager"
SECTION = "x11/base"
-DEPENDS="x11 libxfcegui4 libxfce4mcs libxml2"
+DEPENDS="libx11 libxfcegui4 libxfce4mcs libxml2"
inherit xfce
PACKAGES += "xfdesktop-backdrops"
diff --git a/packages/xfwm4/xfwm4_4.2.0.bb b/packages/xfwm4/xfwm4_4.2.0.bb
index 0fdfd136be..71a46646ea 100644
--- a/packages/xfwm4/xfwm4_4.2.0.bb
+++ b/packages/xfwm4/xfwm4_4.2.0.bb
@@ -9,7 +9,7 @@ inherit xfce
FILES_${PN} += "${datadir}/xfwm4/defaults ${datadir}/xfwm4/themes/default.keys/*"
-DEPENDS="startup-notification x11 xpm libxfce4util libxfcegui4 libxfce4mcs xfce-mcs-manager"
+DEPENDS="startup-notification libx11 libxpm libxfce4util libxfcegui4 libxfce4mcs xfce-mcs-manager"
EXTRA_OECONF += " --enable-startup-notification"
diff --git a/packages/xhost/xhost_20040413.bb b/packages/xhost/xhost_20040413.bb
index b3ca3c939c..4d36e62bee 100644
--- a/packages/xhost/xhost_20040413.bb
+++ b/packages/xhost/xhost_20040413.bb
@@ -1,7 +1,7 @@
FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}"
LICENSE = "MIT"
PV = "0.0+cvs${FIXEDSRCDATE}"
-DEPENDS = "x11 xext xmu"
+DEPENDS = "libx11 libxext libxmu"
DESCRIPTION = "server access control program for X"
MAINTAINER = "Rene Wagner <rw@handhelds.org>"
SECTION = "x11/base"
diff --git a/packages/xkbd/xkbd_0.8.15.bb b/packages/xkbd/xkbd_0.8.15.bb
index daa82dd82e..d27ee5f9e2 100644
--- a/packages/xkbd/xkbd_0.8.15.bb
+++ b/packages/xkbd/xkbd_0.8.15.bb
@@ -7,7 +7,7 @@ PR = "r1"
MAINTAINER = "Phil Blundell <pb@handhelds.org>"
SECTION = "x11"
-DEPENDS = "xpm xtst libxft"
+DEPENDS = "libxpm libxtst libxft"
inherit autotools
diff --git a/packages/xmodmap/xmodmap_cvs.bb b/packages/xmodmap/xmodmap_cvs.bb
index 9582639559..773466e6bb 100644
--- a/packages/xmodmap/xmodmap_cvs.bb
+++ b/packages/xmodmap/xmodmap_cvs.bb
@@ -5,7 +5,7 @@ MAINTAINER = "Rene Wagner <rw@handhelds.org>"
SECTION = "x11/base"
PR = "r1"
-DEPENDS = "x11"
+DEPENDS = "libx11"
SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc/programs/xmodmap \
file://autofoo.patch;patch=1"
diff --git a/packages/xmonobut/xmonobut_0.4.1.bb b/packages/xmonobut/xmonobut_0.4.1.bb
index ebb379c1b3..a0800f7010 100644
--- a/packages/xmonobut/xmonobut_0.4.1.bb
+++ b/packages/xmonobut/xmonobut_0.4.1.bb
@@ -2,7 +2,7 @@ LICENSE = "GPL"
PR = "r1"
DESCRIPTION = "utility to allow middle and right clicking with a stylus"
SECTION = "x11/utils"
-DEPENDS = "x11 xext xpm libmatchbox"
+DEPENDS = "libx11 libxext libxpm libmatchbox"
SRC_URI = "http://www.handhelds.org/~philippe/sources/xmonobut-${PV}.tar.gz \
file://xmonobut.desktop"
inherit autotools
diff --git a/packages/xmonobut/xmonobut_0.4.bb b/packages/xmonobut/xmonobut_0.4.bb
index 928049d161..e4907831f6 100644
--- a/packages/xmonobut/xmonobut_0.4.bb
+++ b/packages/xmonobut/xmonobut_0.4.bb
@@ -2,7 +2,7 @@ LICENSE = "GPL"
PR = "r1"
DESCRIPTION = "utility to allow middle and right clicking with a stylus"
SECTION = "x11/utils"
-DEPENDS = "x11 xext xpm"
+DEPENDS = "libx11 libxext libxpm"
SRC_URI = "http://www.handhelds.org/~mallum/downloadables/xmonobut/xmonobut-${PV}.tar.gz \
file://xmonobut.desktop"
inherit autotools
diff --git a/packages/xprop/xprop_cvs.bb b/packages/xprop/xprop_cvs.bb
index f847952af5..f6dd54b7cd 100644
--- a/packages/xprop/xprop_cvs.bb
+++ b/packages/xprop/xprop_cvs.bb
@@ -1,6 +1,6 @@
PV = "0.0+cvs${SRCDATE}"
LICENSE = "MIT"
-DEPENDS = "x11 xmu xext"
+DEPENDS = "libx11 libxmu libxext"
DESCRIPTION = "property displayer for X"
MAINTER = "Rene Wagner <rw@handhelds.org>"
SECTION = "x11/base"
diff --git a/packages/xqt/xqt_0.0.9.bb b/packages/xqt/xqt_0.0.9.bb
index 8c87c3b797..d5a8e70332 100644
--- a/packages/xqt/xqt_0.0.9.bb
+++ b/packages/xqt/xqt_0.0.9.bb
@@ -4,7 +4,7 @@ SECTION = "x11"
SRCDATE = "20041111"
-DEPENDS = "freetype libxi xmu flex-2.5.4-native virtual/libqte2 libqpe-opie"
+DEPENDS = "freetype libxi libxmu flex-2.5.4-native virtual/libqte2 libqpe-opie"
SRC_URI = "cvs://anonymous@cvs.sourceforge.jp/cvsroot/xqt;module=xc;method=pserver \
file://imake-staging.patch;patch=1 \
diff --git a/packages/xrandr/xrandr_cvs.bb b/packages/xrandr/xrandr_cvs.bb
index 1e6609384b..0ab7c745f4 100644
--- a/packages/xrandr/xrandr_cvs.bb
+++ b/packages/xrandr/xrandr_cvs.bb
@@ -1,6 +1,6 @@
PV = "0.0+cvs${SRCDATE}"
LICENSE= "BSD-X"
-DEPENDS = "libxrandr x11 xext"
+DEPENDS = "libxrandr libx11 libxext"
DESCRIPTION = "X Resize and Rotate extension command."
SECTION = "x11/base"
diff --git a/packages/xrdb/xrdb_cvs.bb b/packages/xrdb/xrdb_cvs.bb
index ca0e93d947..cbf2caac70 100644
--- a/packages/xrdb/xrdb_cvs.bb
+++ b/packages/xrdb/xrdb_cvs.bb
@@ -1,5 +1,5 @@
PV = "0.0+cvs${SRCDATE}"
-DEPENDS = "x11 xmu xext"
+DEPENDS = "libx11 libxmu libxext"
DESCRIPTION = "X server resource database utility"
MAINTAINER = "Rene Wagner <rw@handhelds.org>"
SECTION = "x11/base"
diff --git a/packages/xscreensaver/xscreensaver_4.16.bb b/packages/xscreensaver/xscreensaver_4.16.bb
index 6db40ab4bc..acf629f558 100644
--- a/packages/xscreensaver/xscreensaver_4.16.bb
+++ b/packages/xscreensaver/xscreensaver_4.16.bb
@@ -16,7 +16,7 @@ HOMEPAGE="http://www.jwz.org/xscreensaver/"
PR = "r1"
SECTION="x11-misc"
-DEPENDS="intltool x11 gtk+ libxml2 libglade"
+DEPENDS="intltool libx11 gtk+ libxml2 libglade"
# xscreensaver-demo is a glade app
LDFLAGS_append = " -Wl,--export-dynamic"
diff --git a/packages/xscreensaver/xscreensaver_4.22.bb b/packages/xscreensaver/xscreensaver_4.22.bb
index df4c45fb1c..ba6bd9c58e 100644
--- a/packages/xscreensaver/xscreensaver_4.22.bb
+++ b/packages/xscreensaver/xscreensaver_4.22.bb
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.jwz.org/xscreensaver/"
PR = "r0"
SECTION="x11-misc"
-DEPENDS="intltool x11 gtk+ libxml2 libglade"
+DEPENDS="intltool libx11 gtk+ libxml2 libglade"
# xscreensaver-demo is a glade app
LDFLAGS_append = " -Wl,--export-dynamic"
diff --git a/packages/xserver/xserver-kdrive-omap_6.6.3.bb b/packages/xserver/xserver-kdrive-omap_6.6.3.bb
index 5b131de8bd..8d755f331d 100644
--- a/packages/xserver/xserver-kdrive-omap_6.6.3.bb
+++ b/packages/xserver/xserver-kdrive-omap_6.6.3.bb
@@ -1,5 +1,5 @@
LICENSE = "MIT"
-DEPENDS = "xsp tslib-maemo xproto xdmcp xextensions xtrans xau x11 xext libxrandr fixesext damageext xfont resourceext compositeext xcalibrateext recordext"
+DEPENDS = "xsp tslib-maemo xproto xdmcp xextensions xtrans libxau libx11 libxext libxrandr fixesext damageext libxfont resourceext compositeext xcalibrateext recordext"
PROVIDES = "virtual/xserver"
PACKAGES = "${PN} ${PN}-doc ${PN}-dev ${PN}-locale"
SECTION = "x11/base"
diff --git a/packages/xserver/xserver-kdrive_20050207.bb b/packages/xserver/xserver-kdrive_20050207.bb
index 58289c8ea5..b8e8b08919 100644
--- a/packages/xserver/xserver-kdrive_20050207.bb
+++ b/packages/xserver/xserver-kdrive_20050207.bb
@@ -3,7 +3,7 @@ FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}"
DEFAULT_PREFERENCE = "1"
LICENSE = "MIT"
-DEPENDS = "tslib xproto xdmcp xextensions-1.0.1 xtrans xau x11 xext libxrandr fixesext damageext xfont resourceext compositeext xcalibrateext recordext"
+DEPENDS = "tslib xproto xdmcp xextensions-1.0.1 xtrans libxau libx11 libxext libxrandr fixesext damageext libxfont resourceext compositeext xcalibrateext recordext"
PROVIDES = "virtual/xserver"
RPROVIDES = "virtual/xserver"
PACKAGES = "xserver-kdrive-mach64 xserver-kdrive-fbdev xserver-kdrive-vesa xserver-kdrive-mga xserver-kdrive-via xserver-kdrive-ati xserver-kdrive-fake xserver-kdrive-i810 xserver-kdrive-xephyr xserver-kdrive-epson ${PN}-doc ${PN}-dev ${PN}-locale"
diff --git a/packages/xserver/xserver-kdrive_20050624.bb b/packages/xserver/xserver-kdrive_20050624.bb
index fcabbd4d28..df9e04a6af 100644
--- a/packages/xserver/xserver-kdrive_20050624.bb
+++ b/packages/xserver/xserver-kdrive_20050624.bb
@@ -2,7 +2,7 @@ PV = "0.0+cvs${FIXEDSRCDATE}"
FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}"
LICENSE = "MIT"
-DEPENDS = "tslib xproto xdmcp xextensions xtrans xau x11 xext libxrandr fixesext damageext xfont resourceext compositeext xcalibrateext recordext"
+DEPENDS = "tslib xproto xdmcp xextensions xtrans libxau libx11 libxext libxrandr fixesext damageext libxfont resourceext compositeext xcalibrateext recordext"
PROVIDES = "virtual/xserver"
RPROVIDES = "virtual/xserver"
PACKAGES = "xserver-kdrive-mach64 xserver-kdrive-fbdev xserver-kdrive-vesa xserver-kdrive-mga xserver-kdrive-via xserver-kdrive-ati xserver-kdrive-fake xserver-kdrive-i810 xserver-kdrive-xephyr xserver-kdrive-epson ${PN}-doc ${PN}-dev ${PN}-locale"
diff --git a/packages/xserver/xserver-kdrive_cvs.bb b/packages/xserver/xserver-kdrive_cvs.bb
index dc05735897..b891bca467 100644
--- a/packages/xserver/xserver-kdrive_cvs.bb
+++ b/packages/xserver/xserver-kdrive_cvs.bb
@@ -2,7 +2,7 @@ PV = "0.0+cvs${SRCDATE}"
DEFAULT_PREFERENCE = "-2"
LICENSE = "MIT"
-DEPENDS = "tslib xproto xdmcp xextensions xtrans xau x11 xext libxrandr fixesext damageext xfont resourceext compositeext xcalibrateext recordext"
+DEPENDS = "tslib xproto xdmcp xextensions xtrans libxau libx11 libxext libxrandr fixesext damageext libxfont resourceext compositeext xcalibrateext recordext"
PROVIDES = "virtual/xserver"
RPROVIDES = "virtual/xserver"
PACKAGES = "xserver-kdrive-mach64 xserver-kdrive-fbdev xserver-kdrive-vesa xserver-kdrive-mga xserver-kdrive-via xserver-kdrive-ati xserver-kdrive-fake xserver-kdrive-i810 xserver-kdrive-xephyr xserver-kdrive-epson ${PN}-doc ${PN}-dev ${PN}-locale"
diff --git a/packages/xserver/xserver-xorg_6.8.99.10.bb b/packages/xserver/xserver-xorg_6.8.99.10.bb
index c5b05cd2fc..37546fe1ee 100644
--- a/packages/xserver/xserver-xorg_6.8.99.10.bb
+++ b/packages/xserver/xserver-xorg_6.8.99.10.bb
@@ -4,7 +4,7 @@ PROVIDES = "virtual/xserver"
LICENSE = "Xorg"
PR = "r2"
-DEPENDS = "fontconfig freetype libxi xmu flex-native zlib"
+DEPENDS = "fontconfig freetype libxi libxmu flex-native zlib"
SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc;method=pserver;tag=XORG-6_8_99_10 \
file://imake-staging.patch;patch=1 \
diff --git a/packages/xserver/xserver-xorg_6.8.99.11.bb b/packages/xserver/xserver-xorg_6.8.99.11.bb
index 2a0519fd76..e60f62ef57 100644
--- a/packages/xserver/xserver-xorg_6.8.99.11.bb
+++ b/packages/xserver/xserver-xorg_6.8.99.11.bb
@@ -4,7 +4,7 @@ PROVIDES = "virtual/xserver"
LICENSE = "Xorg"
PR = "r0"
-DEPENDS = "fontconfig freetype libxi xmu flex-native zlib"
+DEPENDS = "fontconfig freetype libxi libxmu flex-native zlib"
SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc;method=pserver;tag=XORG-6_8_99_11 \
file://imake-staging.patch;patch=1 \
diff --git a/packages/xserver/xserver-xorg_cvs.bb b/packages/xserver/xserver-xorg_cvs.bb
index 9c64fb8377..e410581e17 100644
--- a/packages/xserver/xserver-xorg_cvs.bb
+++ b/packages/xserver/xserver-xorg_cvs.bb
@@ -5,7 +5,7 @@ PROVIDES = "virtual/xserver"
PR = "r3"
PV = "6.8.1+cvs${SRCDATE}"
-DEPENDS = "fontconfig freetype libxi xmu flex-2.5.4-native"
+DEPENDS = "fontconfig freetype libxi libxmu flex-2.5.4-native"
SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc;method=pserver \
file://imake-staging.patch;patch=1 \
diff --git a/packages/xset/xset_20040817.bb b/packages/xset/xset_20040817.bb
index f07d2e0918..daf57d15c8 100644
--- a/packages/xset/xset_20040817.bb
+++ b/packages/xset/xset_20040817.bb
@@ -5,7 +5,7 @@ FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}"
PV = "0.0+cvs${FIXEDSRCDATE}"
PR = "r1"
-DEPENDS = "x11 xext xextensions xmu"
+DEPENDS = "libx11 libxext xextensions libxmu"
CFLAGS += "-D_GNU_SOURCE"
diff --git a/packages/xstroke/xstroke_0.6.bb b/packages/xstroke/xstroke_0.6.bb
index c905b7b601..590e2745b6 100644
--- a/packages/xstroke/xstroke_0.6.bb
+++ b/packages/xstroke/xstroke_0.6.bb
@@ -3,7 +3,7 @@ LICENSE = "GPL"
SECTION = "x11"
PRIORITY = "optional"
MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-DEPENDS = "x11 xft xtst xpm"
+DEPENDS = "libx11 xft libxtst libxpm"
PR = "r2"
SRC_URI = "http://xstroke.org/releases/xstroke-0.6.tar.gz \
diff --git a/packages/xstroke/xstroke_cvs.bb b/packages/xstroke/xstroke_cvs.bb
index d19b7d0d45..90e8aec033 100644
--- a/packages/xstroke/xstroke_cvs.bb
+++ b/packages/xstroke/xstroke_cvs.bb
@@ -3,7 +3,7 @@ LICENSE = "GPL"
SECTION = "x11"
PRIORITY = "optional"
MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-DEPENDS = "x11 xft xtst xpm"
+DEPENDS = "libx11 xft libxtst libxpm"
PV = "0.0+cvs${SRCDATE}"
PR = "r1"
diff --git a/packages/xtscal/xtscal_0.4.bb b/packages/xtscal/xtscal_0.4.bb
index d2d4adc37e..fbd8a8d4c9 100644
--- a/packages/xtscal/xtscal_0.4.bb
+++ b/packages/xtscal/xtscal_0.4.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Touchscreen calibration utility"
MAINTAINER = "Phil Blundell <pb@handhelds.org>"
SECTION = "x11/base"
LICENSE = "GPL"
-DEPENDS = "x11 libxft libxrandr"
+DEPENDS = "libx11 libxft libxrandr"
SRC_URI = "${GPE_MIRROR}/xtscal-${PV}.tar.bz2"
diff --git a/packages/xtscal/xtscal_0.5.1.bb b/packages/xtscal/xtscal_0.5.1.bb
index a76b2f3010..ef415227ef 100644
--- a/packages/xtscal/xtscal_0.5.1.bb
+++ b/packages/xtscal/xtscal_0.5.1.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Touchscreen calibration utility"
MAINTAINER = "Phil Blundell <pb@handhelds.org>"
SECTION = "x11/base"
LICENSE = "GPL"
-DEPENDS = "x11 libxft libxrandr xcalibrate"
+DEPENDS = "libx11 libxft libxrandr xcalibrate"
PR = "r1"
diff --git a/packages/xtscal/xtscal_0.5.bb b/packages/xtscal/xtscal_0.5.bb
index 64c51b96a2..757f7d1f21 100644
--- a/packages/xtscal/xtscal_0.5.bb
+++ b/packages/xtscal/xtscal_0.5.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Touchscreen calibration utility"
MAINTAINER = "Phil Blundell <pb@handhelds.org>"
SECTION = "x11/base"
LICENSE = "GPL"
-DEPENDS = "x11 libxft libxrandr xcalibrate"
+DEPENDS = "libx11 libxft libxrandr xcalibrate"
SRC_URI = "${GPE_MIRROR}/xtscal-${PV}.tar.bz2"
diff --git a/packages/xtscal/xtscal_0.6.3.bb b/packages/xtscal/xtscal_0.6.3.bb
index a2a770f4fe..70666f1fbf 100644
--- a/packages/xtscal/xtscal_0.6.3.bb
+++ b/packages/xtscal/xtscal_0.6.3.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "Touchscreen calibration utility"
MAINTAINER = "Phil Blundell <pb@handhelds.org>"
SECTION = "x11/base"
-DEPENDS = "x11 libxft libxrandr xcalibrate"
+DEPENDS = "libx11 libxft libxrandr xcalibrate"
PR = "r1"