Update to 2.11.1:

I'm pleased to announce that we have a new release of fontconfig,
2.11.1 here now, which contains bug fixes.

6 files changed, 11 insertions, 142 deletions

diff --git a/fonts/fontconfig/Makefile b/fonts/fontconfig/Makefile
index 62bace1708f..dc6d7108fde 100644
--- a/fonts/fontconfig/Makefile
+++ b/fonts/fontconfig/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.87 2014/02/06 09:41:08 obache Exp $
+# $NetBSD: Makefile,v 1.88 2014/04/01 21:21:28 wiz Exp $
 
-DISTNAME=	fontconfig-2.11.0
+DISTNAME=	fontconfig-2.11.1
 CATEGORIES=	fonts
 MASTER_SITES=	http://www.fontconfig.org/release/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/fonts/fontconfig/PLIST b/fonts/fontconfig/PLIST
index b1fe3337a78..504eb7b69a1 100644
--- a/fonts/fontconfig/PLIST
+++ b/fonts/fontconfig/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.24 2013/10/17 07:27:33 wiz Exp $
+@comment $NetBSD: PLIST,v 1.25 2014/04/01 21:21:28 wiz Exp $
 bin/fc-cache
 bin/fc-cat
 bin/fc-list
@@ -89,6 +89,7 @@ man/man3/FcDirCacheClean.3
 man/man3/FcDirCacheLoad.3
 man/man3/FcDirCacheLoadFile.3
 man/man3/FcDirCacheRead.3
+man/man3/FcDirCacheRescan.3
 man/man3/FcDirCacheUnlink.3
 man/man3/FcDirCacheUnload.3
 man/man3/FcDirCacheValid.3
@@ -134,6 +135,7 @@ 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
@@ -280,6 +282,7 @@ 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
+share/doc/fontconfig/fontconfig-devel/fcdircacherescan.html
 share/doc/fontconfig/fontconfig-devel/fcdircacheunlink.html
 share/doc/fontconfig/fontconfig-devel/fcdircacheunload.html
 share/doc/fontconfig/fontconfig-devel/fcdircachevalid.html
@@ -325,6 +328,7 @@ 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
diff --git a/fonts/fontconfig/distinfo b/fonts/fontconfig/distinfo
index 339f0266366..0c667c75551 100644
--- a/fonts/fontconfig/distinfo
+++ b/fonts/fontconfig/distinfo
@@ -1,12 +1,9 @@
-$NetBSD: distinfo,v 1.48 2013/10/30 23:53:10 wiz Exp $
+$NetBSD: distinfo,v 1.49 2014/04/01 21:21:28 wiz Exp $
 
-SHA1 (fontconfig-2.11.0.tar.bz2) = 969818b0326ac08241b11cbeaa4f203699f9b550
-RMD160 (fontconfig-2.11.0.tar.bz2) = a77063d43caecc6090e6b942ae4fca08a2f1f62c
-Size (fontconfig-2.11.0.tar.bz2) = 1541382 bytes
+SHA1 (fontconfig-2.11.1.tar.bz2) = 08565feea5a4e6375f9d8a7435dac04e52620ff2
+RMD160 (fontconfig-2.11.1.tar.bz2) = 9d0a242ec05737f5dba3949ffe095f3c100217c7
+Size (fontconfig-2.11.1.tar.bz2) = 1516095 bytes
 SHA1 (patch-aa) = ae9a465321dcaee634faf016e2dd01e2f544af12
-SHA1 (patch-ab) = 5aabb4bd60319c83cbb22f784efe11bdc7308f92
 SHA1 (patch-ac) = 4a0b7b55aa4b5c106fd256c4ef81df2240224803
 SHA1 (patch-af) = d351265c894738284215f0bb38d47cc1c8f28ec7
-SHA1 (patch-ba) = e0ad71bfb333872fcef21d76db06312e7a325202
 SHA1 (patch-src_fcstat.c) = 9cb2d9b656bcb79d33be84a053e928ecf957dfd7
-SHA1 (patch-test_test-migration.c) = 16435e36de501523dd487005dec68c31c229112e
diff --git a/fonts/fontconfig/patches/patch-ab b/fonts/fontconfig/patches/patch-ab
deleted file mode 100644
index a15efc731b4..00000000000
--- a/fonts/fontconfig/patches/patch-ab
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ab,v 1.13 2013/07/26 11:37:22 ryoon Exp $
-
-On Debian GNU/kFreeBSD 7.0, there is posix_fadvise(2), but no
-POSIX_FADV_WILLNEED.
-
---- src/fccache.c.orig	2013-03-21 09:50:26.000000000 +0000
-+++ src/fccache.c
-@@ -31,6 +31,7 @@
- #include <dirent.h>
- #include <string.h>
- #include <sys/types.h>
-+#include <sys/stat.h>
- #include <assert.h>
- #if defined(HAVE_MMAP) || defined(__CYGWIN__)
- #  include <unistd.h>
-@@ -575,7 +576,7 @@ FcDirCacheMapFd (int fd, struct stat *fd
-     {
- #if defined(HAVE_MMAP) || defined(__CYGWIN__)
- 	cache = mmap (0, fd_stat->st_size, PROT_READ, MAP_SHARED, fd, 0);
--#ifdef HAVE_POSIX_FADVISE
-+#if defined(HAVE_POSIX_FADVISE) && defined(POSIX_FADV_WILLNEED)
- 	posix_fadvise (fd, 0, fd_stat->st_size, POSIX_FADV_WILLNEED);
- #endif
- 	if (cache == MAP_FAILED)
diff --git a/fonts/fontconfig/patches/patch-ba b/fonts/fontconfig/patches/patch-ba
deleted file mode 100644
index 5a07a7e3e71..00000000000
--- a/fonts/fontconfig/patches/patch-ba
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD: patch-ba,v 1.3 2013/10/30 23:53:10 wiz Exp $
-
-First chunk: part of the Solaris fix for test-migration.c, from
-Akira TAGOH (upstream)
-
-Second chunk: On NetBSD, it is not supported to load a library linked against
-libpthread into a program that wasn't (since the C library provides
-stubs for some pthread-functions, which might have already been called
-before libpthread is loaded, leading to problems).
-
-Since xdm (not linked against libpthread) might load fontconfig,
-fontconfig shouldn't be linked against libpthread.
-
---- configure.orig	2013-01-10 08:59:05.000000000 +0000
-+++ configure
-@@ -13908,7 +13908,7 @@ $as_echo "#define HAVE_MMAP 1" >>confdef
- fi
- rm -f conftest.mmap conftest.txt
- 
--for ac_func in link mkstemp mkostemp _mktemp_s getopt getopt_long getprogname getexecname rand random lrand48 random_r rand_r regcomp regerror regexec regfree fstatvfs fstatfs lstat
-+for ac_func in link mkstemp mkostemp _mktemp_s mkdtemp getopt getopt_long getprogname getexecname rand random lrand48 random_r rand_r regcomp regerror regexec regfree fstatvfs fstatfs lstat
- do :
-   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
- ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-@@ -15017,6 +15017,11 @@ case ${host_os} in
-         darwin*)
-         ax_pthread_flags="-pthread $ax_pthread_flags"
-         ;;
-+	netbsd*)
-+	# use libc stubs, don't link against libpthread, to allow
-+	# dynamic loading
-+	ax_pthread_flags=""
-+	;;
- esac
- 
- if test x"$ax_pthread_ok" = xno; then
-
diff --git a/fonts/fontconfig/patches/patch-test_test-migration.c b/fonts/fontconfig/patches/patch-test_test-migration.c
deleted file mode 100644
index d306492f9ad..00000000000
--- a/fonts/fontconfig/patches/patch-test_test-migration.c
+++ /dev/null
@@ -1,71 +0,0 @@
-$NetBSD: patch-test_test-migration.c,v 1.2 2013/10/30 23:53:10 wiz Exp $
-
-Fix build on Solaris.
-From Akira TAGOH (upstream).
-
---- test/test-migration.c.orig	2013-10-11 03:10:18.000000000 +0000
-+++ test/test-migration.c
-@@ -4,8 +4,26 @@
- #include <unistd.h>
- #include <sys/types.h>
- #include <dirent.h>
-+#ifndef HAVE_STRUCT_DIRENT_D_TYPE
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+#include <unistd.h>
-+#endif
- #include <fontconfig/fontconfig.h>
- 
-+#ifdef HAVE_MKDTEMP
-+#define fc_mkdtemp	mkdtemp
-+#else
-+char *
-+fc_mkdtemp (char *template)
-+{
-+    if (!mktemp (template) || mkdir (template, 0700))
-+	return NULL;
-+
-+    return template;
-+}
-+#endif
-+
- FcBool
- mkdir_p(const char *dir)
- {
-@@ -36,6 +54,9 @@ unlink_dirs(const char *dir)
-     size_t len = strlen (dir);
-     char *n = NULL;
-     FcBool ret = FcTrue;
-+#ifndef HAVE_STRUCT_DIRENT_D_TYPE
-+    struct stat statb;
-+#endif
- 
-     if (!d)
- 	return FcFalse;
-@@ -53,7 +74,17 @@ unlink_dirs(const char *dir)
- 	strcpy (n, dir);
- 	n[len] = '/';
- 	strcpy (&n[len + 1], e->d_name);
-+#ifdef HAVE_STRUCT_DIRENT_D_TYPE
- 	if (e->d_type == DT_DIR)
-+#else
-+	if (stat (n, &statb) == -1)
-+	{
-+		fprintf (stderr, "E: %s\n", n);
-+		ret = FcFalse;
-+		break;
-+	}
-+	if (S_ISDIR (statb.st_mode))
-+#endif
- 	{
- 	    if (!unlink_dirs (n))
- 	    {
-@@ -89,7 +120,7 @@ int
- main(void)
- {
-     char template[32] = "fontconfig-XXXXXXXX";
--    char *tmp = mkdtemp (template);
-+    char *tmp = fc_mkdtemp (template);
-     size_t len = strlen (tmp), xlen, dlen;
-     char xdg[256], confd[256], fn[256], nfn[256], ud[256], nud[256];
-     int ret = -1;