From 7219087e6a92617f8212acdec0a9c16cff8521c5 Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@linux.intel.com>
Date: Thu, 22 Jul 2010 12:15:29 +0100
Subject: Move less useful xorg-app and xorg-data to meta-extras
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
---
meta-extras/packages/xorg-app/iceauth_1.0.2.bb | 6 ++++++
meta-extras/packages/xorg-app/luit_1.0.2.bb | 8 ++++++++
meta-extras/packages/xorg-app/oclock_1.0.1.bb | 5 +++++
meta-extras/packages/xorg-app/rgb_1.0.1.bb | 6 ++++++
meta-extras/packages/xorg-app/sessreg_1.0.4.bb | 6 ++++++
meta-extras/packages/xorg-app/twm_1.0.4.bb | 11 ++++++++++
meta-extras/packages/xorg-app/xbiff_1.0.1.bb | 9 ++++++++
meta-extras/packages/xorg-app/xclipboard_1.1.0.bb | 4 ++++
meta-extras/packages/xorg-app/xclock_1.0.4.bb | 5 +++++
meta-extras/packages/xorg-app/xcmsdb_1.0.1.bb | 4 ++++
meta-extras/packages/xorg-app/xconsole_1.0.3.bb | 9 ++++++++
meta-extras/packages/xorg-app/xcursorgen_1.0.2.bb | 4 ++++
meta-extras/packages/xorg-app/xdriinfo_1.0.2.bb | 4 ++++
meta-extras/packages/xorg-app/xfd_1.0.1.bb | 9 ++++++++
meta-extras/packages/xorg-app/xfontsel_1.0.2.bb | 9 ++++++++
meta-extras/packages/xorg-app/xgamma_1.0.2.bb | 5 +++++
meta-extras/packages/xorg-app/xkbevd_1.0.2.bb | 4 ++++
meta-extras/packages/xorg-app/xkbprint_1.0.2.bb | 4 ++++
meta-extras/packages/xorg-app/xkbutils_1.0.2.bb | 5 +++++
meta-extras/packages/xorg-app/xkill_1.0.1.bb | 4 ++++
meta-extras/packages/xorg-app/xload_1.0.2.bb | 10 +++++++++
meta-extras/packages/xorg-app/xlogo_1.0.1.bb | 4 ++++
meta-extras/packages/xorg-app/xlsatoms_1.0.1.bb | 4 ++++
meta-extras/packages/xorg-app/xlsclients_1.0.1.bb | 4 ++++
meta-extras/packages/xorg-app/xlsfonts_1.0.2.bb | 4 ++++
meta-extras/packages/xorg-app/xmag_1.0.2.bb | 10 +++++++++
meta-extras/packages/xorg-app/xmessage_1.0.2.bb | 10 +++++++++
meta-extras/packages/xorg-app/xorg-app-common.inc | 15 ++++++++++++++
meta-extras/packages/xorg-app/xpr_1.0.2.bb | 5 +++++
meta-extras/packages/xorg-app/xrefresh_1.0.2.bb | 4 ++++
meta-extras/packages/xorg-app/xsetroot_1.0.2.bb | 6 ++++++
meta-extras/packages/xorg-app/xstdcmap_1.0.1.bb | 4 ++++
meta-extras/packages/xorg-app/xterm_207.bb | 24 ++++++++++++++++++++++
meta-extras/packages/xorg-app/xtrap_1.0.2.bb | 4 ++++
meta-extras/packages/xorg-app/xvidtune_1.0.1.bb | 9 ++++++++
meta-extras/packages/xorg-app/xvinfo_1.0.2.bb | 5 +++++
meta-extras/packages/xorg-app/xwd_1.0.1.bb | 4 ++++
meta-extras/packages/xorg-app/xwud_1.0.1.bb | 4 ++++
meta-extras/packages/xorg-data/xbitmaps_1.0.1.bb | 5 +++++
.../packages/xorg-data/xorg-data-common.inc | 10 +++++++++
meta-moblin/packages/xorg-app/iceauth_1.0.2.bb | 6 ------
meta-moblin/packages/xorg-app/luit_1.0.2.bb | 8 --------
meta-moblin/packages/xorg-app/oclock_1.0.1.bb | 5 -----
meta-moblin/packages/xorg-app/rgb_1.0.1.bb | 6 ------
meta-moblin/packages/xorg-app/sessreg_1.0.4.bb | 6 ------
meta-moblin/packages/xorg-app/twm_1.0.4.bb | 11 ----------
meta-moblin/packages/xorg-app/xbiff_1.0.1.bb | 9 --------
meta-moblin/packages/xorg-app/xclipboard_1.1.0.bb | 4 ----
meta-moblin/packages/xorg-app/xclock_1.0.4.bb | 5 -----
meta-moblin/packages/xorg-app/xcmsdb_1.0.1.bb | 4 ----
meta-moblin/packages/xorg-app/xconsole_1.0.3.bb | 9 --------
meta-moblin/packages/xorg-app/xcursorgen_1.0.2.bb | 4 ----
meta-moblin/packages/xorg-app/xdriinfo_1.0.2.bb | 4 ----
meta-moblin/packages/xorg-app/xfd_1.0.1.bb | 9 --------
meta-moblin/packages/xorg-app/xfontsel_1.0.2.bb | 9 --------
meta-moblin/packages/xorg-app/xgamma_1.0.2.bb | 5 -----
meta-moblin/packages/xorg-app/xkbevd_1.0.2.bb | 4 ----
meta-moblin/packages/xorg-app/xkbprint_1.0.2.bb | 4 ----
meta-moblin/packages/xorg-app/xkbutils_1.0.2.bb | 5 -----
meta-moblin/packages/xorg-app/xkill_1.0.1.bb | 4 ----
meta-moblin/packages/xorg-app/xload_1.0.2.bb | 10 ---------
meta-moblin/packages/xorg-app/xlogo_1.0.1.bb | 4 ----
meta-moblin/packages/xorg-app/xlsatoms_1.0.1.bb | 4 ----
meta-moblin/packages/xorg-app/xlsclients_1.0.1.bb | 4 ----
meta-moblin/packages/xorg-app/xlsfonts_1.0.2.bb | 4 ----
meta-moblin/packages/xorg-app/xmag_1.0.2.bb | 10 ---------
meta-moblin/packages/xorg-app/xmessage_1.0.2.bb | 10 ---------
meta-moblin/packages/xorg-app/xorg-app-common.inc | 15 --------------
meta-moblin/packages/xorg-app/xpr_1.0.2.bb | 5 -----
meta-moblin/packages/xorg-app/xrefresh_1.0.2.bb | 4 ----
meta-moblin/packages/xorg-app/xsetroot_1.0.2.bb | 6 ------
meta-moblin/packages/xorg-app/xstdcmap_1.0.1.bb | 4 ----
meta-moblin/packages/xorg-app/xterm_207.bb | 24 ----------------------
meta-moblin/packages/xorg-app/xtrap_1.0.2.bb | 4 ----
meta-moblin/packages/xorg-app/xvidtune_1.0.1.bb | 9 --------
meta-moblin/packages/xorg-app/xvinfo_1.0.2.bb | 5 -----
meta-moblin/packages/xorg-app/xwd_1.0.1.bb | 4 ----
meta-moblin/packages/xorg-app/xwud_1.0.1.bb | 4 ----
meta-moblin/packages/xorg-data/xbitmaps_1.0.1.bb | 5 -----
.../packages/xorg-data/xorg-data-common.inc | 10 ---------
80 files changed, 266 insertions(+), 266 deletions(-)
create mode 100644 meta-extras/packages/xorg-app/iceauth_1.0.2.bb
create mode 100644 meta-extras/packages/xorg-app/luit_1.0.2.bb
create mode 100644 meta-extras/packages/xorg-app/oclock_1.0.1.bb
create mode 100644 meta-extras/packages/xorg-app/rgb_1.0.1.bb
create mode 100644 meta-extras/packages/xorg-app/sessreg_1.0.4.bb
create mode 100644 meta-extras/packages/xorg-app/twm_1.0.4.bb
create mode 100644 meta-extras/packages/xorg-app/xbiff_1.0.1.bb
create mode 100644 meta-extras/packages/xorg-app/xclipboard_1.1.0.bb
create mode 100644 meta-extras/packages/xorg-app/xclock_1.0.4.bb
create mode 100644 meta-extras/packages/xorg-app/xcmsdb_1.0.1.bb
create mode 100644 meta-extras/packages/xorg-app/xconsole_1.0.3.bb
create mode 100644 meta-extras/packages/xorg-app/xcursorgen_1.0.2.bb
create mode 100644 meta-extras/packages/xorg-app/xdriinfo_1.0.2.bb
create mode 100644 meta-extras/packages/xorg-app/xfd_1.0.1.bb
create mode 100644 meta-extras/packages/xorg-app/xfontsel_1.0.2.bb
create mode 100644 meta-extras/packages/xorg-app/xgamma_1.0.2.bb
create mode 100644 meta-extras/packages/xorg-app/xkbevd_1.0.2.bb
create mode 100644 meta-extras/packages/xorg-app/xkbprint_1.0.2.bb
create mode 100644 meta-extras/packages/xorg-app/xkbutils_1.0.2.bb
create mode 100644 meta-extras/packages/xorg-app/xkill_1.0.1.bb
create mode 100644 meta-extras/packages/xorg-app/xload_1.0.2.bb
create mode 100644 meta-extras/packages/xorg-app/xlogo_1.0.1.bb
create mode 100644 meta-extras/packages/xorg-app/xlsatoms_1.0.1.bb
create mode 100644 meta-extras/packages/xorg-app/xlsclients_1.0.1.bb
create mode 100644 meta-extras/packages/xorg-app/xlsfonts_1.0.2.bb
create mode 100644 meta-extras/packages/xorg-app/xmag_1.0.2.bb
create mode 100644 meta-extras/packages/xorg-app/xmessage_1.0.2.bb
create mode 100644 meta-extras/packages/xorg-app/xorg-app-common.inc
create mode 100644 meta-extras/packages/xorg-app/xpr_1.0.2.bb
create mode 100644 meta-extras/packages/xorg-app/xrefresh_1.0.2.bb
create mode 100644 meta-extras/packages/xorg-app/xsetroot_1.0.2.bb
create mode 100644 meta-extras/packages/xorg-app/xstdcmap_1.0.1.bb
create mode 100644 meta-extras/packages/xorg-app/xterm_207.bb
create mode 100644 meta-extras/packages/xorg-app/xtrap_1.0.2.bb
create mode 100644 meta-extras/packages/xorg-app/xvidtune_1.0.1.bb
create mode 100644 meta-extras/packages/xorg-app/xvinfo_1.0.2.bb
create mode 100644 meta-extras/packages/xorg-app/xwd_1.0.1.bb
create mode 100644 meta-extras/packages/xorg-app/xwud_1.0.1.bb
create mode 100644 meta-extras/packages/xorg-data/xbitmaps_1.0.1.bb
create mode 100644 meta-extras/packages/xorg-data/xorg-data-common.inc
delete mode 100644 meta-moblin/packages/xorg-app/iceauth_1.0.2.bb
delete mode 100644 meta-moblin/packages/xorg-app/luit_1.0.2.bb
delete mode 100644 meta-moblin/packages/xorg-app/oclock_1.0.1.bb
delete mode 100644 meta-moblin/packages/xorg-app/rgb_1.0.1.bb
delete mode 100644 meta-moblin/packages/xorg-app/sessreg_1.0.4.bb
delete mode 100644 meta-moblin/packages/xorg-app/twm_1.0.4.bb
delete mode 100644 meta-moblin/packages/xorg-app/xbiff_1.0.1.bb
delete mode 100644 meta-moblin/packages/xorg-app/xclipboard_1.1.0.bb
delete mode 100644 meta-moblin/packages/xorg-app/xclock_1.0.4.bb
delete mode 100644 meta-moblin/packages/xorg-app/xcmsdb_1.0.1.bb
delete mode 100644 meta-moblin/packages/xorg-app/xconsole_1.0.3.bb
delete mode 100644 meta-moblin/packages/xorg-app/xcursorgen_1.0.2.bb
delete mode 100644 meta-moblin/packages/xorg-app/xdriinfo_1.0.2.bb
delete mode 100644 meta-moblin/packages/xorg-app/xfd_1.0.1.bb
delete mode 100644 meta-moblin/packages/xorg-app/xfontsel_1.0.2.bb
delete mode 100644 meta-moblin/packages/xorg-app/xgamma_1.0.2.bb
delete mode 100644 meta-moblin/packages/xorg-app/xkbevd_1.0.2.bb
delete mode 100644 meta-moblin/packages/xorg-app/xkbprint_1.0.2.bb
delete mode 100644 meta-moblin/packages/xorg-app/xkbutils_1.0.2.bb
delete mode 100644 meta-moblin/packages/xorg-app/xkill_1.0.1.bb
delete mode 100644 meta-moblin/packages/xorg-app/xload_1.0.2.bb
delete mode 100644 meta-moblin/packages/xorg-app/xlogo_1.0.1.bb
delete mode 100644 meta-moblin/packages/xorg-app/xlsatoms_1.0.1.bb
delete mode 100644 meta-moblin/packages/xorg-app/xlsclients_1.0.1.bb
delete mode 100644 meta-moblin/packages/xorg-app/xlsfonts_1.0.2.bb
delete mode 100644 meta-moblin/packages/xorg-app/xmag_1.0.2.bb
delete mode 100644 meta-moblin/packages/xorg-app/xmessage_1.0.2.bb
delete mode 100644 meta-moblin/packages/xorg-app/xorg-app-common.inc
delete mode 100644 meta-moblin/packages/xorg-app/xpr_1.0.2.bb
delete mode 100644 meta-moblin/packages/xorg-app/xrefresh_1.0.2.bb
delete mode 100644 meta-moblin/packages/xorg-app/xsetroot_1.0.2.bb
delete mode 100644 meta-moblin/packages/xorg-app/xstdcmap_1.0.1.bb
delete mode 100644 meta-moblin/packages/xorg-app/xterm_207.bb
delete mode 100644 meta-moblin/packages/xorg-app/xtrap_1.0.2.bb
delete mode 100644 meta-moblin/packages/xorg-app/xvidtune_1.0.1.bb
delete mode 100644 meta-moblin/packages/xorg-app/xvinfo_1.0.2.bb
delete mode 100644 meta-moblin/packages/xorg-app/xwd_1.0.1.bb
delete mode 100644 meta-moblin/packages/xorg-app/xwud_1.0.1.bb
delete mode 100644 meta-moblin/packages/xorg-data/xbitmaps_1.0.1.bb
delete mode 100644 meta-moblin/packages/xorg-data/xorg-data-common.inc
diff --git a/meta-extras/packages/xorg-app/iceauth_1.0.2.bb b/meta-extras/packages/xorg-app/iceauth_1.0.2.bb
new file mode 100644
index 000000000..3dec6f466
--- /dev/null
+++ b/meta-extras/packages/xorg-app/iceauth_1.0.2.bb
@@ -0,0 +1,6 @@
+require xorg-app-common.inc
+PE = "1"
+
+DESCRIPTION = "a tool for manipulating ICE protocol authorization records"
+
+DEPENDS += " libice"
diff --git a/meta-extras/packages/xorg-app/luit_1.0.2.bb b/meta-extras/packages/xorg-app/luit_1.0.2.bb
new file mode 100644
index 000000000..00ae395c6
--- /dev/null
+++ b/meta-extras/packages/xorg-app/luit_1.0.2.bb
@@ -0,0 +1,8 @@
+require xorg-app-common.inc
+PE = "1"
+PR = "r1"
+
+DESCRIPTION = "a filter for locale and ISO 2022 support on Unicode terminals"
+
+DEPENDS += " zlib virtual/libx11 libfontenc libxdmcp"
+
diff --git a/meta-extras/packages/xorg-app/oclock_1.0.1.bb b/meta-extras/packages/xorg-app/oclock_1.0.1.bb
new file mode 100644
index 000000000..b2abeadfb
--- /dev/null
+++ b/meta-extras/packages/xorg-app/oclock_1.0.1.bb
@@ -0,0 +1,5 @@
+require xorg-app-common.inc
+PE = "1"
+
+DEPENDS += " virtual/libx11 libxmu libxext libxt"
+
diff --git a/meta-extras/packages/xorg-app/rgb_1.0.1.bb b/meta-extras/packages/xorg-app/rgb_1.0.1.bb
new file mode 100644
index 000000000..f3622410e
--- /dev/null
+++ b/meta-extras/packages/xorg-app/rgb_1.0.1.bb
@@ -0,0 +1,6 @@
+require xorg-app-common.inc
+PE = "1"
+
+DEPENDS += " xproto util-macros"
+
+FILES_${PN} += "${datadir}/X11"
diff --git a/meta-extras/packages/xorg-app/sessreg_1.0.4.bb b/meta-extras/packages/xorg-app/sessreg_1.0.4.bb
new file mode 100644
index 000000000..6dc94a369
--- /dev/null
+++ b/meta-extras/packages/xorg-app/sessreg_1.0.4.bb
@@ -0,0 +1,6 @@
+require xorg-app-common.inc
+PE = "1"
+
+DESCRIPTION = "a simple program for managing utmp/wtmp entries"
+
+DEPENDS += " virtual/libx11"
diff --git a/meta-extras/packages/xorg-app/twm_1.0.4.bb b/meta-extras/packages/xorg-app/twm_1.0.4.bb
new file mode 100644
index 000000000..b8e75b2bb
--- /dev/null
+++ b/meta-extras/packages/xorg-app/twm_1.0.4.bb
@@ -0,0 +1,11 @@
+require xorg-app-common.inc
+PE = "1"
+
+DESCRIPTION = "tiny window manager"
+
+DEPENDS += " virtual/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/meta-extras/packages/xorg-app/xbiff_1.0.1.bb b/meta-extras/packages/xorg-app/xbiff_1.0.1.bb
new file mode 100644
index 000000000..5ccac5cf1
--- /dev/null
+++ b/meta-extras/packages/xorg-app/xbiff_1.0.1.bb
@@ -0,0 +1,9 @@
+require xorg-app-common.inc
+PE = "1"
+PR = "r1"
+
+DEPENDS += " libxaw xbitmaps libxext"
+
+do_configure_prepend () {
+ sed -i -e 's/XAW_CHECK_XPRINT_SUPPORT(\(.*\))/PKG_CHECK_MODULES(\1, xaw7)/' ${S}/configure.ac
+}
diff --git a/meta-extras/packages/xorg-app/xclipboard_1.1.0.bb b/meta-extras/packages/xorg-app/xclipboard_1.1.0.bb
new file mode 100644
index 000000000..852b80375
--- /dev/null
+++ b/meta-extras/packages/xorg-app/xclipboard_1.1.0.bb
@@ -0,0 +1,4 @@
+require xorg-app-common.inc
+PE = "1"
+
+DEPENDS += " libxaw libxt"
diff --git a/meta-extras/packages/xorg-app/xclock_1.0.4.bb b/meta-extras/packages/xorg-app/xclock_1.0.4.bb
new file mode 100644
index 000000000..bbd839a13
--- /dev/null
+++ b/meta-extras/packages/xorg-app/xclock_1.0.4.bb
@@ -0,0 +1,5 @@
+require xorg-app-common.inc
+DESCRIPTION = "analog / digital clock for X"
+DEPENDS += " virtual/libx11 libxaw libxrender libxft libxkbfile libxt"
+PE = "1"
+
diff --git a/meta-extras/packages/xorg-app/xcmsdb_1.0.1.bb b/meta-extras/packages/xorg-app/xcmsdb_1.0.1.bb
new file mode 100644
index 000000000..056d04bf1
--- /dev/null
+++ b/meta-extras/packages/xorg-app/xcmsdb_1.0.1.bb
@@ -0,0 +1,4 @@
+require xorg-app-common.inc
+PE = "1"
+
+DEPENDS += " virtual/libx11 libxdmcp"
diff --git a/meta-extras/packages/xorg-app/xconsole_1.0.3.bb b/meta-extras/packages/xorg-app/xconsole_1.0.3.bb
new file mode 100644
index 000000000..0e28d9897
--- /dev/null
+++ b/meta-extras/packages/xorg-app/xconsole_1.0.3.bb
@@ -0,0 +1,9 @@
+require xorg-app-common.inc
+DESCRIPTION = "monitor system console messages with X"
+DEPENDS += " libxt"
+PE = "1"
+PR = "r1"
+
+do_configure_prepend () {
+ sed -i -e 's/XAW_CHECK_XPRINT_SUPPORT(\(.*\))/PKG_CHECK_MODULES(\1, xaw7)/' ${S}/configure.ac
+}
diff --git a/meta-extras/packages/xorg-app/xcursorgen_1.0.2.bb b/meta-extras/packages/xorg-app/xcursorgen_1.0.2.bb
new file mode 100644
index 000000000..98e619e99
--- /dev/null
+++ b/meta-extras/packages/xorg-app/xcursorgen_1.0.2.bb
@@ -0,0 +1,4 @@
+require xorg-app-common.inc
+DESCRIPTION = "create an X cursor file from a collection of PNG images"
+DEPENDS += " virtual/libx11 libxcursor libpng"
+PE = "1"
diff --git a/meta-extras/packages/xorg-app/xdriinfo_1.0.2.bb b/meta-extras/packages/xorg-app/xdriinfo_1.0.2.bb
new file mode 100644
index 000000000..b995e9175
--- /dev/null
+++ b/meta-extras/packages/xorg-app/xdriinfo_1.0.2.bb
@@ -0,0 +1,4 @@
+require xorg-app-common.inc
+DESCRIPTION = "query configuration information of DRI drivers"
+DEPENDS += " virtual/libx11 glproto virtual/libgl"
+PE = "1"
diff --git a/meta-extras/packages/xorg-app/xfd_1.0.1.bb b/meta-extras/packages/xorg-app/xfd_1.0.1.bb
new file mode 100644
index 000000000..f2b0c1283
--- /dev/null
+++ b/meta-extras/packages/xorg-app/xfd_1.0.1.bb
@@ -0,0 +1,9 @@
+require xorg-app-common.inc
+PE = "1"
+PR = "r1"
+
+DEPENDS += " libxaw freetype fontconfig libxft libxt"
+
+do_configure_prepend () {
+ sed -i -e 's/XAW_CHECK_XPRINT_SUPPORT(\(.*\))/PKG_CHECK_MODULES(\1, xaw7)/' ${S}/configure.ac
+}
diff --git a/meta-extras/packages/xorg-app/xfontsel_1.0.2.bb b/meta-extras/packages/xorg-app/xfontsel_1.0.2.bb
new file mode 100644
index 000000000..294b029b7
--- /dev/null
+++ b/meta-extras/packages/xorg-app/xfontsel_1.0.2.bb
@@ -0,0 +1,9 @@
+require xorg-app-common.inc
+
+DESCRIPTION = "point and click selection of X11 font names"
+DEPENDS += " libxaw"
+PR = "r1"
+
+do_configure_prepend () {
+ sed -i -e 's/XAW_CHECK_XPRINT_SUPPORT(\(.*\))/PKG_CHECK_MODULES(\1, xaw7)/' ${S}/configure.ac
+}
diff --git a/meta-extras/packages/xorg-app/xgamma_1.0.2.bb b/meta-extras/packages/xorg-app/xgamma_1.0.2.bb
new file mode 100644
index 000000000..e5d479aa8
--- /dev/null
+++ b/meta-extras/packages/xorg-app/xgamma_1.0.2.bb
@@ -0,0 +1,5 @@
+require xorg-app-common.inc
+
+DESCRIPTION = "Alter a monitor's gamma correction through the X server"
+DEPENDS += " virtual/libx11 libxxf86vm"
+PE = "1"
diff --git a/meta-extras/packages/xorg-app/xkbevd_1.0.2.bb b/meta-extras/packages/xorg-app/xkbevd_1.0.2.bb
new file mode 100644
index 000000000..4223f9343
--- /dev/null
+++ b/meta-extras/packages/xorg-app/xkbevd_1.0.2.bb
@@ -0,0 +1,4 @@
+require xorg-app-common.inc
+PE = "1"
+
+DEPENDS += " libxkbfile virtual/libx11"
diff --git a/meta-extras/packages/xorg-app/xkbprint_1.0.2.bb b/meta-extras/packages/xorg-app/xkbprint_1.0.2.bb
new file mode 100644
index 000000000..4223f9343
--- /dev/null
+++ b/meta-extras/packages/xorg-app/xkbprint_1.0.2.bb
@@ -0,0 +1,4 @@
+require xorg-app-common.inc
+PE = "1"
+
+DEPENDS += " libxkbfile virtual/libx11"
diff --git a/meta-extras/packages/xorg-app/xkbutils_1.0.2.bb b/meta-extras/packages/xorg-app/xkbutils_1.0.2.bb
new file mode 100644
index 000000000..102a9ba2d
--- /dev/null
+++ b/meta-extras/packages/xorg-app/xkbutils_1.0.2.bb
@@ -0,0 +1,5 @@
+require xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libxaw libxkbfile virtual/libx11"
diff --git a/meta-extras/packages/xorg-app/xkill_1.0.1.bb b/meta-extras/packages/xorg-app/xkill_1.0.1.bb
new file mode 100644
index 000000000..b6ede179c
--- /dev/null
+++ b/meta-extras/packages/xorg-app/xkill_1.0.1.bb
@@ -0,0 +1,4 @@
+require xorg-app-common.inc
+PE = "1"
+
+DEPENDS += " virtual/libx11 libxmu"
diff --git a/meta-extras/packages/xorg-app/xload_1.0.2.bb b/meta-extras/packages/xorg-app/xload_1.0.2.bb
new file mode 100644
index 000000000..adc79bc7e
--- /dev/null
+++ b/meta-extras/packages/xorg-app/xload_1.0.2.bb
@@ -0,0 +1,10 @@
+require xorg-app-common.inc
+
+DESCRIPTION = "system load average display for X"
+DEPENDS += " libxaw libxt"
+PE = "1"
+PR = "r1"
+
+do_configure_prepend () {
+ sed -i -e 's/XAW_CHECK_XPRINT_SUPPORT(\(.*\))/PKG_CHECK_MODULES(\1, xaw7)/' ${S}/configure.ac
+}
diff --git a/meta-extras/packages/xorg-app/xlogo_1.0.1.bb b/meta-extras/packages/xorg-app/xlogo_1.0.1.bb
new file mode 100644
index 000000000..393d99b33
--- /dev/null
+++ b/meta-extras/packages/xorg-app/xlogo_1.0.1.bb
@@ -0,0 +1,4 @@
+require xorg-app-common.inc
+PE = "1"
+
+DEPENDS += " libxaw libxprintutil libxp libxrender libxft libxext libxt"
diff --git a/meta-extras/packages/xorg-app/xlsatoms_1.0.1.bb b/meta-extras/packages/xorg-app/xlsatoms_1.0.1.bb
new file mode 100644
index 000000000..b6ede179c
--- /dev/null
+++ b/meta-extras/packages/xorg-app/xlsatoms_1.0.1.bb
@@ -0,0 +1,4 @@
+require xorg-app-common.inc
+PE = "1"
+
+DEPENDS += " virtual/libx11 libxmu"
diff --git a/meta-extras/packages/xorg-app/xlsclients_1.0.1.bb b/meta-extras/packages/xorg-app/xlsclients_1.0.1.bb
new file mode 100644
index 000000000..b6ede179c
--- /dev/null
+++ b/meta-extras/packages/xorg-app/xlsclients_1.0.1.bb
@@ -0,0 +1,4 @@
+require xorg-app-common.inc
+PE = "1"
+
+DEPENDS += " virtual/libx11 libxmu"
diff --git a/meta-extras/packages/xorg-app/xlsfonts_1.0.2.bb b/meta-extras/packages/xorg-app/xlsfonts_1.0.2.bb
new file mode 100644
index 000000000..31cd482b6
--- /dev/null
+++ b/meta-extras/packages/xorg-app/xlsfonts_1.0.2.bb
@@ -0,0 +1,4 @@
+require xorg-app-common.inc
+
+DESCRIPTION = "server font list displayer for X"
+DEPENDS += " virtual/libx11"
diff --git a/meta-extras/packages/xorg-app/xmag_1.0.2.bb b/meta-extras/packages/xorg-app/xmag_1.0.2.bb
new file mode 100644
index 000000000..1f0160346
--- /dev/null
+++ b/meta-extras/packages/xorg-app/xmag_1.0.2.bb
@@ -0,0 +1,10 @@
+require xorg-app-common.inc
+
+DESCRIPTION = "magnify parts of the screen"
+DEPENDS += " libxaw libxt"
+PE = "1"
+PR = "r1"
+
+do_configure_prepend () {
+ sed -i -e 's/XAW_CHECK_XPRINT_SUPPORT(\(.*\))/PKG_CHECK_MODULES(\1, xaw7)/' ${S}/configure.ac
+}
diff --git a/meta-extras/packages/xorg-app/xmessage_1.0.2.bb b/meta-extras/packages/xorg-app/xmessage_1.0.2.bb
new file mode 100644
index 000000000..82b6a9a57
--- /dev/null
+++ b/meta-extras/packages/xorg-app/xmessage_1.0.2.bb
@@ -0,0 +1,10 @@
+require xorg-app-common.inc
+
+DESCRIPTION = "xmessage displays a message or query in a window."
+DEPENDS += " libxaw libxt"
+PE = "1"
+PR = "r1"
+
+do_configure_prepend () {
+ sed -i -e 's/XAW_CHECK_XPRINT_SUPPORT(\(.*\))/PKG_CHECK_MODULES(\1, xaw7)/' ${S}/configure.ac
+}
diff --git a/meta-extras/packages/xorg-app/xorg-app-common.inc b/meta-extras/packages/xorg-app/xorg-app-common.inc
new file mode 100644
index 000000000..11f7fe3e0
--- /dev/null
+++ b/meta-extras/packages/xorg-app/xorg-app-common.inc
@@ -0,0 +1,15 @@
+DESCRIPTION = "X application"
+HOMEPAGE = "http://www.x.org/"
+SECTION = "x11/apps"
+LICENSE = "MIT-X"
+DEPENDS = "util-macros-native virtual/libx11"
+
+XORG_PN = "${PN}"
+
+SRC_URI = "${XORG_MIRROR}/individual/app/${XORG_PN}-${PV}.tar.bz2"
+
+S = "${WORKDIR}/${XORG_PN}-${PV}"
+
+inherit autotools pkgconfig
+
+FILES_${PN} += " /usr/lib/X11/${XORG_PN}"
diff --git a/meta-extras/packages/xorg-app/xpr_1.0.2.bb b/meta-extras/packages/xorg-app/xpr_1.0.2.bb
new file mode 100644
index 000000000..96b340c8c
--- /dev/null
+++ b/meta-extras/packages/xorg-app/xpr_1.0.2.bb
@@ -0,0 +1,5 @@
+require xorg-app-common.inc
+
+DESCRIPTION = "print an X window dump"
+DEPENDS += " libxmu virtual/libx11"
+PE = "1"
diff --git a/meta-extras/packages/xorg-app/xrefresh_1.0.2.bb b/meta-extras/packages/xorg-app/xrefresh_1.0.2.bb
new file mode 100644
index 000000000..8a569b065
--- /dev/null
+++ b/meta-extras/packages/xorg-app/xrefresh_1.0.2.bb
@@ -0,0 +1,4 @@
+require xorg-app-common.inc
+PE = "1"
+
+DEPENDS += " virtual/libx11"
diff --git a/meta-extras/packages/xorg-app/xsetroot_1.0.2.bb b/meta-extras/packages/xorg-app/xsetroot_1.0.2.bb
new file mode 100644
index 000000000..0f63feb79
--- /dev/null
+++ b/meta-extras/packages/xorg-app/xsetroot_1.0.2.bb
@@ -0,0 +1,6 @@
+require xorg-app-common.inc
+
+DESCRIPTION = "Sets the visual appearance of the X root window"
+LICENSE = "MIT"
+DEPENDS += "libxmu xbitmaps"
+PE = "1"
diff --git a/meta-extras/packages/xorg-app/xstdcmap_1.0.1.bb b/meta-extras/packages/xorg-app/xstdcmap_1.0.1.bb
new file mode 100644
index 000000000..6a2e50162
--- /dev/null
+++ b/meta-extras/packages/xorg-app/xstdcmap_1.0.1.bb
@@ -0,0 +1,4 @@
+require xorg-app-common.inc
+PE = "1"
+
+DEPENDS += " libxmu virtual/libx11"
diff --git a/meta-extras/packages/xorg-app/xterm_207.bb b/meta-extras/packages/xorg-app/xterm_207.bb
new file mode 100644
index 000000000..aae600b54
--- /dev/null
+++ b/meta-extras/packages/xorg-app/xterm_207.bb
@@ -0,0 +1,24 @@
+DESCRIPTION = "xterm app"
+SECTION = "x11/applications"
+LICENSE = "MIT-X"
+
+DEPENDS = "libxaw xproto virtual/libx11 xextproto xext xau libxpm ncurses"
+
+SRC_URI = "${XORG_MIRROR}/development/X11R7.0-RC4/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_BINDIR_CROSS}/freetype-config --disable-imake"
+
+#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
+}
diff --git a/meta-extras/packages/xorg-app/xtrap_1.0.2.bb b/meta-extras/packages/xorg-app/xtrap_1.0.2.bb
new file mode 100644
index 000000000..cf87d235c
--- /dev/null
+++ b/meta-extras/packages/xorg-app/xtrap_1.0.2.bb
@@ -0,0 +1,4 @@
+require xorg-app-common.inc
+PE = "1"
+
+DEPENDS += " virtual/libx11 libxtrap"
diff --git a/meta-extras/packages/xorg-app/xvidtune_1.0.1.bb b/meta-extras/packages/xorg-app/xvidtune_1.0.1.bb
new file mode 100644
index 000000000..8a20fff4e
--- /dev/null
+++ b/meta-extras/packages/xorg-app/xvidtune_1.0.1.bb
@@ -0,0 +1,9 @@
+require xorg-app-common.inc
+PE = "1"
+PR = "r1"
+
+DEPENDS += " libxaw libxxf86vm libxt"
+
+do_configure_prepend () {
+ sed -i -e 's/XAW_CHECK_XPRINT_SUPPORT(\(.*\))/PKG_CHECK_MODULES(\1, xaw7)/' ${S}/configure.ac
+}
diff --git a/meta-extras/packages/xorg-app/xvinfo_1.0.2.bb b/meta-extras/packages/xorg-app/xvinfo_1.0.2.bb
new file mode 100644
index 000000000..ac27f13f3
--- /dev/null
+++ b/meta-extras/packages/xorg-app/xvinfo_1.0.2.bb
@@ -0,0 +1,5 @@
+require xorg-app-common.inc
+
+DESCRIPTION = "Print out X-Video extension adaptor information"
+DEPENDS += " libxv"
+PE = "1"
diff --git a/meta-extras/packages/xorg-app/xwd_1.0.1.bb b/meta-extras/packages/xorg-app/xwd_1.0.1.bb
new file mode 100644
index 000000000..6a2e50162
--- /dev/null
+++ b/meta-extras/packages/xorg-app/xwd_1.0.1.bb
@@ -0,0 +1,4 @@
+require xorg-app-common.inc
+PE = "1"
+
+DEPENDS += " libxmu virtual/libx11"
diff --git a/meta-extras/packages/xorg-app/xwud_1.0.1.bb b/meta-extras/packages/xorg-app/xwud_1.0.1.bb
new file mode 100644
index 000000000..8a569b065
--- /dev/null
+++ b/meta-extras/packages/xorg-app/xwud_1.0.1.bb
@@ -0,0 +1,4 @@
+require xorg-app-common.inc
+PE = "1"
+
+DEPENDS += " virtual/libx11"
diff --git a/meta-extras/packages/xorg-data/xbitmaps_1.0.1.bb b/meta-extras/packages/xorg-data/xbitmaps_1.0.1.bb
new file mode 100644
index 000000000..f622d769d
--- /dev/null
+++ b/meta-extras/packages/xorg-data/xbitmaps_1.0.1.bb
@@ -0,0 +1,5 @@
+require xorg-data-common.inc
+
+DESCRIPTION = "Common X11 Bitmaps"
+LICENSE = "MIT"
+DEPENDS += "libxmu"
diff --git a/meta-extras/packages/xorg-data/xorg-data-common.inc b/meta-extras/packages/xorg-data/xorg-data-common.inc
new file mode 100644
index 000000000..e12876339
--- /dev/null
+++ b/meta-extras/packages/xorg-data/xorg-data-common.inc
@@ -0,0 +1,10 @@
+HOMEPAGE = "http://www.x.org"
+SECTION = "x11/data"
+LICENSE = "MIT-X"
+
+XORG_PN = "${PN}"
+
+SRC_URI = "${XORG_MIRROR}/individual/data/${XORG_PN}-${PV}.tar.bz2"
+S = "${WORKDIR}/${XORG_PN}-${PV}"
+
+inherit autotools pkgconfig
diff --git a/meta-moblin/packages/xorg-app/iceauth_1.0.2.bb b/meta-moblin/packages/xorg-app/iceauth_1.0.2.bb
deleted file mode 100644
index 3dec6f466..000000000
--- a/meta-moblin/packages/xorg-app/iceauth_1.0.2.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-PE = "1"
-
-DESCRIPTION = "a tool for manipulating ICE protocol authorization records"
-
-DEPENDS += " libice"
diff --git a/meta-moblin/packages/xorg-app/luit_1.0.2.bb b/meta-moblin/packages/xorg-app/luit_1.0.2.bb
deleted file mode 100644
index 00ae395c6..000000000
--- a/meta-moblin/packages/xorg-app/luit_1.0.2.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require xorg-app-common.inc
-PE = "1"
-PR = "r1"
-
-DESCRIPTION = "a filter for locale and ISO 2022 support on Unicode terminals"
-
-DEPENDS += " zlib virtual/libx11 libfontenc libxdmcp"
-
diff --git a/meta-moblin/packages/xorg-app/oclock_1.0.1.bb b/meta-moblin/packages/xorg-app/oclock_1.0.1.bb
deleted file mode 100644
index b2abeadfb..000000000
--- a/meta-moblin/packages/xorg-app/oclock_1.0.1.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-app-common.inc
-PE = "1"
-
-DEPENDS += " virtual/libx11 libxmu libxext libxt"
-
diff --git a/meta-moblin/packages/xorg-app/rgb_1.0.1.bb b/meta-moblin/packages/xorg-app/rgb_1.0.1.bb
deleted file mode 100644
index f3622410e..000000000
--- a/meta-moblin/packages/xorg-app/rgb_1.0.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-PE = "1"
-
-DEPENDS += " xproto util-macros"
-
-FILES_${PN} += "${datadir}/X11"
diff --git a/meta-moblin/packages/xorg-app/sessreg_1.0.4.bb b/meta-moblin/packages/xorg-app/sessreg_1.0.4.bb
deleted file mode 100644
index 6dc94a369..000000000
--- a/meta-moblin/packages/xorg-app/sessreg_1.0.4.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-PE = "1"
-
-DESCRIPTION = "a simple program for managing utmp/wtmp entries"
-
-DEPENDS += " virtual/libx11"
diff --git a/meta-moblin/packages/xorg-app/twm_1.0.4.bb b/meta-moblin/packages/xorg-app/twm_1.0.4.bb
deleted file mode 100644
index b8e75b2bb..000000000
--- a/meta-moblin/packages/xorg-app/twm_1.0.4.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-require xorg-app-common.inc
-PE = "1"
-
-DESCRIPTION = "tiny window manager"
-
-DEPENDS += " virtual/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/meta-moblin/packages/xorg-app/xbiff_1.0.1.bb b/meta-moblin/packages/xorg-app/xbiff_1.0.1.bb
deleted file mode 100644
index 5ccac5cf1..000000000
--- a/meta-moblin/packages/xorg-app/xbiff_1.0.1.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-app-common.inc
-PE = "1"
-PR = "r1"
-
-DEPENDS += " libxaw xbitmaps libxext"
-
-do_configure_prepend () {
- sed -i -e 's/XAW_CHECK_XPRINT_SUPPORT(\(.*\))/PKG_CHECK_MODULES(\1, xaw7)/' ${S}/configure.ac
-}
diff --git a/meta-moblin/packages/xorg-app/xclipboard_1.1.0.bb b/meta-moblin/packages/xorg-app/xclipboard_1.1.0.bb
deleted file mode 100644
index 852b80375..000000000
--- a/meta-moblin/packages/xorg-app/xclipboard_1.1.0.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-require xorg-app-common.inc
-PE = "1"
-
-DEPENDS += " libxaw libxt"
diff --git a/meta-moblin/packages/xorg-app/xclock_1.0.4.bb b/meta-moblin/packages/xorg-app/xclock_1.0.4.bb
deleted file mode 100644
index bbd839a13..000000000
--- a/meta-moblin/packages/xorg-app/xclock_1.0.4.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "analog / digital clock for X"
-DEPENDS += " virtual/libx11 libxaw libxrender libxft libxkbfile libxt"
-PE = "1"
-
diff --git a/meta-moblin/packages/xorg-app/xcmsdb_1.0.1.bb b/meta-moblin/packages/xorg-app/xcmsdb_1.0.1.bb
deleted file mode 100644
index 056d04bf1..000000000
--- a/meta-moblin/packages/xorg-app/xcmsdb_1.0.1.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-require xorg-app-common.inc
-PE = "1"
-
-DEPENDS += " virtual/libx11 libxdmcp"
diff --git a/meta-moblin/packages/xorg-app/xconsole_1.0.3.bb b/meta-moblin/packages/xorg-app/xconsole_1.0.3.bb
deleted file mode 100644
index 0e28d9897..000000000
--- a/meta-moblin/packages/xorg-app/xconsole_1.0.3.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "monitor system console messages with X"
-DEPENDS += " libxt"
-PE = "1"
-PR = "r1"
-
-do_configure_prepend () {
- sed -i -e 's/XAW_CHECK_XPRINT_SUPPORT(\(.*\))/PKG_CHECK_MODULES(\1, xaw7)/' ${S}/configure.ac
-}
diff --git a/meta-moblin/packages/xorg-app/xcursorgen_1.0.2.bb b/meta-moblin/packages/xorg-app/xcursorgen_1.0.2.bb
deleted file mode 100644
index 98e619e99..000000000
--- a/meta-moblin/packages/xorg-app/xcursorgen_1.0.2.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "create an X cursor file from a collection of PNG images"
-DEPENDS += " virtual/libx11 libxcursor libpng"
-PE = "1"
diff --git a/meta-moblin/packages/xorg-app/xdriinfo_1.0.2.bb b/meta-moblin/packages/xorg-app/xdriinfo_1.0.2.bb
deleted file mode 100644
index b995e9175..000000000
--- a/meta-moblin/packages/xorg-app/xdriinfo_1.0.2.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-require xorg-app-common.inc
-DESCRIPTION = "query configuration information of DRI drivers"
-DEPENDS += " virtual/libx11 glproto virtual/libgl"
-PE = "1"
diff --git a/meta-moblin/packages/xorg-app/xfd_1.0.1.bb b/meta-moblin/packages/xorg-app/xfd_1.0.1.bb
deleted file mode 100644
index f2b0c1283..000000000
--- a/meta-moblin/packages/xorg-app/xfd_1.0.1.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-app-common.inc
-PE = "1"
-PR = "r1"
-
-DEPENDS += " libxaw freetype fontconfig libxft libxt"
-
-do_configure_prepend () {
- sed -i -e 's/XAW_CHECK_XPRINT_SUPPORT(\(.*\))/PKG_CHECK_MODULES(\1, xaw7)/' ${S}/configure.ac
-}
diff --git a/meta-moblin/packages/xorg-app/xfontsel_1.0.2.bb b/meta-moblin/packages/xorg-app/xfontsel_1.0.2.bb
deleted file mode 100644
index 294b029b7..000000000
--- a/meta-moblin/packages/xorg-app/xfontsel_1.0.2.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-app-common.inc
-
-DESCRIPTION = "point and click selection of X11 font names"
-DEPENDS += " libxaw"
-PR = "r1"
-
-do_configure_prepend () {
- sed -i -e 's/XAW_CHECK_XPRINT_SUPPORT(\(.*\))/PKG_CHECK_MODULES(\1, xaw7)/' ${S}/configure.ac
-}
diff --git a/meta-moblin/packages/xorg-app/xgamma_1.0.2.bb b/meta-moblin/packages/xorg-app/xgamma_1.0.2.bb
deleted file mode 100644
index e5d479aa8..000000000
--- a/meta-moblin/packages/xorg-app/xgamma_1.0.2.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-app-common.inc
-
-DESCRIPTION = "Alter a monitor's gamma correction through the X server"
-DEPENDS += " virtual/libx11 libxxf86vm"
-PE = "1"
diff --git a/meta-moblin/packages/xorg-app/xkbevd_1.0.2.bb b/meta-moblin/packages/xorg-app/xkbevd_1.0.2.bb
deleted file mode 100644
index 4223f9343..000000000
--- a/meta-moblin/packages/xorg-app/xkbevd_1.0.2.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-require xorg-app-common.inc
-PE = "1"
-
-DEPENDS += " libxkbfile virtual/libx11"
diff --git a/meta-moblin/packages/xorg-app/xkbprint_1.0.2.bb b/meta-moblin/packages/xorg-app/xkbprint_1.0.2.bb
deleted file mode 100644
index 4223f9343..000000000
--- a/meta-moblin/packages/xorg-app/xkbprint_1.0.2.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-require xorg-app-common.inc
-PE = "1"
-
-DEPENDS += " libxkbfile virtual/libx11"
diff --git a/meta-moblin/packages/xorg-app/xkbutils_1.0.2.bb b/meta-moblin/packages/xorg-app/xkbutils_1.0.2.bb
deleted file mode 100644
index 102a9ba2d..000000000
--- a/meta-moblin/packages/xorg-app/xkbutils_1.0.2.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-app-common.inc
-
-#DESCRIPTION = ""
-
-DEPENDS += " libxaw libxkbfile virtual/libx11"
diff --git a/meta-moblin/packages/xorg-app/xkill_1.0.1.bb b/meta-moblin/packages/xorg-app/xkill_1.0.1.bb
deleted file mode 100644
index b6ede179c..000000000
--- a/meta-moblin/packages/xorg-app/xkill_1.0.1.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-require xorg-app-common.inc
-PE = "1"
-
-DEPENDS += " virtual/libx11 libxmu"
diff --git a/meta-moblin/packages/xorg-app/xload_1.0.2.bb b/meta-moblin/packages/xorg-app/xload_1.0.2.bb
deleted file mode 100644
index adc79bc7e..000000000
--- a/meta-moblin/packages/xorg-app/xload_1.0.2.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-app-common.inc
-
-DESCRIPTION = "system load average display for X"
-DEPENDS += " libxaw libxt"
-PE = "1"
-PR = "r1"
-
-do_configure_prepend () {
- sed -i -e 's/XAW_CHECK_XPRINT_SUPPORT(\(.*\))/PKG_CHECK_MODULES(\1, xaw7)/' ${S}/configure.ac
-}
diff --git a/meta-moblin/packages/xorg-app/xlogo_1.0.1.bb b/meta-moblin/packages/xorg-app/xlogo_1.0.1.bb
deleted file mode 100644
index 393d99b33..000000000
--- a/meta-moblin/packages/xorg-app/xlogo_1.0.1.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-require xorg-app-common.inc
-PE = "1"
-
-DEPENDS += " libxaw libxprintutil libxp libxrender libxft libxext libxt"
diff --git a/meta-moblin/packages/xorg-app/xlsatoms_1.0.1.bb b/meta-moblin/packages/xorg-app/xlsatoms_1.0.1.bb
deleted file mode 100644
index b6ede179c..000000000
--- a/meta-moblin/packages/xorg-app/xlsatoms_1.0.1.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-require xorg-app-common.inc
-PE = "1"
-
-DEPENDS += " virtual/libx11 libxmu"
diff --git a/meta-moblin/packages/xorg-app/xlsclients_1.0.1.bb b/meta-moblin/packages/xorg-app/xlsclients_1.0.1.bb
deleted file mode 100644
index b6ede179c..000000000
--- a/meta-moblin/packages/xorg-app/xlsclients_1.0.1.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-require xorg-app-common.inc
-PE = "1"
-
-DEPENDS += " virtual/libx11 libxmu"
diff --git a/meta-moblin/packages/xorg-app/xlsfonts_1.0.2.bb b/meta-moblin/packages/xorg-app/xlsfonts_1.0.2.bb
deleted file mode 100644
index 31cd482b6..000000000
--- a/meta-moblin/packages/xorg-app/xlsfonts_1.0.2.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-require xorg-app-common.inc
-
-DESCRIPTION = "server font list displayer for X"
-DEPENDS += " virtual/libx11"
diff --git a/meta-moblin/packages/xorg-app/xmag_1.0.2.bb b/meta-moblin/packages/xorg-app/xmag_1.0.2.bb
deleted file mode 100644
index 1f0160346..000000000
--- a/meta-moblin/packages/xorg-app/xmag_1.0.2.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-app-common.inc
-
-DESCRIPTION = "magnify parts of the screen"
-DEPENDS += " libxaw libxt"
-PE = "1"
-PR = "r1"
-
-do_configure_prepend () {
- sed -i -e 's/XAW_CHECK_XPRINT_SUPPORT(\(.*\))/PKG_CHECK_MODULES(\1, xaw7)/' ${S}/configure.ac
-}
diff --git a/meta-moblin/packages/xorg-app/xmessage_1.0.2.bb b/meta-moblin/packages/xorg-app/xmessage_1.0.2.bb
deleted file mode 100644
index 82b6a9a57..000000000
--- a/meta-moblin/packages/xorg-app/xmessage_1.0.2.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require xorg-app-common.inc
-
-DESCRIPTION = "xmessage displays a message or query in a window."
-DEPENDS += " libxaw libxt"
-PE = "1"
-PR = "r1"
-
-do_configure_prepend () {
- sed -i -e 's/XAW_CHECK_XPRINT_SUPPORT(\(.*\))/PKG_CHECK_MODULES(\1, xaw7)/' ${S}/configure.ac
-}
diff --git a/meta-moblin/packages/xorg-app/xorg-app-common.inc b/meta-moblin/packages/xorg-app/xorg-app-common.inc
deleted file mode 100644
index 11f7fe3e0..000000000
--- a/meta-moblin/packages/xorg-app/xorg-app-common.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-DESCRIPTION = "X application"
-HOMEPAGE = "http://www.x.org/"
-SECTION = "x11/apps"
-LICENSE = "MIT-X"
-DEPENDS = "util-macros-native virtual/libx11"
-
-XORG_PN = "${PN}"
-
-SRC_URI = "${XORG_MIRROR}/individual/app/${XORG_PN}-${PV}.tar.bz2"
-
-S = "${WORKDIR}/${XORG_PN}-${PV}"
-
-inherit autotools pkgconfig
-
-FILES_${PN} += " /usr/lib/X11/${XORG_PN}"
diff --git a/meta-moblin/packages/xorg-app/xpr_1.0.2.bb b/meta-moblin/packages/xorg-app/xpr_1.0.2.bb
deleted file mode 100644
index 96b340c8c..000000000
--- a/meta-moblin/packages/xorg-app/xpr_1.0.2.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-app-common.inc
-
-DESCRIPTION = "print an X window dump"
-DEPENDS += " libxmu virtual/libx11"
-PE = "1"
diff --git a/meta-moblin/packages/xorg-app/xrefresh_1.0.2.bb b/meta-moblin/packages/xorg-app/xrefresh_1.0.2.bb
deleted file mode 100644
index 8a569b065..000000000
--- a/meta-moblin/packages/xorg-app/xrefresh_1.0.2.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-require xorg-app-common.inc
-PE = "1"
-
-DEPENDS += " virtual/libx11"
diff --git a/meta-moblin/packages/xorg-app/xsetroot_1.0.2.bb b/meta-moblin/packages/xorg-app/xsetroot_1.0.2.bb
deleted file mode 100644
index 0f63feb79..000000000
--- a/meta-moblin/packages/xorg-app/xsetroot_1.0.2.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-
-DESCRIPTION = "Sets the visual appearance of the X root window"
-LICENSE = "MIT"
-DEPENDS += "libxmu xbitmaps"
-PE = "1"
diff --git a/meta-moblin/packages/xorg-app/xstdcmap_1.0.1.bb b/meta-moblin/packages/xorg-app/xstdcmap_1.0.1.bb
deleted file mode 100644
index 6a2e50162..000000000
--- a/meta-moblin/packages/xorg-app/xstdcmap_1.0.1.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-require xorg-app-common.inc
-PE = "1"
-
-DEPENDS += " libxmu virtual/libx11"
diff --git a/meta-moblin/packages/xorg-app/xterm_207.bb b/meta-moblin/packages/xorg-app/xterm_207.bb
deleted file mode 100644
index aae600b54..000000000
--- a/meta-moblin/packages/xorg-app/xterm_207.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-DESCRIPTION = "xterm app"
-SECTION = "x11/applications"
-LICENSE = "MIT-X"
-
-DEPENDS = "libxaw xproto virtual/libx11 xextproto xext xau libxpm ncurses"
-
-SRC_URI = "${XORG_MIRROR}/development/X11R7.0-RC4/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_BINDIR_CROSS}/freetype-config --disable-imake"
-
-#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
-}
diff --git a/meta-moblin/packages/xorg-app/xtrap_1.0.2.bb b/meta-moblin/packages/xorg-app/xtrap_1.0.2.bb
deleted file mode 100644
index cf87d235c..000000000
--- a/meta-moblin/packages/xorg-app/xtrap_1.0.2.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-require xorg-app-common.inc
-PE = "1"
-
-DEPENDS += " virtual/libx11 libxtrap"
diff --git a/meta-moblin/packages/xorg-app/xvidtune_1.0.1.bb b/meta-moblin/packages/xorg-app/xvidtune_1.0.1.bb
deleted file mode 100644
index 8a20fff4e..000000000
--- a/meta-moblin/packages/xorg-app/xvidtune_1.0.1.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require xorg-app-common.inc
-PE = "1"
-PR = "r1"
-
-DEPENDS += " libxaw libxxf86vm libxt"
-
-do_configure_prepend () {
- sed -i -e 's/XAW_CHECK_XPRINT_SUPPORT(\(.*\))/PKG_CHECK_MODULES(\1, xaw7)/' ${S}/configure.ac
-}
diff --git a/meta-moblin/packages/xorg-app/xvinfo_1.0.2.bb b/meta-moblin/packages/xorg-app/xvinfo_1.0.2.bb
deleted file mode 100644
index ac27f13f3..000000000
--- a/meta-moblin/packages/xorg-app/xvinfo_1.0.2.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-app-common.inc
-
-DESCRIPTION = "Print out X-Video extension adaptor information"
-DEPENDS += " libxv"
-PE = "1"
diff --git a/meta-moblin/packages/xorg-app/xwd_1.0.1.bb b/meta-moblin/packages/xorg-app/xwd_1.0.1.bb
deleted file mode 100644
index 6a2e50162..000000000
--- a/meta-moblin/packages/xorg-app/xwd_1.0.1.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-require xorg-app-common.inc
-PE = "1"
-
-DEPENDS += " libxmu virtual/libx11"
diff --git a/meta-moblin/packages/xorg-app/xwud_1.0.1.bb b/meta-moblin/packages/xorg-app/xwud_1.0.1.bb
deleted file mode 100644
index 8a569b065..000000000
--- a/meta-moblin/packages/xorg-app/xwud_1.0.1.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-require xorg-app-common.inc
-PE = "1"
-
-DEPENDS += " virtual/libx11"
diff --git a/meta-moblin/packages/xorg-data/xbitmaps_1.0.1.bb b/meta-moblin/packages/xorg-data/xbitmaps_1.0.1.bb
deleted file mode 100644
index f622d769d..000000000
--- a/meta-moblin/packages/xorg-data/xbitmaps_1.0.1.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-data-common.inc
-
-DESCRIPTION = "Common X11 Bitmaps"
-LICENSE = "MIT"
-DEPENDS += "libxmu"
diff --git a/meta-moblin/packages/xorg-data/xorg-data-common.inc b/meta-moblin/packages/xorg-data/xorg-data-common.inc
deleted file mode 100644
index e12876339..000000000
--- a/meta-moblin/packages/xorg-data/xorg-data-common.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-HOMEPAGE = "http://www.x.org"
-SECTION = "x11/data"
-LICENSE = "MIT-X"
-
-XORG_PN = "${PN}"
-
-SRC_URI = "${XORG_MIRROR}/individual/data/${XORG_PN}-${PV}.tar.bz2"
-S = "${WORKDIR}/${XORG_PN}-${PV}"
-
-inherit autotools pkgconfig
--
cgit v1.2.3