summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
Diffstat (limited to 'packages')
-rw-r--r--packages/xorg-app/appres_X11R7.0-1.0.0.bb6
-rw-r--r--packages/xorg-app/bdftopcf-native_X11R7.0-1.0.0.bb12
-rw-r--r--packages/xorg-app/bdftopcf_X11R7.0-1.0.0.bb8
-rw-r--r--packages/xorg-app/beforelight_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/bitmap_X11R7.0-1.0.1.bb5
-rw-r--r--packages/xorg-app/bitmap_X11R7.1-1.0.2.bb6
-rw-r--r--packages/xorg-app/editres_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/fonttosfnt_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/fslsfonts_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/fstobdf_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/fstobdf_X11R7.1-1.0.2.bb6
-rw-r--r--packages/xorg-app/iceauth_X11R7.0-1.0.1.bb8
-rw-r--r--packages/xorg-app/ico_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/lbxproxy_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/listres_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/luit_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/mkcfm_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/mkfontdir-native_X11R7.0-1.0.1.bb9
-rw-r--r--packages/xorg-app/mkfontdir-native_X11R7.1-1.0.2.bb9
-rw-r--r--packages/xorg-app/mkfontdir_X11R7.0-1.0.1.bb8
-rw-r--r--packages/xorg-app/mkfontdir_X11R7.1-1.0.2.bb6
-rw-r--r--packages/xorg-app/mkfontscale-native_X11R7.0-1.0.1.bb10
-rw-r--r--packages/xorg-app/mkfontscale_X11R7.0-1.0.1.bb8
-rw-r--r--packages/xorg-app/oclock_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/proxymngr_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/rgb_X11R7.0-1.0.0.bb8
-rw-r--r--packages/xorg-app/rgb_X11R7.1-1.0.1.bb7
-rw-r--r--packages/xorg-app/rstart_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/rstart_X11R7.1-1.0.2.bb6
-rw-r--r--packages/xorg-app/scripts_X11R7.0-1.0.1.bb7
-rw-r--r--packages/xorg-app/sessreg_X11R7.0-1.0.0.bb6
-rw-r--r--packages/xorg-app/setxkbmap_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/setxkbmap_X11R7.1-1.0.2.bb6
-rw-r--r--packages/xorg-app/showfont_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/smproxy_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/smproxy_X11R7.1-1.0.2.bb6
-rw-r--r--packages/xorg-app/twm_X11R7.0-1.0.1.bb10
-rw-r--r--packages/xorg-app/viewres_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/x11perf_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/x11perf_X11R7.1-1.4.1.bb5
-rw-r--r--packages/xorg-app/xauth_X11R7.0-1.0.1.bb8
-rw-r--r--packages/xorg-app/xbiff_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xcalc_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xclipboard_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xclock_X11R7.0-1.0.1.bb8
-rw-r--r--packages/xorg-app/xclock_X11R7.1-1.0.2.bb6
-rw-r--r--packages/xorg-app/xcmsdb_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xconsole_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xconsole_X11R7.1-1.0.2.bb6
-rw-r--r--packages/xorg-app/xcursorgen_X11R7.0-1.0.0.bb6
-rw-r--r--packages/xorg-app/xcursorgen_X11R7.1-1.0.1.bb6
-rw-r--r--packages/xorg-app/xdbedizzy_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xditview_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xdm_X11R7.0-1.0.1.bb8
-rw-r--r--packages/xorg-app/xdm_X11R7.1-1.0.4.bb7
-rw-r--r--packages/xorg-app/xdpyinfo_X11R7.0-1.0.1.bb12
-rw-r--r--packages/xorg-app/xdriinfo_X11R7.0-1.0.0.bb6
-rw-r--r--packages/xorg-app/xdriinfo_X11R7.1-1.0.1.bb6
-rw-r--r--packages/xorg-app/xedit_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xedit_X11R7.1-1.0.2.bb6
-rw-r--r--packages/xorg-app/xev_X11R7.0-1.0.1.bb12
-rw-r--r--packages/xorg-app/xeyes_X11R7.0-1.0.1.bb7
-rw-r--r--packages/xorg-app/xf86dga_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xfd_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xfindproxy_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xfontsel_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xfs_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xfs_X11R7.1-1.0.2.bb6
-rw-r--r--packages/xorg-app/xfsinfo_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xfwp_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xgamma_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xgc_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xhost_X11R7.0-1.0.0.bb12
-rw-r--r--packages/xorg-app/xhost_X11R7.1-1.0.1.bb8
-rw-r--r--packages/xorg-app/xinit_X11R7.0-1.0.1.bb9
-rw-r--r--packages/xorg-app/xinit_X11R7.1-1.0.2.bb7
-rw-r--r--packages/xorg-app/xkbcomp_X11R7.0-1.0.1.bb8
-rw-r--r--packages/xorg-app/xkbcomp_X11R7.1-1.0.2.bb6
-rw-r--r--packages/xorg-app/xkbevd_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xkbevd_X11R7.1-1.0.2.bb6
-rw-r--r--packages/xorg-app/xkbprint_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xkbutils_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xkill_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xload_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xlogo_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xlsatoms_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xlsclients_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xlsfonts_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xmag_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xman_X11R7.0-1.0.1.bb8
-rw-r--r--packages/xorg-app/xman_X11R7.1-1.0.2.bb8
-rw-r--r--packages/xorg-app/xmessage_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xmh_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xmodmap_X11R7.0-1.0.0.bb13
-rw-r--r--packages/xorg-app/xmodmap_X11R7.1-1.0.1.bb8
-rw-r--r--packages/xorg-app/xmore_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xorg-app-common.inc13
-rw-r--r--packages/xorg-app/xphelloworld_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xplsprinters_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xpr_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xprehashprinterlist_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xprop_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xrandr_X11R7.0-1.0.1.bb10
-rw-r--r--packages/xorg-app/xrandr_X11R7.1-1.0.2.bb7
-rw-r--r--packages/xorg-app/xrdb_X11R7.0-1.0.1.bb9
-rw-r--r--packages/xorg-app/xrdb_X11R7.1-1.0.2.bb7
-rw-r--r--packages/xorg-app/xrefresh_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xrefresh_X11R7.1-1.0.2.bb6
-rw-r--r--packages/xorg-app/xrx_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xset_X11R7.0-1.0.1.bb14
-rw-r--r--packages/xorg-app/xset_X11R7.1-1.0.2.bb11
-rw-r--r--packages/xorg-app/xsetmode_X11R7.0-1.0.0.bb6
-rw-r--r--packages/xorg-app/xsetpointer_X11R7.0-1.0.0.bb6
-rw-r--r--packages/xorg-app/xsetroot_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xsm_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xstdcmap_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xterm_207.bb29
-rw-r--r--packages/xorg-app/xtrap_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xtrap_X11R7.1-1.0.2.bb6
-rw-r--r--packages/xorg-app/xvidtune_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xvinfo_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xwd_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xwininfo_X11R7.0-1.0.1.bb6
-rw-r--r--packages/xorg-app/xwininfo_X11R7.1-1.0.2.bb6
-rw-r--r--packages/xorg-app/xwud_X11R7.0-1.0.1.bb6
125 files changed, 795 insertions, 84 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
new file mode 100644
index 0000000000..e6780a89f2
--- /dev/null
+++ b/packages/xorg-app/appres_X11R7.0-1.0.0.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+DESCRIPTION = "The appres program prints the resources seen by an application."
+
+DEPENDS += " libx11 libxt"
+
diff --git a/packages/xorg-app/bdftopcf-native_X11R7.0-1.0.0.bb b/packages/xorg-app/bdftopcf-native_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..7b6aa37311
--- /dev/null
+++ b/packages/xorg-app/bdftopcf-native_X11R7.0-1.0.0.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "Native bdftopdf utility"
+SECTION = "x11/fonts"
+LICENSE = "MIT-X"
+
+S="${WORKDIR}/bdftopcf-${PV}"
+
+DEPENDS = "libxfont-native"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/bdftopcf-X11R7.0-1.0.0.tar.gz"
+
+inherit native autotools pkgconfig
+
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 96492be848..4eefa72194 100644
--- a/packages/xorg-app/bdftopcf_X11R7.0-1.0.0.bb
+++ b/packages/xorg-app/bdftopcf_X11R7.0-1.0.0.bb
@@ -1,2 +1,6 @@
-include app-common.inc
-DEPENDS = "libxfont"
+include xorg-app-common.inc
+
+DESCRIPTION = "bdftopcf is a font compiler for the X server and font server."
+
+DEPENDS += " libxfont"
+
diff --git a/packages/xorg-app/beforelight_X11R7.0-1.0.1.bb b/packages/xorg-app/beforelight_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..e8083fde2a
--- /dev/null
+++ b/packages/xorg-app/beforelight_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " 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
new file mode 100644
index 0000000000..a738705e7e
--- /dev/null
+++ b/packages/xorg-app/bitmap_X11R7.0-1.0.1.bb
@@ -0,0 +1,5 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " 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
new file mode 100644
index 0000000000..1f4c3ea1b1
--- /dev/null
+++ b/packages/xorg-app/bitmap_X11R7.1-1.0.2.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " 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
new file mode 100644
index 0000000000..aeb981cd43
--- /dev/null
+++ b/packages/xorg-app/editres_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " 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
new file mode 100644
index 0000000000..5d268a7f76
--- /dev/null
+++ b/packages/xorg-app/fonttosfnt_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " xproto freetype libfontenc"
+
diff --git a/packages/xorg-app/fslsfonts_X11R7.0-1.0.1.bb b/packages/xorg-app/fslsfonts_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..b86b4ba4d8
--- /dev/null
+++ b/packages/xorg-app/fslsfonts_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " 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
new file mode 100644
index 0000000000..b86b4ba4d8
--- /dev/null
+++ b/packages/xorg-app/fstobdf_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " 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
new file mode 100644
index 0000000000..b86b4ba4d8
--- /dev/null
+++ b/packages/xorg-app/fstobdf_X11R7.1-1.0.2.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " 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 19b59b8381..2093e75f68 100644
--- a/packages/xorg-app/iceauth_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/iceauth_X11R7.0-1.0.1.bb
@@ -1,2 +1,6 @@
-include app-common.inc
-DEPENDS = "libx11 libice"
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " xproto libice"
+
diff --git a/packages/xorg-app/ico_X11R7.0-1.0.1.bb b/packages/xorg-app/ico_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..a62b548b00
--- /dev/null
+++ b/packages/xorg-app/ico_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " 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
new file mode 100644
index 0000000000..ce1485e63b
--- /dev/null
+++ b/packages/xorg-app/lbxproxy_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include 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 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
new file mode 100644
index 0000000000..cb0808ad2b
--- /dev/null
+++ b/packages/xorg-app/listres_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libxaw 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
new file mode 100644
index 0000000000..de995f785b
--- /dev/null
+++ b/packages/xorg-app/luit_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " zlib zlib 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
new file mode 100644
index 0000000000..a84aa3db3b
--- /dev/null
+++ b/packages/xorg-app/mkcfm_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libx11 libxfont libfs libfontenc"
+
diff --git a/packages/xorg-app/mkfontdir-native_X11R7.0-1.0.1.bb b/packages/xorg-app/mkfontdir-native_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..b322350e03
--- /dev/null
+++ b/packages/xorg-app/mkfontdir-native_X11R7.0-1.0.1.bb
@@ -0,0 +1,9 @@
+DESCRIPTION = "X mkfontdir app"
+SECTION = "x11/apps"
+LICENSE = "MIT-X"
+
+S="${WORKDIR}/mkfontdir-${PV}"
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/mkfontdir-${PV}.tar.bz2"
+
+DEPENDS = "util-macros-native"
+inherit native autotools pkgconfig
diff --git a/packages/xorg-app/mkfontdir-native_X11R7.1-1.0.2.bb b/packages/xorg-app/mkfontdir-native_X11R7.1-1.0.2.bb
new file mode 100644
index 0000000000..3ec30fde48
--- /dev/null
+++ b/packages/xorg-app/mkfontdir-native_X11R7.1-1.0.2.bb
@@ -0,0 +1,9 @@
+DESCRIPTION = "X mkfontdir app"
+SECTION = "x11/apps"
+LICENSE = "MIT-X"
+
+S="${WORKDIR}/mkfontdir-${PV}"
+SRC_URI = "${XORG_MIRROR}/X11R7.1/src/app/mkfontdir-${PV}.tar.bz2"
+
+DEPENDS = "util-macros-native"
+inherit native autotools pkgconfig
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 eff2e125e7..62c088314f 100644
--- a/packages/xorg-app/mkfontdir_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/mkfontdir_X11R7.0-1.0.1.bb
@@ -1,2 +1,6 @@
-include app-common.inc
-DEPENDS = "mkfontscale"
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
+
diff --git a/packages/xorg-app/mkfontdir_X11R7.1-1.0.2.bb b/packages/xorg-app/mkfontdir_X11R7.1-1.0.2.bb
new file mode 100644
index 0000000000..62c088314f
--- /dev/null
+++ b/packages/xorg-app/mkfontdir_X11R7.1-1.0.2.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
+
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
new file mode 100644
index 0000000000..98b49f99ac
--- /dev/null
+++ b/packages/xorg-app/mkfontscale-native_X11R7.0-1.0.1.bb
@@ -0,0 +1,10 @@
+DESCRIPTION = "X mkfontscale app"
+SECTION = "x11/apps"
+LICENSE = "MIT-X"
+S="${WORKDIR}/mkfontscale-${PV}"
+
+DEPENDS = "libx11-native libfontenc-native"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/mkfontscale-${PV}.tar.bz2"
+
+inherit native autotools pkgconfig
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 ead4663781..0d90a387e2 100644
--- a/packages/xorg-app/mkfontscale_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/mkfontscale_X11R7.0-1.0.1.bb
@@ -1,2 +1,6 @@
-include app-common.inc
-DEPENDS = "libfontenc freetype"
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " zlib libfontenc freetype 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
new file mode 100644
index 0000000000..c73ea3426b
--- /dev/null
+++ b/packages/xorg-app/oclock_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " 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
new file mode 100644
index 0000000000..dc1e5ccbcf
--- /dev/null
+++ b/packages/xorg-app/proxymngr_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libice libxt 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 714ab3f83f..a6eb7ea7d4 100644
--- a/packages/xorg-app/rgb_X11R7.0-1.0.0.bb
+++ b/packages/xorg-app/rgb_X11R7.0-1.0.0.bb
@@ -1,2 +1,6 @@
-include app-common.inc
-DEPENDS = "libx11 libxt"
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " 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
new file mode 100644
index 0000000000..4077c44cfb
--- /dev/null
+++ b/packages/xorg-app/rgb_X11R7.1-1.0.1.bb
@@ -0,0 +1,7 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " xproto util-macros"
+
+
diff --git a/packages/xorg-app/rstart_X11R7.0-1.0.1.bb b/packages/xorg-app/rstart_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..a62b548b00
--- /dev/null
+++ b/packages/xorg-app/rstart_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " 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
new file mode 100644
index 0000000000..a62b548b00
--- /dev/null
+++ b/packages/xorg-app/rstart_X11R7.1-1.0.2.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " 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
new file mode 100644
index 0000000000..3e99a06516
--- /dev/null
+++ b/packages/xorg-app/scripts_X11R7.0-1.0.1.bb
@@ -0,0 +1,7 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " 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
new file mode 100644
index 0000000000..a62b548b00
--- /dev/null
+++ b/packages/xorg-app/sessreg_X11R7.0-1.0.0.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " 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
new file mode 100644
index 0000000000..962cdf481c
--- /dev/null
+++ b/packages/xorg-app/setxkbmap_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libxkbfile 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
new file mode 100644
index 0000000000..962cdf481c
--- /dev/null
+++ b/packages/xorg-app/setxkbmap_X11R7.1-1.0.2.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libxkbfile 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
new file mode 100644
index 0000000000..46efe223ef
--- /dev/null
+++ b/packages/xorg-app/showfont_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libfs"
+
diff --git a/packages/xorg-app/smproxy_X11R7.0-1.0.1.bb b/packages/xorg-app/smproxy_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..a8533a377a
--- /dev/null
+++ b/packages/xorg-app/smproxy_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libxt libxmu"
+
diff --git a/packages/xorg-app/smproxy_X11R7.1-1.0.2.bb b/packages/xorg-app/smproxy_X11R7.1-1.0.2.bb
new file mode 100644
index 0000000000..a8533a377a
--- /dev/null
+++ b/packages/xorg-app/smproxy_X11R7.1-1.0.2.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libxt libxmu"
+
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 e02bc4cf7b..ab47831d31 100644
--- a/packages/xorg-app/twm_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/twm_X11R7.0-1.0.1.bb
@@ -1,14 +1,10 @@
-PR = "r1"
+include xorg-app-common.inc
-include app-common.inc
-DEPENDS = "libx11 libxt libxmu"
+DESCRIPTION = "tiny window manager"
-inherit update-alternatives
+DEPENDS += " libx11 libxext libxt libxmu"
ALTERNATIVE_PATH = "${bindir}/twm"
ALTERNATIVE_NAME = "x-window-manager"
ALTERNATIVE_LINK = "${bindir}/x-window-manager"
ALTERNATIVE_PRIORITY = "1"
-
-
-
diff --git a/packages/xorg-app/viewres_X11R7.0-1.0.1.bb b/packages/xorg-app/viewres_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..2a03dcb18c
--- /dev/null
+++ b/packages/xorg-app/viewres_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libxt"
+
diff --git a/packages/xorg-app/x11perf_X11R7.0-1.0.1.bb b/packages/xorg-app/x11perf_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..52746c9316
--- /dev/null
+++ b/packages/xorg-app/x11perf_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " 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
new file mode 100644
index 0000000000..83b1830524
--- /dev/null
+++ b/packages/xorg-app/x11perf_X11R7.1-1.4.1.bb
@@ -0,0 +1,5 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " 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 c9d1a12ba2..1608c22e0e 100644
--- a/packages/xorg-app/xauth_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/xauth_X11R7.0-1.0.1.bb
@@ -1,2 +1,6 @@
-include app-common.inc
-DEPENDS = "libx11 libxau libxext libxmu"
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libx11 libxau libxext libxmu"
+
diff --git a/packages/xorg-app/xbiff_X11R7.0-1.0.1.bb b/packages/xorg-app/xbiff_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..0c5c6ed540
--- /dev/null
+++ b/packages/xorg-app/xbiff_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libxaw xbitmaps libxext"
+
diff --git a/packages/xorg-app/xcalc_X11R7.0-1.0.1.bb b/packages/xorg-app/xcalc_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..413aa7d029
--- /dev/null
+++ b/packages/xorg-app/xcalc_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libxaw libxt"
+
diff --git a/packages/xorg-app/xclipboard_X11R7.0-1.0.1.bb b/packages/xorg-app/xclipboard_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..413aa7d029
--- /dev/null
+++ b/packages/xorg-app/xclipboard_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libxaw libxt"
+
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 8a4b59d811..aa68cc73e0 100644
--- a/packages/xorg-app/xclock_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/xclock_X11R7.0-1.0.1.bb
@@ -1,2 +1,6 @@
-include app-common.inc
-DEPENDS = "libx11 libxrender libxft libxkbfile libxaw"
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " 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
new file mode 100644
index 0000000000..aa68cc73e0
--- /dev/null
+++ b/packages/xorg-app/xclock_X11R7.1-1.0.2.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " 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
new file mode 100644
index 0000000000..a62b548b00
--- /dev/null
+++ b/packages/xorg-app/xcmsdb_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " 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
new file mode 100644
index 0000000000..413aa7d029
--- /dev/null
+++ b/packages/xorg-app/xconsole_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libxaw libxt"
+
diff --git a/packages/xorg-app/xconsole_X11R7.1-1.0.2.bb b/packages/xorg-app/xconsole_X11R7.1-1.0.2.bb
new file mode 100644
index 0000000000..2a03dcb18c
--- /dev/null
+++ b/packages/xorg-app/xconsole_X11R7.1-1.0.2.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libxt"
+
diff --git a/packages/xorg-app/xcursorgen_X11R7.0-1.0.0.bb b/packages/xorg-app/xcursorgen_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..2f5c449b0b
--- /dev/null
+++ b/packages/xorg-app/xcursorgen_X11R7.0-1.0.0.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " 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
new file mode 100644
index 0000000000..2f5c449b0b
--- /dev/null
+++ b/packages/xorg-app/xcursorgen_X11R7.1-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " 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
new file mode 100644
index 0000000000..7bf0a43a95
--- /dev/null
+++ b/packages/xorg-app/xdbedizzy_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libxp libxprintutil libxp libxau libxext"
+
diff --git a/packages/xorg-app/xditview_X11R7.0-1.0.1.bb b/packages/xorg-app/xditview_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..413aa7d029
--- /dev/null
+++ b/packages/xorg-app/xditview_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libxaw libxt"
+
diff --git a/packages/xorg-app/xdm_X11R7.0-1.0.1.bb b/packages/xorg-app/xdm_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..0ccc5710a9
--- /dev/null
+++ b/packages/xorg-app/xdm_X11R7.0-1.0.1.bb
@@ -0,0 +1,8 @@
+include xorg-app-common.inc
+
+DESCRIPTION = "X display manager"
+
+DEPENDS += " libxmu libxinerama libxpm libxdmcp libxau 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
new file mode 100644
index 0000000000..0450f2f8f3
--- /dev/null
+++ b/packages/xorg-app/xdm_X11R7.1-1.0.4.bb
@@ -0,0 +1,7 @@
+include xorg-app-common.inc
+
+DESCRIPTION = "X display manager"
+
+DEPENDS += " libxmu libxinerama libxpm libxdmcp libxau 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 a8972e18ab..b05149a0ff 100644
--- a/packages/xorg-app/xdpyinfo_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/xdpyinfo_X11R7.0-1.0.1.bb
@@ -1,12 +1,8 @@
-LICENSE = "MIT"
-DEPENDS = "libx11 libxext libxtst"
+include xorg-app-common.inc
+
DESCRIPTION = "X display information utility"
-SECTION = "x11/base"
+LICENSE = "MIT"
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/${PN}-X11R7.0-1.0.1.tar.bz2 \
- file://disable-xkb.patch;patch=1"
-S = "${WORKDIR}/${PN}-X11R7.0-${PV}"
+DEPENDS += " libxtst libxext libx11 libxxf86vm libxxf86dga libxxf86misc libxi libxrender libxinerama libdmx libxp"
EXTRA_OECONF = "--disable-xkb"
-
-inherit autotools pkgconfig
diff --git a/packages/xorg-app/xdriinfo_X11R7.0-1.0.0.bb b/packages/xorg-app/xdriinfo_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..ced75ddf5a
--- /dev/null
+++ b/packages/xorg-app/xdriinfo_X11R7.0-1.0.0.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " 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
new file mode 100644
index 0000000000..ced75ddf5a
--- /dev/null
+++ b/packages/xorg-app/xdriinfo_X11R7.1-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " 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
new file mode 100644
index 0000000000..ae2da418b0
--- /dev/null
+++ b/packages/xorg-app/xedit_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libxaw libxprintutil libxp libxt"
+
diff --git a/packages/xorg-app/xedit_X11R7.1-1.0.2.bb b/packages/xorg-app/xedit_X11R7.1-1.0.2.bb
new file mode 100644
index 0000000000..ae2da418b0
--- /dev/null
+++ b/packages/xorg-app/xedit_X11R7.1-1.0.2.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libxaw libxprintutil libxp libxt"
+
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 2d0f79b046..3158de66a5 100644
--- a/packages/xorg-app/xev_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/xev_X11R7.0-1.0.1.bb
@@ -1,12 +1,8 @@
+include xorg-app-common.inc
+
DESCRIPTION = "X Event Viewer"
-HOMEPAGE = "http://freedesktop.org/wiki/Software_2fxapps"
-LICENSE = "MIT"
MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
-SECTION = "x11/base"
-DEPENDS = "libx11 libxau"
+LICENSE = "MIT"
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/${PN}-X11R7.0-${PV}.tar.bz2 \
- file://diet-x11.patch;patch=1"
-S = "${WORKDIR}/${PN}-X11R7.0-${PV}"
+DEPENDS += " libx11"
-inherit autotools
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 c9d1a12ba2..bc0b9fb114 100644
--- a/packages/xorg-app/xeyes_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/xeyes_X11R7.0-1.0.1.bb
@@ -1,2 +1,5 @@
-include app-common.inc
-DEPENDS = "libx11 libxau libxext libxmu"
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " 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
new file mode 100644
index 0000000000..ef6de0aaaa
--- /dev/null
+++ b/packages/xorg-app/xf86dga_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " 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
new file mode 100644
index 0000000000..4487df1c6e
--- /dev/null
+++ b/packages/xorg-app/xfd_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libxaw freetype fontconfig libxft libxt"
+
diff --git a/packages/xorg-app/xfindproxy_X11R7.0-1.0.1.bb b/packages/xorg-app/xfindproxy_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..02f8bf36b8
--- /dev/null
+++ b/packages/xorg-app/xfindproxy_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " 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
new file mode 100644
index 0000000000..413aa7d029
--- /dev/null
+++ b/packages/xorg-app/xfontsel_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libxaw libxt"
+
diff --git a/packages/xorg-app/xfs_X11R7.0-1.0.1.bb b/packages/xorg-app/xfs_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..bb5dbb18e3
--- /dev/null
+++ b/packages/xorg-app/xfs_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+DESCRIPTION = "X fontserver"
+
+DEPENDS += " libfs libxfont xtrans"
+
diff --git a/packages/xorg-app/xfs_X11R7.1-1.0.2.bb b/packages/xorg-app/xfs_X11R7.1-1.0.2.bb
new file mode 100644
index 0000000000..bb5dbb18e3
--- /dev/null
+++ b/packages/xorg-app/xfs_X11R7.1-1.0.2.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+DESCRIPTION = "X fontserver"
+
+DEPENDS += " libfs libxfont xtrans"
+
diff --git a/packages/xorg-app/xfsinfo_X11R7.0-1.0.1.bb b/packages/xorg-app/xfsinfo_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..b86b4ba4d8
--- /dev/null
+++ b/packages/xorg-app/xfsinfo_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " 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
new file mode 100644
index 0000000000..5300f85f86
--- /dev/null
+++ b/packages/xorg-app/xfwp_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " 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
new file mode 100644
index 0000000000..d8ff2d20a5
--- /dev/null
+++ b/packages/xorg-app/xgamma_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " 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
new file mode 100644
index 0000000000..413aa7d029
--- /dev/null
+++ b/packages/xorg-app/xgc_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libxaw libxt"
+
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 220de1b535..a53f8defed 100644
--- a/packages/xorg-app/xhost_X11R7.0-1.0.0.bb
+++ b/packages/xorg-app/xhost_X11R7.0-1.0.0.bb
@@ -1,10 +1,8 @@
-LICENSE = "MIT"
-DEPENDS = "libx11 libxext libxmu"
-DESCRIPTION = "server access control program for X"
+include xorg-app-common.inc
+
+DESCRIPTION = "Server access control program for X"
MAINTAINER = "Rene Wagner <rw@handhelds.org>"
-SECTION = "x11/base"
+LICENSE = "MIT"
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/${PN}-X11R7.0-${PV}.tar.bz2"
-S = "${WORKDIR}/${PN}-X11R7.0-${PV}"
+DEPENDS += " libx11 libxmu libxau"
-inherit autotools pkgconfig
diff --git a/packages/xorg-app/xhost_X11R7.1-1.0.1.bb b/packages/xorg-app/xhost_X11R7.1-1.0.1.bb
new file mode 100644
index 0000000000..a53f8defed
--- /dev/null
+++ b/packages/xorg-app/xhost_X11R7.1-1.0.1.bb
@@ -0,0 +1,8 @@
+include xorg-app-common.inc
+
+DESCRIPTION = "Server access control program for X"
+MAINTAINER = "Rene Wagner <rw@handhelds.org>"
+LICENSE = "MIT"
+
+DEPENDS += " 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 2e65b76202..3e99a06516 100644
--- a/packages/xorg-app/xinit_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/xinit_X11R7.0-1.0.1.bb
@@ -1,2 +1,7 @@
-include app-common.inc
-DEPENDS = "libx11 twm xclock xeyes xrdb"
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " 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
new file mode 100644
index 0000000000..f3259146f5
--- /dev/null
+++ b/packages/xorg-app/xinit_X11R7.1-1.0.2.bb
@@ -0,0 +1,7 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " 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 808f5d0a6d..debcdb4481 100644
--- a/packages/xorg-app/xkbcomp_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/xkbcomp_X11R7.0-1.0.1.bb
@@ -1,2 +1,6 @@
-include app-common.inc
-DEPENDS = "libx11 libxkbfile"
+include xorg-app-common.inc
+
+DESCRIPTION = "The X Keyboard Extension essentially replaces the core protocol definition of keyboard."
+
+DEPENDS += " 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
new file mode 100644
index 0000000000..debcdb4481
--- /dev/null
+++ b/packages/xorg-app/xkbcomp_X11R7.1-1.0.2.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+DESCRIPTION = "The X Keyboard Extension essentially replaces the core protocol definition of keyboard."
+
+DEPENDS += " 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
new file mode 100644
index 0000000000..962cdf481c
--- /dev/null
+++ b/packages/xorg-app/xkbevd_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libxkbfile 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
new file mode 100644
index 0000000000..962cdf481c
--- /dev/null
+++ b/packages/xorg-app/xkbevd_X11R7.1-1.0.2.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libxkbfile 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
new file mode 100644
index 0000000000..962cdf481c
--- /dev/null
+++ b/packages/xorg-app/xkbprint_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libxkbfile 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
new file mode 100644
index 0000000000..125af907fc
--- /dev/null
+++ b/packages/xorg-app/xkbutils_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libxaw libxkbfile 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
new file mode 100644
index 0000000000..52746c9316
--- /dev/null
+++ b/packages/xorg-app/xkill_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " 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
new file mode 100644
index 0000000000..413aa7d029
--- /dev/null
+++ b/packages/xorg-app/xload_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libxaw libxt"
+
diff --git a/packages/xorg-app/xlogo_X11R7.0-1.0.1.bb b/packages/xorg-app/xlogo_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..1c68e539a6
--- /dev/null
+++ b/packages/xorg-app/xlogo_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libxaw libxprintutil libxp libxrender libxft libxext libxt"
+
diff --git a/packages/xorg-app/xlsatoms_X11R7.0-1.0.1.bb b/packages/xorg-app/xlsatoms_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..52746c9316
--- /dev/null
+++ b/packages/xorg-app/xlsatoms_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " 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
new file mode 100644
index 0000000000..52746c9316
--- /dev/null
+++ b/packages/xorg-app/xlsclients_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " 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
new file mode 100644
index 0000000000..a62b548b00
--- /dev/null
+++ b/packages/xorg-app/xlsfonts_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " 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
new file mode 100644
index 0000000000..413aa7d029
--- /dev/null
+++ b/packages/xorg-app/xmag_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libxaw libxt"
+
diff --git a/packages/xorg-app/xman_X11R7.0-1.0.1.bb b/packages/xorg-app/xman_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..16364e3ddc
--- /dev/null
+++ b/packages/xorg-app/xman_X11R7.0-1.0.1.bb
@@ -0,0 +1,8 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libxaw libxprintutil libxp libxt"
+RDEPENDS = " man"
+
+FILES_${PN} += " /usr/share/X11/xman.help"
diff --git a/packages/xorg-app/xman_X11R7.1-1.0.2.bb b/packages/xorg-app/xman_X11R7.1-1.0.2.bb
new file mode 100644
index 0000000000..16364e3ddc
--- /dev/null
+++ b/packages/xorg-app/xman_X11R7.1-1.0.2.bb
@@ -0,0 +1,8 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libxaw libxprintutil libxp libxt"
+RDEPENDS = " man"
+
+FILES_${PN} += " /usr/share/X11/xman.help"
diff --git a/packages/xorg-app/xmessage_X11R7.0-1.0.1.bb b/packages/xorg-app/xmessage_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..457946bcf3
--- /dev/null
+++ b/packages/xorg-app/xmessage_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+DESCRIPTION = "xmessage displays a message or query in a window."
+
+DEPENDS += " libxaw libxt"
+
diff --git a/packages/xorg-app/xmh_X11R7.0-1.0.1.bb b/packages/xorg-app/xmh_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..413aa7d029
--- /dev/null
+++ b/packages/xorg-app/xmh_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libxaw libxt"
+
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 d65c84bb71..3f1300b670 100644
--- a/packages/xorg-app/xmodmap_X11R7.0-1.0.0.bb
+++ b/packages/xorg-app/xmodmap_X11R7.0-1.0.0.bb
@@ -1,11 +1,8 @@
-LICENSE = "MIT"
-DESCRIPTION = "utility for modifying keymaps and pointer button mappings in X"
-MAINTAINER = "Rene Wagner <rw@handhelds.org>"
-SECTION = "x11/base"
+include xorg-app-common.inc
-DEPENDS = "libx11"
+DESCRIPTION = "Utility for modifying keymaps and pointer button mappings in X"
+MAINTAINER = "Rene Wagner <rw@handhelds.org>"
+LICENSE = "MIT"
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/${PN}-X11R7.0-1.0.0.tar.bz2"
-S = "${WORKDIR}/${PN}-X11R7.0-${PV}"
+DEPENDS += " libx11"
-inherit autotools pkgconfig
diff --git a/packages/xorg-app/xmodmap_X11R7.1-1.0.1.bb b/packages/xorg-app/xmodmap_X11R7.1-1.0.1.bb
new file mode 100644
index 0000000000..b3e13bea6a
--- /dev/null
+++ b/packages/xorg-app/xmodmap_X11R7.1-1.0.1.bb
@@ -0,0 +1,8 @@
+include xorg-app-common.inc
+
+DESCRIPTION = "utility for modifying keymaps and pointer button mappings in X"
+MAINTAINER = "Rene Wagner <rw@handhelds.org>"
+LICENSE = "MIT"
+
+DEPENDS += " libx11"
+
diff --git a/packages/xorg-app/xmore_X11R7.0-1.0.1.bb b/packages/xorg-app/xmore_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..3d53264fba
--- /dev/null
+++ b/packages/xorg-app/xmore_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libxprintutil libxp libxt"
+
diff --git a/packages/xorg-app/xorg-app-common.inc b/packages/xorg-app/xorg-app-common.inc
index 9d668cd9b2..78146b1e78 100644
--- a/packages/xorg-app/xorg-app-common.inc
+++ b/packages/xorg-app/xorg-app-common.inc
@@ -1,13 +1,18 @@
DESCRIPTION = "X application"
+HOMEPAGE = "http://www.x.org"
SECTION = "x11/apps"
-LICENSE= "MIT-X"
+#MAINTAINER = ""
+LICENSE = "MIT-X"
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/${PN}-X11R7.0-${PV}.tar.bz2"
+#DEPENDS = ""
+XORG_PN = "${PN}"
+SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/app/${XORG_PN}-${PV}.tar.gz"
+S = "${WORKDIR}/${XORG_PN}-${PV}"
-S = ${WORKDIR}/${PN}-X11R7.0-${PV}
+FILES_${PN} += " /usr/lib/X11/${XORG_PN}"
inherit autotools pkgconfig
-do_stage () {
+do_stage() {
autotools_stage_all
}
diff --git a/packages/xorg-app/xphelloworld_X11R7.0-1.0.1.bb b/packages/xorg-app/xphelloworld_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..50558f2b05
--- /dev/null
+++ b/packages/xorg-app/xphelloworld_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " 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
new file mode 100644
index 0000000000..edde5ae353
--- /dev/null
+++ b/packages/xorg-app/xplsprinters_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libxp libxprintutil 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
new file mode 100644
index 0000000000..14c99d3343
--- /dev/null
+++ b/packages/xorg-app/xpr_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libxmu 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
new file mode 100644
index 0000000000..97426ec2c7
--- /dev/null
+++ b/packages/xorg-app/xprehashprinterlist_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libxp 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
new file mode 100644
index 0000000000..14c99d3343
--- /dev/null
+++ b/packages/xorg-app/xprop_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libxmu libx11"
+
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 db750c8b97..ac20c5f4cb 100644
--- a/packages/xorg-app/xrandr_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/xrandr_X11R7.0-1.0.1.bb
@@ -1,9 +1,7 @@
-LICENSE= "BSD-X"
-DEPENDS = "libxrandr libx11 libxext"
+include xorg-app-common.inc
+
DESCRIPTION = "X Resize and Rotate extension command."
-SECTION = "x11/base"
+LICENSE= "BSD-X"
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/${PN}-X11R7.0-1.0.1.tar.bz2"
-S = "${WORKDIR}/${PN}-X11R7.0-${PV}"
+DEPENDS += " libxrandr libxrender libx11"
-inherit autotools pkgconfig
diff --git a/packages/xorg-app/xrandr_X11R7.1-1.0.2.bb b/packages/xorg-app/xrandr_X11R7.1-1.0.2.bb
new file mode 100644
index 0000000000..ac20c5f4cb
--- /dev/null
+++ b/packages/xorg-app/xrandr_X11R7.1-1.0.2.bb
@@ -0,0 +1,7 @@
+include xorg-app-common.inc
+
+DESCRIPTION = "X Resize and Rotate extension command."
+LICENSE= "BSD-X"
+
+DEPENDS += " libxrandr libxrender libx11"
+
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 5703556a33..39d6bce25f 100644
--- a/packages/xorg-app/xrdb_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/xrdb_X11R7.0-1.0.1.bb
@@ -1,11 +1,8 @@
-DEPENDS = "libx11 libxmu libxext"
+include xorg-app-common.inc
+
DESCRIPTION = "X server resource database utility"
MAINTAINER = "Rene Wagner <rw@handhelds.org>"
-SECTION = "x11/base"
LICENSE = "xrdb"
-PR = "r0"
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/${PN}-X11R7.0-1.0.1.tar.bz2"
-S = "${WORKDIR}/${PN}-X11R7.0-${PV}"
+DEPENDS += " libxmu libx11 libxext"
-inherit autotools pkgconfig
diff --git a/packages/xorg-app/xrdb_X11R7.1-1.0.2.bb b/packages/xorg-app/xrdb_X11R7.1-1.0.2.bb
new file mode 100644
index 0000000000..903474e054
--- /dev/null
+++ b/packages/xorg-app/xrdb_X11R7.1-1.0.2.bb
@@ -0,0 +1,7 @@
+include xorg-app-common.inc
+
+DESCRIPTION = "X server resource database utility"
+MAINTAINER = "Rene Wagner <rw@handhelds.org>"
+LICENSE = "xrdb"
+
+DEPENDS += " libxmu libx11 libxext"
diff --git a/packages/xorg-app/xrefresh_X11R7.0-1.0.1.bb b/packages/xorg-app/xrefresh_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..a62b548b00
--- /dev/null
+++ b/packages/xorg-app/xrefresh_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " 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
new file mode 100644
index 0000000000..a62b548b00
--- /dev/null
+++ b/packages/xorg-app/xrefresh_X11R7.1-1.0.2.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " 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
new file mode 100644
index 0000000000..058badcd6a
--- /dev/null
+++ b/packages/xorg-app/xrx_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libxaw libx11 libxt libxext xtrans xproxymngproto libxau"
+
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 55f3a0de21..0cca2cd0c3 100644
--- a/packages/xorg-app/xset_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/xset_X11R7.0-1.0.1.bb
@@ -1,17 +1,11 @@
+include xorg-app-common.inc
+
DESCRIPTION = "user preference utility for X"
-LICENSE = "MIT"
MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"
+LICENSE = "MIT"
-DEPENDS = "libx11 libxext xextproto libxmu"
+DEPENDS += " libxmu libxext libx11 libxxf86misc libxfontcache libxp"
CFLAGS += "-D_GNU_SOURCE"
-
-SECTION = "x11/base"
-
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/${PN}-X11R7.0-${PV}.tar.bz2 \
- file://disable-xkb.patch;patch=1"
-S = "${WORKDIR}/${PN}-X11R7.0-${PV}"
-
EXTRA_OECONF = "--disable-xkb"
-inherit autotools pkgconfig
diff --git a/packages/xorg-app/xset_X11R7.1-1.0.2.bb b/packages/xorg-app/xset_X11R7.1-1.0.2.bb
new file mode 100644
index 0000000000..0cca2cd0c3
--- /dev/null
+++ b/packages/xorg-app/xset_X11R7.1-1.0.2.bb
@@ -0,0 +1,11 @@
+include xorg-app-common.inc
+
+DESCRIPTION = "user preference utility for X"
+MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"
+LICENSE = "MIT"
+
+DEPENDS += " libxmu libxext libx11 libxxf86misc libxfontcache libxp"
+
+CFLAGS += "-D_GNU_SOURCE"
+EXTRA_OECONF = "--disable-xkb"
+
diff --git a/packages/xorg-app/xsetmode_X11R7.0-1.0.0.bb b/packages/xorg-app/xsetmode_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..ca8816065c
--- /dev/null
+++ b/packages/xorg-app/xsetmode_X11R7.0-1.0.0.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libxi 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
new file mode 100644
index 0000000000..ca8816065c
--- /dev/null
+++ b/packages/xorg-app/xsetpointer_X11R7.0-1.0.0.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libxi 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
new file mode 100644
index 0000000000..8cf815f2f6
--- /dev/null
+++ b/packages/xorg-app/xsetroot_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libxmu 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
new file mode 100644
index 0000000000..57d80cc75c
--- /dev/null
+++ b/packages/xorg-app/xsm_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = "X Session Manager"
+
+DEPENDS += " libxaw libxt"
+
diff --git a/packages/xorg-app/xstdcmap_X11R7.0-1.0.1.bb b/packages/xorg-app/xstdcmap_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..14c99d3343
--- /dev/null
+++ b/packages/xorg-app/xstdcmap_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libxmu libx11"
+
diff --git a/packages/xorg-app/xterm_207.bb b/packages/xorg-app/xterm_207.bb
new file mode 100644
index 0000000000..0738ffab02
--- /dev/null
+++ b/packages/xorg-app/xterm_207.bb
@@ -0,0 +1,29 @@
+DESCRIPTION = "xterm app"
+SECTION = "x11/apps"
+#MAINTAINER = ""
+LICENSE = "MIT-X"
+
+DEPENDS = "xproto libx11 xextproto xext xau xpm ncurses"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/extras/${PN}-${PV}.tar.gz"
+
+inherit autotools pkgconfig
+
+FILES_${PN} += " /usr/lib/X11"
+
+#EXTRA_OERECONF = " -I${S}/xterm.m4"
+EXTRA_OECONF = " --x-includes=${STAGING_INCDIR} --x-libraries=${STAGING_LIBDIR} FREETYPE_CONFIG=${STAGING_DIR}/${BUILD_SYS}/bin/freetype-config"
+
+#do_configure_prepend () {
+# mv ${S}/aclocal.m4 ${S}/xterm.m4
+#}
+do_configure() {
+
+ sed -e "s%/usr/contrib/X11R6%${STAGING_LIBDIR}%g" -i configure
+
+ oe_runconf
+}
+
+do_stage() {
+ autotools_stage_all
+}
diff --git a/packages/xorg-app/xtrap_X11R7.0-1.0.1.bb b/packages/xorg-app/xtrap_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..76c1a1e3d4
--- /dev/null
+++ b/packages/xorg-app/xtrap_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " 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
new file mode 100644
index 0000000000..76c1a1e3d4
--- /dev/null
+++ b/packages/xorg-app/xtrap_X11R7.1-1.0.2.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " 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
new file mode 100644
index 0000000000..06f2b5115f
--- /dev/null
+++ b/packages/xorg-app/xvidtune_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libxaw libxxf86vm libxt"
+
diff --git a/packages/xorg-app/xvinfo_X11R7.0-1.0.1.bb b/packages/xorg-app/xvinfo_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..b5caa9a7a1
--- /dev/null
+++ b/packages/xorg-app/xvinfo_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libxv 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
new file mode 100644
index 0000000000..14c99d3343
--- /dev/null
+++ b/packages/xorg-app/xwd_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libxmu 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
new file mode 100644
index 0000000000..6662f1d710
--- /dev/null
+++ b/packages/xorg-app/xwininfo_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libxmu libxext 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
new file mode 100644
index 0000000000..6662f1d710
--- /dev/null
+++ b/packages/xorg-app/xwininfo_X11R7.1-1.0.2.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libxmu libxext 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
new file mode 100644
index 0000000000..a62b548b00
--- /dev/null
+++ b/packages/xorg-app/xwud_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libx11"
+