Updated fontconfig to 2.12.0.

Here is the announcement for the stable release after 2 years, which
many features and bug fixes contains.

Summary of the changes since last stable release is:
- - Support the size specific design selection in OS/2 table version 5
- - Allow the modification on 'lang' and 'charset' objects
- - Increase the refcount in FcConfigSetCurrent()
- - some updates in orth files
- - Add --error-on-no-fonts option to fc-cache
- - Use lang=und instead of lang=xx for "undetermined"
- - Add FC_WEIGHT_DEMILIGHT and change from 65 to 55
- - Add FC_COLOR
- - Treat color fonts as scalable
- - no FC_LANG added with FcConfigSubstitute() when it has "und"
- - Hardcode blanks in library
- - Support symbol fonts
- - Unicode 8.0 support
- - Add hintstyle templates and default hintslight
- - GX font support
- - Improve the footprint issue on updating caches
- - Bump the cache version to 6
- - more bug fixes
- - and more...

5 files changed, 53 insertions, 34 deletions

diff --git a/fonts/fontconfig/Makefile b/fonts/fontconfig/Makefile
index 8ec43d0a1e8..cd612ec1f7a 100644
--- a/fonts/fontconfig/Makefile
+++ b/fonts/fontconfig/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.94 2015/07/19 08:11:08 wiz Exp $
+# $NetBSD: Makefile,v 1.95 2016/06/19 20:48:55 wiz Exp $
 
-DISTNAME=	fontconfig-2.11.1
-PKGREVISION=	2
+DISTNAME=	fontconfig-2.12.0
 CATEGORIES=	fonts
 MASTER_SITES=	http://www.fontconfig.org/release/
 EXTRACT_SUFX=	.tar.bz2
@@ -65,7 +64,9 @@ CONF_FILES+=	${EGDIR}/conf.d/README ${PKG_SYSCONFDIR}/conf.d/README
 TMPLDIR=	${PREFIX}/share/fontconfig/conf.avail
 MAKE_DIRS+=	${PKG_SYSCONFDIR}/conf.d
 # following list from ${WRKSRC}/conf.d/Makefile.am
-FC_STDCONF=	10-scale-bitmap-fonts.conf 20-unhint-small-vera.conf \
+FC_STDCONF=	10-scale-bitmap-fonts.conf 10-hinting-full.conf \
+	10-hinting-medium.conf 10-hinting-none.conf 10-hinting-slight.conf \
+	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 \
diff --git a/fonts/fontconfig/PLIST b/fonts/fontconfig/PLIST
index 504eb7b69a1..d06f5e025ce 100644
--- a/fonts/fontconfig/PLIST
+++ b/fonts/fontconfig/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.25 2014/04/01 21:21:28 wiz Exp $
+@comment $NetBSD: PLIST,v 1.26 2016/06/19 20:48:55 wiz Exp $
 bin/fc-cache
 bin/fc-cat
 bin/fc-list
@@ -178,6 +178,11 @@ man/man3/FcPatternHash.3
 man/man3/FcPatternPrint.3
 man/man3/FcPatternReference.3
 man/man3/FcPatternRemove.3
+man/man3/FcRangeCopy.3
+man/man3/FcRangeCreateDouble.3
+man/man3/FcRangeCreateInteger.3
+man/man3/FcRangeDestroy.3
+man/man3/FcRangeGetDouble.3
 man/man3/FcStrBasename.3
 man/man3/FcStrCmp.3
 man/man3/FcStrCmpIgnoreCase.3
@@ -210,6 +215,8 @@ man/man3/FcValueDestroy.3
 man/man3/FcValueEqual.3
 man/man3/FcValuePrint.3
 man/man3/FcValueSave.3
+man/man3/FcWeightFromOpenType.3
+man/man3/FcWeightToOpenType.3
 man/man5/fonts-conf.5
 share/doc/fontconfig/fontconfig-devel.pdf
 share/doc/fontconfig/fontconfig-devel.txt
@@ -371,6 +378,11 @@ share/doc/fontconfig/fontconfig-devel/fcpatternhash.html
 share/doc/fontconfig/fontconfig-devel/fcpatternprint.html
 share/doc/fontconfig/fontconfig-devel/fcpatternreference.html
 share/doc/fontconfig/fontconfig-devel/fcpatternremove.html
+share/doc/fontconfig/fontconfig-devel/fcrangecopy.html
+share/doc/fontconfig/fontconfig-devel/fcrangecreatedouble.html
+share/doc/fontconfig/fontconfig-devel/fcrangecreateinteger.html
+share/doc/fontconfig/fontconfig-devel/fcrangedestroy.html
+share/doc/fontconfig/fontconfig-devel/fcrangegetdouble.html
 share/doc/fontconfig/fontconfig-devel/fcstrbasename.html
 share/doc/fontconfig/fontconfig-devel/fcstrcmp.html
 share/doc/fontconfig/fontconfig-devel/fcstrcmpignorecase.html
@@ -403,6 +415,8 @@ 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/fcweightfromopentype.html
+share/doc/fontconfig/fontconfig-devel/fcweighttoopentype.html
 share/doc/fontconfig/fontconfig-devel/ln12.html
 share/doc/fontconfig/fontconfig-devel/t1.html
 share/doc/fontconfig/fontconfig-devel/x102.html
@@ -414,6 +428,10 @@ share/doc/fontconfig/fontconfig-user.txt
 share/examples/fontconfig/conf.d/README
 share/examples/fontconfig/fonts.conf
 share/fontconfig/conf.avail/10-autohint.conf
+share/fontconfig/conf.avail/10-hinting-full.conf
+share/fontconfig/conf.avail/10-hinting-medium.conf
+share/fontconfig/conf.avail/10-hinting-none.conf
+share/fontconfig/conf.avail/10-hinting-slight.conf
 share/fontconfig/conf.avail/10-no-sub-pixel.conf
 share/fontconfig/conf.avail/10-scale-bitmap-fonts.conf
 share/fontconfig/conf.avail/10-sub-pixel-bgr.conf
diff --git a/fonts/fontconfig/distinfo b/fonts/fontconfig/distinfo
index 0b7933c4331..3c95778529b 100644
--- a/fonts/fontconfig/distinfo
+++ b/fonts/fontconfig/distinfo
@@ -1,16 +1,16 @@
-$NetBSD: distinfo,v 1.53 2015/11/04 17:41:18 agc Exp $
+$NetBSD: distinfo,v 1.54 2016/06/19 20:48:55 wiz Exp $
 
-SHA1 (fontconfig-2.11.1.tar.bz2) = 08565feea5a4e6375f9d8a7435dac04e52620ff2
-RMD160 (fontconfig-2.11.1.tar.bz2) = 9d0a242ec05737f5dba3949ffe095f3c100217c7
-SHA512 (fontconfig-2.11.1.tar.bz2) = acf4e6293e0e5521e4b8f29f4b48860ecd1d39744d0eab21c7332e56bfc3ccc63548e459243c5e425b8e5ef265f2cf065eece02460725e794041219d41188149
-Size (fontconfig-2.11.1.tar.bz2) = 1516095 bytes
+SHA1 (fontconfig-2.12.0.tar.bz2) = 4170b4d11816b10ff739e1b8ce35fae15a45894b
+RMD160 (fontconfig-2.12.0.tar.bz2) = 00b9af80c2abf6c69bf542f4d21a30a32ae728f4
+SHA512 (fontconfig-2.12.0.tar.bz2) = b8f005d56aa9fe6a756be1cb4d843c69c746915c10fe968393527bd3469e4df0401a10edf5b0a69b0e2732cc07f71ad001c19a07726e5dfa881b9d94bb6935f9
+Size (fontconfig-2.12.0.tar.bz2) = 1605355 bytes
 SHA1 (patch-aa) = ae9a465321dcaee634faf016e2dd01e2f544af12
 SHA1 (patch-ac) = 4a0b7b55aa4b5c106fd256c4ef81df2240224803
 SHA1 (patch-af) = d351265c894738284215f0bb38d47cc1c8f28ec7
-SHA1 (patch-configure) = f03b6a4e6223b035ea6f19710f8130164e51c5a8
+SHA1 (patch-configure) = 4256c69b24e57d92e7b3bc9b4640d822d782ec3e
 SHA1 (patch-scandir.c) = e35f4c005f635dd0d8bb949cd32aa34f5e314200
 SHA1 (patch-src_fccharset.c) = f3855554b3b3cab2530b46bc1ccec6a33303de7a
 SHA1 (patch-src_fcftint.h) = d629fd7ef9713ccc56800d033ba2e09c5a9e2bff
 SHA1 (patch-src_fcint.h) = 13602cc605d7dadd2f7c30633236454bb134a50a
-SHA1 (patch-src_fcstat.c) = a4367e7faae72e0531535adaedc7da4365d2b403
+SHA1 (patch-src_fcstat.c) = 3aaa5b1a174644e5d655a9c5890998c9d80e8da9
 SHA1 (patch-test_test-migration.c) = 0fcbae562f8ebdef807978755c252626ade44a09
diff --git a/fonts/fontconfig/patches/patch-configure b/fonts/fontconfig/patches/patch-configure
index 2b04ecfc2cb..3c16edfa72a 100644
--- a/fonts/fontconfig/patches/patch-configure
+++ b/fonts/fontconfig/patches/patch-configure
@@ -1,25 +1,25 @@
-$NetBSD: patch-configure,v 1.1 2014/07/15 14:48:34 ryoon Exp $
+$NetBSD: patch-configure,v 1.2 2016/06/19 20:48:55 wiz Exp $
 
---- configure.orig	2014-03-24 06:04:16.000000000 +0000
+--- configure.orig	2016-06-15 11:11:58.000000000 +0000
 +++ configure
-@@ -13976,6 +13976,10 @@ $as_echo_n "checking for scandir... " >&
- /* end confdefs.h.  */
- 
- 		#include <dirent.h>
+@@ -13976,6 +13976,10 @@ if ac_fn_c_try_compile "$LINENO"; then :
+ $as_echo "$as_me: WARNING: your GCC compiler has a defunct stdint.h for its default-mode" >&2;}
+ fi
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +		#if defined(_SCO_DS)
 +		/* bogus */
 +		#include <prot.h>
 +		#endif
- 		int main(void);
+ fi
+ CXXFLAGS="$old_CXXFLAGS"
+ CPPFLAGS="$old_CPPFLAGS"
+@@ -14004,6 +14008,9 @@ if test "_$ac_cv_header_stdint_t" = "_" 
  
- int
-@@ -14004,6 +14008,9 @@ else
- /* end confdefs.h.  */
+ inttype_headers=`echo  | sed -e 's/,/ /g'`
  
- 			#include <dirent.h>
 +			#if defined(_SCO_DS)
 +			#include <prot.h>
 +			#endif
- 			int main(void);
+ ac_cv_stdint_result="(no helpful system typedefs seen)"
  
- int
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdint uintptr_t" >&5
diff --git a/fonts/fontconfig/patches/patch-src_fcstat.c b/fonts/fontconfig/patches/patch-src_fcstat.c
index bd5a3485bb6..00e5edec05c 100644
--- a/fonts/fontconfig/patches/patch-src_fcstat.c
+++ b/fonts/fontconfig/patches/patch-src_fcstat.c
@@ -1,15 +1,15 @@
-$NetBSD: patch-src_fcstat.c,v 1.4 2014/07/15 14:48:34 ryoon Exp $
+$NetBSD: patch-src_fcstat.c,v 1.5 2016/06/19 20:48:55 wiz 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	2014-03-05 09:27:42.000000000 +0000
+--- src/fcstat.c.orig	2016-04-06 03:22:55.000000000 +0000
 +++ src/fcstat.c
-@@ -42,6 +42,12 @@
- #ifdef HAVE_SYS_MOUNT_H
- #include <sys/mount.h>
+@@ -52,6 +52,12 @@ typedef long long INT64;
+ #define EPOCH_OFFSET 11644473600i64
+ typedef __int64 INT64;
  #endif
 +#ifdef __MirBSD__
 +#include <sys/statvfs.h>
@@ -18,9 +18,9 @@ statvfs and fstatvfs need another include file, at least on MirBSD.
 +#include "../scandir.c"
 +#endif
  
- #ifdef _WIN32
- #ifdef __GNUC__
-@@ -158,7 +164,11 @@ Adler32Finish (struct Adler32 *ctx)
+ /* Workaround for problems in the stat() in the Microsoft C library:
+  *
+@@ -159,7 +165,11 @@ Adler32Finish (struct Adler32 *ctx)
  #ifdef HAVE_STRUCT_DIRENT_D_TYPE
  /* dirent.d_type can be relied upon on FAT filesystem */
  static FcBool
@@ -32,7 +32,7 @@ statvfs and fstatvfs need another include file, at least on MirBSD.
  {
      return entry->d_type != DT_DIR;
  }
-@@ -197,7 +207,11 @@ FcDirChecksum (const FcChar8 *dir, time_
+@@ -263,7 +273,11 @@ FcDirChecksum (const FcChar8 *dir, time_
  #else
  		 NULL,
  #endif