Update to 2.9.0. No proper NEWS file found.

    Bump version to 2.9.0
    Get rid of $< from Makefile.am
    Fix a build fail on some environment.
    Fix a build fail on some environment
    Fix a build issue
    Update to detect the uncommited changes properly
    Update the version info
    Fix distcheck error
    Bug 19128 - Handling whitespace in aliases
    Add a workaround alias for Dingbats.
    Check null value for given object to avoid possibly segfaulting
    Bug 23336 - unable to display bitmap-only (SFNT) TrueType or OpenType
    Force to find out a size for bitmap-only ttf to avoid the blank glyphs
    in the font.
    Patch from Bug Fly
    Bug 41694 - FcCache functions have random-number-generator side
    effects
    Use the own random number generator state if possible.
    Bug 25652 - Add ortho file for locale mni_IN
    Add mni.orth for Maniputi
    Bug 25653 - Add ortho file for locale doi_IN
    Add doi.orth for Dogri
    Add brx.orth and sat.orth
    Bug 25650 - Add ortho file for locale sat_IN
    Add sat.orth for Santali
    Bug 25651 - Add ortho file for locale brx_IN
    Add brx.orth for Bodo.
    Bug 27385 - lcdfilter settings for freetype-2.3.12 not available
    in fontconfig-2.8.0
    Add config files for FT_LcdFilter options.
    Patch from Robin Johnson.
    Do not update stream->pos when seeking is failed.
    Bug 46169 - Pointer error in FcConfigGlobMatch
    Fix possibly accessing the invalid memory and a crash in the
    worst case
    when the glob string is longer than the string.
    makealias: handle missing funcs better
    When adding new functions, if the actual definition doesn't match the
    header (say due to a typo), the regeneration of the internal headers
    get confused and output bad cpp logic.  This causes gcc to barf due
    to mismatched #ifdef/#endif.  Which is a pain to figure out due to
    the sheer voulme of generated code.
    So tweak the makealias script to detect this case and error out.
    While we're here, improve the cpp output a bit to indent, include
    comments, and merge similar ifdef blocks.
    FcObjectValidType: tweak -1 checking
    Newer gcc doesn't like when you switch on an enum and use a value
    that isn't declared:
    fcname.c: In function 'FcObjectValidType':
    fcname.c:299:2: warning: case value '4294967295'
	not in enumerated type 'FcType' [-Wswitch]
    So tweak the logic to avoid this warning.
    fix build warnings when using --with-arch
    Latest configure code will setup FC_ARCHITECTURE directly rather than
    going through ARCHITECTURE, so update fcarch.h accordingly.
    fc-{list,match}: constify format string
    We don't free this string anywhere, so mark it const to avoid gcc
    warnings
    and possible bugs in the future (if people did try freeing it).
    fc-list.c: In function 'main':
    fc-list.c:161:16: warning: pointer targets in assignment
	differ in signedness [-Wpointer-sign]
    fc-match.c: In function 'main':
    fc-match.c:201:13: warning: pointer targets in assignment
	differ in signedness [-Wpointer-sign]
    fc-match.c:203:13: warning: pointer targets in assignment
	differ in signedness [-Wpointer-sign]
    FcName{,Get}Constant: constify string input
    These funcs don't modify the incoming string, so add const markings.
    This is the "right thing", shouldn't change the ABI, and fixes some
    gcc warnings:
    fccfg.c: In function 'FcConfigEvaluate':
    fccfg.c:916:2: warning: passing argument 1 of 'IA__FcNameConstant'
	discards 'const' qualifier from pointer target type [enabled
	by default]
    fcalias.h:253:34: note: expected 'FcChar8 *' but
	argument is of type 'const FcChar8 *'
    fcxml.c: In function 'FcTypecheckExpr':
    fcxml.c:604:2: warning: passing argument 1 of 'IA__FcNameGetConstant'
	discards 'const' qualifier from pointer target type [enabled
	by default]
    fcalias.h:251:37: note: expected 'FcChar8 *' but
	argument is of type 'const FcChar8 *'
    fc-cat: fix pointer warning
    Add a cast to avoid a gcc warning:
    fc-cat.c: In function 'cache_print_set':
    fc-cat.c:230:2: warning: pointer targets in passing argument 2
	of 'FcPatternFormat' differ in signedness [-Wpointer-sign]
    ../fontconfig/fontconfig.h:860:1: note:
	expected 'const FcChar8 *' but argument is of type 'char *'
    FcStat: change to FcChar8 for first arg
    This shouldn't affect the ABI, makes FcStat more like the rest of the
    fontconfig API, and fixes warnings where we pass FcChar8* pointers in
    to this func from other places.
    delete unused variables
    Newer gcc is better at detecting set-but-unused variables.
    FcStrPlus: optimize a little
    We've already calculated the lengths of these strings, so re-use those
    values to avoid having to rescan the strings multiple times.
    Bug 44826 - <alias> must contain only a single <family>
    Fix invalid syntax around alias elements in 30-metric-aliases.conf
    40-nonlatin.conf and 45-latin.conf.
    Patch from lolilolicon
    Get rid of the unexpected family name
    UmePlus P Gothic isn't a serif font.
    Bug 43406 - typo of Japanese font name in conf.d/65-nonlatin.conf
    Fix a typo.
    Bug 43321 - Required corrections in urdu.orth file
    Drop U+0629 and U+0647, and add U+06c3 to ur.orth
    Bug 42423 - make default Korean font from Un to Nanum
    Update 40-nonlatin.conf and 65-nonlatin.conf for Nanum korean fonts.
    Bug 40452 - Running 'fc-match --all' core dumps when no fonts are
    installed
    This would changes the behavior of FcFontSort().
    it won't returns NULL afterward.
    Bug 35517 - Remove Apple Roman cmap support
    Get rid of the apple roman encoding related code
    Add a missing file
    Bug 32965 - Asturian (ast-ES) language matching missing ḷḷḥ
    Add U+1E24, U+1E25, U+1E36 and U+1e37 for Asturian
    Remove the unnecessary comment in ks.orth
    Bug 27195 - need updates to ks.orth file
    Add U+0620, U+0657, U+065f, U+0672, U+0673 and U+06c4 for Kashmiri
    See http://www.unicode.org/charts/PDF/U0600.pdf
    Bug 24744 - No n'ko orthography
    Add nqo.orth for N'Ko
    Add FcPublic to FcLangSetUnion and FcLangSetSubtract
    Patch from ssp
    Fix parallel build
    Bug 41171 - Invalid use of memset
    Fix stupid bug in FcFontSort()
    I broke FcFontSort() language handling at the end of 2008 with this
    commit: c7641f28
    G-d knows how many of the lang-matching bugs in bugzilla will be
    fixed by this changed...
    I'm really sorry, everyone!
    Switch fc-cat to use FcPatternFormat()
    Added the a builtin "fccat" to FcPatternFormat().
    Switch fc-match to use FcPatternFormat()
    Fix small bug in FcPatternFormat that was letting element-default to
    consume the convertor sequence.
    Bug 26718 - "fc-match sans file" doesn't work
    - Do not throw away FC_FILE in FcNameUnparse
    - Update the builtin "fclist" format to remove FC_FILE properly
    instead
    - Switch fc-list to use FcPatternFormat()
    Note that I had previously broken fc-list and it was not showing the
    file name anymore.	No one noticed that it seems!  Now fixed.
    Bug 36577 - Updating cache with no-bitmaps disables bitmap fonts...
    Do not remove blacklisted fonts during cache generation.  We already
    apply the blacklist when reading the caches.  The idea always has been
    that the config should not affect caches built, although that design
    was tarnished with the introduction of target="scan" configurations.
    [.gitignore] Update
    Bug 35587 - Add padding to make valgrind and glibc not hate each other
    Fix warning
    Always define FcStat as a function
    Such that first arg is const char *.  We also need to make more
    changes
    in that function as part of some other bug.
    More doc typo fixes
    Mark constant strings as constant
    Fixes a few compiler warnings in fcxml.c and makes it clear that they
    should not be freed.
    Bug 30566 - fcformat.c:interpret_enumerate() passes uninitialized
    idx to FcPatternGetLangSet()
    Bug 20113 - Uighur (ug) orthography incomplete
    Documentation fixes
    Remove --enable-maintainer-mode from autogen.sh
    Update CaseFolding.txt to Unicode 6.0
    Remove AM_MAINTAINER_MODE
    That macro is simply broken.
    This was also brought up in:
    Bug 32679 - fontconfig-2.8.0 does not cross compile
    Fix assertion failure on le32d4
    Reported by Jon TURNEY.
    Doc nit
    Skip <range> elements with begin > end
    Add <range> support for <blank> into the DTD
Merge: 30fd4fa fa269cf
    Allow editing charset and lang in target="scan"
    Merge commit 'fa269cf812ee304534b0e4c44662202496008db0'
    Fixes:
    Bug 31969 - Can't modify charset in target="scan"
    Bug 23758 - Can't modify lang in target="scan"
    Bump version
    Make fc-arch stuff cross-compiling-safe
    Fixes:
    Bug 32679 - fontconfig-2.8.0 does not cross compile
    Bug 25462 - Cross-compilation doesn't work
    Make most generated-files cross-compiling-safe
    By simply including a copy in the tarball.
    Remains fc-arch which is trickier.
    add some documents
    Add editing langset feature.
    The syntax to add any langset to the langset table looks like:
    <match target="scan">
	<test name="family">
	    <string>Buggy Sans</string>
	</test>
	<edit name="lang" mode="assign">
	    <plus>
		<name>lang</name>
		<langset>
		    <string>zh-cn</string>
		    <string>zh-tw</string>
		</langset>
	    </plus>
	</edit>
    </match>
    To remove any langset from the langset table:
    <match target="scan">
	<test name="family">
	    <string>Buggy Sans</string>
	</test>
	<edit name="lang" mode="assign">
	    <minus>
		<name>lang</name>
		<langset>
		    <string>ja</string>
		</langset>
	    </minus>
	</edit>
    </match>
    Add the range support in blank element
    add some document for range and charset.
    Add charset editing feature.
    The syntax to add any characters to the charset table looks like:
    <match target="scan">
	<test name="family">
	    <string>Buggy Sans</string>
	</test>
	<edit name="charset" mode="assign">
	    <plus>
		<name>charset</name>
		<charset>
		    <int>0x3220</int>	 <!-- PARENTHESIZED IDEOGRAPH
		    ONE -->
		</charset>
	    </plus>
	</edit>
    </match>
    To remove any characters from the charset table:
    <match target="scan">
	<test name="family">
	    <string>Buggy Sans</string>
	</test>
	<edit name="charset" mode="assign">
	    <minus>
		<name>charset</name>
		<charset>
		    <int>0x06CC</int>	 <!-- ARABIC LETTER FARSI YEH -->
		    <int>0x06D2</int>	 <!-- ARABIC LETTER YEH BARREE -->
		    <int>0x06D3</int>	 <!-- ARABIC LETTER YEH BARREE
		    WITH HAMZA ABOVE -->
		</charset>
	    </minus>
	</edit>
    </match>
    You could also use the range element for convenience:
    ...
		<charset>
		    <int>0x06CC</int>	 <!-- ARABIC LETTER FARSI YEH -->
		    <range>
			<int>0x06D2</int>    <!-- ARABIC LETTER YEH
			BARREE -->
			<int>0x06D3</int>    <!-- ARABIC LETTER YEH
			BARREE WITH HAMZA ABOVE -->
		    </range>
		</charset>
    ...
    Bug 28958 - lang=en matches other langs
    Patch from Akira TAGOH.
    Fix returned value
    Cleanup copyright notices to replace "Keith Packard" with "the
    author(s)"
    Add more copyright owners
    fontconfig.pc.in: Add sysconfdir, localstatedir, and PACKAGE
    In the default case, cachedir and confdir will evaluate to something
    referencing these other variables (which wouldn't otherwise be defined
    in the pkg-config file.
    Fixes a regression introduced by
    81b542b50f82f8a0ad9f38f7d913fe5433631166
    Tested-by: Jon TURNEY <jon.turney@dronecode.org.uk>
    fontconfig.pc: Add variables for confdir and cachedir
    Bug 24729 - [ne_NP] Fix ortho file
    Exclude three characters (U+090C..090E) from Nepalese.
    [fc-lang] Support excluding characters
    By prefixing a line by a hyphen/minus sign.  Useful when including
    other orth files.
    Add new public API: FcCharSetDelChar()
    Bug 29995 - fc-cat does not invoke FcFini()
    Add comments
    Bug 29338 - fc-pattern.sgml, open para tag
    Fix compiler warnings
    Add fc-pattern cmdline tool
    Fix comment
    Remove all training whitespaces
    More whitespace
    Whitespace
    Accept TT_PLATFORM_MICROSOFT, TT_MS_ID_SYMBOL_CS from name table
    The OT spec says:
    "When building a Unicode font for Windows, the platform ID should
    be 3 and the encoding ID should be 1. When building a symbol
    font for Windows, the platform ID should be 3 and the encoding
    ID should be 0."
    We were ignoring the SYMBOL_CS entry before.  It's UTF-16/UCS-2
    like the UNICODE_CS.
    Also, always use UTF-16BE instead of UCS-2BE.  The conversion
    was doing UTF-16BE anyway.
    Don't include unistd.h in fontconfig.h
    Bug 26783 patch: unistd.h not exist on ms windows
    Bug 25152 Don't sleep(2) if all caches were uptodate
    Bug 26157 Solaris/Sun C 5.8: compilation of 2.8.0 and 2.7.3 fails
    Bug 18886 installation crashes if fontconfig already installed
    Run the uninstalled fc-cache, not the installed one.
    More doc typo fixes
    Fix doc typo
    Add note about autogen.sh to INSTALL
    Update INSTALL
    Bug 25508 configure assumes bash > 2.0 is on system
    Remove dolt.  With libtool2, there's not much need for dolt.
    [doc] Fix typo
    [fc-cache] Document -r argument in man page

7 files changed, 36 insertions, 148 deletions

diff --git a/fonts/fontconfig/Makefile b/fonts/fontconfig/Makefile
index 0cfe2e8f3c8..c9b80c88a98 100644
--- a/fonts/fontconfig/Makefile
+++ b/fonts/fontconfig/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.74 2011/11/09 03:20:06 christos Exp $
+# $NetBSD: Makefile,v 1.75 2012/06/10 16:12:46 wiz Exp $
 
-DISTNAME=	fontconfig-2.8.0
-PKGREVISION=	3
+DISTNAME=	fontconfig-2.9.0
 CATEGORIES=	fonts
 MASTER_SITES=	http://www.fontconfig.org/release/
 
@@ -27,7 +26,6 @@ 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-cache-dir=${VARBASE:Q}/cache/fontconfig
-CONFIGURE_ARGS+=	--with-x
 CONFIGURE_ARGS+=	--enable-docs
 CONFIGURE_ENV+=		HASDOCBOOK=no
 
@@ -47,7 +45,11 @@ CONFIGURE_ARGS+=	--with-arch=${MACHINE_ARCH}
 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
 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
@@ -76,9 +78,6 @@ TEST_TARGET=	check
 CONFIGURE_ENV+=	CC_FOR_BUILD=${NATIVE_CC:Q}
 .endif
 
-pre-configure:
-	${ECHO} '#define FC_ARCHITECTURE "@host_cpu@"' > ${WRKSRC}/fc-arch/fcarch.h.in
-
 post-install:
 	${INSTALL_DATA} ${FILESDIR}/30-pkgsrc-aliases.conf \
 		${DESTDIR}${EGDIR}/conf.d
diff --git a/fonts/fontconfig/PLIST b/fonts/fontconfig/PLIST
index 9814519245b..b06b228e855 100644
--- a/fonts/fontconfig/PLIST
+++ b/fonts/fontconfig/PLIST
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.19 2009/07/18 13:20:00 wiz Exp $
+@comment $NetBSD: PLIST,v 1.20 2012/06/10 16:12:47 wiz Exp $
 bin/fc-cache
 bin/fc-cat
 bin/fc-list
 bin/fc-match
+bin/fc-pattern
 bin/fc-query
 bin/fc-scan
 include/fontconfig/fcfreetype.h
@@ -14,6 +15,7 @@ man/man1/fc-cache.1
 man/man1/fc-cat.1
 man/man1/fc-list.1
 man/man1/fc-match.1
+man/man1/fc-pattern.1
 man/man1/fc-query.1
 man/man1/fc-scan.1
 man/man3/FcAtomicCreate.3
@@ -38,6 +40,7 @@ man/man3/FcCharSetCopy.3
 man/man3/FcCharSetCount.3
 man/man3/FcCharSetCoverage.3
 man/man3/FcCharSetCreate.3
+man/man3/FcCharSetDelChar.3
 man/man3/FcCharSetDestroy.3
 man/man3/FcCharSetEqual.3
 man/man3/FcCharSetFirstPage.3
@@ -120,11 +123,14 @@ man/man3/FcLangSetCompare.3
 man/man3/FcLangSetContains.3
 man/man3/FcLangSetCopy.3
 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
+man/man3/FcLangSetUnion.3
 man/man3/FcMatrixCopy.3
 man/man3/FcMatrixEqual.3
 man/man3/FcMatrixInit.3
@@ -219,6 +225,7 @@ share/doc/fontconfig/fontconfig-devel/fccharsetcopy.html
 share/doc/fontconfig/fontconfig-devel/fccharsetcount.html
 share/doc/fontconfig/fontconfig-devel/fccharsetcoverage.html
 share/doc/fontconfig/fontconfig-devel/fccharsetcreate.html
+share/doc/fontconfig/fontconfig-devel/fccharsetdelchar.html
 share/doc/fontconfig/fontconfig-devel/fccharsetdestroy.html
 share/doc/fontconfig/fontconfig-devel/fccharsetequal.html
 share/doc/fontconfig/fontconfig-devel/fccharsetfirstpage.html
@@ -301,11 +308,14 @@ share/doc/fontconfig/fontconfig-devel/fclangsetcompare.html
 share/doc/fontconfig/fontconfig-devel/fclangsetcontains.html
 share/doc/fontconfig/fontconfig-devel/fclangsetcopy.html
 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
+share/doc/fontconfig/fontconfig-devel/fclangsetunion.html
 share/doc/fontconfig/fontconfig-devel/fcmatrixcopy.html
 share/doc/fontconfig/fontconfig-devel/fcmatrixequal.html
 share/doc/fontconfig/fontconfig-devel/fcmatrixinit.html
@@ -375,8 +385,7 @@ 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/ln12.html
-share/doc/fontconfig/fontconfig-devel/t1.html
+share/doc/fontconfig/fontconfig-devel/index.html
 share/doc/fontconfig/fontconfig-devel/x102.html
 share/doc/fontconfig/fontconfig-devel/x19.html
 share/doc/fontconfig/fontconfig-devel/x31.html
@@ -390,6 +399,9 @@ 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
diff --git a/fonts/fontconfig/distinfo b/fonts/fontconfig/distinfo
index 5b0b93a3b3f..0a69b80ac02 100644
--- a/fonts/fontconfig/distinfo
+++ b/fonts/fontconfig/distinfo
@@ -1,11 +1,9 @@
-$NetBSD: distinfo,v 1.33 2011/11/09 03:20:06 christos Exp $
+$NetBSD: distinfo,v 1.34 2012/06/10 16:12:47 wiz Exp $
 
-SHA1 (fontconfig-2.8.0.tar.gz) = 570fb55eb14f2c92a7b470b941e9d35dbfafa716
-RMD160 (fontconfig-2.8.0.tar.gz) = fefee412cad4fa71b573e997e14f1df12f439be2
-Size (fontconfig-2.8.0.tar.gz) = 1548409 bytes
-SHA1 (patch-aa) = e49e03606abbf51231b1ced8cdaa4b1a2aa4940f
-SHA1 (patch-ab) = 20412b1b56d833e4ae71350f45b6f998088268d2
+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 (patch-ab) = 71925f19d55a0daf382f4ac31c5010180173ae50
 SHA1 (patch-ac) = 7745afc09fbd463c184bfb783acf8d30f2effbf4
 SHA1 (patch-ae) = 7348e85cfa2d0b97649b4648346e6ea906b02769
-SHA1 (patch-ca) = 8d3abf96af648a44494afad8495635fceb6098ec
-SHA1 (patch-cb) = 4816c914da277ccf826bdb8c82fec6de04e49a1d
diff --git a/fonts/fontconfig/patches/patch-aa b/fonts/fontconfig/patches/patch-aa
index 8dc0b5d4a71..89b191e1891 100644
--- a/fonts/fontconfig/patches/patch-aa
+++ b/fonts/fontconfig/patches/patch-aa
@@ -1,17 +1,8 @@
-$NetBSD: patch-aa,v 1.13 2009/07/18 13:20:01 wiz Exp $
+$NetBSD: patch-aa,v 1.14 2012/06/10 16:12:47 wiz Exp $
 
---- Makefile.in.orig	2009-06-24 19:05:28.000000000 +0000
+--- Makefile.in.orig	2012-03-10 17:30:13.000000000 +0000
 +++ Makefile.in
-@@ -299,7 +299,7 @@ target_alias = @target_alias@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--SUBDIRS = fontconfig fc-case fc-lang fc-glyphname fc-arch src \
-+SUBDIRS = fontconfig fc-case fc-lang fc-glyphname src \
- 	fc-cache fc-cat fc-list fc-match fc-query fc-scan conf.d $(DOCSRC) test
- 
- EXTRA_DIST = fontconfig.pc.in fonts.conf.in fonts.dtd \
-@@ -316,10 +316,11 @@ MAINTAINERCLEANFILES = $(srcdir)/aclocal
+@@ -319,10 +319,11 @@ MAINTAINERCLEANFILES = $(srcdir)/aclocal
  	-type f -name Makefile.in -print` $(srcdir)/ChangeLog
  pkgconfigdir = $(libdir)/pkgconfig
  pkgconfig_DATA = fontconfig.pc
@@ -24,7 +15,7 @@ $NetBSD: patch-aa,v 1.13 2009/07/18 13:20:01 wiz Exp $
  all: config.h
  	$(MAKE) $(AM_MAKEFLAGS) all-recursive
  
-@@ -896,7 +897,8 @@ fonts.conf: fonts.conf.in Makefile
+@@ -900,7 +901,8 @@ fonts.conf: fonts.conf.in Makefile
  	mv $@.tmp $@
  
  install-data-local: fonts.conf
diff --git a/fonts/fontconfig/patches/patch-ab b/fonts/fontconfig/patches/patch-ab
index 5b8f2b27587..fc1dd054c8e 100644
--- a/fonts/fontconfig/patches/patch-ab
+++ b/fonts/fontconfig/patches/patch-ab
@@ -1,12 +1,12 @@
-$NetBSD: patch-ab,v 1.10 2011/11/09 14:30:42 christos Exp $
+$NetBSD: patch-ab,v 1.11 2012/06/10 16:12:47 wiz Exp $
 
---- src/fccache.c.orig	2009-11-16 12:24:52.000000000 -0500
-+++ src/fccache.c	2011-11-08 20:23:37.000000000 -0500
-@@ -28,6 +28,7 @@
+--- src/fccache.c.orig	2012-03-10 06:24:46.000000000 +0000
++++ src/fccache.c
+@@ -31,6 +31,7 @@
  #include <dirent.h>
  #include <string.h>
  #include <sys/types.h>
 +#include <sys/stat.h>
+ #include <time.h>
  #include <assert.h>
  #if defined(HAVE_MMAP) || defined(__CYGWIN__)
- #  include <unistd.h>
diff --git a/fonts/fontconfig/patches/patch-ca b/fonts/fontconfig/patches/patch-ca
deleted file mode 100644
index 9d8294065d2..00000000000
--- a/fonts/fontconfig/patches/patch-ca
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-ca,v 1.2 2007/11/30 22:31:17 wiz Exp $
-
---- configure.in.orig	2007-11-14 02:54:45.000000000 +0000
-+++ configure.in
-@@ -137,22 +137,6 @@ AC_SUBST(EXEEXT_FOR_BUILD)
- 
- dnl ==========================================================================
- 
--AC_ARG_WITH(arch,      [  --with-arch=ARCH      Force architecture to ARCH], arch="$withval", arch=auto)
--
--if test $cross_compiling = yes; then
--	case "$arch" in
--	auto)
--		AC_MSG_ERROR([Cannot autodetect architecture in cross compile environment]
--			     [Use --with-arch=ARCH to specify architecture])
--		;;
--	esac
--fi
--
--ARCHITECTURE=$arch
--AC_SUBST(ARCHITECTURE)
--
--dnl ==========================================================================
--
- # Checks for header files.
- AC_HEADER_DIRENT
- AC_HEADER_STDC
-@@ -565,6 +549,7 @@ fc-lang/Makefile
- fc-glyphname/Makefile
- fc-case/Makefile
- fc-arch/Makefile
-+fc-arch/fcarch.h
- src/Makefile
- conf.d/Makefile
- fc-cache/Makefile
diff --git a/fonts/fontconfig/patches/patch-cb b/fonts/fontconfig/patches/patch-cb
deleted file mode 100644
index 03e08124041..00000000000
--- a/fonts/fontconfig/patches/patch-cb
+++ /dev/null
@@ -1,77 +0,0 @@
-$NetBSD: patch-cb,v 1.4 2009/07/18 13:20:01 wiz Exp $
-
---- configure.orig	2009-06-24 19:05:31.000000000 +0000
-+++ configure
-@@ -815,7 +815,6 @@ FREETYPE_CFLAGS
- FREETYPE_LIBS
- ft_config
- ICONV_LIBS
--ARCHITECTURE
- EXEEXT_FOR_BUILD
- CC_FOR_BUILD
- CROSS_COMPILING_FALSE
-@@ -953,7 +952,6 @@ with_pic
- enable_fast_install
- with_gnu_ld
- enable_libtool_lock
--with_arch
- with_freetype_config
- with_expat
- with_expat_includes
-@@ -1624,7 +1622,6 @@ Optional Packages:
-   --with-pic              try to use only PIC/non-PIC objects [default=use
-                           both]
-   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
--  --with-arch=ARCH      Force architecture to ARCH
-   --with-freetype-config=PROG   Use FreeType configuration program PROG
-   --with-expat=DIR              Use Expat in DIR
-   --with-expat-includes=DIR     Use Expat includes in DIR
-@@ -11933,31 +11930,6 @@ $as_echo "$EXEEXT_FOR_BUILD" >&6; }
- 
- 
- 
--
--# Check whether --with-arch was given.
--if test "${with_arch+set}" = set; then
--  withval=$with_arch; arch="$withval"
--else
--  arch=auto
--fi
--
--
--if test $cross_compiling = yes; then
--	case "$arch" in
--	auto)
--		{ { $as_echo "$as_me:$LINENO: error: Cannot autodetect architecture in cross compile environment
--			     Use --with-arch=ARCH to specify architecture" >&5
--$as_echo "$as_me: error: Cannot autodetect architecture in cross compile environment
--			     Use --with-arch=ARCH to specify architecture" >&2;}
--   { (exit 1); exit 1; }; }
--		;;
--	esac
--fi
--
--ARCHITECTURE=$arch
--
--
--
- # Checks for header files.
- 
- 
-@@ -15026,7 +14998,7 @@ fi
- 
- 
- 
--ac_config_files="$ac_config_files Makefile fontconfig/Makefile fc-lang/Makefile fc-glyphname/Makefile fc-case/Makefile fc-arch/Makefile src/Makefile conf.d/Makefile fc-cache/Makefile fc-cat/Makefile fc-list/Makefile fc-match/Makefile fc-query/Makefile fc-scan/Makefile doc/Makefile doc/version.sgml test/Makefile fontconfig.spec fontconfig.pc fontconfig-zip"
-+ac_config_files="$ac_config_files Makefile fontconfig/Makefile fc-lang/Makefile fc-glyphname/Makefile fc-case/Makefile fc-arch/Makefile fc-arch/fcarch.h src/Makefile conf.d/Makefile fc-cache/Makefile fc-cat/Makefile fc-list/Makefile fc-match/Makefile fc-query/Makefile fc-scan/Makefile doc/Makefile doc/version.sgml test/Makefile fontconfig.spec fontconfig.pc fontconfig-zip"
- 
- cat >confcache <<\_ACEOF
- # This file is a shell script that caches the results of configure
-@@ -15962,6 +15934,7 @@ do
-     "fc-glyphname/Makefile") CONFIG_FILES="$CONFIG_FILES fc-glyphname/Makefile" ;;
-     "fc-case/Makefile") CONFIG_FILES="$CONFIG_FILES fc-case/Makefile" ;;
-     "fc-arch/Makefile") CONFIG_FILES="$CONFIG_FILES fc-arch/Makefile" ;;
-+    "fc-arch/fcarch.h") CONFIG_FILES="$CONFIG_FILES fc-arch/fcarch.h" ;;
-     "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
-     "conf.d/Makefile") CONFIG_FILES="$CONFIG_FILES conf.d/Makefile" ;;
-     "fc-cache/Makefile") CONFIG_FILES="$CONFIG_FILES fc-cache/Makefile" ;;