CVS commit: pkgsrc/fonts/fontconfig

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Mon Mar 12 11:28:08 UTC 2018

Modified Files:
        pkgsrc/fonts/fontconfig: distinfo
        pkgsrc/fonts/fontconfig/patches: patch-configure

Log Message:
Do not look for libuuid on Darwin, it is built-in.


To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.64 pkgsrc/fonts/fontconfig/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/fonts/fontconfig/patches/patch-configure

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/fonts/fontconfig/distinfo
diff -u pkgsrc/fonts/fontconfig/distinfo:1.63 pkgsrc/fonts/fontconfig/distinfo:1.64
--- pkgsrc/fonts/fontconfig/distinfo:1.63       Sun Mar 11 17:54:03 2018
+++ pkgsrc/fonts/fontconfig/distinfo    Mon Mar 12 11:28:08 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.63 2018/03/11 17:54:03 wiz Exp $
+$NetBSD: distinfo,v 1.64 2018/03/12 11:28:08 adam Exp $
 
 SHA1 (fontconfig-2.13.0.tar.bz2) = b7bcc5d47211b7bbac35bb221860407db3601f5b
 RMD160 (fontconfig-2.13.0.tar.bz2) = cbc9a9b34f10b72e09d425557b156cf46c675a05
@@ -7,7 +7,7 @@ Size (fontconfig-2.13.0.tar.bz2) = 17005
 SHA1 (patch-aa) = ae9a465321dcaee634faf016e2dd01e2f544af12
 SHA1 (patch-ac) = 4a0b7b55aa4b5c106fd256c4ef81df2240224803
 SHA1 (patch-af) = d351265c894738284215f0bb38d47cc1c8f28ec7
-SHA1 (patch-configure) = 4256c69b24e57d92e7b3bc9b4640d822d782ec3e
+SHA1 (patch-configure) = a3c85915a4f08ee32afc74467cfba22e3abbc6b4
 SHA1 (patch-scandir.c) = e35f4c005f635dd0d8bb949cd32aa34f5e314200
 SHA1 (patch-src_fccharset.c) = f3855554b3b3cab2530b46bc1ccec6a33303de7a
 SHA1 (patch-src_fcfreetype.c) = 42542ae666b292af700313ee103d0f295cf69e4e

Index: pkgsrc/fonts/fontconfig/patches/patch-configure
diff -u pkgsrc/fonts/fontconfig/patches/patch-configure:1.2 pkgsrc/fonts/fontconfig/patches/patch-configure:1.3
--- pkgsrc/fonts/fontconfig/patches/patch-configure:1.2 Sun Jun 19 20:48:55 2016
+++ pkgsrc/fonts/fontconfig/patches/patch-configure     Mon Mar 12 11:28:08 2018
@@ -1,8 +1,23 @@
-$NetBSD: patch-configure,v 1.2 2016/06/19 20:48:55 wiz Exp $
+$NetBSD: patch-configure,v 1.3 2018/03/12 11:28:08 adam Exp $
 
---- configure.orig     2016-06-15 11:11:58.000000000 +0000
+Do not look for libuuid on Darwin, it is built-in.
+
+--- configure.orig     2018-03-06 03:31:59.000000000 +0000
 +++ configure
-@@ -13976,6 +13976,10 @@ if ac_fn_c_try_compile "$LINENO"; then :
+@@ -13295,8 +13295,12 @@ case "$host" in
+   *-*-mingw*)
+     os_win32=yes
+     ;;
++  *-*-darwin*)
++    os_darwin=yes
++    ;;
+   *)
+     os_win32=no
++    os_darwin=no
+ esac
+  if test "$os_win32" = "yes"; then
+   OS_WIN32_TRUE=
+@@ -15891,6 +15895,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
@@ -13,7 +28,7 @@ $NetBSD: patch-configure,v 1.2 2016/06/1
  fi
  CXXFLAGS="$old_CXXFLAGS"
  CPPFLAGS="$old_CPPFLAGS"
-@@ -14004,6 +14008,9 @@ if test "_$ac_cv_header_stdint_t" = "_" 
+@@ -15919,6 +15927,9 @@ if test "_$ac_cv_header_stdint_t" = "_" 
  
  inttype_headers=`echo  | sed -e 's/,/ /g'`
  
@@ -23,3 +38,12 @@ $NetBSD: patch-configure,v 1.2 2016/06/1
  ac_cv_stdint_result="(no helpful system typedefs seen)"
  
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdint uintptr_t" >&5
+@@ -17187,7 +17198,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