Changes 2.10.93:

      Bug 62980 - matching native fonts with even :lang=en
      Ensure closing fp on error
      Obtain fonts data via FT_Face instead of opening a file directly
      Revert the previous change and rework to not export freetype API outside fcfreetype.c
      documented FC_HASH and FC_POSTSCRIPT_NAME
      Bug 63329 - make check fails: .. contents:: :depth: 2
      Use the glob matching for filename
      Bug 63452 - conf.d/README outdated
      Fix missing OSAtomicCompareAndSwapPtrBarrier() on Mac OS X 10.4
      Bug 63922 - FcFreeTypeQueryFace fails on postscripts fonts loaded from memory
      build-chain, replace INCLUDES directive by AM_CPPFLAGS

6 files changed, 37 insertions, 36 deletions

diff --git a/fonts/fontconfig/Makefile b/fonts/fontconfig/Makefile
index 9982b21e1f7..63c376f18b3 100644
--- a/fonts/fontconfig/Makefile
+++ b/fonts/fontconfig/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.81 2013/04/10 11:41:37 wiz Exp $
+# $NetBSD: Makefile,v 1.82 2013/05/20 19:56:39 adam Exp $
 
-DISTNAME=	fontconfig-2.10.92
+DISTNAME=	fontconfig-2.10.93
 CATEGORIES=	fonts
 MASTER_SITES=	http://www.fontconfig.org/release/
+EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.fontconfig.org/
@@ -11,23 +12,22 @@ COMMENT=	Library for configuring and customizing font access
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-GNU_CONFIGURE=		YES
-USE_LIBTOOL=		YES
+USE_LIBTOOL=		yes
 USE_TOOLS+=		gmake pkg-config
-
-PKGCONFIG_OVERRIDE=	fontconfig.pc.in
-
-PKG_SYSCONFSUBDIR=	fontconfig
-
+GNU_CONFIGURE=		yes
 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-baseconfigdir=${PKG_SYSCONFDIR:Q}
-CONFIGURE_ARGS+=	--with-cache-dir=${VARBASE:Q}/cache/fontconfig
+CONFIGURE_ARGS+=	--with-baseconfigdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=	--with-cache-dir=${VARBASE}/cache/fontconfig
 CONFIGURE_ARGS+=	--enable-docs
 CONFIGURE_ENV+=		HASDOCBOOK=no
 
+PKGCONFIG_OVERRIDE=	fontconfig.pc.in
+
+PKG_SYSCONFSUBDIR=	fontconfig
+
 .include "../../mk/bsd.prefs.mk"
 
 GSFONTS=	${PREFIX}/share/fonts/urw,${PREFIX}/share/ghostscript/fonts
diff --git a/fonts/fontconfig/distinfo b/fonts/fontconfig/distinfo
index d51b71706e7..e854e9ee85d 100644
--- a/fonts/fontconfig/distinfo
+++ b/fonts/fontconfig/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.40 2013/04/10 11:41:37 wiz Exp $
+$NetBSD: distinfo,v 1.41 2013/05/20 19:56:39 adam Exp $
 
-SHA1 (fontconfig-2.10.92.tar.gz) = 8fb6f6f5d590a9397aa36ffa225c44dca4876e47
-RMD160 (fontconfig-2.10.92.tar.gz) = cf71b33229b76afe101ca6a861e67731952f9d63
-Size (fontconfig-2.10.92.tar.gz) = 1819236 bytes
-SHA1 (patch-aa) = c0e2e282383e8fab643d0a10fa47e42ebb4e8ae8
+SHA1 (fontconfig-2.10.93.tar.bz2) = 78a87be2a59b0c803bfd69cdafc85cbc31381d3a
+RMD160 (fontconfig-2.10.93.tar.bz2) = 0427185e941f534c3e40dd3ae4abdd2ab72fac20
+Size (fontconfig-2.10.93.tar.bz2) = 1526089 bytes
+SHA1 (patch-aa) = a0a752e7050ae438198b7286d01dbc5ab4a7e53e
 SHA1 (patch-ab) = 04d21073e6e585c5317e5c29d2d1918d240ce233
-SHA1 (patch-ac) = c4f9904842c43246321cb982af78c1a61d06ad75
-SHA1 (patch-af) = becdaa40180fd8aaa828faf3776ccd70d460e67e
+SHA1 (patch-ac) = 7de7a672650286d2f72b95b9c96e19b5df2a9155
+SHA1 (patch-af) = d351265c894738284215f0bb38d47cc1c8f28ec7
 SHA1 (patch-ba) = e4f116b777a8046615569ae6e89545ad3c7abf77
-SHA1 (patch-src_fcstat.c) = 3b8443b92f9fca5c02e21301da55ada3a0b20536
+SHA1 (patch-src_fcstat.c) = 9cb2d9b656bcb79d33be84a053e928ecf957dfd7
diff --git a/fonts/fontconfig/patches/patch-aa b/fonts/fontconfig/patches/patch-aa
index 80bcc432b83..013b74e63e4 100644
--- a/fonts/fontconfig/patches/patch-aa
+++ b/fonts/fontconfig/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.16 2013/03/14 19:32:32 drochner Exp $
+$NetBSD: patch-aa,v 1.17 2013/05/20 19:56:39 adam Exp $
 
---- Makefile.in.orig	2013-01-10 08:59:03.000000000 +0000
+--- Makefile.in.orig	2013-05-20 08:44:34.000000000 +0000
 +++ Makefile.in
-@@ -357,6 +357,7 @@ top_build_prefix = @top_build_prefix@
+@@ -363,6 +363,7 @@ top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  xmldir = $(XMLDIR)
@@ -10,7 +10,7 @@ $NetBSD: patch-aa,v 1.16 2013/03/14 19:32:32 drochner Exp $
  SUBDIRS = fontconfig fc-case fc-lang fc-glyphname src fc-cache fc-cat \
  	fc-list fc-match fc-pattern fc-query fc-scan fc-validate \
  	conf.d test $(am__append_1)
-@@ -383,6 +384,7 @@ xml_DATA = fonts.dtd
+@@ -386,6 +387,7 @@ xml_DATA = fonts.dtd
  @CROSS_COMPILING_FALSE@RUN_FC_CACHE_TEST = test -z "$(DESTDIR)"
  @CROSS_COMPILING_TRUE@RUN_FC_CACHE_TEST = false
  DISTCHECK_CONFIGURE_FLAGS = 
@@ -18,7 +18,7 @@ $NetBSD: patch-aa,v 1.16 2013/03/14 19:32:32 drochner Exp $
  all: config.h
  	$(MAKE) $(AM_MAKEFLAGS) all-recursive
  
-@@ -974,17 +976,13 @@ fonts.conf: fonts.conf.in Makefile
+@@ -977,17 +979,13 @@ fonts.conf: fonts.conf.in Makefile
  	mv $@.tmp $@
  
  install-data-local: fonts.conf
diff --git a/fonts/fontconfig/patches/patch-ac b/fonts/fontconfig/patches/patch-ac
index 111ffba5511..138f257cb9a 100644
--- a/fonts/fontconfig/patches/patch-ac
+++ b/fonts/fontconfig/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.11 2012/07/31 18:12:28 drochner Exp $
+$NetBSD: patch-ac,v 1.12 2013/05/20 19:56:39 adam Exp $
 
---- conf.d/Makefile.in.orig	2012-07-27 02:24:50.000000000 +0000
+--- conf.d/Makefile.in.orig	2013-05-20 08:44:34.000000000 +0000
 +++ conf.d/Makefile.in
-@@ -218,7 +218,7 @@ build_cpu = @build_cpu@
+@@ -257,7 +257,7 @@ build_cpu = @build_cpu@
  build_os = @build_os@
  build_vendor = @build_vendor@
  builddir = @builddir@
@@ -11,8 +11,8 @@ $NetBSD: patch-ac,v 1.11 2012/07/31 18:12:28 drochner Exp $
  datadir = @datadir@
  datarootdir = @datarootdir@
  docdir = @docdir@
-@@ -541,6 +541,7 @@ uninstall-am: uninstall-configDATA unins
- 
+@@ -600,6 +600,7 @@ README: $(srcdir)/README.in
+ 	sed "s|\@TEMPLATEDIR\@|$(templatedir)|" $< > $@
  
  install-data-hook:
 +xinstall-data-hook:
diff --git a/fonts/fontconfig/patches/patch-af b/fonts/fontconfig/patches/patch-af
index 1c8ba6ee27f..999346de40c 100644
--- a/fonts/fontconfig/patches/patch-af
+++ b/fonts/fontconfig/patches/patch-af
@@ -1,15 +1,15 @@
-$NetBSD: patch-af,v 1.1 2012/07/31 18:12:28 drochner Exp $
+$NetBSD: patch-af,v 1.2 2013/05/20 19:56:39 adam Exp $
 
---- conf.d/README.orig	2012-02-20 03:49:18.000000000 +0000
+--- conf.d/README.orig	2013-05-13 03:05:36.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
+-These files are normally installed in /usr/share/fontconfig/conf.avail
+-and then symlinked here, allowing them to be easily installed and then
+-enabled/disabled by adjusting the symlinks.
++These files are normally 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
diff --git a/fonts/fontconfig/patches/patch-src_fcstat.c b/fonts/fontconfig/patches/patch-src_fcstat.c
index 0d65ab2545f..e88fece5c53 100644
--- a/fonts/fontconfig/patches/patch-src_fcstat.c
+++ b/fonts/fontconfig/patches/patch-src_fcstat.c
@@ -1,9 +1,10 @@
-$NetBSD: patch-src_fcstat.c,v 1.2 2013/03/14 19:32:33 drochner Exp $
+$NetBSD: patch-src_fcstat.c,v 1.3 2013/05/20 19:56:39 adam Exp $
 
 The argument types to scandir(3) differ between different OSes.
 OpenBSD seems to be still different. I used the provided alphasort
 instead of rewriting the equivalent sorter function.
 statvfs and fstatvfs need another include file, at least on MirBSD.
+
 --- src/fcstat.c.orig	2013-01-08 06:42:23.000000000 +0000
 +++ src/fcstat.c
 @@ -42,6 +42,9 @@