Update to 2.2.99:

Fontconfig 2.2.99 contains a few minor bug fixes plus the addition of
polite type warnings for the config file. This latter change could use a
bit of exposure to existing config files to see if it whines about
legitimate configurations.

4 files changed, 23 insertions, 26 deletions

diff --git a/fonts/fontconfig/Makefile b/fonts/fontconfig/Makefile
index 7316086beba..7450e669a84 100644
--- a/fonts/fontconfig/Makefile
+++ b/fonts/fontconfig/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.36 2005/01/18 12:15:46 drochner Exp $
+# $NetBSD: Makefile,v 1.37 2005/02/26 16:39:51 wiz Exp $
 #
 
-DISTNAME=	fontconfig-2.2.98
+DISTNAME=	fontconfig-2.2.99
 CATEGORIES=	fonts gnome
 MASTER_SITES=	http://www.fontconfig.org/release/
 
diff --git a/fonts/fontconfig/distinfo b/fonts/fontconfig/distinfo
index 5b828627ed8..067f1ea803f 100644
--- a/fonts/fontconfig/distinfo
+++ b/fonts/fontconfig/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.10 2005/02/23 19:18:27 agc Exp $
+$NetBSD: distinfo,v 1.11 2005/02/26 16:39:51 wiz Exp $
 
-SHA1 (fontconfig-2.2.98.tar.gz) = a7ae6069d2d493e3d5a4272fe6d7f6b40e487ef4
-RMD160 (fontconfig-2.2.98.tar.gz) = 83e7b10c852f5fcb69525fbc52ec86af6dbac36f
-Size (fontconfig-2.2.98.tar.gz) = 754064 bytes
-SHA1 (patch-aa) = db0828a00a8942b4b9a2304992c8a521040c2764
-SHA1 (patch-ab) = 6c795128c701d8dd98aeaa3a76c91b4a0a3f1b0c
+SHA1 (fontconfig-2.2.99.tar.gz) = f0cbc742b3724e2edba22ae18a26f479e18ddb46
+RMD160 (fontconfig-2.2.99.tar.gz) = fdaf8af8d16d1676aea57d41ee1e0c6f14fc502a
+Size (fontconfig-2.2.99.tar.gz) = 756924 bytes
+SHA1 (patch-aa) = 45cc9535d2ca35de6ed9f651776d6d2731867bba
+SHA1 (patch-ab) = 5609c3b19c8ef5b57d7ba932b91da09b9e47b3a3
diff --git a/fonts/fontconfig/patches/patch-aa b/fonts/fontconfig/patches/patch-aa
index 91ac829782f..2ca7f9a2484 100644
--- a/fonts/fontconfig/patches/patch-aa
+++ b/fonts/fontconfig/patches/patch-aa
@@ -1,21 +1,18 @@
-$NetBSD: patch-aa,v 1.6 2005/01/18 12:15:46 drochner Exp $
+$NetBSD: patch-aa,v 1.7 2005/02/26 16:39:51 wiz Exp $
 
---- Makefile.in.orig	2004-12-29 20:45:34.000000000 +0100
+--- Makefile.in.orig	2005-01-29 01:43:07.000000000 +0100
 +++ Makefile.in
-@@ -209,7 +209,7 @@ EXTRA_DIST = \
+@@ -213,11 +213,12 @@ EXTRA_DIST = \
  pkgconfigdir = $(libdir)/pkgconfig
  pkgconfig_DATA = fontconfig.pc
  
 -configdir = $(CONFDIR)
 +configdir = $(prefix)/share/examples/fontconfig
  config_DATA = fonts.dtd
+ 
+ @CROSS_COMPILING_TRUE@RUN_FC_CACHE_TEST = false
+ @CROSS_COMPILING_FALSE@RUN_FC_CACHE_TEST = test -z "$(DESTDIR)"
++RUN_FC_CACHE_TEST = false
  subdir = .
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-@@ -700,7 +700,6 @@ install-data-local:
- 	  echo " $(INSTALL_DATA) local.conf $(DESTDIR)$(configdir)/local.conf"; \
- 	  $(INSTALL_DATA) local.conf $(DESTDIR)$(configdir)/local.conf; \
- 	fi; fi; fi
--	if [ x$(DESTDIR) = x ]; then fc-cache/fc-cache -f -v; fi
- 
- uninstall-local:
- 	if [ -f $(srcdir)/fonts.conf ]; then \
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/fonts/fontconfig/patches/patch-ab b/fonts/fontconfig/patches/patch-ab
index 8ce7ce95a18..9918e3c72fe 100644
--- a/fonts/fontconfig/patches/patch-ab
+++ b/fonts/fontconfig/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.5 2004/06/07 23:37:41 dmcmahill Exp $
+$NetBSD: patch-ab,v 1.6 2005/02/26 16:39:51 wiz Exp $
 
---- doc/Makefile.in.orig	Sat May 29 19:43:19 2004
+--- doc/Makefile.in.orig	2005-01-29 01:43:08.000000000 +0100
 +++ doc/Makefile.in
-@@ -374,6 +374,53 @@ distclean-libtool:
+@@ -378,6 +378,53 @@ distclean-libtool:
  	-rm -f libtool
  uninstall-info-am:
  
@@ -56,7 +56,7 @@ $NetBSD: patch-ab,v 1.5 2004/06/07 23:37:41 dmcmahill Exp $
  man5dir = $(mandir)/man5
  install-man5: $(man5_MANS) $(man_MANS)
  	@$(NORMAL_INSTALL)
-@@ -548,7 +595,7 @@ check: check-am
+@@ -552,7 +599,7 @@ check: check-am
  all-am: Makefile $(PROGRAMS) $(MANS) $(DATA) all-local
  
  installdirs:
@@ -65,7 +65,7 @@ $NetBSD: patch-ab,v 1.5 2004/06/07 23:37:41 dmcmahill Exp $
  install: install-am
  install-exec: install-exec-am
  install-data: install-data-am
-@@ -599,7 +646,7 @@ install-exec-am:
+@@ -603,7 +650,7 @@ install-exec-am:
  
  install-info: install-info-am
  
@@ -74,7 +74,7 @@ $NetBSD: patch-ab,v 1.5 2004/06/07 23:37:41 dmcmahill Exp $
  
  installcheck-am:
  
-@@ -624,7 +671,7 @@ ps-am:
+@@ -628,7 +675,7 @@ ps-am:
  uninstall-am: uninstall-docDATA uninstall-htmldocDATA uninstall-info-am \
  	uninstall-man
  
@@ -83,7 +83,7 @@ $NetBSD: patch-ab,v 1.5 2004/06/07 23:37:41 dmcmahill Exp $
  
  .PHONY: CTAGS GTAGS all all-am all-local check check-am clean \
  	clean-generic clean-libtool clean-local clean-noinstPROGRAMS \
-@@ -633,12 +680,12 @@ uninstall-man: uninstall-man5
+@@ -637,12 +684,12 @@ uninstall-man: uninstall-man5
  	info-am install install-am install-data install-data-am \
  	install-docDATA install-exec install-exec-am \
  	install-htmldocDATA install-info install-info-am install-man \