xorg-font: Update for X11R7.0 and X11R7.1.

42 files changed, 250 insertions, 34 deletions

diff --git a/packages/xorg-font/encodings_X11R7.0-1.0.0.bb b/packages/xorg-font/encodings_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..00aafda3bf
--- /dev/null
+++ b/packages/xorg-font/encodings_X11R7.0-1.0.0.bb
@@ -0,0 +1,7 @@
+include xorg-font-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS = "mkfontscale-native"
+RDEPENDS = ""
+
diff --git a/packages/xorg-font/font-adobe-100dpi_X11R7.0-1.0.0.bb b/packages/xorg-font/font-adobe-100dpi_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..5ad12ba000
--- /dev/null
+++ b/packages/xorg-font/font-adobe-100dpi_X11R7.0-1.0.0.bb
@@ -0,0 +1,6 @@
+include xorg-font-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
+
diff --git a/packages/xorg-font/font-adobe-75dpi_X11R7.0-1.0.0.bb b/packages/xorg-font/font-adobe-75dpi_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..8f3721cab8
--- /dev/null
+++ b/packages/xorg-font/font-adobe-75dpi_X11R7.0-1.0.0.bb
@@ -0,0 +1,5 @@
+include xorg-font-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-font/font-adobe-utopia-100dpi_X11R7.0-1.0.1.bb b/packages/xorg-font/font-adobe-utopia-100dpi_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..7020e75d8c
--- /dev/null
+++ b/packages/xorg-font/font-adobe-utopia-100dpi_X11R7.0-1.0.1.bb
@@ -0,0 +1,5 @@
+include xorg-font-common.inc
+
+DESCRIPTION = "Adobe typeface software"
+
+#DEPENDS += " "
diff --git a/packages/xorg-font/font-adobe-utopia-75dpi_X11R7.0-1.0.1.bb b/packages/xorg-font/font-adobe-utopia-75dpi_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..1a385e386e
--- /dev/null
+++ b/packages/xorg-font/font-adobe-utopia-75dpi_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-font-common.inc
+
+DESCRIPTION = "Adobe typeface software"
+
+#DEPENDS += " "
+
diff --git a/packages/xorg-font/font-adobe-utopia-type1_X11R7.0-1.0.1.bb b/packages/xorg-font/font-adobe-utopia-type1_X11R7.0-1.0.1.bb
new file mode 100644
index 0000000000..1a385e386e
--- /dev/null
+++ b/packages/xorg-font/font-adobe-utopia-type1_X11R7.0-1.0.1.bb
@@ -0,0 +1,6 @@
+include xorg-font-common.inc
+
+DESCRIPTION = "Adobe typeface software"
+
+#DEPENDS += " "
+
diff --git a/packages/xorg-font/font-alias_X11R7.0-1.0.1.bb b/packages/xorg-font/font-alias_X11R7.0-1.0.1.bb
index f757dd39bf..02db64181a 100644
--- a/packages/xorg-font/font-alias_X11R7.0-1.0.1.bb
+++ b/packages/xorg-font/font-alias_X11R7.0-1.0.1.bb
@@ -1,4 +1,7 @@
-include font-common.inc
+include xorg-font-common.inc
+
+DESCRIPTION = "X font aliases."
+
+DEPENDS = "xserver-xorg font-util"
+RDEPENDS = "encodings font-util"
 
-DEPENDS = "mkfontscale"
-FILES_${PN} = "${libdir}/X11/fonts/*"
diff --git a/packages/xorg-font/font-arabic-misc_X11R7.0-1.0.0.bb b/packages/xorg-font/font-arabic-misc_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..8fcecc96be
--- /dev/null
+++ b/packages/xorg-font/font-arabic-misc_X11R7.0-1.0.0.bb
@@ -0,0 +1,7 @@
+include xorg-font-common.inc
+
+DESCRIPTION = "100dpi, 24 point (approximately) font to minimally support (almost) all \
+of the Arabic characters available in Unicode."
+
+#DEPENDS += " "
+
diff --git a/packages/xorg-font/font-bh-100dpi_X11R7.0-1.0.0.bb b/packages/xorg-font/font-bh-100dpi_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..8f3721cab8
--- /dev/null
+++ b/packages/xorg-font/font-bh-100dpi_X11R7.0-1.0.0.bb
@@ -0,0 +1,5 @@
+include xorg-font-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-font/font-bh-75dpi_X11R7.0-1.0.0.bb b/packages/xorg-font/font-bh-75dpi_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..8f3721cab8
--- /dev/null
+++ b/packages/xorg-font/font-bh-75dpi_X11R7.0-1.0.0.bb
@@ -0,0 +1,5 @@
+include xorg-font-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-font/font-bh-lucidatypewriter-100dpi_X11R7.0-1.0.0.bb b/packages/xorg-font/font-bh-lucidatypewriter-100dpi_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..8f3721cab8
--- /dev/null
+++ b/packages/xorg-font/font-bh-lucidatypewriter-100dpi_X11R7.0-1.0.0.bb
@@ -0,0 +1,5 @@
+include xorg-font-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-font/font-bh-lucidatypewriter-75dpi_X11R7.0-1.0.0.bb b/packages/xorg-font/font-bh-lucidatypewriter-75dpi_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..8f3721cab8
--- /dev/null
+++ b/packages/xorg-font/font-bh-lucidatypewriter-75dpi_X11R7.0-1.0.0.bb
@@ -0,0 +1,5 @@
+include xorg-font-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-font/font-bh-ttf_X11R7.0-1.0.0.bb b/packages/xorg-font/font-bh-ttf_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..8f3721cab8
--- /dev/null
+++ b/packages/xorg-font/font-bh-ttf_X11R7.0-1.0.0.bb
@@ -0,0 +1,5 @@
+include xorg-font-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-font/font-bh-type1_X11R7.0-1.0.0.bb b/packages/xorg-font/font-bh-type1_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..8f3721cab8
--- /dev/null
+++ b/packages/xorg-font/font-bh-type1_X11R7.0-1.0.0.bb
@@ -0,0 +1,5 @@
+include xorg-font-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-font/font-bitstream-100dpi_X11R7.0-1.0.0.bb b/packages/xorg-font/font-bitstream-100dpi_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..8f3721cab8
--- /dev/null
+++ b/packages/xorg-font/font-bitstream-100dpi_X11R7.0-1.0.0.bb
@@ -0,0 +1,5 @@
+include xorg-font-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-font/font-bitstream-75dpi_X11R7.0-1.0.0.bb b/packages/xorg-font/font-bitstream-75dpi_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..8f3721cab8
--- /dev/null
+++ b/packages/xorg-font/font-bitstream-75dpi_X11R7.0-1.0.0.bb
@@ -0,0 +1,5 @@
+include xorg-font-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-font/font-bitstream-speedo_X11R7.0-1.0.0.bb b/packages/xorg-font/font-bitstream-speedo_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..8f3721cab8
--- /dev/null
+++ b/packages/xorg-font/font-bitstream-speedo_X11R7.0-1.0.0.bb
@@ -0,0 +1,5 @@
+include xorg-font-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-font/font-bitstream-type1_X11R7.0-1.0.0.bb b/packages/xorg-font/font-bitstream-type1_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..8f3721cab8
--- /dev/null
+++ b/packages/xorg-font/font-bitstream-type1_X11R7.0-1.0.0.bb
@@ -0,0 +1,5 @@
+include xorg-font-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-font/font-cronyx-cyrillic_X11R7.0-1.0.0.bb b/packages/xorg-font/font-cronyx-cyrillic_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..8f3721cab8
--- /dev/null
+++ b/packages/xorg-font/font-cronyx-cyrillic_X11R7.0-1.0.0.bb
@@ -0,0 +1,5 @@
+include xorg-font-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-font/font-cursor-misc_X11R7.0-1.0.0.bb b/packages/xorg-font/font-cursor-misc_X11R7.0-1.0.0.bb
index a7b1ceaf0d..8f3721cab8 100644
--- a/packages/xorg-font/font-cursor-misc_X11R7.0-1.0.0.bb
+++ b/packages/xorg-font/font-cursor-misc_X11R7.0-1.0.0.bb
@@ -1,4 +1,5 @@
-include font-common.inc
+include xorg-font-common.inc
 
-DEPENDS = "bdftopcf font-util"
-FILES_${PN} = "${libdir}/X11/fonts/*"
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-font/font-daewoo-misc_X11R7.0-1.0.0.bb b/packages/xorg-font/font-daewoo-misc_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..8f3721cab8
--- /dev/null
+++ b/packages/xorg-font/font-daewoo-misc_X11R7.0-1.0.0.bb
@@ -0,0 +1,5 @@
+include xorg-font-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-font/font-dec-misc_X11R7.0-1.0.0.bb b/packages/xorg-font/font-dec-misc_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..8f3721cab8
--- /dev/null
+++ b/packages/xorg-font/font-dec-misc_X11R7.0-1.0.0.bb
@@ -0,0 +1,5 @@
+include xorg-font-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-font/font-ibm-type1_X11R7.0-1.0.0.bb b/packages/xorg-font/font-ibm-type1_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..8f3721cab8
--- /dev/null
+++ b/packages/xorg-font/font-ibm-type1_X11R7.0-1.0.0.bb
@@ -0,0 +1,5 @@
+include xorg-font-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-font/font-isas-misc_X11R7.0-1.0.0.bb b/packages/xorg-font/font-isas-misc_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..8f3721cab8
--- /dev/null
+++ b/packages/xorg-font/font-isas-misc_X11R7.0-1.0.0.bb
@@ -0,0 +1,5 @@
+include xorg-font-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-font/font-jis-misc_X11R7.0-1.0.0.bb b/packages/xorg-font/font-jis-misc_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..8f3721cab8
--- /dev/null
+++ b/packages/xorg-font/font-jis-misc_X11R7.0-1.0.0.bb
@@ -0,0 +1,5 @@
+include xorg-font-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-font/font-micro-misc_X11R7.0-1.0.0.bb b/packages/xorg-font/font-micro-misc_X11R7.0-1.0.0.bb
index 14022adaf9..9b876fb953 100644
--- a/packages/xorg-font/font-micro-misc_X11R7.0-1.0.0.bb
+++ b/packages/xorg-font/font-micro-misc_X11R7.0-1.0.0.bb
@@ -1,7 +1,7 @@
-include font-common.inc
+include xorg-font-common.inc
 
-DEPENDS = "bdftopcf font-util"
+#DESCRIPTION = ""
 
-FILES_${PN} = "${libdir}/X11/fonts/misc/*"
+#DEPENDS += " "
 
-EXTRA_OECONF = "--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4 --disable-iso8859-5 --disable-iso8859-6 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-12 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-15 --disable-iso8859-16 --disable-jisx0201 --disable-koi8-r" 
+-EXTRA_OECONF = "--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4 --disable-iso8859-5 --disable-iso8859-6 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-12 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-15 --disable-iso8859-16 --disable-jisx0201 --disable-koi8-r"
diff --git a/packages/xorg-font/font-misc-cyrillic_X11R7.0-1.0.0.bb b/packages/xorg-font/font-misc-cyrillic_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..8f3721cab8
--- /dev/null
+++ b/packages/xorg-font/font-misc-cyrillic_X11R7.0-1.0.0.bb
@@ -0,0 +1,5 @@
+include xorg-font-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-font/font-misc-ethiopic_X11R7.0-1.0.0.bb b/packages/xorg-font/font-misc-ethiopic_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..8f3721cab8
--- /dev/null
+++ b/packages/xorg-font/font-misc-ethiopic_X11R7.0-1.0.0.bb
@@ -0,0 +1,5 @@
+include xorg-font-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-font/font-misc-meltho_X11R7.0-1.0.0.bb b/packages/xorg-font/font-misc-meltho_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..f932b30872
--- /dev/null
+++ b/packages/xorg-font/font-misc-meltho_X11R7.0-1.0.0.bb
@@ -0,0 +1,6 @@
+include xorg-font-common.inc
+
+DESCRIPTION = "These fonts are designed for the display of Syriac text."
+
+#DEPENDS += " "
+
diff --git a/packages/xorg-font/font-misc-misc_X11R7.0-1.0.0.bb b/packages/xorg-font/font-misc-misc_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..8f3721cab8
--- /dev/null
+++ b/packages/xorg-font/font-misc-misc_X11R7.0-1.0.0.bb
@@ -0,0 +1,5 @@
+include xorg-font-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-font/font-mutt-misc_X11R7.0-1.0.0.bb b/packages/xorg-font/font-mutt-misc_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..c2812649ff
--- /dev/null
+++ b/packages/xorg-font/font-mutt-misc_X11R7.0-1.0.0.bb
@@ -0,0 +1,7 @@
+include xorg-font-common.inc
+
+DESCRIPTION = "Provides a 12pt, 100dpi proportional font with many of \
+the glyphs needed for Unicode text."
+
+#DEPENDS += " "
+
diff --git a/packages/xorg-font/font-schumacher-misc_X11R7.0-1.0.0.bb b/packages/xorg-font/font-schumacher-misc_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..8f3721cab8
--- /dev/null
+++ b/packages/xorg-font/font-schumacher-misc_X11R7.0-1.0.0.bb
@@ -0,0 +1,5 @@
+include xorg-font-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-font/font-screen-cyrillic_X11R7.0-1.0.0.bb b/packages/xorg-font/font-screen-cyrillic_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..8f3721cab8
--- /dev/null
+++ b/packages/xorg-font/font-screen-cyrillic_X11R7.0-1.0.0.bb
@@ -0,0 +1,5 @@
+include xorg-font-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-font/font-sony-misc_X11R7.0-1.0.0.bb b/packages/xorg-font/font-sony-misc_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..8f3721cab8
--- /dev/null
+++ b/packages/xorg-font/font-sony-misc_X11R7.0-1.0.0.bb
@@ -0,0 +1,5 @@
+include xorg-font-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-font/font-sun-misc_X11R7.0-1.0.0.bb b/packages/xorg-font/font-sun-misc_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..8f3721cab8
--- /dev/null
+++ b/packages/xorg-font/font-sun-misc_X11R7.0-1.0.0.bb
@@ -0,0 +1,5 @@
+include xorg-font-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-font/font-util-native_X11R7.0-1.0.0.bb b/packages/xorg-font/font-util-native_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..07a5659300
--- /dev/null
+++ b/packages/xorg-font/font-util-native_X11R7.0-1.0.0.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "X font utils."
+SECTION = "x11/fonts"
+LICENSE = "MIT-X"
+
+S="${WORKDIR}/font-util-${PV}"
+
+DEPENDS = "bdftopcf-native"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/font/font-util-${PV}.tar.gz"
+
+inherit native autotools pkgconfig 
diff --git a/packages/xorg-font/font-util-native_X11R7.1-1.0.1.bb b/packages/xorg-font/font-util-native_X11R7.1-1.0.1.bb
new file mode 100644
index 0000000000..07a5659300
--- /dev/null
+++ b/packages/xorg-font/font-util-native_X11R7.1-1.0.1.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "X font utils."
+SECTION = "x11/fonts"
+LICENSE = "MIT-X"
+
+S="${WORKDIR}/font-util-${PV}"
+
+DEPENDS = "bdftopcf-native"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/font/font-util-${PV}.tar.gz"
+
+inherit native autotools pkgconfig 
diff --git a/packages/xorg-font/font-util_X11R7.0-1.0.0.bb b/packages/xorg-font/font-util_X11R7.0-1.0.0.bb
index 5bbf7e0809..17986ecffe 100644
--- a/packages/xorg-font/font-util_X11R7.0-1.0.0.bb
+++ b/packages/xorg-font/font-util_X11R7.0-1.0.0.bb
@@ -1,5 +1,7 @@
-include font-common.inc
+include xorg-font-common.inc
 
-DEPENDS = "bdftopcf"
+DESCRIPTION = "X font utils."
+
+DEPENDS = "encodings"
+RDEPENDS = "encodings"
 
-FILES_${PN} = "${bindir}/* ${libdir}/X11/fonts/util/*"
diff --git a/packages/xorg-font/font-util_X11R7.1-1.0.1.bb b/packages/xorg-font/font-util_X11R7.1-1.0.1.bb
new file mode 100644
index 0000000000..17986ecffe
--- /dev/null
+++ b/packages/xorg-font/font-util_X11R7.1-1.0.1.bb
@@ -0,0 +1,7 @@
+include xorg-font-common.inc
+
+DESCRIPTION = "X font utils."
+
+DEPENDS = "encodings"
+RDEPENDS = "encodings"
+
diff --git a/packages/xorg-font/font-winitzki-cyrillic_X11R7.0-1.0.0.bb b/packages/xorg-font/font-winitzki-cyrillic_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..8f3721cab8
--- /dev/null
+++ b/packages/xorg-font/font-winitzki-cyrillic_X11R7.0-1.0.0.bb
@@ -0,0 +1,5 @@
+include xorg-font-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-font/font-xfree86-type1_X11R7.0-1.0.0.bb b/packages/xorg-font/font-xfree86-type1_X11R7.0-1.0.0.bb
new file mode 100644
index 0000000000..8f3721cab8
--- /dev/null
+++ b/packages/xorg-font/font-xfree86-type1_X11R7.0-1.0.0.bb
@@ -0,0 +1,5 @@
+include xorg-font-common.inc
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
diff --git a/packages/xorg-font/xorg-font-common.inc b/packages/xorg-font/xorg-font-common.inc
index 37d478bdc6..38fd1af5a5 100644
--- a/packages/xorg-font/xorg-font-common.inc
+++ b/packages/xorg-font/xorg-font-common.inc
@@ -1,31 +1,32 @@
-DESCRIPTION = "X font files"
+HOMEPAGE = "http://www.x.org"
 SECTION = "x11/fonts"
-LICENSE= "MIT-X"
+#MAINTAINER = ""
+LICENSE = "MIT-X"
 
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/font/${PN}-X11R7.0-${PV}.tar.bz2"
-S = "${WORKDIR}/${PN}-X11R7.0-${PV}"
-FONT_DIR = "${datadir}/share/fonts"
-DEPENDS = "encodings mkfontscale mkfontdir"
+DEPENDS = " encodings font-alias font-util-native mkfontdir-native mkfontscale-native"
+RDEPENDS = "encodings font-util font-alias"
+
+XORG_PN = "${PN}"
+SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/font/${XORG_PN}-${PV}.tar.gz"
+S = "${WORKDIR}/${XORG_PN}-${PV}"
 
 inherit autotools pkgconfig
 
-do_stage () {
-	autotools_stage_all
-}
+FILES_${PN} += " ${libdir}/X11/fonts"
 
+do_install_append() {
+	find ${D}${libdir}/X11/fonts -type f -name fonts.dir | xargs rm -f
+	find ${D}${libdir}/X11/fonts -type f -name fonts.scale | xargs rm -f
+}
 
-FILES_${PN} += " ${libdir}/X11/fonts/*.gz ${libdir}/X11/fonts/*/*.gz"
+do_stage() {
+	autotools_stage_all
+}
 
 pkg_postinst_${PN} () {
-
-        if [ "x$D" != "x" ]; then
-                exit 1
-        fi
-
-        for fontdir in /usr/lib/X11/fonts/* /usr/lib/X11/fonts/*/*  ; do
-                if test -d $fontdir ; then
-                        mkfontdir $fontdir
-                        mkfontscale $fontdir
-                fi
-        done
+	set -x
+	for fontdir in `find $D/usr/lib/X11/fonts -type d`; do 
+		mkfontdir $fontdir
+		mkfontscale $fontdir
+	done
 }