fontconfig: update to 2.13.1.

Changes not found.

4 files changed, 40 insertions, 21 deletions

diff --git a/fonts/fontconfig/Makefile b/fonts/fontconfig/Makefile
index a5ade3ff1b1..4c6ae6d8534 100644
--- a/fonts/fontconfig/Makefile
+++ b/fonts/fontconfig/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.111 2018/08/31 09:06:07 tnn Exp $
+# $NetBSD: Makefile,v 1.112 2018/09/02 20:30:43 wiz Exp $
 
-DISTNAME=	fontconfig-2.13.0
-PKGREVISION=	2
+DISTNAME=	fontconfig-2.13.1
 CATEGORIES=	fonts
 MASTER_SITES=	https://www.fontconfig.org/release/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/fonts/fontconfig/PLIST b/fonts/fontconfig/PLIST
index bedb0ac618a..d57b1bd3052 100644
--- a/fonts/fontconfig/PLIST
+++ b/fonts/fontconfig/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.30 2018/03/24 15:44:54 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.31 2018/09/02 20:30:43 wiz Exp $
 bin/fc-cache
 bin/fc-cat
 bin/fc-conflist
@@ -93,6 +93,7 @@ man/man3/FcConfigUptoDate.3
 man/man3/FcDefaultSubstitute.3
 man/man3/FcDirCacheClean.3
 man/man3/FcDirCacheCreateUUID.3
+man/man3/FcDirCacheDeleteUUID.3
 man/man3/FcDirCacheLoad.3
 man/man3/FcDirCacheLoadFile.3
 man/man3/FcDirCacheRead.3
@@ -179,11 +180,20 @@ man/man3/FcPatternDuplicate.3
 man/man3/FcPatternEqual.3
 man/man3/FcPatternEqualSubset.3
 man/man3/FcPatternFilter.3
+man/man3/FcPatternFindIter.3
 man/man3/FcPatternFormat.3
 man/man3/FcPatternGet-Type.3
 man/man3/FcPatternGet.3
 man/man3/FcPatternGetWithBinding.3
 man/man3/FcPatternHash.3
+man/man3/FcPatternIterEqual.3
+man/man3/FcPatternIterGetObject.3
+man/man3/FcPatternIterGetValue.3
+man/man3/FcPatternIterIsValid.3
+man/man3/FcPatternIterNext.3
+man/man3/FcPatternIterStart.3
+man/man3/FcPatternIterValueCount.3
+man/man3/FcPatternObjectCount.3
 man/man3/FcPatternPrint.3
 man/man3/FcPatternReference.3
 man/man3/FcPatternRemove.3
@@ -302,6 +312,7 @@ 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/fcdircachecreateuuid.html
+share/doc/fontconfig/fontconfig-devel/fcdircachedeleteuuid.html
 share/doc/fontconfig/fontconfig-devel/fcdircacheload.html
 share/doc/fontconfig/fontconfig-devel/fcdircacheloadfile.html
 share/doc/fontconfig/fontconfig-devel/fcdircacheread.html
@@ -388,11 +399,20 @@ share/doc/fontconfig/fontconfig-devel/fcpatternduplicate.html
 share/doc/fontconfig/fontconfig-devel/fcpatternequal.html
 share/doc/fontconfig/fontconfig-devel/fcpatternequalsubset.html
 share/doc/fontconfig/fontconfig-devel/fcpatternfilter.html
+share/doc/fontconfig/fontconfig-devel/fcpatternfinditer.html
 share/doc/fontconfig/fontconfig-devel/fcpatternformat.html
 share/doc/fontconfig/fontconfig-devel/fcpatternget-type.html
 share/doc/fontconfig/fontconfig-devel/fcpatternget.html
 share/doc/fontconfig/fontconfig-devel/fcpatterngetwithbinding.html
 share/doc/fontconfig/fontconfig-devel/fcpatternhash.html
+share/doc/fontconfig/fontconfig-devel/fcpatterniterequal.html
+share/doc/fontconfig/fontconfig-devel/fcpatternitergetobject.html
+share/doc/fontconfig/fontconfig-devel/fcpatternitergetvalue.html
+share/doc/fontconfig/fontconfig-devel/fcpatterniterisvalid.html
+share/doc/fontconfig/fontconfig-devel/fcpatterniternext.html
+share/doc/fontconfig/fontconfig-devel/fcpatterniterstart.html
+share/doc/fontconfig/fontconfig-devel/fcpatternitervaluecount.html
+share/doc/fontconfig/fontconfig-devel/fcpatternobjectcount.html
 share/doc/fontconfig/fontconfig-devel/fcpatternprint.html
 share/doc/fontconfig/fontconfig-devel/fcpatternreference.html
 share/doc/fontconfig/fontconfig-devel/fcpatternremove.html
diff --git a/fonts/fontconfig/distinfo b/fonts/fontconfig/distinfo
index b86ea8410d7..c75e95004b6 100644
--- a/fonts/fontconfig/distinfo
+++ b/fonts/fontconfig/distinfo
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.65 2018/03/24 17:08:31 joerg Exp $
+$NetBSD: distinfo,v 1.66 2018/09/02 20:30:43 wiz Exp $
 
-SHA1 (fontconfig-2.13.0.tar.bz2) = b7bcc5d47211b7bbac35bb221860407db3601f5b
-RMD160 (fontconfig-2.13.0.tar.bz2) = cbc9a9b34f10b72e09d425557b156cf46c675a05
-SHA512 (fontconfig-2.13.0.tar.bz2) = f0ad8f2542c8b1e900f5c3d213466a31dd3785da726d6eb455b6734c71c6e5751b28172203e2f9668e9c8e1512072235ea46a1a5e6a85ec54ccc332adb4e5fbc
-Size (fontconfig-2.13.0.tar.bz2) = 1700500 bytes
+SHA1 (fontconfig-2.13.1.tar.bz2) = 75612356ef4f801735b49baf987f8942b4a7a5e1
+RMD160 (fontconfig-2.13.1.tar.bz2) = a971903874fb0395a7ab2d5705378af1ffce2b2c
+SHA512 (fontconfig-2.13.1.tar.bz2) = f97f2a9db294fd72d416a7d76dd7db5934ade2cf76903764b09e7decc33e0e2eed1a1d35c5f1c7fd9ea39e2c7653b9e65365f0c6205e047e95e38ba5000dd100
+Size (fontconfig-2.13.1.tar.bz2) = 1723639 bytes
 SHA1 (patch-aa) = ae9a465321dcaee634faf016e2dd01e2f544af12
 SHA1 (patch-ac) = 4a0b7b55aa4b5c106fd256c4ef81df2240224803
 SHA1 (patch-af) = d351265c894738284215f0bb38d47cc1c8f28ec7
-SHA1 (patch-configure) = 803ef86268883ea55fd08bd86710ea258e1c1488
+SHA1 (patch-configure) = 164cb8ae38d71e52eb9c41584d8597f6c44228b5
 SHA1 (patch-scandir.c) = e35f4c005f635dd0d8bb949cd32aa34f5e314200
 SHA1 (patch-src_fccharset.c) = f3855554b3b3cab2530b46bc1ccec6a33303de7a
 SHA1 (patch-src_fcfreetype.c) = 42542ae666b292af700313ee103d0f295cf69e4e
diff --git a/fonts/fontconfig/patches/patch-configure b/fonts/fontconfig/patches/patch-configure
index 861a95be680..2728ace561a 100644
--- a/fonts/fontconfig/patches/patch-configure
+++ b/fonts/fontconfig/patches/patch-configure
@@ -1,12 +1,12 @@
-$NetBSD: patch-configure,v 1.4 2018/03/24 17:08:31 joerg Exp $
+$NetBSD: patch-configure,v 1.5 2018/09/02 20:30:43 wiz Exp $
 
 Do not look for libuuid on Darwin, it is built-in.
 
 Patch "GNU" gettext support to not depend unnecessary on "GNU" gettext.
 
---- configure.orig	2018-03-06 03:31:59.000000000 +0000
+--- configure.orig	2018-08-30 08:24:28.000000000 +0000
 +++ configure
-@@ -13295,8 +13295,12 @@ case "$host" in
+@@ -13304,8 +13304,12 @@ case "$host" in
    *-*-mingw*)
      os_win32=yes
      ;;
@@ -19,7 +19,7 @@ Patch "GNU" gettext support to not depend unnecessary on "GNU" gettext.
  esac
   if test "$os_win32" = "yes"; then
    OS_WIN32_TRUE=
-@@ -15227,8 +15231,7 @@ extern
+@@ -15236,8 +15240,7 @@ extern
  #ifdef __cplusplus
  "C"
  #endif
@@ -29,7 +29,7 @@ Patch "GNU" gettext support to not depend unnecessary on "GNU" gettext.
  #else
  #define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
  #endif
-@@ -15264,8 +15267,7 @@ extern
+@@ -15273,8 +15276,7 @@ extern
  #ifdef __cplusplus
  "C"
  #endif
@@ -39,7 +39,7 @@ Patch "GNU" gettext support to not depend unnecessary on "GNU" gettext.
  #else
  #define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
  #endif
-@@ -15891,6 +15893,10 @@ if ac_fn_c_try_compile "$LINENO"; then :
+@@ -15900,6 +15902,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
@@ -50,7 +50,7 @@ Patch "GNU" gettext support to not depend unnecessary on "GNU" gettext.
  fi
  CXXFLAGS="$old_CXXFLAGS"
  CPPFLAGS="$old_CPPFLAGS"
-@@ -15919,6 +15925,9 @@ if test "_$ac_cv_header_stdint_t" = "_" 
+@@ -15928,6 +15934,9 @@ if test "_$ac_cv_header_stdint_t" = "_" 
  
  inttype_headers=`echo  | sed -e 's/,/ /g'`
  
@@ -60,12 +60,12 @@ Patch "GNU" gettext support to not depend unnecessary on "GNU" gettext.
  ac_cv_stdint_result="(no helpful system typedefs seen)"
  
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdint uintptr_t" >&5
-@@ -17187,7 +17196,7 @@ CFLAGS="$fontconfig_save_cflags"
+@@ -17196,7 +17205,7 @@ CFLAGS="$fontconfig_save_cflags"
  #
  # Check for uuid
  #
 -if test "$os_win32" != "yes"; then
 +if test "$os_win32" != "yes" -a "$os_darwin" != "yes"; then
- 
- pkg_failed=no
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for UUID" >&5
+ 	use_pkgconfig_for_uuid=yes
+ 	if test -n "${UUID_LIBS}"; then
+ 		save_UUID_LIBS=$UUID_LIBS