update to 2.2.98

changes:
2.2.97
Fc-cache sleeps before exiting to ensure filesystem timestamps are well
ordered.
Added Punjai orthography.
The timestamp in fonts.conf is gone now.  Too many problems.
The default font path includes all of the X fonts; use selectfont/rejectfont
to eliminate bitmaps, as shown in the sample local.conf file.
<include> configuration elements may now reference a directory.  Files
in that directory matching [0-9]* are loaded in UTF-8 collating sequence order.
<selectfont> configuration added to control which fonts are used.
fontformat font pattern elements built from the FT_Get_X11_Font_Format
function in newer versions of FreeType.
'capability' list constructed from gsub/gpos and silf values in TrueType
files.
Multi-lingual names (style, family, fullname) extracted and stored with
parallel <foo>lang properties marking language.
2.2.98
Share object name strings (Michael Meeks)
Eliminate a couple of codepoints from Russian orthography (John Thacker)
Add synthetic emboldening configuration changes (Jakub Pavelek)
Change FcFontSetSort to ignore language after fonts with the requested
languages have been found. (Owen Taylor)
Add some RedHat font configuration changes (Owen Tayler).
Add full Unicode case folding support to case-ignoring string functions
(Keith Packard)
Remove Han characters from Korean orthography (Tor Andersson)

4 files changed, 114 insertions, 133 deletions

diff --git a/fonts/fontconfig/Makefile b/fonts/fontconfig/Makefile
index 66d4442a1ae..7316086beba 100644
--- a/fonts/fontconfig/Makefile
+++ b/fonts/fontconfig/Makefile
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.35 2004/12/20 18:49:37 xtraeme Exp $
+# $NetBSD: Makefile,v 1.36 2005/01/18 12:15:46 drochner Exp $
 #
 
-DISTNAME=	fontconfig-2.2.96
-PKGREVISION=	1
+DISTNAME=	fontconfig-2.2.98
 CATEGORIES=	fonts gnome
-MASTER_SITES=	http://freedesktop.org/~fontconfig/release/
+MASTER_SITES=	http://www.fontconfig.org/release/
 
 MAINTAINER=	tech-pkg@NetBSD.org
-HOMEPAGE=	http://freedesktop.org/Software/fontconfig/
+HOMEPAGE=	http://www.fontconfig.org/
 COMMENT=	Library for configuring and customizing font access
 
 # This can use 2.0.5 but things which use it (ala pango) require 2.0.9 so make
diff --git a/fonts/fontconfig/PLIST b/fonts/fontconfig/PLIST
index 314c8855834..545df8a5714 100644
--- a/fonts/fontconfig/PLIST
+++ b/fonts/fontconfig/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2004/09/22 08:09:31 jlam Exp $
+@comment $NetBSD: PLIST,v 1.8 2005/01/18 12:15:46 drochner Exp $
 bin/fc-cache
 bin/fc-list
 bin/fc-match
@@ -111,6 +111,7 @@ man/man3/FcPatternGet-Type.3
 man/man3/FcPatternGet.3
 man/man3/FcPatternHash.3
 man/man3/FcPatternPrint.3
+man/man3/FcPatternRemove.3
 man/man3/FcStrBasename.3
 man/man3/FcStrCmpIgnoreCase.3
 man/man3/FcStrCopy.3
@@ -135,107 +136,108 @@ man/man3/FcValueSave.3
 man/man5/fonts-conf.5
 share/doc/fontconfig/fontconfig-devel.txt
 share/doc/fontconfig/fontconfig-devel/index.html
-share/doc/fontconfig/fontconfig-devel/r1015.html
-share/doc/fontconfig/fontconfig-devel/r1037.html
-share/doc/fontconfig/fontconfig-devel/r1063.html
-share/doc/fontconfig/fontconfig-devel/r1085.html
-share/doc/fontconfig/fontconfig-devel/r1108.html
-share/doc/fontconfig/fontconfig-devel/r1132.html
-share/doc/fontconfig/fontconfig-devel/r1155.html
+share/doc/fontconfig/fontconfig-devel/r1009.html
+share/doc/fontconfig/fontconfig-devel/r1040.html
+share/doc/fontconfig/fontconfig-devel/r1062.html
+share/doc/fontconfig/fontconfig-devel/r1088.html
+share/doc/fontconfig/fontconfig-devel/r1110.html
+share/doc/fontconfig/fontconfig-devel/r1133.html
+share/doc/fontconfig/fontconfig-devel/r1157.html
 share/doc/fontconfig/fontconfig-devel/r1180.html
 share/doc/fontconfig/fontconfig-devel/r120.html
 share/doc/fontconfig/fontconfig-devel/r1205.html
 share/doc/fontconfig/fontconfig-devel/r1230.html
 share/doc/fontconfig/fontconfig-devel/r1255.html
 share/doc/fontconfig/fontconfig-devel/r1280.html
-share/doc/fontconfig/fontconfig-devel/r1302.html
+share/doc/fontconfig/fontconfig-devel/r1305.html
 share/doc/fontconfig/fontconfig-devel/r1327.html
 share/doc/fontconfig/fontconfig-devel/r1352.html
 share/doc/fontconfig/fontconfig-devel/r1377.html
-share/doc/fontconfig/fontconfig-devel/r1404.html
+share/doc/fontconfig/fontconfig-devel/r1402.html
 share/doc/fontconfig/fontconfig-devel/r141.html
-share/doc/fontconfig/fontconfig-devel/r1435.html
-share/doc/fontconfig/fontconfig-devel/r1458.html
-share/doc/fontconfig/fontconfig-devel/r1481.html
-share/doc/fontconfig/fontconfig-devel/r1507.html
-share/doc/fontconfig/fontconfig-devel/r1536.html
-share/doc/fontconfig/fontconfig-devel/r1566.html
-share/doc/fontconfig/fontconfig-devel/r1596.html
+share/doc/fontconfig/fontconfig-devel/r1429.html
+share/doc/fontconfig/fontconfig-devel/r1460.html
+share/doc/fontconfig/fontconfig-devel/r1483.html
+share/doc/fontconfig/fontconfig-devel/r1506.html
+share/doc/fontconfig/fontconfig-devel/r1532.html
+share/doc/fontconfig/fontconfig-devel/r1561.html
+share/doc/fontconfig/fontconfig-devel/r1591.html
 share/doc/fontconfig/fontconfig-devel/r162.html
-share/doc/fontconfig/fontconfig-devel/r1629.html
-share/doc/fontconfig/fontconfig-devel/r1650.html
-share/doc/fontconfig/fontconfig-devel/r1671.html
-share/doc/fontconfig/fontconfig-devel/r1693.html
-share/doc/fontconfig/fontconfig-devel/r1714.html
-share/doc/fontconfig/fontconfig-devel/r1736.html
-share/doc/fontconfig/fontconfig-devel/r1757.html
-share/doc/fontconfig/fontconfig-devel/r1779.html
-share/doc/fontconfig/fontconfig-devel/r1801.html
-share/doc/fontconfig/fontconfig-devel/r1823.html
+share/doc/fontconfig/fontconfig-devel/r1621.html
+share/doc/fontconfig/fontconfig-devel/r1654.html
+share/doc/fontconfig/fontconfig-devel/r1675.html
+share/doc/fontconfig/fontconfig-devel/r1696.html
+share/doc/fontconfig/fontconfig-devel/r1718.html
+share/doc/fontconfig/fontconfig-devel/r1739.html
+share/doc/fontconfig/fontconfig-devel/r1761.html
+share/doc/fontconfig/fontconfig-devel/r1782.html
+share/doc/fontconfig/fontconfig-devel/r1804.html
+share/doc/fontconfig/fontconfig-devel/r1826.html
 share/doc/fontconfig/fontconfig-devel/r183.html
-share/doc/fontconfig/fontconfig-devel/r1844.html
-share/doc/fontconfig/fontconfig-devel/r1868.html
-share/doc/fontconfig/fontconfig-devel/r1889.html
-share/doc/fontconfig/fontconfig-devel/r1911.html
-share/doc/fontconfig/fontconfig-devel/r1934.html
-share/doc/fontconfig/fontconfig-devel/r1957.html
-share/doc/fontconfig/fontconfig-devel/r1980.html
-share/doc/fontconfig/fontconfig-devel/r2001.html
-share/doc/fontconfig/fontconfig-devel/r2030.html
+share/doc/fontconfig/fontconfig-devel/r1848.html
+share/doc/fontconfig/fontconfig-devel/r1869.html
+share/doc/fontconfig/fontconfig-devel/r1893.html
+share/doc/fontconfig/fontconfig-devel/r1914.html
+share/doc/fontconfig/fontconfig-devel/r1936.html
+share/doc/fontconfig/fontconfig-devel/r1959.html
+share/doc/fontconfig/fontconfig-devel/r1982.html
+share/doc/fontconfig/fontconfig-devel/r2005.html
+share/doc/fontconfig/fontconfig-devel/r2026.html
 share/doc/fontconfig/fontconfig-devel/r204.html
 share/doc/fontconfig/fontconfig-devel/r2055.html
-share/doc/fontconfig/fontconfig-devel/r2083.html
-share/doc/fontconfig/fontconfig-devel/r2120.html
-share/doc/fontconfig/fontconfig-devel/r2151.html
-share/doc/fontconfig/fontconfig-devel/r2178.html
-share/doc/fontconfig/fontconfig-devel/r2202.html
-share/doc/fontconfig/fontconfig-devel/r2228.html
+share/doc/fontconfig/fontconfig-devel/r2080.html
+share/doc/fontconfig/fontconfig-devel/r2108.html
+share/doc/fontconfig/fontconfig-devel/r2145.html
+share/doc/fontconfig/fontconfig-devel/r2176.html
+share/doc/fontconfig/fontconfig-devel/r2203.html
+share/doc/fontconfig/fontconfig-devel/r2227.html
 share/doc/fontconfig/fontconfig-devel/r225.html
-share/doc/fontconfig/fontconfig-devel/r2252.html
-share/doc/fontconfig/fontconfig-devel/r2276.html
+share/doc/fontconfig/fontconfig-devel/r2253.html
+share/doc/fontconfig/fontconfig-devel/r2277.html
 share/doc/fontconfig/fontconfig-devel/r2301.html
-share/doc/fontconfig/fontconfig-devel/r2325.html
-share/doc/fontconfig/fontconfig-devel/r2349.html
-share/doc/fontconfig/fontconfig-devel/r2371.html
-share/doc/fontconfig/fontconfig-devel/r2399.html
-share/doc/fontconfig/fontconfig-devel/r2420.html
-share/doc/fontconfig/fontconfig-devel/r2441.html
-share/doc/fontconfig/fontconfig-devel/r2464.html
+share/doc/fontconfig/fontconfig-devel/r2326.html
+share/doc/fontconfig/fontconfig-devel/r2350.html
+share/doc/fontconfig/fontconfig-devel/r2374.html
+share/doc/fontconfig/fontconfig-devel/r2396.html
+share/doc/fontconfig/fontconfig-devel/r2424.html
+share/doc/fontconfig/fontconfig-devel/r2445.html
+share/doc/fontconfig/fontconfig-devel/r2466.html
+share/doc/fontconfig/fontconfig-devel/r2489.html
 share/doc/fontconfig/fontconfig-devel/r249.html
-share/doc/fontconfig/fontconfig-devel/r2490.html
-share/doc/fontconfig/fontconfig-devel/r2512.html
-share/doc/fontconfig/fontconfig-devel/r2534.html
-share/doc/fontconfig/fontconfig-devel/r2556.html
-share/doc/fontconfig/fontconfig-devel/r2578.html
-share/doc/fontconfig/fontconfig-devel/r2600.html
-share/doc/fontconfig/fontconfig-devel/r2621.html
-share/doc/fontconfig/fontconfig-devel/r2642.html
+share/doc/fontconfig/fontconfig-devel/r2515.html
+share/doc/fontconfig/fontconfig-devel/r2537.html
+share/doc/fontconfig/fontconfig-devel/r2559.html
+share/doc/fontconfig/fontconfig-devel/r2581.html
+share/doc/fontconfig/fontconfig-devel/r2603.html
+share/doc/fontconfig/fontconfig-devel/r2625.html
+share/doc/fontconfig/fontconfig-devel/r2646.html
 share/doc/fontconfig/fontconfig-devel/r2667.html
+share/doc/fontconfig/fontconfig-devel/r2692.html
 share/doc/fontconfig/fontconfig-devel/r270.html
-share/doc/fontconfig/fontconfig-devel/r2703.html
-share/doc/fontconfig/fontconfig-devel/r2738.html
-share/doc/fontconfig/fontconfig-devel/r2766.html
+share/doc/fontconfig/fontconfig-devel/r2728.html
+share/doc/fontconfig/fontconfig-devel/r2763.html
 share/doc/fontconfig/fontconfig-devel/r2791.html
-share/doc/fontconfig/fontconfig-devel/r2812.html
+share/doc/fontconfig/fontconfig-devel/r2816.html
 share/doc/fontconfig/fontconfig-devel/r2837.html
 share/doc/fontconfig/fontconfig-devel/r2862.html
 share/doc/fontconfig/fontconfig-devel/r2887.html
 share/doc/fontconfig/fontconfig-devel/r291.html
-share/doc/fontconfig/fontconfig-devel/r2913.html
-share/doc/fontconfig/fontconfig-devel/r2935.html
-share/doc/fontconfig/fontconfig-devel/r2957.html
-share/doc/fontconfig/fontconfig-devel/r2979.html
+share/doc/fontconfig/fontconfig-devel/r2912.html
+share/doc/fontconfig/fontconfig-devel/r2938.html
+share/doc/fontconfig/fontconfig-devel/r2960.html
+share/doc/fontconfig/fontconfig-devel/r2982.html
 share/doc/fontconfig/fontconfig-devel/r3004.html
-share/doc/fontconfig/fontconfig-devel/r3033.html
+share/doc/fontconfig/fontconfig-devel/r3029.html
 share/doc/fontconfig/fontconfig-devel/r3058.html
-share/doc/fontconfig/fontconfig-devel/r3090.html
-share/doc/fontconfig/fontconfig-devel/r3123.html
-share/doc/fontconfig/fontconfig-devel/r3159.html
+share/doc/fontconfig/fontconfig-devel/r3083.html
+share/doc/fontconfig/fontconfig-devel/r3115.html
+share/doc/fontconfig/fontconfig-devel/r3148.html
 share/doc/fontconfig/fontconfig-devel/r316.html
-share/doc/fontconfig/fontconfig-devel/r3182.html
-share/doc/fontconfig/fontconfig-devel/r3205.html
+share/doc/fontconfig/fontconfig-devel/r3184.html
+share/doc/fontconfig/fontconfig-devel/r3207.html
 share/doc/fontconfig/fontconfig-devel/r3230.html
-share/doc/fontconfig/fontconfig-devel/r3252.html
+share/doc/fontconfig/fontconfig-devel/r3255.html
+share/doc/fontconfig/fontconfig-devel/r3277.html
 share/doc/fontconfig/fontconfig-devel/r344.html
 share/doc/fontconfig/fontconfig-devel/r365.html
 share/doc/fontconfig/fontconfig-devel/r393.html
@@ -245,19 +247,19 @@ share/doc/fontconfig/fontconfig-devel/r525.html
 share/doc/fontconfig/fontconfig-devel/r612.html
 share/doc/fontconfig/fontconfig-devel/r653.html
 share/doc/fontconfig/fontconfig-devel/r676.html
-share/doc/fontconfig/fontconfig-devel/r697.html
-share/doc/fontconfig/fontconfig-devel/r725.html
-share/doc/fontconfig/fontconfig-devel/r747.html
-share/doc/fontconfig/fontconfig-devel/r771.html
-share/doc/fontconfig/fontconfig-devel/r792.html
-share/doc/fontconfig/fontconfig-devel/r813.html
-share/doc/fontconfig/fontconfig-devel/r839.html
-share/doc/fontconfig/fontconfig-devel/r860.html
-share/doc/fontconfig/fontconfig-devel/r883.html
-share/doc/fontconfig/fontconfig-devel/r904.html
-share/doc/fontconfig/fontconfig-devel/r938.html
-share/doc/fontconfig/fontconfig-devel/r961.html
-share/doc/fontconfig/fontconfig-devel/r984.html
+share/doc/fontconfig/fontconfig-devel/r701.html
+share/doc/fontconfig/fontconfig-devel/r722.html
+share/doc/fontconfig/fontconfig-devel/r750.html
+share/doc/fontconfig/fontconfig-devel/r772.html
+share/doc/fontconfig/fontconfig-devel/r796.html
+share/doc/fontconfig/fontconfig-devel/r817.html
+share/doc/fontconfig/fontconfig-devel/r838.html
+share/doc/fontconfig/fontconfig-devel/r864.html
+share/doc/fontconfig/fontconfig-devel/r885.html
+share/doc/fontconfig/fontconfig-devel/r908.html
+share/doc/fontconfig/fontconfig-devel/r929.html
+share/doc/fontconfig/fontconfig-devel/r963.html
+share/doc/fontconfig/fontconfig-devel/r986.html
 share/doc/fontconfig/fontconfig-devel/r99.html
 share/doc/fontconfig/fontconfig-devel/x19.html
 share/doc/fontconfig/fontconfig-devel/x31.html
diff --git a/fonts/fontconfig/distinfo b/fonts/fontconfig/distinfo
index 8372d91266c..c0ab96bd142 100644
--- a/fonts/fontconfig/distinfo
+++ b/fonts/fontconfig/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.8 2004/08/05 22:17:25 recht Exp $
+$NetBSD: distinfo,v 1.9 2005/01/18 12:15:46 drochner Exp $
 
-SHA1 (fontconfig-2.2.96.tar.gz) = 49acf58076e082b76c69bc71e476ca33ed07a621
-Size (fontconfig-2.2.96.tar.gz) = 778400 bytes
-SHA1 (patch-aa) = 5ac2316628124fe41c68aef7ab23e25389fffcc4
+SHA1 (fontconfig-2.2.98.tar.gz) = a7ae6069d2d493e3d5a4272fe6d7f6b40e487ef4
+Size (fontconfig-2.2.98.tar.gz) = 754064 bytes
+SHA1 (patch-aa) = db0828a00a8942b4b9a2304992c8a521040c2764
 SHA1 (patch-ab) = 6c795128c701d8dd98aeaa3a76c91b4a0a3f1b0c
diff --git a/fonts/fontconfig/patches/patch-aa b/fonts/fontconfig/patches/patch-aa
index ce112e4eb33..91ac829782f 100644
--- a/fonts/fontconfig/patches/patch-aa
+++ b/fonts/fontconfig/patches/patch-aa
@@ -1,41 +1,21 @@
-$NetBSD: patch-aa,v 1.5 2004/06/07 23:37:41 dmcmahill Exp $
+$NetBSD: patch-aa,v 1.6 2005/01/18 12:15:46 drochner Exp $
 
---- Makefile.in.orig	Sat May 29 19:43:19 2004
+--- Makefile.in.orig	2004-12-29 20:45:34.000000000 +0100
 +++ Makefile.in
-@@ -290,12 +290,12 @@ uninstall-info-am:
- configDATA_INSTALL = $(INSTALL_DATA)
- install-configDATA: $(config_DATA)
- 	@$(NORMAL_INSTALL)
--	$(mkinstalldirs) $(DESTDIR)$(configdir)
-+	$(mkinstalldirs) $(DESTDIR)$(datadir)/examples/fontconfig
- 	@list='$(config_DATA)'; for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  f="`echo $$p | sed -e 's|^.*/||'`"; \
--	  echo " $(configDATA_INSTALL) $$d$$p $(DESTDIR)$(configdir)/$$f"; \
--	  $(configDATA_INSTALL) $$d$$p $(DESTDIR)$(configdir)/$$f; \
-+	  echo " $(configDATA_INSTALL) $$d$$p $(DESTDIR)$(datadir)/examples/fontconfig/$$f"; \
-+	  $(configDATA_INSTALL) $$d$$p $(DESTDIR)$(datadir)/examples/fontconfig/$$f; \
- 	done
+@@ -209,7 +209,7 @@ EXTRA_DIST = \
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = fontconfig.pc
  
- uninstall-configDATA:
-@@ -680,14 +680,14 @@ uninstall-info: uninstall-info-recursive
- 
- install-data-local:
- 	$(mkinstalldirs) $(DESTDIR)/$(configdir)
--	if [ -f $(DESTDIR)$(configdir)/local.conf ]; then \
--	  echo "not overwriting existing $(DESTDIR)$(configdir)/local.conf"; \
-+	if [ -f $(DESTDIR)$(datadir)/examples/fontconfig/local.conf ]; then \
-+	  echo "not overwriting existing $(DESTDIR)$(datadir)/examples/fontconfig/local.conf"; \
- 	else if [ -f $(srcdir)/local.conf ]; then \
--	  echo " $(INSTALL_DATA) $(srcdir)/local.conf $(DESTDIR)$(configdir)/local.conf"; \
--	  $(INSTALL_DATA) $(srcdir)/local.conf $(DESTDIR)$(configdir)/local.conf; \
-+	  echo " $(INSTALL_DATA) $(srcdir)/local.conf $(DESTDIR)$(datadir)/examples/fontconfig/local.conf"; \
-+	  $(INSTALL_DATA) $(srcdir)/local.conf $(DESTDIR)$(datadir)/examples/fontconfig/local.conf; \
- 	else if [ -f local.conf ]; then \
--	  echo " $(INSTALL_DATA) local.conf $(DESTDIR)$(configdir)/local.conf"; \
--	  $(INSTALL_DATA) local.conf $(DESTDIR)$(configdir)/local.conf; \
-+	  echo " $(INSTALL_DATA) local.conf $(DESTDIR)$(datadir)/examples/fontconfig/local.conf"; \
-+	  $(INSTALL_DATA) local.conf $(DESTDIR)$(datadir)/examples/fontconfig/local.conf; \
+-configdir = $(CONFDIR)
++configdir = $(prefix)/share/examples/fontconfig
+ config_DATA = fonts.dtd
+ 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
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
+-	if [ x$(DESTDIR) = x ]; then fc-cache/fc-cache -f -v; fi
+ 
+ uninstall-local:
+ 	if [ -f $(srcdir)/fonts.conf ]; then \