10 files changed, 47 insertions, 4 deletions
diff --git a/packages/xorg-app/mkfontdir-native_1.0.3.bb b/packages/xorg-app/mkfontdir-native_1.0.3.bb
index 2753b185ba..1c62b85a1d 100644
--- a/packages/xorg-app/mkfontdir-native_1.0.3.bb
+++ b/packages/xorg-app/mkfontdir-native_1.0.3.bb
@@ -6,6 +6,6 @@ PR = "r1"
 PE = "1"
 
 S = "${WORKDIR}/mkfontdir-${PV}"
-SRC_URI = "${XORG_MIRROR}/X11R7.1/src/app/mkfontdir-${PV}.tar.bz2"
+SRC_URI = "${XORG_MIRROR}/individual/app/mkfontdir-${PV}.tar.bz2"
 
 inherit native autotools pkgconfig
diff --git a/packages/xorg-app/mkfontscale-native_1.0.3.bb b/packages/xorg-app/mkfontscale-native_1.0.3.bb
new file mode 100644
index 0000000000..0b3578ec11
--- /dev/null
+++ b/packages/xorg-app/mkfontscale-native_1.0.3.bb
@@ -0,0 +1,10 @@
+DESCRIPTION = "X mkfontscale app"
+SECTION = "x11/applications"
+LICENSE = "MIT-X"
+S="${WORKDIR}/mkfontscale-${PV}"
+
+DEPENDS = "libx11-native libfontenc-native freetype-native"
+
+SRC_URI = "${XORG_MIRROR}/individual/app/mkfontscale-${PV}.tar.bz2"
+
+inherit native autotools pkgconfig
diff --git a/packages/xorg-app/mkfontscale_1.0.3.bb b/packages/xorg-app/mkfontscale_1.0.3.bb
new file mode 100644
index 0000000000..2f5eab7d63
--- /dev/null
+++ b/packages/xorg-app/mkfontscale_1.0.3.bb
@@ -0,0 +1,6 @@
+require xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " zlib libfontenc freetype virtual/libx11"
+
diff --git a/packages/xorg-app/xdm_1.1.4.bb b/packages/xorg-app/xdm_1.1.4.bb
index 7b4195e3d8..5df9fdd7bf 100644
--- a/packages/xorg-app/xdm_1.1.4.bb
+++ b/packages/xorg-app/xdm_1.1.4.bb
@@ -3,6 +3,6 @@ PE = "1"
 
 DESCRIPTION = "X display manager"
 
-DEPENDS += " libxmu libxinerama libxpm libxdmcp libxau virtual/libx11 libxext libxdmcp libxt"
+DEPENDS += " libxmu libxinerama libxpm libxdmcp libxau virtual/libx11 libxext libxdmcp libxt libxaw"
 
 EXTRA_OECONF += " --with-random-device=/dev/urandom"
diff --git a/packages/xorg-app/xdm_1.1.6.bb b/packages/xorg-app/xdm_1.1.6.bb
index 1520a903ad..eb153b1da9 100644
--- a/packages/xorg-app/xdm_1.1.6.bb
+++ b/packages/xorg-app/xdm_1.1.6.bb
@@ -3,7 +3,7 @@ PE = "1"
 
 DESCRIPTION = "X display manager"
 
-DEPENDS += " libxmu libxinerama libxpm libxdmcp libxau virtual/libx11 libxext libxdmcp libxt"
+DEPENDS += " libxmu libxinerama libxpm libxdmcp libxau virtual/libx11 libxext libxdmcp libxt libxaw"
 
 EXTRA_OECONF += " --with-random-device=/dev/urandom"
 
diff --git a/packages/xorg-app/xkbcomp-native_1.0.3.bb b/packages/xorg-app/xkbcomp-native_1.0.3.bb
new file mode 100644
index 0000000000..ee7c25c407
--- /dev/null
+++ b/packages/xorg-app/xkbcomp-native_1.0.3.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "The X Keyboard Extension essentially replaces the core protocol definition of keyboard."
+
+SECTION = "x11/applications"
+LICENSE = "MIT-X"
+S="${WORKDIR}/xkbcomp-${PV}"
+
+DEPENDS = "libx11-native libxkbfile-native"
+
+SRC_URI = "${XORG_MIRROR}/individual/app/xkbcomp-${PV}.tar.bz2"
+
+inherit native autotools pkgconfig
diff --git a/packages/xorg-app/xkbcomp_1.0.3.bb b/packages/xorg-app/xkbcomp_1.0.3.bb
new file mode 100644
index 0000000000..ca6cdb8898
--- /dev/null
+++ b/packages/xorg-app/xkbcomp_1.0.3.bb
@@ -0,0 +1,5 @@
+require xorg-app-common.inc
+
+DESCRIPTION = "The X Keyboard Extension essentially replaces the core protocol definition of keyboard."
+
+DEPENDS += " virtual/libx11 libxkbfile"
diff --git a/packages/xorg-app/xkbutils_1.0.1.bb b/packages/xorg-app/xkbutils_1.0.1.bb
new file mode 100644
index 0000000000..15ce7e6011
--- /dev/null
+++ b/packages/xorg-app/xkbutils_1.0.1.bb
@@ -0,0 +1,6 @@
+require xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libxaw libxkbfile virtual/libx11"
+
diff --git a/packages/xorg-app/xlsfonts_1.0.1.bb b/packages/xorg-app/xlsfonts_1.0.1.bb
new file mode 100644
index 0000000000..c84456cd48
--- /dev/null
+++ b/packages/xorg-app/xlsfonts_1.0.1.bb
@@ -0,0 +1,5 @@
+require xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " virtual/libx11"
diff --git a/packages/xorg-app/xterm_207.bb b/packages/xorg-app/xterm_207.bb
index 8c940bd2e8..547b42d0f1 100644
--- a/packages/xorg-app/xterm_207.bb
+++ b/packages/xorg-app/xterm_207.bb
@@ -11,7 +11,7 @@ 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 --disable-imake"
+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