font-alias, font-cursor-misc font-misc-misc, font-util: merge from #870

6 files changed, 50 insertions, 0 deletions

diff --git a/packages/xorg-fonts/.mtn2git_empty b/packages/xorg-fonts/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xorg-fonts/.mtn2git_empty
diff --git a/packages/xorg-fonts/font-alias_1.0.1.bb b/packages/xorg-fonts/font-alias_1.0.1.bb
new file mode 100644
index 0000000000..f757dd39bf
--- /dev/null
+++ b/packages/xorg-fonts/font-alias_1.0.1.bb
@@ -0,0 +1,4 @@
+include font-common.inc
+
+DEPENDS = "mkfontscale"
+FILES_${PN} = "${libdir}/X11/fonts/*"
diff --git a/packages/xorg-fonts/font-common.inc b/packages/xorg-fonts/font-common.inc
new file mode 100644
index 0000000000..0acd27406a
--- /dev/null
+++ b/packages/xorg-fonts/font-common.inc
@@ -0,0 +1,30 @@
+DESCRIPTION = "X font files"
+SECTION = "x11/fonts"
+LICENSE= "MIT-X"
+
+SRC_URI = "${XORG_MIRROR}/X11R7.0/src/font/${PN}-${PV}.tar.bz2"
+FONT_DIR = "${datadir}/share/fonts"
+DEPENDS = "encodings mkfontscale mkfontdir"
+
+inherit autotools pkgconfig
+
+do_stage () {
+	autotools_stage_all
+}
+
+
+FILES_${PN} += " ${libdir}/X11/fonts/*.gz ${libdir}/X11/fonts/*/*.gz"
+
+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
+}
diff --git a/packages/xorg-fonts/font-cursor-misc_1.0.0.bb b/packages/xorg-fonts/font-cursor-misc_1.0.0.bb
new file mode 100644
index 0000000000..a7b1ceaf0d
--- /dev/null
+++ b/packages/xorg-fonts/font-cursor-misc_1.0.0.bb
@@ -0,0 +1,4 @@
+include font-common.inc
+
+DEPENDS = "bdftopcf font-util"
+FILES_${PN} = "${libdir}/X11/fonts/*"
diff --git a/packages/xorg-fonts/font-misc-misc_1.0.0.bb b/packages/xorg-fonts/font-misc-misc_1.0.0.bb
new file mode 100644
index 0000000000..14022adaf9
--- /dev/null
+++ b/packages/xorg-fonts/font-misc-misc_1.0.0.bb
@@ -0,0 +1,7 @@
+include font-common.inc
+
+DEPENDS = "bdftopcf font-util"
+
+FILES_${PN} = "${libdir}/X11/fonts/misc/*"
+
+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-fonts/font-util_1.0.0.bb b/packages/xorg-fonts/font-util_1.0.0.bb
new file mode 100644
index 0000000000..5bbf7e0809
--- /dev/null
+++ b/packages/xorg-fonts/font-util_1.0.0.bb
@@ -0,0 +1,5 @@
+include font-common.inc
+
+DEPENDS = "bdftopcf"
+
+FILES_${PN} = "${bindir}/* ${libdir}/X11/fonts/util/*"