summaryrefslogtreecommitdiff
path: root/packages/xorg-app
diff options
context:
space:
mode:
Diffstat (limited to 'packages/xorg-app')
-rw-r--r--packages/xorg-app/appres_X11R7.0-1.0.0.bb4
-rw-r--r--packages/xorg-app/bdftopcf_X11R7.0-1.0.0.bb2
-rw-r--r--packages/xorg-app/beforelight_X11R7.0-1.0.1.bb4
-rw-r--r--packages/xorg-app/bitmap_X11R7.0-1.0.1.bb4
-rw-r--r--packages/xorg-app/bitmap_X11R7.1-1.0.2.bb4
-rw-r--r--packages/xorg-app/editres_X11R7.0-1.0.1.bb4
-rw-r--r--packages/xorg-app/fonttosfnt_X11R7.0-1.0.1.bb2
-rw-r--r--packages/xorg-app/fslsfonts_X11R7.0-1.0.1.bb4
-rw-r--r--packages/xorg-app/fstobdf_X11R7.0-1.0.1.bb4
-rw-r--r--packages/xorg-app/fstobdf_X11R7.1-1.0.2.bb4
-rw-r--r--packages/xorg-app/iceauth_X11R7.0-1.0.1.bb2
-rw-r--r--packages/xorg-app/ico_X11R7.0-1.0.1.bb4
-rw-r--r--packages/xorg-app/lbxproxy_X11R7.0-1.0.1.bb4
-rw-r--r--packages/xorg-app/listres_X11R7.0-1.0.1.bb4
-rw-r--r--packages/xorg-app/luit_X11R7.0-1.0.1.bb4
-rw-r--r--packages/xorg-app/mkcfm_X11R7.0-1.0.1.bb4
-rw-r--r--packages/xorg-app/mkfontdir_X11R7.0-1.0.1.bb2
-rw-r--r--packages/xorg-app/mkfontdir_X11R7.1-1.0.2.bb2
-rw-r--r--packages/xorg-app/mkfontscale-native_X11R7.0-1.0.1.bb2
-rw-r--r--packages/xorg-app/mkfontscale_X11R7.0-1.0.1.bb4
-rw-r--r--packages/xorg-app/oclock_X11R7.0-1.0.1.bb4
-rw-r--r--packages/xorg-app/proxymngr_X11R7.0-1.0.1.bb4
-rw-r--r--packages/xorg-app/rgb_X11R7.0-1.0.0.bb4
-rw-r--r--packages/xorg-app/rgb_X11R7.1-1.0.1.bb5
-rw-r--r--packages/xorg-app/rstart_X11R7.0-1.0.1.bb4
-rw-r--r--packages/xorg-app/rstart_X11R7.1-1.0.2.bb4
-rw-r--r--packages/xorg-app/scripts_X11R7.0-1.0.1.bb4
-rw-r--r--packages/xorg-app/sessreg_X11R7.0-1.0.0.bb4
-rw-r--r--packages/xorg-app/setxkbmap_X11R7.0-1.0.1.bb4
-rw-r--r--packages/xorg-app/setxkbmap_X11R7.1-1.0.2.bb4
-rw-r--r--packages/xorg-app/showfont_X11R7.0-1.0.1.bb2
-rw-r--r--packages/xorg-app/smproxy_X11R7.0-1.0.1.bb2
-rw-r--r--packages/xorg-app/smproxy_X11R7.1-1.0.2.bb2
-rw-r--r--packages/xorg-app/twm_X11R7.0-1.0.1.bb4
-rw-r--r--packages/xorg-app/viewres_X11R7.0-1.0.1.bb2
-rw-r--r--packages/xorg-app/x11perf_X11R7.0-1.0.1.bb4
-rw-r--r--packages/xorg-app/x11perf_X11R7.1-1.4.1.bb4
-rw-r--r--packages/xorg-app/xauth_X11R7.0-1.0.1.bb4
-rw-r--r--packages/xorg-app/xauth_cvs.bb2
-rw-r--r--packages/xorg-app/xbiff_X11R7.0-1.0.1.bb2
-rw-r--r--packages/xorg-app/xcalc_X11R7.0-1.0.1.bb2
-rw-r--r--packages/xorg-app/xclipboard_X11R7.0-1.0.1.bb2
-rw-r--r--packages/xorg-app/xclock_X11R7.0-1.0.1.bb4
-rw-r--r--packages/xorg-app/xclock_X11R7.1-1.0.2.bb4
-rw-r--r--packages/xorg-app/xcmsdb_X11R7.0-1.0.1.bb4
-rw-r--r--packages/xorg-app/xconsole_X11R7.0-1.0.1.bb2
-rw-r--r--packages/xorg-app/xconsole_X11R7.1-1.0.2.bb2
-rw-r--r--packages/xorg-app/xcursorgen_X11R7.0-1.0.0.bb4
-rw-r--r--packages/xorg-app/xcursorgen_X11R7.1-1.0.1.bb4
-rw-r--r--packages/xorg-app/xdbedizzy_X11R7.0-1.0.1.bb2
-rw-r--r--packages/xorg-app/xditview_X11R7.0-1.0.1.bb2
-rw-r--r--packages/xorg-app/xdm_X11R7.0-1.0.1.bb4
-rw-r--r--packages/xorg-app/xdm_X11R7.1-1.0.4.bb4
-rw-r--r--packages/xorg-app/xdpyinfo_X11R7.0-1.0.1.bb4
-rw-r--r--packages/xorg-app/xdpyinfo_cvs.bb2
-rw-r--r--packages/xorg-app/xdriinfo_X11R7.0-1.0.0.bb4
-rw-r--r--packages/xorg-app/xdriinfo_X11R7.1-1.0.1.bb4
-rw-r--r--packages/xorg-app/xedit_X11R7.0-1.0.1.bb2
-rw-r--r--packages/xorg-app/xedit_X11R7.1-1.0.2.bb2
-rw-r--r--packages/xorg-app/xev_X11R7.0-1.0.1.bb4
-rw-r--r--packages/xorg-app/xev_cvs.bb2
-rw-r--r--packages/xorg-app/xeyes_X11R7.0-1.0.1.bb4
-rw-r--r--packages/xorg-app/xf86dga_X11R7.0-1.0.1.bb4
-rw-r--r--packages/xorg-app/xfd_X11R7.0-1.0.1.bb2
-rw-r--r--packages/xorg-app/xfindproxy_X11R7.0-1.0.1.bb4
-rw-r--r--packages/xorg-app/xfontsel_X11R7.0-1.0.1.bb2
-rw-r--r--packages/xorg-app/xfs_X11R7.0-1.0.1.bb2
-rw-r--r--packages/xorg-app/xfs_X11R7.1-1.0.2.bb2
-rw-r--r--packages/xorg-app/xfsinfo_X11R7.0-1.0.1.bb4
-rw-r--r--packages/xorg-app/xfwp_X11R7.0-1.0.1.bb4
-rw-r--r--packages/xorg-app/xgamma_X11R7.0-1.0.1.bb4
-rw-r--r--packages/xorg-app/xgc_X11R7.0-1.0.1.bb2
-rw-r--r--packages/xorg-app/xhost_20040413.bb2
-rw-r--r--packages/xorg-app/xhost_X11R7.0-1.0.0.bb4
-rw-r--r--packages/xorg-app/xhost_X11R7.1-1.0.1.bb4
-rw-r--r--packages/xorg-app/xinit_X11R7.0-1.0.1.bb4
-rw-r--r--packages/xorg-app/xinit_X11R7.1-1.0.2.bb4
-rw-r--r--packages/xorg-app/xkbcomp_X11R7.0-1.0.1.bb4
-rw-r--r--packages/xorg-app/xkbcomp_X11R7.1-1.0.2.bb4
-rw-r--r--packages/xorg-app/xkbevd_X11R7.0-1.0.1.bb4
-rw-r--r--packages/xorg-app/xkbevd_X11R7.1-1.0.2.bb4
-rw-r--r--packages/xorg-app/xkbprint_X11R7.0-1.0.1.bb4
-rw-r--r--packages/xorg-app/xkbutils_X11R7.0-1.0.1.bb4
-rw-r--r--packages/xorg-app/xkill_X11R7.0-1.0.1.bb4
-rw-r--r--packages/xorg-app/xload_X11R7.0-1.0.1.bb2
-rw-r--r--packages/xorg-app/xlogo_X11R7.0-1.0.1.bb2
-rw-r--r--packages/xorg-app/xlsatoms_X11R7.0-1.0.1.bb4
-rw-r--r--packages/xorg-app/xlsclients_X11R7.0-1.0.1.bb4
-rw-r--r--packages/xorg-app/xlsfonts_X11R7.0-1.0.1.bb4
-rw-r--r--packages/xorg-app/xmag_X11R7.0-1.0.1.bb2
-rw-r--r--packages/xorg-app/xman_X11R7.0-1.0.1.bb2
-rw-r--r--packages/xorg-app/xman_X11R7.1-1.0.2.bb2
-rw-r--r--packages/xorg-app/xmessage_X11R7.0-1.0.1.bb2
-rw-r--r--packages/xorg-app/xmh_X11R7.0-1.0.1.bb2
-rw-r--r--packages/xorg-app/xmodmap_X11R7.0-1.0.0.bb4
-rw-r--r--packages/xorg-app/xmodmap_X11R7.1-1.0.1.bb4
-rw-r--r--packages/xorg-app/xmodmap_cvs.bb2
-rw-r--r--packages/xorg-app/xmore_X11R7.0-1.0.1.bb2
-rw-r--r--packages/xorg-app/xorg-app-common.inc2
-rw-r--r--packages/xorg-app/xphelloworld_X11R7.0-1.0.1.bb4
-rw-r--r--packages/xorg-app/xplsprinters_X11R7.0-1.0.1.bb4
-rw-r--r--packages/xorg-app/xpr_X11R7.0-1.0.1.bb4
-rw-r--r--packages/xorg-app/xprehashprinterlist_X11R7.0-1.0.1.bb4
-rw-r--r--packages/xorg-app/xprop_X11R7.0-1.0.1.bb4
-rw-r--r--packages/xorg-app/xprop_cvs.bb2
-rw-r--r--packages/xorg-app/xrandr_X11R7.0-1.0.1.bb4
-rw-r--r--packages/xorg-app/xrandr_X11R7.1-1.0.2.bb4
-rw-r--r--packages/xorg-app/xrandr_cvs.bb2
-rw-r--r--packages/xorg-app/xrdb_X11R7.0-1.0.1.bb4
-rw-r--r--packages/xorg-app/xrdb_X11R7.1-1.0.2.bb4
-rw-r--r--packages/xorg-app/xrdb_cvs.bb2
-rw-r--r--packages/xorg-app/xrefresh_X11R7.0-1.0.1.bb4
-rw-r--r--packages/xorg-app/xrefresh_X11R7.1-1.0.2.bb4
-rw-r--r--packages/xorg-app/xrx_X11R7.0-1.0.1.bb4
-rw-r--r--packages/xorg-app/xset_20040817.bb2
-rw-r--r--packages/xorg-app/xset_X11R7.0-1.0.1.bb4
-rw-r--r--packages/xorg-app/xset_X11R7.1-1.0.2.bb4
-rw-r--r--packages/xorg-app/xsetmode_X11R7.0-1.0.0.bb4
-rw-r--r--packages/xorg-app/xsetpointer_X11R7.0-1.0.0.bb4
-rw-r--r--packages/xorg-app/xsetroot_X11R7.0-1.0.1.bb4
-rw-r--r--packages/xorg-app/xsm_X11R7.0-1.0.1.bb2
-rw-r--r--packages/xorg-app/xstdcmap_X11R7.0-1.0.1.bb4
-rw-r--r--packages/xorg-app/xterm_207.bb4
-rw-r--r--packages/xorg-app/xtrap_X11R7.0-1.0.1.bb4
-rw-r--r--packages/xorg-app/xtrap_X11R7.1-1.0.2.bb4
-rw-r--r--packages/xorg-app/xvidtune_X11R7.0-1.0.1.bb2
-rw-r--r--packages/xorg-app/xvinfo_X11R7.0-1.0.1.bb4
-rw-r--r--packages/xorg-app/xwd_X11R7.0-1.0.1.bb4
-rw-r--r--packages/xorg-app/xwininfo_X11R7.0-1.0.1.bb4
-rw-r--r--packages/xorg-app/xwininfo_X11R7.1-1.0.2.bb4
-rw-r--r--packages/xorg-app/xwud_X11R7.0-1.0.1.bb4
131 files changed, 220 insertions, 217 deletions
diff --git a/packages/xorg-app/appres_X11R7.0-1.0.0.bb b/packages/xorg-app/appres_X11R7.0-1.0.0.bb
index cb0d42a2a6..5805a0fe04 100644
--- a/packages/xorg-app/appres_X11R7.0-1.0.0.bb
+++ b/packages/xorg-app/appres_X11R7.0-1.0.0.bb
@@ -1,6 +1,6 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
DESCRIPTION = "The appres program prints the resources seen by an application."
-DEPENDS += " virtual/x11 libxt"
+DEPENDS += " virtual/libx11 libxt"
diff --git a/packages/xorg-app/bdftopcf_X11R7.0-1.0.0.bb b/packages/xorg-app/bdftopcf_X11R7.0-1.0.0.bb
index 4eefa72194..d9f37daf1a 100644
--- a/packages/xorg-app/bdftopcf_X11R7.0-1.0.0.bb
+++ b/packages/xorg-app/bdftopcf_X11R7.0-1.0.0.bb
@@ -1,4 +1,4 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
DESCRIPTION = "bdftopcf is a font compiler for the X server and font server."
diff --git a/packages/xorg-app/beforelight_X11R7.0-1.0.1.bb b/packages/xorg-app/beforelight_X11R7.0-1.0.1.bb
index e25b3ba16a..5a64332d48 100644
--- a/packages/xorg-app/beforelight_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/beforelight_X11R7.0-1.0.1.bb
@@ -1,6 +1,6 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
#DESCRIPTION = ""
-DEPENDS += " virtual/x11 libxscrnsaver libxt libxaw libxt"
+DEPENDS += " virtual/libx11 libxscrnsaver libxt libxaw libxt"
diff --git a/packages/xorg-app/bitmap_X11R7.0-1.0.1.bb b/packages/xorg-app/bitmap_X11R7.0-1.0.1.bb
index 3d953e8a19..c933d4f718 100644
--- a/packages/xorg-app/bitmap_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/bitmap_X11R7.0-1.0.1.bb
@@ -1,5 +1,5 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
#DESCRIPTION = ""
-DEPENDS += " virtual/x11 libxmu xbitmaps libxt"
+DEPENDS += " virtual/libx11 libxmu xbitmaps libxt"
diff --git a/packages/xorg-app/bitmap_X11R7.1-1.0.2.bb b/packages/xorg-app/bitmap_X11R7.1-1.0.2.bb
index 3e5736e063..4d9a7f53de 100644
--- a/packages/xorg-app/bitmap_X11R7.1-1.0.2.bb
+++ b/packages/xorg-app/bitmap_X11R7.1-1.0.2.bb
@@ -1,6 +1,6 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
#DESCRIPTION = ""
-DEPENDS += " virtual/x11 libxmu xbitmaps libxt"
+DEPENDS += " virtual/libx11 libxmu xbitmaps libxt"
diff --git a/packages/xorg-app/editres_X11R7.0-1.0.1.bb b/packages/xorg-app/editres_X11R7.0-1.0.1.bb
index 908dc878cb..281a33c4bd 100644
--- a/packages/xorg-app/editres_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/editres_X11R7.0-1.0.1.bb
@@ -1,6 +1,6 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
#DESCRIPTION = ""
-DEPENDS += " virtual/x11 libxt libxmu libxaw"
+DEPENDS += " virtual/libx11 libxt libxmu libxaw"
diff --git a/packages/xorg-app/fonttosfnt_X11R7.0-1.0.1.bb b/packages/xorg-app/fonttosfnt_X11R7.0-1.0.1.bb
index 5d268a7f76..fb84802ca6 100644
--- a/packages/xorg-app/fonttosfnt_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/fonttosfnt_X11R7.0-1.0.1.bb
@@ -1,4 +1,4 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
#DESCRIPTION = ""
diff --git a/packages/xorg-app/fslsfonts_X11R7.0-1.0.1.bb b/packages/xorg-app/fslsfonts_X11R7.0-1.0.1.bb
index b274cd549f..0257648e20 100644
--- a/packages/xorg-app/fslsfonts_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/fslsfonts_X11R7.0-1.0.1.bb
@@ -1,6 +1,6 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
#DESCRIPTION = ""
-DEPENDS += " virtual/x11 libfs"
+DEPENDS += " virtual/libx11 libfs"
diff --git a/packages/xorg-app/fstobdf_X11R7.0-1.0.1.bb b/packages/xorg-app/fstobdf_X11R7.0-1.0.1.bb
index b274cd549f..0257648e20 100644
--- a/packages/xorg-app/fstobdf_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/fstobdf_X11R7.0-1.0.1.bb
@@ -1,6 +1,6 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
#DESCRIPTION = ""
-DEPENDS += " virtual/x11 libfs"
+DEPENDS += " virtual/libx11 libfs"
diff --git a/packages/xorg-app/fstobdf_X11R7.1-1.0.2.bb b/packages/xorg-app/fstobdf_X11R7.1-1.0.2.bb
index b274cd549f..0257648e20 100644
--- a/packages/xorg-app/fstobdf_X11R7.1-1.0.2.bb
+++ b/packages/xorg-app/fstobdf_X11R7.1-1.0.2.bb
@@ -1,6 +1,6 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
#DESCRIPTION = ""
-DEPENDS += " virtual/x11 libfs"
+DEPENDS += " virtual/libx11 libfs"
diff --git a/packages/xorg-app/iceauth_X11R7.0-1.0.1.bb b/packages/xorg-app/iceauth_X11R7.0-1.0.1.bb
index 2093e75f68..5f94b334be 100644
--- a/packages/xorg-app/iceauth_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/iceauth_X11R7.0-1.0.1.bb
@@ -1,4 +1,4 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
#DESCRIPTION = ""
diff --git a/packages/xorg-app/ico_X11R7.0-1.0.1.bb b/packages/xorg-app/ico_X11R7.0-1.0.1.bb
index 827257910a..d584483e44 100644
--- a/packages/xorg-app/ico_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/ico_X11R7.0-1.0.1.bb
@@ -1,6 +1,6 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
#DESCRIPTION = ""
-DEPENDS += " virtual/x11"
+DEPENDS += " virtual/libx11"
diff --git a/packages/xorg-app/lbxproxy_X11R7.0-1.0.1.bb b/packages/xorg-app/lbxproxy_X11R7.0-1.0.1.bb
index f18de41289..b9aa49f4ab 100644
--- a/packages/xorg-app/lbxproxy_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/lbxproxy_X11R7.0-1.0.1.bb
@@ -1,6 +1,6 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
DESCRIPTION = "Applications that would like to take advantage of the Low Bandwidth \
extension to X (LBX) must make their connections to an lbxproxy."
-DEPENDS += " xtrans libxext liblbxutil virtual/x11 libice xproxymngproto bigreqsproto zlib"
+DEPENDS += " xtrans libxext liblbxutil virtual/libx11 libice xproxymngproto bigreqsproto zlib"
diff --git a/packages/xorg-app/listres_X11R7.0-1.0.1.bb b/packages/xorg-app/listres_X11R7.0-1.0.1.bb
index aff984e46b..61fb362e23 100644
--- a/packages/xorg-app/listres_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/listres_X11R7.0-1.0.1.bb
@@ -1,6 +1,6 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
#DESCRIPTION = ""
-DEPENDS += " libxaw virtual/x11 libxt libxmu"
+DEPENDS += " libxaw virtual/libx11 libxt libxmu"
diff --git a/packages/xorg-app/luit_X11R7.0-1.0.1.bb b/packages/xorg-app/luit_X11R7.0-1.0.1.bb
index c83cd38c5d..dd599b3ad7 100644
--- a/packages/xorg-app/luit_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/luit_X11R7.0-1.0.1.bb
@@ -1,6 +1,6 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
#DESCRIPTION = ""
-DEPENDS += " zlib zlib virtual/x11 libfontenc"
+DEPENDS += " zlib zlib virtual/libx11 libfontenc"
diff --git a/packages/xorg-app/mkcfm_X11R7.0-1.0.1.bb b/packages/xorg-app/mkcfm_X11R7.0-1.0.1.bb
index 144e600beb..d2974045c2 100644
--- a/packages/xorg-app/mkcfm_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/mkcfm_X11R7.0-1.0.1.bb
@@ -1,6 +1,6 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
#DESCRIPTION = ""
-DEPENDS += " virtual/x11 libxfont libfs libfontenc"
+DEPENDS += " virtual/libx11 libxfont libfs libfontenc"
diff --git a/packages/xorg-app/mkfontdir_X11R7.0-1.0.1.bb b/packages/xorg-app/mkfontdir_X11R7.0-1.0.1.bb
index 62c088314f..556afd2867 100644
--- a/packages/xorg-app/mkfontdir_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/mkfontdir_X11R7.0-1.0.1.bb
@@ -1,4 +1,4 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
#DESCRIPTION = ""
diff --git a/packages/xorg-app/mkfontdir_X11R7.1-1.0.2.bb b/packages/xorg-app/mkfontdir_X11R7.1-1.0.2.bb
index 62c088314f..556afd2867 100644
--- a/packages/xorg-app/mkfontdir_X11R7.1-1.0.2.bb
+++ b/packages/xorg-app/mkfontdir_X11R7.1-1.0.2.bb
@@ -1,4 +1,4 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
#DESCRIPTION = ""
diff --git a/packages/xorg-app/mkfontscale-native_X11R7.0-1.0.1.bb b/packages/xorg-app/mkfontscale-native_X11R7.0-1.0.1.bb
index 29e304922d..98b49f99ac 100644
--- a/packages/xorg-app/mkfontscale-native_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/mkfontscale-native_X11R7.0-1.0.1.bb
@@ -3,7 +3,7 @@ SECTION = "x11/apps"
LICENSE = "MIT-X"
S="${WORKDIR}/mkfontscale-${PV}"
-DEPENDS = "virtual/x11-native libfontenc-native"
+DEPENDS = "libx11-native libfontenc-native"
SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/mkfontscale-${PV}.tar.bz2"
diff --git a/packages/xorg-app/mkfontscale_X11R7.0-1.0.1.bb b/packages/xorg-app/mkfontscale_X11R7.0-1.0.1.bb
index dc2b681490..2f5eab7d63 100644
--- a/packages/xorg-app/mkfontscale_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/mkfontscale_X11R7.0-1.0.1.bb
@@ -1,6 +1,6 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
#DESCRIPTION = ""
-DEPENDS += " zlib libfontenc freetype virtual/x11"
+DEPENDS += " zlib libfontenc freetype virtual/libx11"
diff --git a/packages/xorg-app/oclock_X11R7.0-1.0.1.bb b/packages/xorg-app/oclock_X11R7.0-1.0.1.bb
index 4c564a3643..f275cc94d4 100644
--- a/packages/xorg-app/oclock_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/oclock_X11R7.0-1.0.1.bb
@@ -1,6 +1,6 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
#DESCRIPTION = ""
-DEPENDS += " virtual/x11 libxmu libxext libxt"
+DEPENDS += " virtual/libx11 libxmu libxext libxt"
diff --git a/packages/xorg-app/proxymngr_X11R7.0-1.0.1.bb b/packages/xorg-app/proxymngr_X11R7.0-1.0.1.bb
index 7272764f52..ea4a1ad78d 100644
--- a/packages/xorg-app/proxymngr_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/proxymngr_X11R7.0-1.0.1.bb
@@ -1,6 +1,6 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
#DESCRIPTION = ""
-DEPENDS += " libice libxt virtual/x11 xproxymngproto"
+DEPENDS += " libice libxt virtual/libx11 xproxymngproto"
diff --git a/packages/xorg-app/rgb_X11R7.0-1.0.0.bb b/packages/xorg-app/rgb_X11R7.0-1.0.0.bb
index 0895ec79c8..1c46d69a0b 100644
--- a/packages/xorg-app/rgb_X11R7.0-1.0.0.bb
+++ b/packages/xorg-app/rgb_X11R7.0-1.0.0.bb
@@ -1,6 +1,6 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
#DESCRIPTION = ""
-DEPENDS += " virtual/x11 libxt"
+DEPENDS += " virtual/libx11 libxt"
diff --git a/packages/xorg-app/rgb_X11R7.1-1.0.1.bb b/packages/xorg-app/rgb_X11R7.1-1.0.1.bb
index 4077c44cfb..59dd8abd27 100644
--- a/packages/xorg-app/rgb_X11R7.1-1.0.1.bb
+++ b/packages/xorg-app/rgb_X11R7.1-1.0.1.bb
@@ -1,7 +1,10 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
+PR = "r1"
#DESCRIPTION = ""
DEPENDS += " xproto util-macros"
+FILES_${PN} += "${datadir}/X11"
+
diff --git a/packages/xorg-app/rstart_X11R7.0-1.0.1.bb b/packages/xorg-app/rstart_X11R7.0-1.0.1.bb
index 827257910a..d584483e44 100644
--- a/packages/xorg-app/rstart_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/rstart_X11R7.0-1.0.1.bb
@@ -1,6 +1,6 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
#DESCRIPTION = ""
-DEPENDS += " virtual/x11"
+DEPENDS += " virtual/libx11"
diff --git a/packages/xorg-app/rstart_X11R7.1-1.0.2.bb b/packages/xorg-app/rstart_X11R7.1-1.0.2.bb
index 827257910a..d584483e44 100644
--- a/packages/xorg-app/rstart_X11R7.1-1.0.2.bb
+++ b/packages/xorg-app/rstart_X11R7.1-1.0.2.bb
@@ -1,6 +1,6 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
#DESCRIPTION = ""
-DEPENDS += " virtual/x11"
+DEPENDS += " virtual/libx11"
diff --git a/packages/xorg-app/scripts_X11R7.0-1.0.1.bb b/packages/xorg-app/scripts_X11R7.0-1.0.1.bb
index e1f332e8c1..00bfde0620 100644
--- a/packages/xorg-app/scripts_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/scripts_X11R7.0-1.0.1.bb
@@ -1,7 +1,7 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
#DESCRIPTION = ""
-DEPENDS += " virtual/x11"
+DEPENDS += " virtual/libx11"
diff --git a/packages/xorg-app/sessreg_X11R7.0-1.0.0.bb b/packages/xorg-app/sessreg_X11R7.0-1.0.0.bb
index 827257910a..d584483e44 100644
--- a/packages/xorg-app/sessreg_X11R7.0-1.0.0.bb
+++ b/packages/xorg-app/sessreg_X11R7.0-1.0.0.bb
@@ -1,6 +1,6 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
#DESCRIPTION = ""
-DEPENDS += " virtual/x11"
+DEPENDS += " virtual/libx11"
diff --git a/packages/xorg-app/setxkbmap_X11R7.0-1.0.1.bb b/packages/xorg-app/setxkbmap_X11R7.0-1.0.1.bb
index 29ed7358d5..8001d661e7 100644
--- a/packages/xorg-app/setxkbmap_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/setxkbmap_X11R7.0-1.0.1.bb
@@ -1,6 +1,6 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
#DESCRIPTION = ""
-DEPENDS += " libxkbfile virtual/x11"
+DEPENDS += " libxkbfile virtual/libx11"
diff --git a/packages/xorg-app/setxkbmap_X11R7.1-1.0.2.bb b/packages/xorg-app/setxkbmap_X11R7.1-1.0.2.bb
index 29ed7358d5..8001d661e7 100644
--- a/packages/xorg-app/setxkbmap_X11R7.1-1.0.2.bb
+++ b/packages/xorg-app/setxkbmap_X11R7.1-1.0.2.bb
@@ -1,6 +1,6 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
#DESCRIPTION = ""
-DEPENDS += " libxkbfile virtual/x11"
+DEPENDS += " libxkbfile virtual/libx11"
diff --git a/packages/xorg-app/showfont_X11R7.0-1.0.1.bb b/packages/xorg-app/showfont_X11R7.0-1.0.1.bb
index 46efe223ef..165202b2da 100644
--- a/packages/xorg-app/showfont_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/showfont_X11R7.0-1.0.1.bb
@@ -1,4 +1,4 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
#DESCRIPTION = ""
diff --git a/packages/xorg-app/smproxy_X11R7.0-1.0.1.bb b/packages/xorg-app/smproxy_X11R7.0-1.0.1.bb
index a8533a377a..843541dc77 100644
--- a/packages/xorg-app/smproxy_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/smproxy_X11R7.0-1.0.1.bb
@@ -1,4 +1,4 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
#DESCRIPTION = ""
diff --git a/packages/xorg-app/smproxy_X11R7.1-1.0.2.bb b/packages/xorg-app/smproxy_X11R7.1-1.0.2.bb
index a8533a377a..843541dc77 100644
--- a/packages/xorg-app/smproxy_X11R7.1-1.0.2.bb
+++ b/packages/xorg-app/smproxy_X11R7.1-1.0.2.bb
@@ -1,4 +1,4 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
#DESCRIPTION = ""
diff --git a/packages/xorg-app/twm_X11R7.0-1.0.1.bb b/packages/xorg-app/twm_X11R7.0-1.0.1.bb
index c975c2c42d..3cbab36e9b 100644
--- a/packages/xorg-app/twm_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/twm_X11R7.0-1.0.1.bb
@@ -1,8 +1,8 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
DESCRIPTION = "tiny window manager"
-DEPENDS += " virtual/x11 libxext libxt libxmu"
+DEPENDS += " virtual/libx11 libxext libxt libxmu"
ALTERNATIVE_PATH = "${bindir}/twm"
ALTERNATIVE_NAME = "x-window-manager"
diff --git a/packages/xorg-app/viewres_X11R7.0-1.0.1.bb b/packages/xorg-app/viewres_X11R7.0-1.0.1.bb
index 2a03dcb18c..50c6a97949 100644
--- a/packages/xorg-app/viewres_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/viewres_X11R7.0-1.0.1.bb
@@ -1,4 +1,4 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
#DESCRIPTION = ""
diff --git a/packages/xorg-app/x11perf_X11R7.0-1.0.1.bb b/packages/xorg-app/x11perf_X11R7.0-1.0.1.bb
index 8e07c499b9..905f3cdced 100644
--- a/packages/xorg-app/x11perf_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/x11perf_X11R7.0-1.0.1.bb
@@ -1,6 +1,6 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
#DESCRIPTION = ""
-DEPENDS += " virtual/x11 libxmu"
+DEPENDS += " virtual/libx11 libxmu"
diff --git a/packages/xorg-app/x11perf_X11R7.1-1.4.1.bb b/packages/xorg-app/x11perf_X11R7.1-1.4.1.bb
index 4b4f4fe068..8581abd43c 100644
--- a/packages/xorg-app/x11perf_X11R7.1-1.4.1.bb
+++ b/packages/xorg-app/x11perf_X11R7.1-1.4.1.bb
@@ -1,5 +1,5 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
#DESCRIPTION = ""
-DEPENDS += " virtual/x11 libxmu libxrender libxft libxext"
+DEPENDS += " virtual/libx11 libxmu libxrender libxft libxext"
diff --git a/packages/xorg-app/xauth_X11R7.0-1.0.1.bb b/packages/xorg-app/xauth_X11R7.0-1.0.1.bb
index d9e62caa1f..b891ff90ef 100644
--- a/packages/xorg-app/xauth_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/xauth_X11R7.0-1.0.1.bb
@@ -1,6 +1,6 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
#DESCRIPTION = ""
-DEPENDS += " virtual/x11 libxau libxext libxmu"
+DEPENDS += " virtual/libx11 libxau libxext libxmu"
diff --git a/packages/xorg-app/xauth_cvs.bb b/packages/xorg-app/xauth_cvs.bb
index c1489e10a9..a944d1d51d 100644
--- a/packages/xorg-app/xauth_cvs.bb
+++ b/packages/xorg-app/xauth_cvs.bb
@@ -1,6 +1,6 @@
PV = "0.0+cvs${SRCDATE}"
LICENSE = "MIT"
-DEPENDS = "virtual/x11 libxau libxmu libxext"
+DEPENDS = "virtual/libx11 libxau libxmu libxext"
DESCRIPTION = "X authority file utility"
MAINTAINER = "Rene Wagner <rw@handhelds.org>"
SECTION = "x11/base"
diff --git a/packages/xorg-app/xbiff_X11R7.0-1.0.1.bb b/packages/xorg-app/xbiff_X11R7.0-1.0.1.bb
index 0c5c6ed540..5e21a9e590 100644
--- a/packages/xorg-app/xbiff_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/xbiff_X11R7.0-1.0.1.bb
@@ -1,4 +1,4 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
#DESCRIPTION = ""
diff --git a/packages/xorg-app/xcalc_X11R7.0-1.0.1.bb b/packages/xorg-app/xcalc_X11R7.0-1.0.1.bb
index 413aa7d029..9ef50b8ffd 100644
--- a/packages/xorg-app/xcalc_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/xcalc_X11R7.0-1.0.1.bb
@@ -1,4 +1,4 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
#DESCRIPTION = ""
diff --git a/packages/xorg-app/xclipboard_X11R7.0-1.0.1.bb b/packages/xorg-app/xclipboard_X11R7.0-1.0.1.bb
index 413aa7d029..9ef50b8ffd 100644
--- a/packages/xorg-app/xclipboard_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/xclipboard_X11R7.0-1.0.1.bb
@@ -1,4 +1,4 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
#DESCRIPTION = ""
diff --git a/packages/xorg-app/xclock_X11R7.0-1.0.1.bb b/packages/xorg-app/xclock_X11R7.0-1.0.1.bb
index e8ee6e20a4..7ad19bb1bb 100644
--- a/packages/xorg-app/xclock_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/xclock_X11R7.0-1.0.1.bb
@@ -1,6 +1,6 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
#DESCRIPTION = ""
-DEPENDS += " virtual/x11 libxaw libxrender libxft libxkbfile libxt"
+DEPENDS += " virtual/libx11 libxaw libxrender libxft libxkbfile libxt"
diff --git a/packages/xorg-app/xclock_X11R7.1-1.0.2.bb b/packages/xorg-app/xclock_X11R7.1-1.0.2.bb
index e8ee6e20a4..7ad19bb1bb 100644
--- a/packages/xorg-app/xclock_X11R7.1-1.0.2.bb
+++ b/packages/xorg-app/xclock_X11R7.1-1.0.2.bb
@@ -1,6 +1,6 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
#DESCRIPTION = ""
-DEPENDS += " virtual/x11 libxaw libxrender libxft libxkbfile libxt"
+DEPENDS += " virtual/libx11 libxaw libxrender libxft libxkbfile libxt"
diff --git a/packages/xorg-app/xcmsdb_X11R7.0-1.0.1.bb b/packages/xorg-app/xcmsdb_X11R7.0-1.0.1.bb
index 827257910a..d584483e44 100644
--- a/packages/xorg-app/xcmsdb_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/xcmsdb_X11R7.0-1.0.1.bb
@@ -1,6 +1,6 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
#DESCRIPTION = ""
-DEPENDS += " virtual/x11"
+DEPENDS += " virtual/libx11"
diff --git a/packages/xorg-app/xconsole_X11R7.0-1.0.1.bb b/packages/xorg-app/xconsole_X11R7.0-1.0.1.bb
index 413aa7d029..9ef50b8ffd 100644
--- a/packages/xorg-app/xconsole_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/xconsole_X11R7.0-1.0.1.bb
@@ -1,4 +1,4 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
#DESCRIPTION = ""
diff --git a/packages/xorg-app/xconsole_X11R7.1-1.0.2.bb b/packages/xorg-app/xconsole_X11R7.1-1.0.2.bb
index 2a03dcb18c..50c6a97949 100644
--- a/packages/xorg-app/xconsole_X11R7.1-1.0.2.bb
+++ b/packages/xorg-app/xconsole_X11R7.1-1.0.2.bb
@@ -1,4 +1,4 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
#DESCRIPTION = ""
diff --git a/packages/xorg-app/xcursorgen_X11R7.0-1.0.0.bb b/packages/xorg-app/xcursorgen_X11R7.0-1.0.0.bb
index f75a98b9d3..2dbb5b76ce 100644
--- a/packages/xorg-app/xcursorgen_X11R7.0-1.0.0.bb
+++ b/packages/xorg-app/xcursorgen_X11R7.0-1.0.0.bb
@@ -1,6 +1,6 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
#DESCRIPTION = ""
-DEPENDS += " virtual/x11 libxcursor libpng"
+DEPENDS += " virtual/libx11 libxcursor libpng"
diff --git a/packages/xorg-app/xcursorgen_X11R7.1-1.0.1.bb b/packages/xorg-app/xcursorgen_X11R7.1-1.0.1.bb
index f75a98b9d3..2dbb5b76ce 100644
--- a/packages/xorg-app/xcursorgen_X11R7.1-1.0.1.bb
+++ b/packages/xorg-app/xcursorgen_X11R7.1-1.0.1.bb
@@ -1,6 +1,6 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
#DESCRIPTION = ""
-DEPENDS += " virtual/x11 libxcursor libpng"
+DEPENDS += " virtual/libx11 libxcursor libpng"
diff --git a/packages/xorg-app/xdbedizzy_X11R7.0-1.0.1.bb b/packages/xorg-app/xdbedizzy_X11R7.0-1.0.1.bb
index 7bf0a43a95..37d37250df 100644
--- a/packages/xorg-app/xdbedizzy_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/xdbedizzy_X11R7.0-1.0.1.bb
@@ -1,4 +1,4 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
#DESCRIPTION = ""
diff --git a/packages/xorg-app/xditview_X11R7.0-1.0.1.bb b/packages/xorg-app/xditview_X11R7.0-1.0.1.bb
index 413aa7d029..9ef50b8ffd 100644
--- a/packages/xorg-app/xditview_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/xditview_X11R7.0-1.0.1.bb
@@ -1,4 +1,4 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
#DESCRIPTION = ""
diff --git a/packages/xorg-app/xdm_X11R7.0-1.0.1.bb b/packages/xorg-app/xdm_X11R7.0-1.0.1.bb
index e99c1aa768..d2c87b6a57 100644
--- a/packages/xorg-app/xdm_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/xdm_X11R7.0-1.0.1.bb
@@ -1,8 +1,8 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
DESCRIPTION = "X display manager"
-DEPENDS += " libxmu libxinerama libxpm libxdmcp libxau virtual/x11 libxext libxdmcp libxt"
+DEPENDS += " libxmu libxinerama libxpm libxdmcp libxau virtual/libx11 libxext libxdmcp libxt"
EXTRA_OECONF += " --with-random-device=/dev/urandom"
diff --git a/packages/xorg-app/xdm_X11R7.1-1.0.4.bb b/packages/xorg-app/xdm_X11R7.1-1.0.4.bb
index 438af7fbf6..955fd33732 100644
--- a/packages/xorg-app/xdm_X11R7.1-1.0.4.bb
+++ b/packages/xorg-app/xdm_X11R7.1-1.0.4.bb
@@ -1,7 +1,7 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
DESCRIPTION = "X display manager"
-DEPENDS += " libxmu libxinerama libxpm libxdmcp libxau virtual/x11 libxext libxdmcp libxt"
+DEPENDS += " libxmu libxinerama libxpm libxdmcp libxau virtual/libx11 libxext libxdmcp libxt"
EXTRA_OECONF += " --with-random-device=/dev/urandom"
diff --git a/packages/xorg-app/xdpyinfo_X11R7.0-1.0.1.bb b/packages/xorg-app/xdpyinfo_X11R7.0-1.0.1.bb
index c577aeb38a..d212bc1422 100644
--- a/packages/xorg-app/xdpyinfo_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/xdpyinfo_X11R7.0-1.0.1.bb
@@ -1,9 +1,9 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
DESCRIPTION = "X display information utility"
LICENSE = "MIT"
-DEPENDS += " libxtst libxext virtual/x11 libxxf86vm libxxf86dga libxxf86misc libxi libxrender libxinerama libdmx libxp"
+DEPENDS += " libxtst libxext virtual/libx11 libxxf86vm libxxf86dga libxxf86misc libxi libxrender libxinerama libdmx libxp"
SRC_URI += "file://disable-xkb.patch;patch=1"
diff --git a/packages/xorg-app/xdpyinfo_cvs.bb b/packages/xorg-app/xdpyinfo_cvs.bb
index 06d548c9ba..df31ba68d5 100644
--- a/packages/xorg-app/xdpyinfo_cvs.bb
+++ b/packages/xorg-app/xdpyinfo_cvs.bb
@@ -1,6 +1,6 @@
PV = "0.0+cvs${SRCDATE}"
LICENSE = "MIT"
-DEPENDS = "virtual/x11 libxext libxtst"
+DEPENDS = "virtual/libx11 libxext libxtst"
DESCRIPTION = "X display information utility"
MAINTAINER = "Phil Blundell <pb@handhelds.org>"
SECTION = "x11/base"
diff --git a/packages/xorg-app/xdriinfo_X11R7.0-1.0.0.bb b/packages/xorg-app/xdriinfo_X11R7.0-1.0.0.bb
index 9ab9e1a0e7..61e5837b9e 100644
--- a/packages/xorg-app/xdriinfo_X11R7.0-1.0.0.bb
+++ b/packages/xorg-app/xdriinfo_X11R7.0-1.0.0.bb
@@ -1,6 +1,6 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
#DESCRIPTION = ""
-DEPENDS += " virtual/x11 glproto mesa"
+DEPENDS += " virtual/libx11 glproto mesa"
diff --git a/packages/xorg-app/xdriinfo_X11R7.1-1.0.1.bb b/packages/xorg-app/xdriinfo_X11R7.1-1.0.1.bb
index 9ab9e1a0e7..61e5837b9e 100644
--- a/packages/xorg-app/xdriinfo_X11R7.1-1.0.1.bb
+++ b/packages/xorg-app/xdriinfo_X11R7.1-1.0.1.bb
@@ -1,6 +1,6 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
#DESCRIPTION = ""
-DEPENDS += " virtual/x11 glproto mesa"
+DEPENDS += " virtual/libx11 glproto mesa"
diff --git a/packages/xorg-app/xedit_X11R7.0-1.0.1.bb b/packages/xorg-app/xedit_X11R7.0-1.0.1.bb
index ae2da418b0..c4008cc579 100644
--- a/packages/xorg-app/xedit_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/xedit_X11R7.0-1.0.1.bb
@@ -1,4 +1,4 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
#DESCRIPTION = ""
diff --git a/packages/xorg-app/xedit_X11R7.1-1.0.2.bb b/packages/xorg-app/xedit_X11R7.1-1.0.2.bb
index ae2da418b0..c4008cc579 100644
--- a/packages/xorg-app/xedit_X11R7.1-1.0.2.bb
+++ b/packages/xorg-app/xedit_X11R7.1-1.0.2.bb
@@ -1,4 +1,4 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
#DESCRIPTION = ""
diff --git a/packages/xorg-app/xev_X11R7.0-1.0.1.bb b/packages/xorg-app/xev_X11R7.0-1.0.1.bb
index 61b8ca4284..20cb06c4cd 100644
--- a/packages/xorg-app/xev_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/xev_X11R7.0-1.0.1.bb
@@ -1,8 +1,8 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
DESCRIPTION = "X Event Viewer"
MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
LICENSE = "MIT"
-DEPENDS += " virtual/x11"
+DEPENDS += " virtual/libx11"
diff --git a/packages/xorg-app/xev_cvs.bb b/packages/xorg-app/xev_cvs.bb
index e1f9a33a67..8acf2261cb 100644
--- a/packages/xorg-app/xev_cvs.bb
+++ b/packages/xorg-app/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 = "virtual/x11 libxau"
+DEPENDS = "virtual/libx11 libxau"
PR = "r1"
SRC_URI = "${FREEDESKTOP_CVS}/xapps;module=xev \
diff --git a/packages/xorg-app/xeyes_X11R7.0-1.0.1.bb b/packages/xorg-app/xeyes_X11R7.0-1.0.1.bb
index 6d2c81ffd6..de9861c60e 100644
--- a/packages/xorg-app/xeyes_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/xeyes_X11R7.0-1.0.1.bb
@@ -1,5 +1,5 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
#DESCRIPTION = ""
-DEPENDS += " virtual/x11 libxau libxt libxext libxmu"
+DEPENDS += " virtual/libx11 libxau libxt libxext libxmu"
diff --git a/packages/xorg-app/xf86dga_X11R7.0-1.0.1.bb b/packages/xorg-app/xf86dga_X11R7.0-1.0.1.bb
index 4dfb42d0b3..6a5f12d484 100644
--- a/packages/xorg-app/xf86dga_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/xf86dga_X11R7.0-1.0.1.bb
@@ -1,6 +1,6 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
#DESCRIPTION = ""
-DEPENDS += " virtual/x11 libxxf86dga libxt libxaw libxmu"
+DEPENDS += " virtual/libx11 libxxf86dga libxt libxaw libxmu"
diff --git a/packages/xorg-app/xfd_X11R7.0-1.0.1.bb b/packages/xorg-app/xfd_X11R7.0-1.0.1.bb
index 4487df1c6e..1751f4bdf7 100644
--- a/packages/xorg-app/xfd_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/xfd_X11R7.0-1.0.1.bb
@@ -1,4 +1,4 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
#DESCRIPTION = ""
diff --git a/packages/xorg-app/xfindproxy_X11R7.0-1.0.1.bb b/packages/xorg-app/xfindproxy_X11R7.0-1.0.1.bb
index 41fe411756..bf8ad7904b 100644
--- a/packages/xorg-app/xfindproxy_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/xfindproxy_X11R7.0-1.0.1.bb
@@ -1,6 +1,6 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
#DESCRIPTION = ""
-DEPENDS += " virtual/x11 libice libxt xproxymngproto"
+DEPENDS += " virtual/libx11 libice libxt xproxymngproto"
diff --git a/packages/xorg-app/xfontsel_X11R7.0-1.0.1.bb b/packages/xorg-app/xfontsel_X11R7.0-1.0.1.bb
index 413aa7d029..9ef50b8ffd 100644
--- a/packages/xorg-app/xfontsel_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/xfontsel_X11R7.0-1.0.1.bb
@@ -1,4 +1,4 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
#DESCRIPTION = ""
diff --git a/packages/xorg-app/xfs_X11R7.0-1.0.1.bb b/packages/xorg-app/xfs_X11R7.0-1.0.1.bb
index bb5dbb18e3..9567be7a12 100644
--- a/packages/xorg-app/xfs_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/xfs_X11R7.0-1.0.1.bb
@@ -1,4 +1,4 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
DESCRIPTION = "X fontserver"
diff --git a/packages/xorg-app/xfs_X11R7.1-1.0.2.bb b/packages/xorg-app/xfs_X11R7.1-1.0.2.bb
index bb5dbb18e3..9567be7a12 100644
--- a/packages/xorg-app/xfs_X11R7.1-1.0.2.bb
+++ b/packages/xorg-app/xfs_X11R7.1-1.0.2.bb
@@ -1,4 +1,4 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
DESCRIPTION = "X fontserver"
diff --git a/packages/xorg-app/xfsinfo_X11R7.0-1.0.1.bb b/packages/xorg-app/xfsinfo_X11R7.0-1.0.1.bb
index b274cd549f..0257648e20 100644
--- a/packages/xorg-app/xfsinfo_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/xfsinfo_X11R7.0-1.0.1.bb
@@ -1,6 +1,6 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
#DESCRIPTION = ""
-DEPENDS += " virtual/x11 libfs"
+DEPENDS += " virtual/libx11 libfs"
diff --git a/packages/xorg-app/xfwp_X11R7.0-1.0.1.bb b/packages/xorg-app/xfwp_X11R7.0-1.0.1.bb
index 258c980548..b9dc35b367 100644
--- a/packages/xorg-app/xfwp_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/xfwp_X11R7.0-1.0.1.bb
@@ -1,6 +1,6 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
#DESCRIPTION = ""
-DEPENDS += " virtual/x11 libice xproxymngproto"
+DEPENDS += " virtual/libx11 libice xproxymngproto"
diff --git a/packages/xorg-app/xgamma_X11R7.0-1.0.1.bb b/packages/xorg-app/xgamma_X11R7.0-1.0.1.bb
index 8f3678475a..7549d9902f 100644
--- a/packages/xorg-app/xgamma_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/xgamma_X11R7.0-1.0.1.bb
@@ -1,6 +1,6 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
#DESCRIPTION = ""
-DEPENDS += " virtual/x11 libxxf86vm"
+DEPENDS += " virtual/libx11 libxxf86vm"
diff --git a/packages/xorg-app/xgc_X11R7.0-1.0.1.bb b/packages/xorg-app/xgc_X11R7.0-1.0.1.bb
index 413aa7d029..9ef50b8ffd 100644
--- a/packages/xorg-app/xgc_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/xgc_X11R7.0-1.0.1.bb
@@ -1,4 +1,4 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
#DESCRIPTION = ""
diff --git a/packages/xorg-app/xhost_20040413.bb b/packages/xorg-app/xhost_20040413.bb
index 1bc64ecf77..ed240dbba1 100644
--- a/packages/xorg-app/xhost_20040413.bb
+++ b/packages/xorg-app/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 = "virtual/x11 libxext libxmu"
+DEPENDS = "virtual/libx11 libxext libxmu"
DESCRIPTION = "server access control program for X"
MAINTAINER = "Rene Wagner <rw@handhelds.org>"
SECTION = "x11/base"
diff --git a/packages/xorg-app/xhost_X11R7.0-1.0.0.bb b/packages/xorg-app/xhost_X11R7.0-1.0.0.bb
index ff7cacd178..a08ad7184d 100644
--- a/packages/xorg-app/xhost_X11R7.0-1.0.0.bb
+++ b/packages/xorg-app/xhost_X11R7.0-1.0.0.bb
@@ -1,8 +1,8 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
DESCRIPTION = "Server access control program for X"
MAINTAINER = "Rene Wagner <rw@handhelds.org>"
LICENSE = "MIT"
-DEPENDS += " virtual/x11 libxmu libxau"
+DEPENDS += " virtual/libx11 libxmu libxau"
diff --git a/packages/xorg-app/xhost_X11R7.1-1.0.1.bb b/packages/xorg-app/xhost_X11R7.1-1.0.1.bb
index ff7cacd178..a08ad7184d 100644
--- a/packages/xorg-app/xhost_X11R7.1-1.0.1.bb
+++ b/packages/xorg-app/xhost_X11R7.1-1.0.1.bb
@@ -1,8 +1,8 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
DESCRIPTION = "Server access control program for X"
MAINTAINER = "Rene Wagner <rw@handhelds.org>"
LICENSE = "MIT"
-DEPENDS += " virtual/x11 libxmu libxau"
+DEPENDS += " virtual/libx11 libxmu libxau"
diff --git a/packages/xorg-app/xinit_X11R7.0-1.0.1.bb b/packages/xorg-app/xinit_X11R7.0-1.0.1.bb
index e1f332e8c1..00bfde0620 100644
--- a/packages/xorg-app/xinit_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/xinit_X11R7.0-1.0.1.bb
@@ -1,7 +1,7 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
#DESCRIPTION = ""
-DEPENDS += " virtual/x11"
+DEPENDS += " virtual/libx11"
diff --git a/packages/xorg-app/xinit_X11R7.1-1.0.2.bb b/packages/xorg-app/xinit_X11R7.1-1.0.2.bb
index 59f7755640..025a578370 100644
--- a/packages/xorg-app/xinit_X11R7.1-1.0.2.bb
+++ b/packages/xorg-app/xinit_X11R7.1-1.0.2.bb
@@ -1,7 +1,7 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
#DESCRIPTION = ""
-DEPENDS += " virtual/x11"
+DEPENDS += " virtual/libx11"
FILES_${PN} += " /usr/lib/X11/xinit"
diff --git a/packages/xorg-app/xkbcomp_X11R7.0-1.0.1.bb b/packages/xorg-app/xkbcomp_X11R7.0-1.0.1.bb
index aa6b46e13c..f6b9503cd8 100644
--- a/packages/xorg-app/xkbcomp_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/xkbcomp_X11R7.0-1.0.1.bb
@@ -1,6 +1,6 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
DESCRIPTION = "The X Keyboard Extension essentially replaces the core protocol definition of keyboard."
-DEPENDS += " virtual/x11 libxkbfile"
+DEPENDS += " virtual/libx11 libxkbfile"
diff --git a/packages/xorg-app/xkbcomp_X11R7.1-1.0.2.bb b/packages/xorg-app/xkbcomp_X11R7.1-1.0.2.bb
index aa6b46e13c..f6b9503cd8 100644
--- a/packages/xorg-app/xkbcomp_X11R7.1-1.0.2.bb
+++ b/packages/xorg-app/xkbcomp_X11R7.1-1.0.2.bb
@@ -1,6 +1,6 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
DESCRIPTION = "The X Keyboard Extension essentially replaces the core protocol definition of keyboard."
-DEPENDS += " virtual/x11 libxkbfile"
+DEPENDS += " virtual/libx11 libxkbfile"
diff --git a/packages/xorg-app/xkbevd_X11R7.0-1.0.1.bb b/packages/xorg-app/xkbevd_X11R7.0-1.0.1.bb
index 29ed7358d5..8001d661e7 100644
--- a/packages/xorg-app/xkbevd_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/xkbevd_X11R7.0-1.0.1.bb
@@ -1,6 +1,6 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
#DESCRIPTION = ""
-DEPENDS += " libxkbfile virtual/x11"
+DEPENDS += " libxkbfile virtual/libx11"
diff --git a/packages/xorg-app/xkbevd_X11R7.1-1.0.2.bb b/packages/xorg-app/xkbevd_X11R7.1-1.0.2.bb
index 29ed7358d5..8001d661e7 100644
--- a/packages/xorg-app/xkbevd_X11R7.1-1.0.2.bb
+++ b/packages/xorg-app/xkbevd_X11R7.1-1.0.2.bb
@@ -1,6 +1,6 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
#DESCRIPTION = ""
-DEPENDS += " libxkbfile virtual/x11"
+DEPENDS += " libxkbfile virtual/libx11"
diff --git a/packages/xorg-app/xkbprint_X11R7.0-1.0.1.bb b/packages/xorg-app/xkbprint_X11R7.0-1.0.1.bb
index 29ed7358d5..8001d661e7 100644
--- a/packages/xorg-app/xkbprint_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/xkbprint_X11R7.0-1.0.1.bb
@@ -1,6 +1,6 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
#DESCRIPTION = ""
-DEPENDS += " libxkbfile virtual/x11"
+DEPENDS += " libxkbfile virtual/libx11"
diff --git a/packages/xorg-app/xkbutils_X11R7.0-1.0.1.bb b/packages/xorg-app/xkbutils_X11R7.0-1.0.1.bb
index 512ff6c6de..15ce7e6011 100644
--- a/packages/xorg-app/xkbutils_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/xkbutils_X11R7.0-1.0.1.bb
@@ -1,6 +1,6 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
#DESCRIPTION = ""
-DEPENDS += " libxaw libxkbfile virtual/x11"
+DEPENDS += " libxaw libxkbfile virtual/libx11"
diff --git a/packages/xorg-app/xkill_X11R7.0-1.0.1.bb b/packages/xorg-app/xkill_X11R7.0-1.0.1.bb
index 8e07c499b9..905f3cdced 100644
--- a/packages/xorg-app/xkill_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/xkill_X11R7.0-1.0.1.bb
@@ -1,6 +1,6 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
#DESCRIPTION = ""
-DEPENDS += " virtual/x11 libxmu"
+DEPENDS += " virtual/libx11 libxmu"
diff --git a/packages/xorg-app/xload_X11R7.0-1.0.1.bb b/packages/xorg-app/xload_X11R7.0-1.0.1.bb
index 413aa7d029..9ef50b8ffd 100644
--- a/packages/xorg-app/xload_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/xload_X11R7.0-1.0.1.bb
@@ -1,4 +1,4 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
#DESCRIPTION = ""
diff --git a/packages/xorg-app/xlogo_X11R7.0-1.0.1.bb b/packages/xorg-app/xlogo_X11R7.0-1.0.1.bb
index 1c68e539a6..b328683361 100644
--- a/packages/xorg-app/xlogo_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/xlogo_X11R7.0-1.0.1.bb
@@ -1,4 +1,4 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
#DESCRIPTION = ""
diff --git a/packages/xorg-app/xlsatoms_X11R7.0-1.0.1.bb b/packages/xorg-app/xlsatoms_X11R7.0-1.0.1.bb
index 8e07c499b9..905f3cdced 100644
--- a/packages/xorg-app/xlsatoms_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/xlsatoms_X11R7.0-1.0.1.bb
@@ -1,6 +1,6 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
#DESCRIPTION = ""
-DEPENDS += " virtual/x11 libxmu"
+DEPENDS += " virtual/libx11 libxmu"
diff --git a/packages/xorg-app/xlsclients_X11R7.0-1.0.1.bb b/packages/xorg-app/xlsclients_X11R7.0-1.0.1.bb
index 8e07c499b9..905f3cdced 100644
--- a/packages/xorg-app/xlsclients_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/xlsclients_X11R7.0-1.0.1.bb
@@ -1,6 +1,6 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
#DESCRIPTION = ""
-DEPENDS += " virtual/x11 libxmu"
+DEPENDS += " virtual/libx11 libxmu"
diff --git a/packages/xorg-app/xlsfonts_X11R7.0-1.0.1.bb b/packages/xorg-app/xlsfonts_X11R7.0-1.0.1.bb
index 827257910a..d584483e44 100644
--- a/packages/xorg-app/xlsfonts_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/xlsfonts_X11R7.0-1.0.1.bb
@@ -1,6 +1,6 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
#DESCRIPTION = ""
-DEPENDS += " virtual/x11"
+DEPENDS += " virtual/libx11"
diff --git a/packages/xorg-app/xmag_X11R7.0-1.0.1.bb b/packages/xorg-app/xmag_X11R7.0-1.0.1.bb
index 413aa7d029..9ef50b8ffd 100644
--- a/packages/xorg-app/xmag_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/xmag_X11R7.0-1.0.1.bb
@@ -1,4 +1,4 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
#DESCRIPTION = ""
diff --git a/packages/xorg-app/xman_X11R7.0-1.0.1.bb b/packages/xorg-app/xman_X11R7.0-1.0.1.bb
index 16364e3ddc..7559ace10c 100644
--- a/packages/xorg-app/xman_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/xman_X11R7.0-1.0.1.bb
@@ -1,4 +1,4 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
#DESCRIPTION = ""
diff --git a/packages/xorg-app/xman_X11R7.1-1.0.2.bb b/packages/xorg-app/xman_X11R7.1-1.0.2.bb
index 16364e3ddc..7559ace10c 100644
--- a/packages/xorg-app/xman_X11R7.1-1.0.2.bb
+++ b/packages/xorg-app/xman_X11R7.1-1.0.2.bb
@@ -1,4 +1,4 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
#DESCRIPTION = ""
diff --git a/packages/xorg-app/xmessage_X11R7.0-1.0.1.bb b/packages/xorg-app/xmessage_X11R7.0-1.0.1.bb
index 457946bcf3..da0a1896b3 100644
--- a/packages/xorg-app/xmessage_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/xmessage_X11R7.0-1.0.1.bb
@@ -1,4 +1,4 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
DESCRIPTION = "xmessage displays a message or query in a window."
diff --git a/packages/xorg-app/xmh_X11R7.0-1.0.1.bb b/packages/xorg-app/xmh_X11R7.0-1.0.1.bb
index 413aa7d029..9ef50b8ffd 100644
--- a/packages/xorg-app/xmh_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/xmh_X11R7.0-1.0.1.bb
@@ -1,4 +1,4 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
#DESCRIPTION = ""
diff --git a/packages/xorg-app/xmodmap_X11R7.0-1.0.0.bb b/packages/xorg-app/xmodmap_X11R7.0-1.0.0.bb
index e0149a478f..b671beb07b 100644
--- a/packages/xorg-app/xmodmap_X11R7.0-1.0.0.bb
+++ b/packages/xorg-app/xmodmap_X11R7.0-1.0.0.bb
@@ -1,8 +1,8 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
DESCRIPTION = "Utility for modifying keymaps and pointer button mappings in X"
MAINTAINER = "Rene Wagner <rw@handhelds.org>"
LICENSE = "MIT"
-DEPENDS += " virtual/x11"
+DEPENDS += " virtual/libx11"
diff --git a/packages/xorg-app/xmodmap_X11R7.1-1.0.1.bb b/packages/xorg-app/xmodmap_X11R7.1-1.0.1.bb
index 40e27576a6..4fe4c0c4cc 100644
--- a/packages/xorg-app/xmodmap_X11R7.1-1.0.1.bb
+++ b/packages/xorg-app/xmodmap_X11R7.1-1.0.1.bb
@@ -1,8 +1,8 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
DESCRIPTION = "utility for modifying keymaps and pointer button mappings in X"
MAINTAINER = "Rene Wagner <rw@handhelds.org>"
LICENSE = "MIT"
-DEPENDS += " virtual/x11"
+DEPENDS += " virtual/libx11"
diff --git a/packages/xorg-app/xmodmap_cvs.bb b/packages/xorg-app/xmodmap_cvs.bb
index c1fb2425d1..7f45b28a89 100644
--- a/packages/xorg-app/xmodmap_cvs.bb
+++ b/packages/xorg-app/xmodmap_cvs.bb
@@ -5,7 +5,7 @@ MAINTAINER = "Rene Wagner <rw@handhelds.org>"
SECTION = "x11/base"
PR = "r1"
-DEPENDS = "virtual/x11"
+DEPENDS = "virtual/libx11"
SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc/programs/xmodmap \
file://autofoo.patch;patch=1"
diff --git a/packages/xorg-app/xmore_X11R7.0-1.0.1.bb b/packages/xorg-app/xmore_X11R7.0-1.0.1.bb
index 3d53264fba..88b90afb05 100644
--- a/packages/xorg-app/xmore_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/xmore_X11R7.0-1.0.1.bb
@@ -1,4 +1,4 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
#DESCRIPTION = ""
diff --git a/packages/xorg-app/xorg-app-common.inc b/packages/xorg-app/xorg-app-common.inc
index 78146b1e78..53aa991b9f 100644
--- a/packages/xorg-app/xorg-app-common.inc
+++ b/packages/xorg-app/xorg-app-common.inc
@@ -6,7 +6,7 @@ LICENSE = "MIT-X"
#DEPENDS = ""
XORG_PN = "${PN}"
-SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/app/${XORG_PN}-${PV}.tar.gz"
+SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/app/${XORG_PN}-${PV}.tar.bz2"
S = "${WORKDIR}/${XORG_PN}-${PV}"
FILES_${PN} += " /usr/lib/X11/${XORG_PN}"
diff --git a/packages/xorg-app/xphelloworld_X11R7.0-1.0.1.bb b/packages/xorg-app/xphelloworld_X11R7.0-1.0.1.bb
index 609c5643bf..2153dfd459 100644
--- a/packages/xorg-app/xphelloworld_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/xphelloworld_X11R7.0-1.0.1.bb
@@ -1,6 +1,6 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
#DESCRIPTION = ""
-DEPENDS += " virtual/x11 libxprintapputil libxaw libxprintutil libxt libxp"
+DEPENDS += " virtual/libx11 libxprintapputil libxaw libxprintutil libxt libxp"
diff --git a/packages/xorg-app/xplsprinters_X11R7.0-1.0.1.bb b/packages/xorg-app/xplsprinters_X11R7.0-1.0.1.bb
index f1c547af4e..79f4194c48 100644
--- a/packages/xorg-app/xplsprinters_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/xplsprinters_X11R7.0-1.0.1.bb
@@ -1,6 +1,6 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
#DESCRIPTION = ""
-DEPENDS += " libxp libxprintutil virtual/x11"
+DEPENDS += " libxp libxprintutil virtual/libx11"
diff --git a/packages/xorg-app/xpr_X11R7.0-1.0.1.bb b/packages/xorg-app/xpr_X11R7.0-1.0.1.bb
index 7bba2c74df..2dd7807ec5 100644
--- a/packages/xorg-app/xpr_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/xpr_X11R7.0-1.0.1.bb
@@ -1,6 +1,6 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
#DESCRIPTION = ""
-DEPENDS += " libxmu virtual/x11"
+DEPENDS += " libxmu virtual/libx11"
diff --git a/packages/xorg-app/xprehashprinterlist_X11R7.0-1.0.1.bb b/packages/xorg-app/xprehashprinterlist_X11R7.0-1.0.1.bb
index cccb035df6..0718958efe 100644
--- a/packages/xorg-app/xprehashprinterlist_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/xprehashprinterlist_X11R7.0-1.0.1.bb
@@ -1,6 +1,6 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
#DESCRIPTION = ""
-DEPENDS += " libxp virtual/x11"
+DEPENDS += " libxp virtual/libx11"
diff --git a/packages/xorg-app/xprop_X11R7.0-1.0.1.bb b/packages/xorg-app/xprop_X11R7.0-1.0.1.bb
index 7bba2c74df..2dd7807ec5 100644
--- a/packages/xorg-app/xprop_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/xprop_X11R7.0-1.0.1.bb
@@ -1,6 +1,6 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
#DESCRIPTION = ""
-DEPENDS += " libxmu virtual/x11"
+DEPENDS += " libxmu virtual/libx11"
diff --git a/packages/xorg-app/xprop_cvs.bb b/packages/xorg-app/xprop_cvs.bb
index 93ddb2dbf6..1079d6a591 100644
--- a/packages/xorg-app/xprop_cvs.bb
+++ b/packages/xorg-app/xprop_cvs.bb
@@ -1,6 +1,6 @@
PV = "0.0+cvs${SRCDATE}"
LICENSE = "MIT"
-DEPENDS = "virtual/x11 libxmu libxext"
+DEPENDS = "virtual/libx11 libxmu libxext"
DESCRIPTION = "property displayer for X"
MAINTER = "Rene Wagner <rw@handhelds.org>"
SECTION = "x11/base"
diff --git a/packages/xorg-app/xrandr_X11R7.0-1.0.1.bb b/packages/xorg-app/xrandr_X11R7.0-1.0.1.bb
index b03804bcb6..4b878cc32e 100644
--- a/packages/xorg-app/xrandr_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/xrandr_X11R7.0-1.0.1.bb
@@ -1,7 +1,7 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
DESCRIPTION = "X Resize and Rotate extension command."
LICENSE= "BSD-X"
-DEPENDS += " libxrandr libxrender virtual/x11"
+DEPENDS += " libxrandr libxrender virtual/libx11"
diff --git a/packages/xorg-app/xrandr_X11R7.1-1.0.2.bb b/packages/xorg-app/xrandr_X11R7.1-1.0.2.bb
index b03804bcb6..4b878cc32e 100644
--- a/packages/xorg-app/xrandr_X11R7.1-1.0.2.bb
+++ b/packages/xorg-app/xrandr_X11R7.1-1.0.2.bb
@@ -1,7 +1,7 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
DESCRIPTION = "X Resize and Rotate extension command."
LICENSE= "BSD-X"
-DEPENDS += " libxrandr libxrender virtual/x11"
+DEPENDS += " libxrandr libxrender virtual/libx11"
diff --git a/packages/xorg-app/xrandr_cvs.bb b/packages/xorg-app/xrandr_cvs.bb
index f45e04115b..30a31e1569 100644
--- a/packages/xorg-app/xrandr_cvs.bb
+++ b/packages/xorg-app/xrandr_cvs.bb
@@ -1,6 +1,6 @@
PV = "0.0+cvs${SRCDATE}"
LICENSE= "BSD-X"
-DEPENDS = "libxrandr virtual/x11 libxext"
+DEPENDS = "libxrandr virtual/libx11 libxext"
DESCRIPTION = "X Resize and Rotate extension command."
SECTION = "x11/base"
diff --git a/packages/xorg-app/xrdb_X11R7.0-1.0.1.bb b/packages/xorg-app/xrdb_X11R7.0-1.0.1.bb
index 7d8538be29..bad78d3873 100644
--- a/packages/xorg-app/xrdb_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/xrdb_X11R7.0-1.0.1.bb
@@ -1,8 +1,8 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
DESCRIPTION = "X server resource database utility"
MAINTAINER = "Rene Wagner <rw@handhelds.org>"
LICENSE = "xrdb"
-DEPENDS += " libxmu virtual/x11 libxext"
+DEPENDS += " libxmu virtual/libx11 libxext"
diff --git a/packages/xorg-app/xrdb_X11R7.1-1.0.2.bb b/packages/xorg-app/xrdb_X11R7.1-1.0.2.bb
index 9533003b8f..d73890cc15 100644
--- a/packages/xorg-app/xrdb_X11R7.1-1.0.2.bb
+++ b/packages/xorg-app/xrdb_X11R7.1-1.0.2.bb
@@ -1,7 +1,7 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
DESCRIPTION = "X server resource database utility"
MAINTAINER = "Rene Wagner <rw@handhelds.org>"
LICENSE = "xrdb"
-DEPENDS += " libxmu virtual/x11 libxext"
+DEPENDS += " libxmu virtual/libx11 libxext"
diff --git a/packages/xorg-app/xrdb_cvs.bb b/packages/xorg-app/xrdb_cvs.bb
index 191eb9897f..51a3fcd08a 100644
--- a/packages/xorg-app/xrdb_cvs.bb
+++ b/packages/xorg-app/xrdb_cvs.bb
@@ -1,5 +1,5 @@
PV = "0.0+cvs${SRCDATE}"
-DEPENDS = "virtual/x11 libxmu libxext"
+DEPENDS = "virtual/libx11 libxmu libxext"
DESCRIPTION = "X server resource database utility"
MAINTAINER = "Rene Wagner <rw@handhelds.org>"
SECTION = "x11/base"
diff --git a/packages/xorg-app/xrefresh_X11R7.0-1.0.1.bb b/packages/xorg-app/xrefresh_X11R7.0-1.0.1.bb
index 827257910a..d584483e44 100644
--- a/packages/xorg-app/xrefresh_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/xrefresh_X11R7.0-1.0.1.bb
@@ -1,6 +1,6 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
#DESCRIPTION = ""
-DEPENDS += " virtual/x11"
+DEPENDS += " virtual/libx11"
diff --git a/packages/xorg-app/xrefresh_X11R7.1-1.0.2.bb b/packages/xorg-app/xrefresh_X11R7.1-1.0.2.bb
index 827257910a..d584483e44 100644
--- a/packages/xorg-app/xrefresh_X11R7.1-1.0.2.bb
+++ b/packages/xorg-app/xrefresh_X11R7.1-1.0.2.bb
@@ -1,6 +1,6 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
#DESCRIPTION = ""
-DEPENDS += " virtual/x11"
+DEPENDS += " virtual/libx11"
diff --git a/packages/xorg-app/xrx_X11R7.0-1.0.1.bb b/packages/xorg-app/xrx_X11R7.0-1.0.1.bb
index 831e7de68f..d956f3aecd 100644
--- a/packages/xorg-app/xrx_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/xrx_X11R7.0-1.0.1.bb
@@ -1,6 +1,6 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
#DESCRIPTION = ""
-DEPENDS += " libxaw virtual/x11 libxt libxext xtrans xproxymngproto libxau"
+DEPENDS += " libxaw virtual/libx11 libxt libxext xtrans xproxymngproto libxau"
diff --git a/packages/xorg-app/xset_20040817.bb b/packages/xorg-app/xset_20040817.bb
index ca41d2373d..90247fdb26 100644
--- a/packages/xorg-app/xset_20040817.bb
+++ b/packages/xorg-app/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 = "virtual/x11 libxext xextensions libxmu"
+DEPENDS = "virtual/libx11 libxext xextensions libxmu"
CFLAGS += "-D_GNU_SOURCE"
diff --git a/packages/xorg-app/xset_X11R7.0-1.0.1.bb b/packages/xorg-app/xset_X11R7.0-1.0.1.bb
index ca689e55f7..b8b204e657 100644
--- a/packages/xorg-app/xset_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/xset_X11R7.0-1.0.1.bb
@@ -1,10 +1,10 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
DESCRIPTION = "user preference utility for X"
MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"
LICENSE = "MIT"
-DEPENDS += " libxmu libxext virtual/x11 libxxf86misc libxfontcache libxp"
+DEPENDS += " libxmu libxext virtual/libx11 libxxf86misc libxfontcache libxp"
SRC_URI += "file://disable-xkb.patch;patch=1"
diff --git a/packages/xorg-app/xset_X11R7.1-1.0.2.bb b/packages/xorg-app/xset_X11R7.1-1.0.2.bb
index ca689e55f7..b8b204e657 100644
--- a/packages/xorg-app/xset_X11R7.1-1.0.2.bb
+++ b/packages/xorg-app/xset_X11R7.1-1.0.2.bb
@@ -1,10 +1,10 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
DESCRIPTION = "user preference utility for X"
MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"
LICENSE = "MIT"
-DEPENDS += " libxmu libxext virtual/x11 libxxf86misc libxfontcache libxp"
+DEPENDS += " libxmu libxext virtual/libx11 libxxf86misc libxfontcache libxp"
SRC_URI += "file://disable-xkb.patch;patch=1"
diff --git a/packages/xorg-app/xsetmode_X11R7.0-1.0.0.bb b/packages/xorg-app/xsetmode_X11R7.0-1.0.0.bb
index 6bd79a0eb8..d473975d5e 100644
--- a/packages/xorg-app/xsetmode_X11R7.0-1.0.0.bb
+++ b/packages/xorg-app/xsetmode_X11R7.0-1.0.0.bb
@@ -1,6 +1,6 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
#DESCRIPTION = ""
-DEPENDS += " libxi virtual/x11"
+DEPENDS += " libxi virtual/libx11"
diff --git a/packages/xorg-app/xsetpointer_X11R7.0-1.0.0.bb b/packages/xorg-app/xsetpointer_X11R7.0-1.0.0.bb
index 6bd79a0eb8..d473975d5e 100644
--- a/packages/xorg-app/xsetpointer_X11R7.0-1.0.0.bb
+++ b/packages/xorg-app/xsetpointer_X11R7.0-1.0.0.bb
@@ -1,6 +1,6 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
#DESCRIPTION = ""
-DEPENDS += " libxi virtual/x11"
+DEPENDS += " libxi virtual/libx11"
diff --git a/packages/xorg-app/xsetroot_X11R7.0-1.0.1.bb b/packages/xorg-app/xsetroot_X11R7.0-1.0.1.bb
index 99061f45c4..d5ddbadb49 100644
--- a/packages/xorg-app/xsetroot_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/xsetroot_X11R7.0-1.0.1.bb
@@ -1,6 +1,6 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
#DESCRIPTION = ""
-DEPENDS += " libxmu virtual/x11 xbitmaps"
+DEPENDS += " libxmu virtual/libx11 xbitmaps"
diff --git a/packages/xorg-app/xsm_X11R7.0-1.0.1.bb b/packages/xorg-app/xsm_X11R7.0-1.0.1.bb
index 57d80cc75c..6c22106e5a 100644
--- a/packages/xorg-app/xsm_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/xsm_X11R7.0-1.0.1.bb
@@ -1,4 +1,4 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
#DESCRIPTION = "X Session Manager"
diff --git a/packages/xorg-app/xstdcmap_X11R7.0-1.0.1.bb b/packages/xorg-app/xstdcmap_X11R7.0-1.0.1.bb
index 7bba2c74df..2dd7807ec5 100644
--- a/packages/xorg-app/xstdcmap_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/xstdcmap_X11R7.0-1.0.1.bb
@@ -1,6 +1,6 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
#DESCRIPTION = ""
-DEPENDS += " libxmu virtual/x11"
+DEPENDS += " libxmu virtual/libx11"
diff --git a/packages/xorg-app/xterm_207.bb b/packages/xorg-app/xterm_207.bb
index aa34d9b106..03b9b3873c 100644
--- a/packages/xorg-app/xterm_207.bb
+++ b/packages/xorg-app/xterm_207.bb
@@ -3,9 +3,9 @@ SECTION = "x11/apps"
#MAINTAINER = ""
LICENSE = "MIT-X"
-DEPENDS = "xproto virtual/x11 xextproto xext xau xpm ncurses"
+DEPENDS = "libxaw xproto virtual/libx11 xextproto xext xau xpm ncurses"
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/extras/${PN}-${PV}.tar.gz"
+SRC_URI = "${XORG_MIRROR}/development/X11R7.0-RC4/extras/${PN}-${PV}.tar.gz"
inherit autotools pkgconfig
diff --git a/packages/xorg-app/xtrap_X11R7.0-1.0.1.bb b/packages/xorg-app/xtrap_X11R7.0-1.0.1.bb
index fb3dca78a1..91933be884 100644
--- a/packages/xorg-app/xtrap_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/xtrap_X11R7.0-1.0.1.bb
@@ -1,6 +1,6 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
#DESCRIPTION = ""
-DEPENDS += " virtual/x11 libxtrap"
+DEPENDS += " virtual/libx11 libxtrap"
diff --git a/packages/xorg-app/xtrap_X11R7.1-1.0.2.bb b/packages/xorg-app/xtrap_X11R7.1-1.0.2.bb
index fb3dca78a1..91933be884 100644
--- a/packages/xorg-app/xtrap_X11R7.1-1.0.2.bb
+++ b/packages/xorg-app/xtrap_X11R7.1-1.0.2.bb
@@ -1,6 +1,6 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
#DESCRIPTION = ""
-DEPENDS += " virtual/x11 libxtrap"
+DEPENDS += " virtual/libx11 libxtrap"
diff --git a/packages/xorg-app/xvidtune_X11R7.0-1.0.1.bb b/packages/xorg-app/xvidtune_X11R7.0-1.0.1.bb
index 06f2b5115f..66fa7fff7f 100644
--- a/packages/xorg-app/xvidtune_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/xvidtune_X11R7.0-1.0.1.bb
@@ -1,4 +1,4 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
#DESCRIPTION = ""
diff --git a/packages/xorg-app/xvinfo_X11R7.0-1.0.1.bb b/packages/xorg-app/xvinfo_X11R7.0-1.0.1.bb
index 4fdaf2427e..e0fe5605bc 100644
--- a/packages/xorg-app/xvinfo_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/xvinfo_X11R7.0-1.0.1.bb
@@ -1,6 +1,6 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
#DESCRIPTION = ""
-DEPENDS += " libxv virtual/x11"
+DEPENDS += " libxv virtual/libx11"
diff --git a/packages/xorg-app/xwd_X11R7.0-1.0.1.bb b/packages/xorg-app/xwd_X11R7.0-1.0.1.bb
index 7bba2c74df..2dd7807ec5 100644
--- a/packages/xorg-app/xwd_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/xwd_X11R7.0-1.0.1.bb
@@ -1,6 +1,6 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
#DESCRIPTION = ""
-DEPENDS += " libxmu virtual/x11"
+DEPENDS += " libxmu virtual/libx11"
diff --git a/packages/xorg-app/xwininfo_X11R7.0-1.0.1.bb b/packages/xorg-app/xwininfo_X11R7.0-1.0.1.bb
index a871a5c6e5..71fb6f0ca4 100644
--- a/packages/xorg-app/xwininfo_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/xwininfo_X11R7.0-1.0.1.bb
@@ -1,6 +1,6 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
#DESCRIPTION = ""
-DEPENDS += " libxmu libxext virtual/x11"
+DEPENDS += " libxmu libxext virtual/libx11"
diff --git a/packages/xorg-app/xwininfo_X11R7.1-1.0.2.bb b/packages/xorg-app/xwininfo_X11R7.1-1.0.2.bb
index a871a5c6e5..71fb6f0ca4 100644
--- a/packages/xorg-app/xwininfo_X11R7.1-1.0.2.bb
+++ b/packages/xorg-app/xwininfo_X11R7.1-1.0.2.bb
@@ -1,6 +1,6 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
#DESCRIPTION = ""
-DEPENDS += " libxmu libxext virtual/x11"
+DEPENDS += " libxmu libxext virtual/libx11"
diff --git a/packages/xorg-app/xwud_X11R7.0-1.0.1.bb b/packages/xorg-app/xwud_X11R7.0-1.0.1.bb
index 827257910a..d584483e44 100644
--- a/packages/xorg-app/xwud_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/xwud_X11R7.0-1.0.1.bb
@@ -1,6 +1,6 @@
-include xorg-app-common.inc
+require xorg-app-common.inc
#DESCRIPTION = ""
-DEPENDS += " virtual/x11"
+DEPENDS += " virtual/libx11"