rename packages/ to recipes/ per earlier agreement

See links below for more details:
http://thread.gmane.org/gmane.comp.handhelds.openembedded/21326
http://thread.gmane.org/gmane.comp.handhelds.openembedded/21816

Signed-off-by: Denys Dmytriyenko <denis@denix.org>
Acked-by: Mike Westerhof <mwester@dls.net>
Acked-by: Philip Balister <philip@balister.org>
Acked-by: Khem Raj <raj.khem@gmail.com>
Acked-by: Marcin Juszkiewicz <hrw@openembedded.org>
Acked-by: Koen Kooi <koen@openembedded.org>
Acked-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>

18 files changed, 424 insertions, 0 deletions

diff --git a/recipes/fontconfig/files/01fc-cache b/recipes/fontconfig/files/01fc-cache
new file mode 100644
index 0000000000..963aaec8ca
--- /dev/null
+++ b/recipes/fontconfig/files/01fc-cache
@@ -0,0 +1,4 @@
+#!/bin/sh
+# Author: Rolf Leggewie
+
+fc-cache
diff --git a/recipes/fontconfig/files/local.conf b/recipes/fontconfig/files/local.conf
new file mode 100644
index 0000000000..d678878f3e
--- /dev/null
+++ b/recipes/fontconfig/files/local.conf
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<!-- /etc/fonts/local.conf file for local customizations -->
+<fontconfig>
+<!--
+  Enable sub-pixel rendering
+	<match target="font">
+		<test qual="all" name="rgba">
+			<const>unknown</const>
+		</test>
+		<edit name="rgba" mode="assign"><const>rgb</const></edit>
+	</match>
+-->
+
+<!-- X11R7.0 installs fonts to a new location -->
+	<dir>/usr/lib/X11/fonts/misc</dir>
+	<dir>/usr/lib/X11/fonts/Type1</dir>
+	<dir>/usr/lib/X11/fonts/75dpi</dir>
+</fontconfig>
diff --git a/recipes/fontconfig/files/one-j-too-many.patch b/recipes/fontconfig/files/one-j-too-many.patch
new file mode 100644
index 0000000000..04d8e0237e
--- /dev/null
+++ b/recipes/fontconfig/files/one-j-too-many.patch
@@ -0,0 +1,24 @@
+--- fontconfig-2.3.95/src/fcname.c.orig	2006-07-26 15:20:01.469770388 +0200
++++ fontconfig-2.3.95/src/fcname.c	2006-07-26 15:22:38.415239062 +0200
+@@ -305,17 +305,16 @@
+ FcObjectPtrU (FcObjectPtr si)
+ {
+     const FcObjectTypeList  *l;
+-    int i, j;
++    int i;
+ 
+     if (si > 0)
+     {
+         if (si < biggest_known_ntypes)
+             return biggest_known_types[si].object;
+ 
+-        j = 0;
+         for (l = _FcObjectTypes; l; l = l->next)
+-            for (i = 0; i < l->ntypes; i++, j++)
+-                if (j == si)
++            for (i = 0; i < l->ntypes; i++)
++                if (l->basic_offset+i == si)
+                     return l->types[i].object;
+     }
+ 
+
diff --git a/recipes/fontconfig/fontconfig-2.2.95/fc-glyphname.patch b/recipes/fontconfig/fontconfig-2.2.95/fc-glyphname.patch
new file mode 100644
index 0000000000..1afd9324ff
--- /dev/null
+++ b/recipes/fontconfig/fontconfig-2.2.95/fc-glyphname.patch
@@ -0,0 +1,19 @@
+--- fontconfig/fc-glyphname/Makefile.am~	2004-04-14 17:06:35.000000000 +0100
++++ fontconfig/fc-glyphname/Makefile.am	2004-05-15 11:41:35.000000000 +0100
+@@ -27,6 +27,7 @@
+ TMPL=fcglyphname.tmpl.h
+ STMPL=${top_srcdir}/fc-glyphname/${TMPL}
+ TARG=fcglyphname.h
++FC_GLYPHNAME=./fc-glyphname
+ 
+ noinst_PROGRAMS=fc-glyphname
+ 
+@@ -41,7 +42,7 @@
+ 
+ $(TARG): $(STMPL) fc-glyphname $(SGLYPHNAME)
+ 	rm -f $(TARG)
+-	./fc-glyphname $(SGLYPHNAME) < $(STMPL) > $(TARG)
++	$(FC_GLYPHNAME) $(SGLYPHNAME) < $(STMPL) > $(TARG)
+ 
+ CLEANFILES=$(TARG)
+ 
diff --git a/recipes/fontconfig/fontconfig-2.2.95/fc-lang.patch b/recipes/fontconfig/fontconfig-2.2.95/fc-lang.patch
new file mode 100644
index 0000000000..d08242a377
--- /dev/null
+++ b/recipes/fontconfig/fontconfig-2.2.95/fc-lang.patch
@@ -0,0 +1,18 @@
+--- fontconfig/fc-lang/Makefile.am~	2004-04-14 17:06:36.000000000 +0100
++++ fontconfig/fc-lang/Makefile.am	2004-05-15 11:22:44.000000000 +0100
+@@ -27,6 +27,7 @@
+ TMPL=fclang.tmpl.h
+ STMPL=${top_srcdir}/fc-lang/fclang.tmpl.h
+ TARG=fclang.h
++FC_LANG=./fc-lang
+ 
+ noinst_PROGRAMS=fc-lang
+ 
+@@ -40,6 +41,6 @@
+ 
+ $(TARG):$(ORTH) fc-lang $(STMPL)
+ 	rm -f $(TARG)
+-	./fc-lang -d ${srcdir} $(ORTH) < $(STMPL) > $(TARG)
++	$(FC_LANG) -d ${srcdir} $(ORTH) < $(STMPL) > $(TARG)
+ 
+ CLEANFILES=$(TARG)
diff --git a/recipes/fontconfig/fontconfig-2.3.91/fc-glyphname.patch b/recipes/fontconfig/fontconfig-2.3.91/fc-glyphname.patch
new file mode 100644
index 0000000000..b62bdda0ca
--- /dev/null
+++ b/recipes/fontconfig/fontconfig-2.3.91/fc-glyphname.patch
@@ -0,0 +1,19 @@
+--- /tmp/Makefile.am	2006-04-25 15:46:09.236249864 +0200
++++ fontconfig-2.3.94/fc-glyphname/Makefile.am	2006-04-25 15:46:39.175698376 +0200
+@@ -31,6 +31,7 @@
+ TMPL=fcglyphname.tmpl.h
+ STMPL=${top_srcdir}/fc-glyphname/${TMPL}
+ TARG=fcglyphname.h
++FC_GLYPHNAME=./fc-glyphname
+ 
+ noinst_PROGRAMS=fc-glyphname
+ 
+@@ -45,7 +46,7 @@
+ 
+ $(TARG): $(STMPL) fc-glyphname$(EXEEXT) $(SGLYPHNAME)
+ 	rm -f $(TARG)
+-	./fc-glyphname$(EXEEXT) $(SGLYPHNAME) < $(STMPL) > $(TARG)
++	$(FC_GLYPHNAME)$(EXEEXT) $(SGLYPHNAME) < $(STMPL) > $(TARG)
+ 
+ CLEANFILES=$(TARG)
+ 
diff --git a/recipes/fontconfig/fontconfig-2.3.91/fc-lang.patch b/recipes/fontconfig/fontconfig-2.3.91/fc-lang.patch
new file mode 100644
index 0000000000..533f3249a8
--- /dev/null
+++ b/recipes/fontconfig/fontconfig-2.3.91/fc-lang.patch
@@ -0,0 +1,18 @@
+--- /tmp/Makefile.am	2006-04-25 15:47:49.313035880 +0200
++++ fontconfig-2.3.94/fc-lang/Makefile.am	2006-04-25 15:48:22.807943880 +0200
+@@ -31,6 +31,7 @@
+ TMPL=fclang.tmpl.h
+ STMPL=${top_srcdir}/fc-lang/fclang.tmpl.h
+ TARG=fclang.h
++FC_LANG=./fc-lang
+ 
+ noinst_PROGRAMS=fc-lang
+ 
+@@ -44,6 +45,6 @@
+ 
+ $(TARG):$(ORTH) fc-lang${EXEEXT} $(STMPL)
+ 	rm -f $(TARG)
+-	./fc-lang${EXEEXT} -d ${srcdir} $(ORTH) < $(STMPL) > $(TARG)
++	$(FC_LANG)${EXEEXT} -d ${srcdir} $(ORTH) < $(STMPL) > $(TARG)
+ 
+ CLEANFILES=$(TARG)
diff --git a/recipes/fontconfig/fontconfig-2.4.1/configure_fix.patch b/recipes/fontconfig/fontconfig-2.4.1/configure_fix.patch
new file mode 100644
index 0000000000..6d6fa25b5a
--- /dev/null
+++ b/recipes/fontconfig/fontconfig-2.4.1/configure_fix.patch
@@ -0,0 +1,14 @@
+Libtool 2.2.2 requires this is used with AC_SUBST
+
+RP - 14/4/08
+
+--- /tmp/configure.in	2008-06-02 15:21:22.254641651 +0200
++++ fontconfig-2.4.1/configure.in	2008-06-02 15:21:48.485061892 +0200
+@@ -46,6 +46,7 @@
+ AC_SUBST(LT_CURRENT)
+ AC_SUBST(LT_REVISION)
+ LT_AGE=1
++AC_SUBST(LT_AGE)
+ 
+ LT_VERSION_INFO="$LT_CURRENT:$LT_REVISION:$LT_AGE"
+ AC_SUBST(LT_VERSION_INFO)
diff --git a/recipes/fontconfig/fontconfig-2.6.0/fix-pkgconfig.patch b/recipes/fontconfig/fontconfig-2.6.0/fix-pkgconfig.patch
new file mode 100644
index 0000000000..17b85f758d
--- /dev/null
+++ b/recipes/fontconfig/fontconfig-2.6.0/fix-pkgconfig.patch
@@ -0,0 +1,15 @@
+---
+ fontconfig.pc.in |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- fontconfig-2.6.0.orig/fontconfig.pc.in
++++ fontconfig-2.6.0/fontconfig.pc.in
+@@ -5,7 +5,7 @@ includedir=@includedir@
+ 
+ Name: Fontconfig
+ Description: Font configuration and customization library
+ Version: @VERSION@
+ Libs: -L${libdir} -lfontconfig
+-Libs.private: @EXPAT_LIBS@ @FREETYPE_LIBS@
++Libs.private: @EXPAT_LIBS@ -L${libdir} -lfreetype
+ Cflags: -I${includedir}
diff --git a/recipes/fontconfig/fontconfig-native_2.2.95.bb b/recipes/fontconfig/fontconfig-native_2.2.95.bb
new file mode 100644
index 0000000000..541b74634c
--- /dev/null
+++ b/recipes/fontconfig/fontconfig-native_2.2.95.bb
@@ -0,0 +1,15 @@
+SECTION = "base"
+LICENSE = "BSD"
+require fontconfig_${PV}.bb
+inherit native
+DEPENDS = "freetype-native expat-native zlib-native"
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/fontconfig-${PV}"
+
+EXTRA_OEMAKE = ""
+EXTRA_OECONF = "${@[' --disable-docs',' --disable-docs --with-freetype-config=%s/freetype-config' % bb.data.getVar('STAGING_BINDIR', d, 1)][os.path.isfile('%s/freetype-config' % bb.data.getVar('STAGING_BINDIR', d, 1))]}"
+
+do_stage () {
+	oe_runmake install
+	install fc-lang/fc-lang ${STAGING_BINDIR}
+	install fc-glyphname/fc-glyphname ${STAGING_BINDIR}
+}
diff --git a/recipes/fontconfig/fontconfig-native_2.3.91.bb b/recipes/fontconfig/fontconfig-native_2.3.91.bb
new file mode 100644
index 0000000000..541b74634c
--- /dev/null
+++ b/recipes/fontconfig/fontconfig-native_2.3.91.bb
@@ -0,0 +1,15 @@
+SECTION = "base"
+LICENSE = "BSD"
+require fontconfig_${PV}.bb
+inherit native
+DEPENDS = "freetype-native expat-native zlib-native"
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/fontconfig-${PV}"
+
+EXTRA_OEMAKE = ""
+EXTRA_OECONF = "${@[' --disable-docs',' --disable-docs --with-freetype-config=%s/freetype-config' % bb.data.getVar('STAGING_BINDIR', d, 1)][os.path.isfile('%s/freetype-config' % bb.data.getVar('STAGING_BINDIR', d, 1))]}"
+
+do_stage () {
+	oe_runmake install
+	install fc-lang/fc-lang ${STAGING_BINDIR}
+	install fc-glyphname/fc-glyphname ${STAGING_BINDIR}
+}
diff --git a/recipes/fontconfig/fontconfig-native_2.6.0.bb b/recipes/fontconfig/fontconfig-native_2.6.0.bb
new file mode 100644
index 0000000000..541b74634c
--- /dev/null
+++ b/recipes/fontconfig/fontconfig-native_2.6.0.bb
@@ -0,0 +1,15 @@
+SECTION = "base"
+LICENSE = "BSD"
+require fontconfig_${PV}.bb
+inherit native
+DEPENDS = "freetype-native expat-native zlib-native"
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/fontconfig-${PV}"
+
+EXTRA_OEMAKE = ""
+EXTRA_OECONF = "${@[' --disable-docs',' --disable-docs --with-freetype-config=%s/freetype-config' % bb.data.getVar('STAGING_BINDIR', d, 1)][os.path.isfile('%s/freetype-config' % bb.data.getVar('STAGING_BINDIR', d, 1))]}"
+
+do_stage () {
+	oe_runmake install
+	install fc-lang/fc-lang ${STAGING_BINDIR}
+	install fc-glyphname/fc-glyphname ${STAGING_BINDIR}
+}
diff --git a/recipes/fontconfig/fontconfig.inc b/recipes/fontconfig/fontconfig.inc
new file mode 100644
index 0000000000..e55fa8c768
--- /dev/null
+++ b/recipes/fontconfig/fontconfig.inc
@@ -0,0 +1,43 @@
+DESCRIPTION = "A library for configuring and customizing font access."
+SECTION = "libs"
+LICENSE = "BSD"
+DEPENDS = "expat freetype freetype-native zlib"
+
+PR = "r1"
+# Work around past breakage in debian.bbclass
+RPROVIDES_fontconfig-utils = "libfontconfig-utils"
+RREPLACES_fontconfig-utils = "libfontconfig-utils"
+RCONFLICTS_fontconfig-utils = "libfontconfig-utils"
+DEBIAN_NOAUTONAME_fontconfig-utils = "1"
+
+SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz \
+           file://01fc-cache"
+
+S = "${WORKDIR}/fontconfig-${PV}"
+
+inherit autotools pkgconfig
+
+export HASDOCBOOK="no"
+
+EXTRA_OECONF = " --disable-docs --with-cache-dir=/var/lib/fontconfig"
+EXTRA_OEMAKE = "FC_LANG=fc-lang FC_GLYPHNAME=fc-glyphname"
+
+# The tarball has some of the patched files as read only, which
+# patch doesn't like at all
+
+fontconfig_do_unpack() {
+       chmod -R u+rw ${S}
+}
+
+python do_unpack () {
+       bb.build.exec_func('base_do_unpack', d)
+       bb.build.exec_func('fontconfig_do_unpack', d)
+}
+
+fontconfig-utils_do_install_prepend() {
+        install -m 0755 ${WORKDIR}/01fc-cache ${D}${sysconfdir}/update-fonts-common.d/
+}
+
+PACKAGES =+ "fontconfig-utils-dbg fontconfig-utils "
+FILES_fontconfig-utils-dbg += "${bindir}/*.dbg"
+FILES_fontconfig-utils = "${bindir}/*"
diff --git a/recipes/fontconfig/fontconfig_2.2.95.bb b/recipes/fontconfig/fontconfig_2.2.95.bb
new file mode 100644
index 0000000000..d1aab24951
--- /dev/null
+++ b/recipes/fontconfig/fontconfig_2.2.95.bb
@@ -0,0 +1,22 @@
+require fontconfig.inc
+
+DEPENDS += "fontconfig-native"
+
+SRC_URI += "file://fc-glyphname.patch;patch=1 \
+           file://fc-lang.patch;patch=1 \
+	   file://local.conf"
+PR = "r8"
+
+do_stage () {
+	oe_libinstall -so -a -C src libfontconfig ${STAGING_LIBDIR}
+	install -d ${STAGING_INCDIR}/fontconfig
+	for i in ${S}/fontconfig/*.h; do install -m 0644 $i ${STAGING_INCDIR}/fontconfig/; done
+}
+
+do_install () {
+	autotools_do_install
+
+	install -d ${D}/etc/fonts/
+	install -m 0644 ${WORKDIR}/local.conf ${D}/etc/fonts/
+}
+
diff --git a/recipes/fontconfig/fontconfig_2.3.91.bb b/recipes/fontconfig/fontconfig_2.3.91.bb
new file mode 100644
index 0000000000..ec6ef8e037
--- /dev/null
+++ b/recipes/fontconfig/fontconfig_2.3.91.bb
@@ -0,0 +1,24 @@
+require fontconfig.inc
+
+DEPENDS += "fontconfig-native"
+
+SRC_URI += "file://fc-glyphname.patch;patch=1 \
+           file://fc-lang.patch;patch=1 \
+           file://one-j-too-many.patch;patch=1 \
+           file://local.conf"
+
+PR = "r3"
+
+do_stage () {
+	oe_libinstall -so -a -C src libfontconfig ${STAGING_LIBDIR}
+	install -d ${STAGING_INCDIR}/fontconfig
+	for i in ${S}/fontconfig/*.h; do install -m 0644 $i ${STAGING_INCDIR}/fontconfig/; done
+}
+
+do_install () {
+	autotools_do_install
+
+	install -d ${D}/etc/fonts/
+	install -m 0644 ${WORKDIR}/local.conf ${D}/etc/fonts/
+}
+
diff --git a/recipes/fontconfig/fontconfig_2.3.95.bb b/recipes/fontconfig/fontconfig_2.3.95.bb
new file mode 100644
index 0000000000..035f8467ed
--- /dev/null
+++ b/recipes/fontconfig/fontconfig_2.3.95.bb
@@ -0,0 +1,16 @@
+require fontconfig.inc
+
+SRC_URI += "file://one-j-too-many.patch;patch=1"
+
+PR = "r2"
+
+do_stage () {
+	oe_libinstall -so -a -C src libfontconfig ${STAGING_LIBDIR}
+	install -d ${STAGING_INCDIR}/fontconfig
+	for i in ${S}/fontconfig/*.h; do install -m 0644 $i ${STAGING_INCDIR}/fontconfig/; done
+}
+
+do_install () {
+	autotools_do_install
+}
+
diff --git a/recipes/fontconfig/fontconfig_2.4.1.bb b/recipes/fontconfig/fontconfig_2.4.1.bb
new file mode 100644
index 0000000000..c1d861cfb9
--- /dev/null
+++ b/recipes/fontconfig/fontconfig_2.4.1.bb
@@ -0,0 +1,46 @@
+require fontconfig.inc
+
+PR = "r3"
+
+SRC_URI += "https://stage.maemo.org/svn/maemo/projects/haf/trunk/fontconfig/device_symbols.h \
+	    file://configure_fix.patch;patch=1 "
+
+EXTRA_OECONF += " --with-arch=${HOST_ARCH}"
+
+do_stage () {
+	cp ${WORKDIR}/device_symbols.h ${S}/fontconfig/
+	oe_libinstall -so -a -C src libfontconfig ${STAGING_LIBDIR}
+	install -d ${STAGING_INCDIR}/fontconfig
+	for i in ${S}/fontconfig/*.h; do install -m 0644 $i ${STAGING_INCDIR}/fontconfig/; done
+        ln -sf ${STAGING_INCDIR}/fontconfig/device_symbols.h ${STAGING_INCDIR}
+}
+
+BUILD_CFLAGS += " -I${STAGING_INCDIR_NATIVE}/freetype2"
+
+do_configure_append () {
+	sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-case/Makefile
+	sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-glyphname/Makefile
+	sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-lang/Makefile
+	sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-arch/Makefile
+
+	sed -i 's|CFLAGS =.*|CFLAGS =${BUILD_CFLAGS}|' fc-case/Makefile
+	sed -i 's|CFLAGS =.*|CFLAGS =${BUILD_CFLAGS}|' fc-glyphname/Makefile
+	sed -i 's|CFLAGS =.*|CFLAGS =${BUILD_CFLAGS}|' fc-lang/Makefile
+	sed -i 's|CFLAGS =.*|CFLAGS =${BUILD_CFLAGS}|' fc-arch/Makefile
+
+	sed -i 's|CPPFLAGS =.*|CPPFLAGS =${BUILD_CPPFLAGS}|' fc-case/Makefile
+	sed -i 's|CPPFLAGS =.*|CPPFLAGS =${BUILD_CPPFLAGS}|' fc-glyphname/Makefile
+	sed -i 's|CPPFLAGS =.*|CPPFLAGS =${BUILD_CPPFLAGS}|' fc-lang/Makefile
+	sed -i 's|CPPFLAGS =.*|CPPFLAGS =${BUILD_CPPFLAGS}|' fc-arch/Makefile
+
+	sed -i 's|CXXFLAGS =.*|CFLAGS =${BUILD_CXXFLAGS}|' fc-case/Makefile
+	sed -i 's|CXXFLAGS =.*|CFLAGS =${BUILD_CXXFLAGS}|' fc-glyphname/Makefile
+	sed -i 's|CXXFLAGS =.*|CFLAGS =${BUILD_CXXFLAGS}|' fc-lang/Makefile
+	sed -i 's|CXXFLAGS =.*|CFLAGS =${BUILD_CXXFLAGS}|' fc-arch/Makefile
+
+}
+
+do_install () {
+	autotools_do_install
+}
+
diff --git a/recipes/fontconfig/fontconfig_2.6.0.bb b/recipes/fontconfig/fontconfig_2.6.0.bb
new file mode 100644
index 0000000000..5a056b7885
--- /dev/null
+++ b/recipes/fontconfig/fontconfig_2.6.0.bb
@@ -0,0 +1,78 @@
+SECTION = "libs"
+LICENSE = "BSD"
+DESCRIPTION = "A library for configuring and customizing font access."
+DEPENDS = "expat freetype zlib"
+
+PR = "r1"
+
+SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz \
+           file://fix-pkgconfig.patch;patch=1"
+
+PACKAGES =+ "fontconfig-utils-dbg fontconfig-utils "
+FILES_fontconfig-utils-dbg = "${bindir}/*.dbg"
+FILES_fontconfig-utils = "${bindir}/*"
+
+# Work around past breakage in debian.bbclass
+RPROVIDES_fontconfig-utils = "libfontconfig-utils"
+RREPLACES_fontconfig-utils = "libfontconfig-utils"
+RCONFLICTS_fontconfig-utils = "libfontconfig-utils"
+DEBIAN_NOAUTONAME_fontconfig-utils = "1"
+
+S = "${WORKDIR}/fontconfig-${PV}"
+
+PARALLEL_MAKE = ""
+
+inherit autotools pkgconfig
+
+export HASDOCBOOK="no"
+
+EXTRA_OECONF = " --disable-docs --with-arch=${HOST_ARCH} --with-cache-dir=/var/lib/fontconfig"
+EXTRA_OEMAKE = "FC_LANG=fc-lang FC_GLYPHNAME=fc-glyphname"
+
+# The tarball has some of the patched files as read only, which
+# patch doesn't like at all
+
+fontconfig_do_unpack() {
+       chmod -R u+rw ${S}
+}
+
+python do_unpack () {
+       bb.build.exec_func('base_do_unpack', d)
+       bb.build.exec_func('fontconfig_do_unpack', d)
+}
+
+do_stage () {
+	oe_libinstall -so -a -C src libfontconfig ${STAGING_LIBDIR}
+	install -d ${STAGING_INCDIR}/fontconfig
+	for i in ${S}/fontconfig/*.h; do install -m 0644 $i ${STAGING_INCDIR}/fontconfig/; done
+}
+
+BUILD_CFLAGS += " -I${STAGING_INCDIR}/freetype2"
+
+do_configure_append () {
+	sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-case/Makefile
+	sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-glyphname/Makefile
+	sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-lang/Makefile
+	sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-arch/Makefile
+
+	sed -i 's|CFLAGS =.*|CFLAGS =${BUILD_CFLAGS}|' fc-case/Makefile
+	sed -i 's|CFLAGS =.*|CFLAGS =${BUILD_CFLAGS}|' fc-glyphname/Makefile
+	sed -i 's|CFLAGS =.*|CFLAGS =${BUILD_CFLAGS}|' fc-lang/Makefile
+	sed -i 's|CFLAGS =.*|CFLAGS =${BUILD_CFLAGS}|' fc-arch/Makefile
+
+	sed -i 's|CPPFLAGS =.*|CPPFLAGS =${BUILD_CPPFLAGS}|' fc-case/Makefile
+	sed -i 's|CPPFLAGS =.*|CPPFLAGS =${BUILD_CPPFLAGS}|' fc-glyphname/Makefile
+	sed -i 's|CPPFLAGS =.*|CPPFLAGS =${BUILD_CPPFLAGS}|' fc-lang/Makefile
+	sed -i 's|CPPFLAGS =.*|CPPFLAGS =${BUILD_CPPFLAGS}|' fc-arch/Makefile
+
+	sed -i 's|CXXFLAGS =.*|CFLAGS =${BUILD_CXXFLAGS}|' fc-case/Makefile
+	sed -i 's|CXXFLAGS =.*|CFLAGS =${BUILD_CXXFLAGS}|' fc-glyphname/Makefile
+	sed -i 's|CXXFLAGS =.*|CFLAGS =${BUILD_CXXFLAGS}|' fc-lang/Makefile
+	sed -i 's|CXXFLAGS =.*|CFLAGS =${BUILD_CXXFLAGS}|' fc-arch/Makefile
+
+}
+
+do_install () {
+	autotools_do_install
+}
+