update to 2.10.1

changes:
* FC_GLOBAL_ADVANCE now deprecated
* Disable non-Unicode SFNT names by default (Use --enable-iconv to
  enable it)
* Available config files has been moved to
  /usr/share/fontconfig/conf.avail
* Warns multiple values of <test>s and <family>s in <match> and <alias>
* Add XDG Base Directory Specification support
* Add FC_LANG environment variable for default substitute language.
* Add more options to configure the installation paths
* Add "namelang" object to obtain the localized name of the family,
  style and fullname.
* Unicode 6.1 support
* CACHEDIR.TAG support
* Fix several build issues with older gcc, MinGW, Win32.
* Fix a fail of creating caches on some filesystems
* Fix memory leaks
* Add/Update orthography files
* Improve documents
* and more bug fixes and enhancements.

pkgsrc changes: some cleanup - install only useful stuff to /etc

7 files changed, 137 insertions, 125 deletions

diff --git a/fonts/fontconfig/Makefile b/fonts/fontconfig/Makefile
index c9b80c88a98..e7cb6778ff4 100644
--- a/fonts/fontconfig/Makefile
+++ b/fonts/fontconfig/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.75 2012/06/10 16:12:46 wiz Exp $
+# $NetBSD: Makefile,v 1.76 2012/07/31 18:12:28 drochner Exp $
 
-DISTNAME=	fontconfig-2.9.0
+DISTNAME=	fontconfig-2.10.1
 CATEGORIES=	fonts
 MASTER_SITES=	http://www.fontconfig.org/release/
 
@@ -14,7 +14,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake pkg-config
 
 PKGCONFIG_OVERRIDE=	fontconfig.pc.in
 
@@ -24,7 +24,7 @@ CONFIGURE_ARGS+=	--with-default-fonts=${LOCALBASE}/lib/X11/fonts
 CONFIGURE_ARGS+=	--with-freetype-config=${BUILDLINK_PREFIX.freetype2}/bin/freetype-config
 CONFIGURE_ARGS+=	--with-expat-includes=${BUILDLINK_PREFIX.expat}/include
 CONFIGURE_ARGS+=	--with-expat-lib=${BUILDLINK_PREFIX.expat}/lib
-CONFIGURE_ARGS+=	--with-confdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+=	--with-baseconfigdir=${PKG_SYSCONFDIR:Q}
 CONFIGURE_ARGS+=	--with-cache-dir=${VARBASE:Q}/cache/fontconfig
 CONFIGURE_ARGS+=	--enable-docs
 CONFIGURE_ENV+=		HASDOCBOOK=no
@@ -35,43 +35,38 @@ GSFONTS=	${PREFIX}/share/fonts/urw,${PREFIX}/share/ghostscript/fonts
 .if ${X11BASE} != ${LOCALBASE}
 CONFIGURE_ARGS+=	--with-add-fonts=${X11BASE}/lib/X11/fonts,${GSFONTS}
 .else
-CONFIGURE_ARGS+=	--with-add-fonts=${GSFONTS}
+CONFIGURE_ARGS+=	--with-add-fonts=${LOCALBASE}/share/fonts/X11,${GSFONTS}
 .endif
 
 .if ${OPSYS} == "Darwin"
 CONFIGURE_ARGS+=	--with-arch=${MACHINE_ARCH}
 .endif
 
+SUBST_CLASSES+= prefix
+SUBST_STAGE.prefix=	post-build
+SUBST_FILES.prefix=	conf.d/README
+SUBST_VARS.prefix=	PREFIX
+
 EGDIR=		${PREFIX}/share/examples/fontconfig
 CONF_FILES=	${EGDIR}/fonts.conf ${PKG_SYSCONFDIR}/fonts.conf
-CONF_FILES+=	${EGDIR}/fonts.dtd ${PKG_SYSCONFDIR}/fonts.dtd
-MAKE_DIRS+=	${PKG_SYSCONFDIR}/conf.avail
+CONF_FILES+=	${EGDIR}/conf.d/README ${PKG_SYSCONFDIR}/conf.d/README
+
+TMPLDIR=	${PREFIX}/share/fontconfig/conf.avail
 MAKE_DIRS+=	${PKG_SYSCONFDIR}/conf.d
-CONF_FILES+=	${EGDIR}/conf.avail/11-lcdfilter-default.conf ${PKG_SYSCONFDIR}/conf.avail/11-lcdfilter-default.conf
-CONF_FILES+=	${EGDIR}/conf.avail/11-lcdfilter-legacy.conf ${PKG_SYSCONFDIR}/conf.avail/11-lcdfilter-legacy.conf
-CONF_FILES+=	${EGDIR}/conf.avail/11-lcdfilter-light.conf ${PKG_SYSCONFDIR}/conf.avail/11-lcdfilter-light.conf
-CONF_FILES+=	${EGDIR}/conf.d/20-fix-globaladvance.conf ${PKG_SYSCONFDIR}/conf.d/20-fix-globaladvance.conf
-CONF_FILES+=	${EGDIR}/conf.d/20-unhint-small-vera.conf ${PKG_SYSCONFDIR}/conf.d/20-unhint-small-vera.conf
-CONF_FILES+=	${EGDIR}/conf.d/30-metric-aliases.conf ${PKG_SYSCONFDIR}/conf.d/30-metric-aliases.conf
-CONF_FILES+=	${EGDIR}/conf.d/30-urw-aliases.conf ${PKG_SYSCONFDIR}/conf.d/30-urw-aliases.conf
-CONF_FILES+=	${EGDIR}/conf.d/40-nonlatin.conf ${PKG_SYSCONFDIR}/conf.d/40-nonlatin.conf
-CONF_FILES+=	${EGDIR}/conf.d/45-latin.conf ${PKG_SYSCONFDIR}/conf.d/45-latin.conf
-CONF_FILES+=	${EGDIR}/conf.d/49-sansserif.conf ${PKG_SYSCONFDIR}/conf.d/49-sansserif.conf
-CONF_FILES+=	${EGDIR}/conf.d/50-user.conf ${PKG_SYSCONFDIR}/conf.d/50-user.conf
-CONF_FILES+=	${EGDIR}/conf.d/51-local.conf ${PKG_SYSCONFDIR}/conf.d/51-local.conf
-CONF_FILES+=	${EGDIR}/conf.d/60-latin.conf ${PKG_SYSCONFDIR}/conf.d/60-latin.conf
-CONF_FILES+=	${EGDIR}/conf.d/65-fonts-persian.conf ${PKG_SYSCONFDIR}/conf.d/65-fonts-persian.conf
-CONF_FILES+=	${EGDIR}/conf.d/65-nonlatin.conf ${PKG_SYSCONFDIR}/conf.d/65-nonlatin.conf
-CONF_FILES+=	${EGDIR}/conf.d/69-unifont.conf ${PKG_SYSCONFDIR}/conf.d/69-unifont.conf
-CONF_FILES+=	${EGDIR}/conf.d/80-delicious.conf ${PKG_SYSCONFDIR}/conf.d/80-delicious.conf
-CONF_FILES+=	${EGDIR}/conf.d/90-synthetic.conf ${PKG_SYSCONFDIR}/conf.d/90-synthetic.conf
-CONF_FILES+=	${EGDIR}/conf.d/30-pkgsrc-aliases.conf ${PKG_SYSCONFDIR}/conf.d/30-pkgsrc-aliases.conf
+# following list from ${WRKSRC}/conf.d/Makefile.am
+FC_STDCONF=	20-unhint-small-vera.conf 30-metric-aliases.conf 30-urw-aliases.conf \
+	40-nonlatin.conf 45-latin.conf 49-sansserif.conf 50-user.conf 51-local.conf \
+	60-latin.conf 65-fonts-persian.conf 65-nonlatin.conf 69-unifont.conf \
+	80-delicious.conf 90-synthetic.conf
+# pkgsrc addition
+FC_STDCONF+=	30-pkgsrc-aliases.conf
+.for f in ${FC_STDCONF}
+CONF_FILES+=	${TMPLDIR}/${f} ${PKG_SYSCONFDIR}/conf.d/${f}
+.endfor
 
 MAKE_DIRS+=	${VARBASE}/cache
 BUILD_DEFS+=	VARBASE
 
-LIBS+=		${BUILDLINK_LDADD.iconv}
-
 TEST_TARGET=	check
 
 .if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
@@ -80,9 +75,8 @@ CONFIGURE_ENV+=	CC_FOR_BUILD=${NATIVE_CC:Q}
 
 post-install:
 	${INSTALL_DATA} ${FILESDIR}/30-pkgsrc-aliases.conf \
-		${DESTDIR}${EGDIR}/conf.d
+		${DESTDIR}${TMPLDIR}
 
-.include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
diff --git a/fonts/fontconfig/PLIST b/fonts/fontconfig/PLIST
index b06b228e855..556f179dbc3 100644
--- a/fonts/fontconfig/PLIST
+++ b/fonts/fontconfig/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.20 2012/06/10 16:12:47 wiz Exp $
+@comment $NetBSD: PLIST,v 1.21 2012/07/31 18:12:28 drochner Exp $
 bin/fc-cache
 bin/fc-cat
 bin/fc-list
@@ -31,6 +31,7 @@ man/man3/FcBlanksCreate.3
 man/man3/FcBlanksDestroy.3
 man/man3/FcBlanksIsMember.3
 man/man3/FcCacheCopySet.3
+man/man3/FcCacheCreateTagFile.3
 man/man3/FcCacheDir.3
 man/man3/FcCacheNumFont.3
 man/man3/FcCacheNumSubdir.3
@@ -80,6 +81,7 @@ man/man3/FcConfigSubstitute.3
 man/man3/FcConfigSubstituteWithPat.3
 man/man3/FcConfigUptoDate.3
 man/man3/FcDefaultSubstitute.3
+man/man3/FcDirCacheClean.3
 man/man3/FcDirCacheLoad.3
 man/man3/FcDirCacheLoadFile.3
 man/man3/FcDirCacheRead.3
@@ -108,6 +110,7 @@ man/man3/FcFreeTypeCharSet.3
 man/man3/FcFreeTypeCharSetAndSpacing.3
 man/man3/FcFreeTypeQuery.3
 man/man3/FcFreeTypeQueryFace.3
+man/man3/FcGetDefaultLangs.3
 man/man3/FcGetLangs.3
 man/man3/FcGetVersion.3
 man/man3/FcInit.3
@@ -126,7 +129,6 @@ man/man3/FcLangSetCreate.3
 man/man3/FcLangSetDel.3
 man/man3/FcLangSetDestroy.3
 man/man3/FcLangSetEqual.3
-man/man3/FcLangSetGetLangs.3
 man/man3/FcLangSetHasLang.3
 man/man3/FcLangSetHash.3
 man/man3/FcLangSetSubtract.3
@@ -216,6 +218,7 @@ share/doc/fontconfig/fontconfig-devel/fcblankscreate.html
 share/doc/fontconfig/fontconfig-devel/fcblanksdestroy.html
 share/doc/fontconfig/fontconfig-devel/fcblanksismember.html
 share/doc/fontconfig/fontconfig-devel/fccachecopyset.html
+share/doc/fontconfig/fontconfig-devel/fccachecreatetagfile.html
 share/doc/fontconfig/fontconfig-devel/fccachedir.html
 share/doc/fontconfig/fontconfig-devel/fccachenumfont.html
 share/doc/fontconfig/fontconfig-devel/fccachenumsubdir.html
@@ -265,6 +268,7 @@ share/doc/fontconfig/fontconfig-devel/fcconfigsubstitute.html
 share/doc/fontconfig/fontconfig-devel/fcconfigsubstitutewithpat.html
 share/doc/fontconfig/fontconfig-devel/fcconfiguptodate.html
 share/doc/fontconfig/fontconfig-devel/fcdefaultsubstitute.html
+share/doc/fontconfig/fontconfig-devel/fcdircacheclean.html
 share/doc/fontconfig/fontconfig-devel/fcdircacheload.html
 share/doc/fontconfig/fontconfig-devel/fcdircacheloadfile.html
 share/doc/fontconfig/fontconfig-devel/fcdircacheread.html
@@ -293,6 +297,7 @@ share/doc/fontconfig/fontconfig-devel/fcfreetypecharset.html
 share/doc/fontconfig/fontconfig-devel/fcfreetypecharsetandspacing.html
 share/doc/fontconfig/fontconfig-devel/fcfreetypequery.html
 share/doc/fontconfig/fontconfig-devel/fcfreetypequeryface.html
+share/doc/fontconfig/fontconfig-devel/fcgetdefaultlangs.html
 share/doc/fontconfig/fontconfig-devel/fcgetlangs.html
 share/doc/fontconfig/fontconfig-devel/fcgetversion.html
 share/doc/fontconfig/fontconfig-devel/fcinit.html
@@ -311,7 +316,6 @@ share/doc/fontconfig/fontconfig-devel/fclangsetcreate.html
 share/doc/fontconfig/fontconfig-devel/fclangsetdel.html
 share/doc/fontconfig/fontconfig-devel/fclangsetdestroy.html
 share/doc/fontconfig/fontconfig-devel/fclangsetequal.html
-share/doc/fontconfig/fontconfig-devel/fclangsetgetlangs.html
 share/doc/fontconfig/fontconfig-devel/fclangsethash.html
 share/doc/fontconfig/fontconfig-devel/fclangsethaslang.html
 share/doc/fontconfig/fontconfig-devel/fclangsetsubtract.html
@@ -385,58 +389,43 @@ share/doc/fontconfig/fontconfig-devel/fcvaluedestroy.html
 share/doc/fontconfig/fontconfig-devel/fcvalueequal.html
 share/doc/fontconfig/fontconfig-devel/fcvalueprint.html
 share/doc/fontconfig/fontconfig-devel/fcvaluesave.html
-share/doc/fontconfig/fontconfig-devel/index.html
+share/doc/fontconfig/fontconfig-devel/ln12.html
+share/doc/fontconfig/fontconfig-devel/t1.html
 share/doc/fontconfig/fontconfig-devel/x102.html
 share/doc/fontconfig/fontconfig-devel/x19.html
 share/doc/fontconfig/fontconfig-devel/x31.html
 share/doc/fontconfig/fontconfig-user.html
 share/doc/fontconfig/fontconfig-user.pdf
 share/doc/fontconfig/fontconfig-user.txt
-share/examples/fontconfig/conf.avail/10-autohint.conf
-share/examples/fontconfig/conf.avail/10-no-sub-pixel.conf
-share/examples/fontconfig/conf.avail/10-sub-pixel-bgr.conf
-share/examples/fontconfig/conf.avail/10-sub-pixel-rgb.conf
-share/examples/fontconfig/conf.avail/10-sub-pixel-vbgr.conf
-share/examples/fontconfig/conf.avail/10-sub-pixel-vrgb.conf
-share/examples/fontconfig/conf.avail/10-unhinted.conf
-share/examples/fontconfig/conf.avail/11-lcdfilter-default.conf
-share/examples/fontconfig/conf.avail/11-lcdfilter-legacy.conf
-share/examples/fontconfig/conf.avail/11-lcdfilter-light.conf
-share/examples/fontconfig/conf.avail/20-fix-globaladvance.conf
-share/examples/fontconfig/conf.avail/20-unhint-small-vera.conf
-share/examples/fontconfig/conf.avail/25-unhint-nonlatin.conf
-share/examples/fontconfig/conf.avail/30-metric-aliases.conf
-share/examples/fontconfig/conf.avail/30-urw-aliases.conf
-share/examples/fontconfig/conf.avail/40-nonlatin.conf
-share/examples/fontconfig/conf.avail/45-latin.conf
-share/examples/fontconfig/conf.avail/49-sansserif.conf
-share/examples/fontconfig/conf.avail/50-user.conf
-share/examples/fontconfig/conf.avail/51-local.conf
-share/examples/fontconfig/conf.avail/60-latin.conf
-share/examples/fontconfig/conf.avail/65-fonts-persian.conf
-share/examples/fontconfig/conf.avail/65-khmer.conf
-share/examples/fontconfig/conf.avail/65-nonlatin.conf
-share/examples/fontconfig/conf.avail/69-unifont.conf
-share/examples/fontconfig/conf.avail/70-no-bitmaps.conf
-share/examples/fontconfig/conf.avail/70-yes-bitmaps.conf
-share/examples/fontconfig/conf.avail/80-delicious.conf
-share/examples/fontconfig/conf.avail/90-synthetic.conf
-share/examples/fontconfig/conf.d/20-fix-globaladvance.conf
-share/examples/fontconfig/conf.d/20-unhint-small-vera.conf
-share/examples/fontconfig/conf.d/30-metric-aliases.conf
-share/examples/fontconfig/conf.d/30-pkgsrc-aliases.conf
-share/examples/fontconfig/conf.d/30-urw-aliases.conf
-share/examples/fontconfig/conf.d/40-nonlatin.conf
-share/examples/fontconfig/conf.d/45-latin.conf
-share/examples/fontconfig/conf.d/49-sansserif.conf
-share/examples/fontconfig/conf.d/50-user.conf
-share/examples/fontconfig/conf.d/51-local.conf
-share/examples/fontconfig/conf.d/60-latin.conf
-share/examples/fontconfig/conf.d/65-fonts-persian.conf
-share/examples/fontconfig/conf.d/65-nonlatin.conf
-share/examples/fontconfig/conf.d/69-unifont.conf
-share/examples/fontconfig/conf.d/80-delicious.conf
-share/examples/fontconfig/conf.d/90-synthetic.conf
 share/examples/fontconfig/conf.d/README
 share/examples/fontconfig/fonts.conf
-share/examples/fontconfig/fonts.dtd
+share/fontconfig/conf.avail/10-autohint.conf
+share/fontconfig/conf.avail/10-no-sub-pixel.conf
+share/fontconfig/conf.avail/10-sub-pixel-bgr.conf
+share/fontconfig/conf.avail/10-sub-pixel-rgb.conf
+share/fontconfig/conf.avail/10-sub-pixel-vbgr.conf
+share/fontconfig/conf.avail/10-sub-pixel-vrgb.conf
+share/fontconfig/conf.avail/10-unhinted.conf
+share/fontconfig/conf.avail/11-lcdfilter-default.conf
+share/fontconfig/conf.avail/11-lcdfilter-legacy.conf
+share/fontconfig/conf.avail/11-lcdfilter-light.conf
+share/fontconfig/conf.avail/20-unhint-small-vera.conf
+share/fontconfig/conf.avail/25-unhint-nonlatin.conf
+share/fontconfig/conf.avail/30-metric-aliases.conf
+share/fontconfig/conf.avail/30-pkgsrc-aliases.conf
+share/fontconfig/conf.avail/30-urw-aliases.conf
+share/fontconfig/conf.avail/40-nonlatin.conf
+share/fontconfig/conf.avail/45-latin.conf
+share/fontconfig/conf.avail/49-sansserif.conf
+share/fontconfig/conf.avail/50-user.conf
+share/fontconfig/conf.avail/51-local.conf
+share/fontconfig/conf.avail/60-latin.conf
+share/fontconfig/conf.avail/65-fonts-persian.conf
+share/fontconfig/conf.avail/65-khmer.conf
+share/fontconfig/conf.avail/65-nonlatin.conf
+share/fontconfig/conf.avail/69-unifont.conf
+share/fontconfig/conf.avail/70-no-bitmaps.conf
+share/fontconfig/conf.avail/70-yes-bitmaps.conf
+share/fontconfig/conf.avail/80-delicious.conf
+share/fontconfig/conf.avail/90-synthetic.conf
+share/xml/fontconfig/fonts.dtd
diff --git a/fonts/fontconfig/buildlink3.mk b/fonts/fontconfig/buildlink3.mk
index ac1a0710e5d..b25dbcba273 100644
--- a/fonts/fontconfig/buildlink3.mk
+++ b/fonts/fontconfig/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.28 2012/05/07 01:53:29 dholland Exp $
+# $NetBSD: buildlink3.mk,v 1.29 2012/07/31 18:12:28 drochner Exp $
 
 BUILDLINK_TREE+=	fontconfig
 
@@ -9,7 +9,6 @@ BUILDLINK_API_DEPENDS.fontconfig+=	fontconfig>=2.4.2
 BUILDLINK_ABI_DEPENDS.fontconfig+=	fontconfig>=2.8.0nb2
 BUILDLINK_PKGSRCDIR.fontconfig?=	../../fonts/fontconfig
 
-.include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
diff --git a/fonts/fontconfig/distinfo b/fonts/fontconfig/distinfo
index 0a69b80ac02..0797d5ed7a5 100644
--- a/fonts/fontconfig/distinfo
+++ b/fonts/fontconfig/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.34 2012/06/10 16:12:47 wiz Exp $
+$NetBSD: distinfo,v 1.35 2012/07/31 18:12:28 drochner Exp $
 
-SHA1 (fontconfig-2.9.0.tar.gz) = 1ab2f437c2261028ae7969892277af2d8d8db489
-RMD160 (fontconfig-2.9.0.tar.gz) = 9456d0ab2ae72086ec3edce9d72e007e2bf9bf1e
-Size (fontconfig-2.9.0.tar.gz) = 1682774 bytes
-SHA1 (patch-aa) = d6a80dbeae1579d9c66e1f6b60a27e4837c1f503
+SHA1 (fontconfig-2.10.1.tar.gz) = e377cbe989cd22d3a10020309c906ecbbcac0043
+RMD160 (fontconfig-2.10.1.tar.gz) = 5dab00198b010d6d9a2bc20864b24497f09745ce
+Size (fontconfig-2.10.1.tar.gz) = 1700168 bytes
+SHA1 (patch-aa) = fe0608917aea58ec43d51986d888fc7c38ae6aa3
 SHA1 (patch-ab) = 71925f19d55a0daf382f4ac31c5010180173ae50
-SHA1 (patch-ac) = 7745afc09fbd463c184bfb783acf8d30f2effbf4
+SHA1 (patch-ac) = c4f9904842c43246321cb982af78c1a61d06ad75
 SHA1 (patch-ae) = 7348e85cfa2d0b97649b4648346e6ea906b02769
+SHA1 (patch-af) = becdaa40180fd8aaa828faf3776ccd70d460e67e
diff --git a/fonts/fontconfig/patches/patch-aa b/fonts/fontconfig/patches/patch-aa
index 89b191e1891..b671cab88a4 100644
--- a/fonts/fontconfig/patches/patch-aa
+++ b/fonts/fontconfig/patches/patch-aa
@@ -1,27 +1,43 @@
-$NetBSD: patch-aa,v 1.14 2012/06/10 16:12:47 wiz Exp $
+$NetBSD: patch-aa,v 1.15 2012/07/31 18:12:28 drochner Exp $
 
---- Makefile.in.orig	2012-03-10 17:30:13.000000000 +0000
+--- Makefile.in.orig	2012-07-27 02:24:51.000000000 +0000
 +++ Makefile.in
-@@ -319,10 +319,11 @@ MAINTAINERCLEANFILES = $(srcdir)/aclocal
- 	-type f -name Makefile.in -print` $(srcdir)/ChangeLog
- pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = fontconfig.pc
--configdir = $(CONFDIR)
-+configdir = $(prefix)/share/examples/fontconfig
- config_DATA = fonts.dtd
+@@ -317,6 +317,7 @@ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ xmldir = $(XMLDIR)
++egdir = $(prefix)/share/examples/fontconfig
+ SUBDIRS = fontconfig fc-case fc-lang fc-glyphname src \
+ 	fc-cache fc-cat fc-list fc-match fc-pattern fc-query fc-scan \
+ 	conf.d $(DOCSRC) test
+@@ -340,6 +341,7 @@ pkgconfig_DATA = fontconfig.pc
+ xml_DATA = fonts.dtd
  @CROSS_COMPILING_FALSE@RUN_FC_CACHE_TEST = test -z "$(DESTDIR)"
  @CROSS_COMPILING_TRUE@RUN_FC_CACHE_TEST = false
 +RUN_FC_CACHE_TEST = false
  all: config.h
  	$(MAKE) $(AM_MAKEFLAGS) all-recursive
  
-@@ -900,7 +901,8 @@ fonts.conf: fonts.conf.in Makefile
+@@ -932,17 +934,13 @@ fonts.conf: fonts.conf.in Makefile
  	mv $@.tmp $@
  
  install-data-local: fonts.conf
--	$(mkinstalldirs) $(DESTDIR)$(configdir) $(DESTDIR)$(fc_cachedir)
-+	$(mkinstalldirs) $(DESTDIR)$(configdir)
-+	$(mkinstalldirs) $(DESTDIR)$(fc_cachedir)
- 	if [ -f $(DESTDIR)$(configdir)/fonts.conf ]; then \
- 	  echo "backing up existing $(DESTDIR)$(configdir)/fonts.conf"; \
- 	  mv $(DESTDIR)$(configdir)/fonts.conf $(DESTDIR)$(configdir)/fonts.conf.bak; \
+-	$(mkinstalldirs) $(DESTDIR)$(baseconfigdir) $(DESTDIR)$(fc_cachedir)
+-	if [ -f $(DESTDIR)$(baseconfigdir)/fonts.conf ]; then \
+-	  echo "backing up existing $(DESTDIR)$(baseconfigdir)/fonts.conf"; \
+-	  mv $(DESTDIR)$(baseconfigdir)/fonts.conf $(DESTDIR)$(baseconfigdir)/fonts.conf.bak; \
+-	fi
++	$(mkinstalldirs) $(DESTDIR)$(egdir)
+ 	if [ -f $(srcdir)/fonts.conf ]; then \
+-	  echo " $(INSTALL_DATA) $(srcdir)/fonts.conf $(DESTDIR)$(baseconfigdir)/fonts.conf"; \
+-	  $(INSTALL_DATA) $(srcdir)/fonts.conf $(DESTDIR)$(baseconfigdir)/fonts.conf; \
++	  echo " $(INSTALL_DATA) $(srcdir)/fonts.conf $(DESTDIR)$(egdir)/fonts.conf"; \
++	  $(INSTALL_DATA) $(srcdir)/fonts.conf $(DESTDIR)$(egdir)/fonts.conf; \
+ 	else if [ -f fonts.conf ]; then \
+-	  echo " $(INSTALL_DATA) fonts.conf $(DESTDIR)$(baseconfigdir)/fonts.conf"; \
+-	  $(INSTALL_DATA) fonts.conf $(DESTDIR)$(baseconfigdir)/fonts.conf; \
++	  echo " $(INSTALL_DATA) fonts.conf $(DESTDIR)$(egdir)/fonts.conf"; \
++	  $(INSTALL_DATA) fonts.conf $(DESTDIR)$(egdir)/fonts.conf; \
+ 	fi; fi
+ 	@(if $(RUN_FC_CACHE_TEST); then \
+ 	    echo "fc-cache$(EXEEXT) -s -f -v"; \
diff --git a/fonts/fontconfig/patches/patch-ac b/fonts/fontconfig/patches/patch-ac
index f62e8480e89..111ffba5511 100644
--- a/fonts/fontconfig/patches/patch-ac
+++ b/fonts/fontconfig/patches/patch-ac
@@ -1,24 +1,21 @@
-$NetBSD: patch-ac,v 1.10 2009/07/18 13:20:01 wiz Exp $
+$NetBSD: patch-ac,v 1.11 2012/07/31 18:12:28 drochner Exp $
 
---- conf.d/Makefile.in.orig	2009-06-24 19:05:23.000000000 +0000
+--- conf.d/Makefile.in.orig	2012-07-27 02:24:50.000000000 +0000
 +++ conf.d/Makefile.in
-@@ -237,7 +237,7 @@ psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
--sysconfdir = @sysconfdir@
-+sysconfdir = $(prefix)/share/examples/fontconfig
- target_alias = @target_alias@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
-@@ -292,8 +292,8 @@ CONF_LINKS = \
+@@ -218,7 +218,7 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-configdir = $(CONFIGDIR)
++configdir = $(prefix)/share/examples/fontconfig/conf.d
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -541,6 +541,7 @@ uninstall-am: uninstall-configDATA unins
  
- EXTRA_DIST = $(CONF_FILES) $(DOC_FILES)
- configdir = $(CONFDIR)
--confavaildir = $(configdir)/conf.avail
--confddir = $(configdir)/conf.d
-+confavaildir = $(sysconfdir)/conf.avail
-+confddir = $(sysconfdir)/conf.d
- confavail_DATA = $(CONF_FILES)
- confd_DATA = $(DOC_FILES)
- all: all-am
+ 
+ install-data-hook:
++xinstall-data-hook:
+ 	mkdir -p $(DESTDIR)$(configdir)
+ 	@(echo cd $(DESTDIR)$(configdir);			\
+ 	  cd $(DESTDIR)$(configdir);				\
diff --git a/fonts/fontconfig/patches/patch-af b/fonts/fontconfig/patches/patch-af
new file mode 100644
index 00000000000..1c8ba6ee27f
--- /dev/null
+++ b/fonts/fontconfig/patches/patch-af
@@ -0,0 +1,16 @@
+$NetBSD: patch-af,v 1.1 2012/07/31 18:12:28 drochner Exp $
+
+--- conf.d/README.orig	2012-02-20 03:49:18.000000000 +0000
++++ conf.d/README
+@@ -2,9 +2,8 @@ conf.d/README
+ 
+ Each file in this directory is a fontconfig configuration file.  Fontconfig
+ scans this directory, loading all files of the form [0-9][0-9]*.conf.
+-These files are normally installed in ../conf.avail and then symlinked here,
+-allowing them to be easily installed and then enabled/disabled by adjusting
+-the symlinks.
++These files are installed in @PREFIX@/share/fontconfig/conf.avail
++and then copied or symlinked here as needed.
+ 
+ The files are loaded in numeric order, the structure of the configuration
+ has led to the following conventions in usage: