diff -Nurd -x'*~' fontconfig-2.10.1.orig/fontconfig.pc.in fontconfig-2.10.1/fontconfig.pc.in
--- fontconfig-2.10.1.orig/fontconfig.pc.in	2012-07-23 22:01:32.000000000 -0400
+++ fontconfig-2.10.1/fontconfig.pc.in	2012-07-29 16:12:53.000000000 -0400
@@ -12,5 +12,4 @@
 Description: Font configuration and customization library
 Version: @VERSION@
 Libs: -L${libdir} -lfontconfig
-Libs.private: @LIBXML2_LIBS@ @EXPAT_LIBS@ @FREETYPE_LIBS@ @ICONV_LIBS@
 Cflags: -I${includedir}
diff -Nurd -x'*~' fontconfig-2.10.1.orig/fonts.conf.in fontconfig-2.10.1/fonts.conf.in
--- fontconfig-2.10.1.orig/fonts.conf.in	2012-07-23 22:01:32.000000000 -0400
+++ fontconfig-2.10.1/fonts.conf.in	2012-07-29 16:12:53.000000000 -0400
@@ -66,16 +66,27 @@
 	</match>
 
 <!--
+  Load per-user customization file
+-->
+	<include ignore_missing="yes">~/.fonts.conf</include>
+
+<!--
   Load local system customization file
 -->
 	<include ignore_missing="yes">@CONFIGDIR@</include>
+ 
+<!--
+  Load local (apple) system customization file
+-->
+	<include ignore_missing="yes">/usr/X11/lib/X11/fonts/local.conf</include>
+	<include ignore_missing="yes">/etc/fonts/local.conf</include>
 
 <!-- Font cache directory list -->
 
 	<cachedir>@FC_CACHEDIR@</cachedir>
 	<cachedir prefix="xdg">fontconfig</cachedir>
 	<!-- the following element will be removed in the future -->
-	<cachedir>~/.fontconfig</cachedir>
+	<cachedir>~/.fontconfig-2.4</cachedir>
 
 	<config>
 <!--