Update to 2.4.2:

 2.4.2

 Han-Wen Nienhuys:
       FcStrCanonFileName buggy for mingw. (bug 8311)
       More fixes for Win32 building (bug 8311)

 Kean Johnston:
       Don't use varargs CPP macros in fccache.c. (bug 8733)

 Keith Packard:
       Remove documentation for non-existant FcConfigNormalizeFontDir.
       Build fontconfig.def from header files when needed.
       Detect and use available random number generator (bug 8308)
       Add sparc64 architecture string.
       FcStrCanonAbsoluteFilename should be static.
       Use explicit platform/nameid order when scanning ttf files.
       Warn (and recover) from config file without <cachedir> elements.
       Avoid writing uninitialized structure pad bytes to cache files.
       Fix grep pattern in makealias to work on non-Gnu grep (bug 8368).
       Add FcFreeTypeQueryFace external API. Bug #7311.
       Segfault scanning non-font files. Disallow scan edit of user vars. (#8767)
       Add space between type and formal in devel man pages (bug 8935)

 Mike FABIAN:
       Do not clean cache files for different architectures

 Peter Breitenlohner:
       A VPATH build of fontconfig-2.4.1 fails for various reasons. Bug 8933.
       Use <literal> instead of <sgmltag> when documenting fonts.conf. Bug 8935.
       Fix fc-cat documentation (bug 8935).

4 files changed, 101 insertions, 114 deletions

diff --git a/fonts/fontconfig/Makefile b/fonts/fontconfig/Makefile
index c61a4af1a60..d6910bc815c 100644
--- a/fonts/fontconfig/Makefile
+++ b/fonts/fontconfig/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.59 2006/11/03 07:13:31 joerg Exp $
+# $NetBSD: Makefile,v 1.60 2006/12/04 12:41:51 wiz Exp $
 
-DISTNAME=	fontconfig-2.4.1
+DISTNAME=	fontconfig-2.4.2
 CATEGORIES=	fonts
 MASTER_SITES=	http://www.fontconfig.org/release/
 
diff --git a/fonts/fontconfig/PLIST b/fonts/fontconfig/PLIST
index 2bbe7c2f0c8..29ec0f9318b 100644
--- a/fonts/fontconfig/PLIST
+++ b/fonts/fontconfig/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2006/09/17 18:20:20 joerg Exp $
+@comment $NetBSD: PLIST,v 1.14 2006/12/04 12:41:51 wiz Exp $
 bin/fc-cache
 bin/fc-cat
 bin/fc-list
@@ -50,7 +50,6 @@ man/man3/FcConfigGetCurrent.3
 man/man3/FcConfigGetFontDirs.3
 man/man3/FcConfigGetFonts.3
 man/man3/FcConfigGetRescanInverval.3
-man/man3/FcConfigNormalizeFontDir.3
 man/man3/FcConfigParseAndLoad.3
 man/man3/FcConfigSetCurrent.3
 man/man3/FcConfigSetRescanInverval.3
@@ -73,6 +72,7 @@ man/man3/FcFontSort.3
 man/man3/FcFreeTypeCharIndex.3
 man/man3/FcFreeTypeCharSet.3
 man/man3/FcFreeTypeQuery.3
+man/man3/FcFreeTypeQueryFace.3
 man/man3/FcGetVersion.3
 man/man3/FcInit.3
 man/man3/FcInitBringUptoDate.3
@@ -142,111 +142,111 @@ share/doc/fontconfig/fontconfig-devel.pdf
 share/doc/fontconfig/fontconfig-devel.txt
 share/doc/fontconfig/fontconfig-devel/index.html
 share/doc/fontconfig/fontconfig-devel/r1011.html
-share/doc/fontconfig/fontconfig-devel/r1042.html
-share/doc/fontconfig/fontconfig-devel/r1064.html
-share/doc/fontconfig/fontconfig-devel/r1090.html
-share/doc/fontconfig/fontconfig-devel/r1112.html
-share/doc/fontconfig/fontconfig-devel/r1135.html
-share/doc/fontconfig/fontconfig-devel/r1159.html
-share/doc/fontconfig/fontconfig-devel/r1182.html
+share/doc/fontconfig/fontconfig-devel/r1038.html
+share/doc/fontconfig/fontconfig-devel/r1069.html
+share/doc/fontconfig/fontconfig-devel/r1091.html
+share/doc/fontconfig/fontconfig-devel/r1117.html
+share/doc/fontconfig/fontconfig-devel/r1139.html
+share/doc/fontconfig/fontconfig-devel/r1162.html
+share/doc/fontconfig/fontconfig-devel/r1186.html
 share/doc/fontconfig/fontconfig-devel/r120.html
-share/doc/fontconfig/fontconfig-devel/r1207.html
-share/doc/fontconfig/fontconfig-devel/r1232.html
-share/doc/fontconfig/fontconfig-devel/r1257.html
-share/doc/fontconfig/fontconfig-devel/r1282.html
-share/doc/fontconfig/fontconfig-devel/r1307.html
-share/doc/fontconfig/fontconfig-devel/r1329.html
-share/doc/fontconfig/fontconfig-devel/r1354.html
-share/doc/fontconfig/fontconfig-devel/r1379.html
-share/doc/fontconfig/fontconfig-devel/r1404.html
+share/doc/fontconfig/fontconfig-devel/r1209.html
+share/doc/fontconfig/fontconfig-devel/r1234.html
+share/doc/fontconfig/fontconfig-devel/r1259.html
+share/doc/fontconfig/fontconfig-devel/r1284.html
+share/doc/fontconfig/fontconfig-devel/r1309.html
+share/doc/fontconfig/fontconfig-devel/r1334.html
+share/doc/fontconfig/fontconfig-devel/r1356.html
+share/doc/fontconfig/fontconfig-devel/r1381.html
+share/doc/fontconfig/fontconfig-devel/r1406.html
 share/doc/fontconfig/fontconfig-devel/r141.html
 share/doc/fontconfig/fontconfig-devel/r1431.html
-share/doc/fontconfig/fontconfig-devel/r1462.html
-share/doc/fontconfig/fontconfig-devel/r1485.html
-share/doc/fontconfig/fontconfig-devel/r1508.html
-share/doc/fontconfig/fontconfig-devel/r1534.html
-share/doc/fontconfig/fontconfig-devel/r1563.html
-share/doc/fontconfig/fontconfig-devel/r1593.html
+share/doc/fontconfig/fontconfig-devel/r1458.html
+share/doc/fontconfig/fontconfig-devel/r1489.html
+share/doc/fontconfig/fontconfig-devel/r1512.html
+share/doc/fontconfig/fontconfig-devel/r1535.html
+share/doc/fontconfig/fontconfig-devel/r1561.html
+share/doc/fontconfig/fontconfig-devel/r1590.html
 share/doc/fontconfig/fontconfig-devel/r162.html
-share/doc/fontconfig/fontconfig-devel/r1623.html
-share/doc/fontconfig/fontconfig-devel/r1656.html
-share/doc/fontconfig/fontconfig-devel/r1677.html
-share/doc/fontconfig/fontconfig-devel/r1698.html
-share/doc/fontconfig/fontconfig-devel/r1720.html
-share/doc/fontconfig/fontconfig-devel/r1741.html
-share/doc/fontconfig/fontconfig-devel/r1763.html
-share/doc/fontconfig/fontconfig-devel/r1784.html
-share/doc/fontconfig/fontconfig-devel/r1806.html
-share/doc/fontconfig/fontconfig-devel/r1828.html
+share/doc/fontconfig/fontconfig-devel/r1620.html
+share/doc/fontconfig/fontconfig-devel/r1650.html
+share/doc/fontconfig/fontconfig-devel/r1683.html
+share/doc/fontconfig/fontconfig-devel/r1704.html
+share/doc/fontconfig/fontconfig-devel/r1725.html
+share/doc/fontconfig/fontconfig-devel/r1747.html
+share/doc/fontconfig/fontconfig-devel/r1768.html
+share/doc/fontconfig/fontconfig-devel/r1790.html
+share/doc/fontconfig/fontconfig-devel/r1811.html
 share/doc/fontconfig/fontconfig-devel/r183.html
-share/doc/fontconfig/fontconfig-devel/r1850.html
-share/doc/fontconfig/fontconfig-devel/r1871.html
-share/doc/fontconfig/fontconfig-devel/r1895.html
-share/doc/fontconfig/fontconfig-devel/r1916.html
-share/doc/fontconfig/fontconfig-devel/r1938.html
-share/doc/fontconfig/fontconfig-devel/r1961.html
-share/doc/fontconfig/fontconfig-devel/r1984.html
-share/doc/fontconfig/fontconfig-devel/r2007.html
-share/doc/fontconfig/fontconfig-devel/r2028.html
+share/doc/fontconfig/fontconfig-devel/r1833.html
+share/doc/fontconfig/fontconfig-devel/r1855.html
+share/doc/fontconfig/fontconfig-devel/r1877.html
+share/doc/fontconfig/fontconfig-devel/r1898.html
+share/doc/fontconfig/fontconfig-devel/r1922.html
+share/doc/fontconfig/fontconfig-devel/r1943.html
+share/doc/fontconfig/fontconfig-devel/r1965.html
+share/doc/fontconfig/fontconfig-devel/r1988.html
+share/doc/fontconfig/fontconfig-devel/r2011.html
+share/doc/fontconfig/fontconfig-devel/r2034.html
 share/doc/fontconfig/fontconfig-devel/r204.html
-share/doc/fontconfig/fontconfig-devel/r2057.html
-share/doc/fontconfig/fontconfig-devel/r2082.html
-share/doc/fontconfig/fontconfig-devel/r2110.html
-share/doc/fontconfig/fontconfig-devel/r2147.html
-share/doc/fontconfig/fontconfig-devel/r2178.html
+share/doc/fontconfig/fontconfig-devel/r2055.html
+share/doc/fontconfig/fontconfig-devel/r2084.html
+share/doc/fontconfig/fontconfig-devel/r2109.html
+share/doc/fontconfig/fontconfig-devel/r2137.html
+share/doc/fontconfig/fontconfig-devel/r2174.html
 share/doc/fontconfig/fontconfig-devel/r2205.html
-share/doc/fontconfig/fontconfig-devel/r2229.html
+share/doc/fontconfig/fontconfig-devel/r2232.html
 share/doc/fontconfig/fontconfig-devel/r225.html
-share/doc/fontconfig/fontconfig-devel/r2252.html
-share/doc/fontconfig/fontconfig-devel/r2278.html
-share/doc/fontconfig/fontconfig-devel/r2302.html
-share/doc/fontconfig/fontconfig-devel/r2326.html
-share/doc/fontconfig/fontconfig-devel/r2351.html
-share/doc/fontconfig/fontconfig-devel/r2375.html
-share/doc/fontconfig/fontconfig-devel/r2399.html
-share/doc/fontconfig/fontconfig-devel/r2421.html
-share/doc/fontconfig/fontconfig-devel/r2449.html
-share/doc/fontconfig/fontconfig-devel/r2470.html
+share/doc/fontconfig/fontconfig-devel/r2256.html
+share/doc/fontconfig/fontconfig-devel/r2282.html
+share/doc/fontconfig/fontconfig-devel/r2306.html
+share/doc/fontconfig/fontconfig-devel/r2330.html
+share/doc/fontconfig/fontconfig-devel/r2355.html
+share/doc/fontconfig/fontconfig-devel/r2379.html
+share/doc/fontconfig/fontconfig-devel/r2403.html
+share/doc/fontconfig/fontconfig-devel/r2425.html
+share/doc/fontconfig/fontconfig-devel/r2453.html
+share/doc/fontconfig/fontconfig-devel/r2474.html
 share/doc/fontconfig/fontconfig-devel/r249.html
-share/doc/fontconfig/fontconfig-devel/r2491.html
-share/doc/fontconfig/fontconfig-devel/r2514.html
-share/doc/fontconfig/fontconfig-devel/r2540.html
-share/doc/fontconfig/fontconfig-devel/r2562.html
-share/doc/fontconfig/fontconfig-devel/r2584.html
-share/doc/fontconfig/fontconfig-devel/r2606.html
-share/doc/fontconfig/fontconfig-devel/r2628.html
-share/doc/fontconfig/fontconfig-devel/r2650.html
-share/doc/fontconfig/fontconfig-devel/r2671.html
-share/doc/fontconfig/fontconfig-devel/r2692.html
+share/doc/fontconfig/fontconfig-devel/r2495.html
+share/doc/fontconfig/fontconfig-devel/r2518.html
+share/doc/fontconfig/fontconfig-devel/r2544.html
+share/doc/fontconfig/fontconfig-devel/r2566.html
+share/doc/fontconfig/fontconfig-devel/r2588.html
+share/doc/fontconfig/fontconfig-devel/r2610.html
+share/doc/fontconfig/fontconfig-devel/r2632.html
+share/doc/fontconfig/fontconfig-devel/r2654.html
+share/doc/fontconfig/fontconfig-devel/r2675.html
+share/doc/fontconfig/fontconfig-devel/r2696.html
 share/doc/fontconfig/fontconfig-devel/r270.html
-share/doc/fontconfig/fontconfig-devel/r2717.html
-share/doc/fontconfig/fontconfig-devel/r2753.html
-share/doc/fontconfig/fontconfig-devel/r2788.html
-share/doc/fontconfig/fontconfig-devel/r2816.html
-share/doc/fontconfig/fontconfig-devel/r2841.html
-share/doc/fontconfig/fontconfig-devel/r2862.html
-share/doc/fontconfig/fontconfig-devel/r2887.html
+share/doc/fontconfig/fontconfig-devel/r2721.html
+share/doc/fontconfig/fontconfig-devel/r2757.html
+share/doc/fontconfig/fontconfig-devel/r2792.html
+share/doc/fontconfig/fontconfig-devel/r2820.html
+share/doc/fontconfig/fontconfig-devel/r2845.html
+share/doc/fontconfig/fontconfig-devel/r2866.html
+share/doc/fontconfig/fontconfig-devel/r2891.html
 share/doc/fontconfig/fontconfig-devel/r291.html
-share/doc/fontconfig/fontconfig-devel/r2912.html
-share/doc/fontconfig/fontconfig-devel/r2937.html
-share/doc/fontconfig/fontconfig-devel/r2963.html
-share/doc/fontconfig/fontconfig-devel/r2985.html
-share/doc/fontconfig/fontconfig-devel/r3007.html
-share/doc/fontconfig/fontconfig-devel/r3029.html
-share/doc/fontconfig/fontconfig-devel/r3054.html
-share/doc/fontconfig/fontconfig-devel/r3083.html
-share/doc/fontconfig/fontconfig-devel/r3108.html
-share/doc/fontconfig/fontconfig-devel/r3140.html
+share/doc/fontconfig/fontconfig-devel/r2916.html
+share/doc/fontconfig/fontconfig-devel/r2941.html
+share/doc/fontconfig/fontconfig-devel/r2967.html
+share/doc/fontconfig/fontconfig-devel/r2989.html
+share/doc/fontconfig/fontconfig-devel/r3011.html
+share/doc/fontconfig/fontconfig-devel/r3033.html
+share/doc/fontconfig/fontconfig-devel/r3058.html
+share/doc/fontconfig/fontconfig-devel/r3087.html
+share/doc/fontconfig/fontconfig-devel/r3112.html
+share/doc/fontconfig/fontconfig-devel/r3144.html
 share/doc/fontconfig/fontconfig-devel/r316.html
-share/doc/fontconfig/fontconfig-devel/r3173.html
-share/doc/fontconfig/fontconfig-devel/r3209.html
-share/doc/fontconfig/fontconfig-devel/r3232.html
-share/doc/fontconfig/fontconfig-devel/r3254.html
-share/doc/fontconfig/fontconfig-devel/r3277.html
-share/doc/fontconfig/fontconfig-devel/r3302.html
-share/doc/fontconfig/fontconfig-devel/r3329.html
-share/doc/fontconfig/fontconfig-devel/r3356.html
-share/doc/fontconfig/fontconfig-devel/r3378.html
+share/doc/fontconfig/fontconfig-devel/r3177.html
+share/doc/fontconfig/fontconfig-devel/r3213.html
+share/doc/fontconfig/fontconfig-devel/r3236.html
+share/doc/fontconfig/fontconfig-devel/r3258.html
+share/doc/fontconfig/fontconfig-devel/r3281.html
+share/doc/fontconfig/fontconfig-devel/r3306.html
+share/doc/fontconfig/fontconfig-devel/r3333.html
+share/doc/fontconfig/fontconfig-devel/r3360.html
+share/doc/fontconfig/fontconfig-devel/r3382.html
 share/doc/fontconfig/fontconfig-devel/r344.html
 share/doc/fontconfig/fontconfig-devel/r365.html
 share/doc/fontconfig/fontconfig-devel/r393.html
diff --git a/fonts/fontconfig/distinfo b/fonts/fontconfig/distinfo
index 657a9cc09b7..1ef21377bdc 100644
--- a/fonts/fontconfig/distinfo
+++ b/fonts/fontconfig/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.22 2006/11/28 16:15:30 tv Exp $
+$NetBSD: distinfo,v 1.23 2006/12/04 12:41:51 wiz Exp $
 
-SHA1 (fontconfig-2.4.1.tar.gz) = 4e7d0f86bb4b637b7e66700068c50e044d3cc2e0
-RMD160 (fontconfig-2.4.1.tar.gz) = f48bd6a0ccc0cdd945659defeb9d944c629297ff
-Size (fontconfig-2.4.1.tar.gz) = 1270946 bytes
+SHA1 (fontconfig-2.4.2.tar.gz) = cd5e30625680a0435563b586275156eaf8d0d34a
+RMD160 (fontconfig-2.4.2.tar.gz) = c953020a5193500080c9eceef47b76e61c41b188
+Size (fontconfig-2.4.2.tar.gz) = 1278340 bytes
 SHA1 (patch-aa) = 7aa7831ccc818d0f501df941a1d12f3ed610d33b
 SHA1 (patch-ac) = 965087ba6e457daf17c55fc3573b51fd6425be93
-SHA1 (patch-ad) = 258665b323eddd9fc7f11ab7706985002299f011
 SHA1 (patch-ae) = 9b74310ddd2986390f48b0622a0225c29d6372e2
diff --git a/fonts/fontconfig/patches/patch-ad b/fonts/fontconfig/patches/patch-ad
deleted file mode 100644
index 8e65475a21a..00000000000
--- a/fonts/fontconfig/patches/patch-ad
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ad,v 1.4 2006/10/04 17:15:06 wiz Exp $
-
---- fc-arch/fcarch.tmpl.h.orig	2006-09-14 01:39:42.000000000 +0000
-+++ fc-arch/fcarch.tmpl.h
-@@ -32,6 +32,7 @@
- x86	    78563412_00000001_00000004_00000004_00000004_00000010_00000004_00000004_00000008_00000004_00000004_0000000c_00000004_00000004_00000010_00000004_00000004_00000002_00000020_00000004_0000001c
- x86-64	    78563412_00000001_00000008_00000004_00000008_00000018_00000008_00000008_00000010_00000004_00000008_00000010_00000004_00000008_00000018_00000008_00000008_00000002_00000020_00000004_00000030
- ppc	    12345678_00000001_00000004_00000004_00000004_00000010_00000004_00000004_00000008_00000004_00000004_00000010_00000004_00000004_00000010_00000004_00000004_00000002_00000020_00000004_0000001c
-+sparc64	    12345678_00000001_00000008_00000004_00000008_00000018_00000008_00000008_00000010_00000004_00000008_00000010_00000004_00000008_00000018_00000008_00000008_00000002_00000020_00000004_00000030
- ppc64	    12345678_00000001_00000008_00000004_00000008_00000018_00000008_00000008_00000010_00000004_00000008_00000010_00000004_00000008_00000018_00000008_00000008_00000002_00000020_00000004_00000030
- m68k	    12345678_00000001_00000004_00000004_00000004_00000010_00000004_00000004_00000008_00000004_00000004_0000000c_00000004_00000004_00000010_00000004_00000004_00000002_00000020_00000004_0000001c
- mipsel	    78563412_00000001_00000004_00000004_00000004_00000010_00000004_00000004_00000008_00000004_00000004_00000010_00000004_00000004_00000010_00000004_00000004_00000002_00000020_00000004_0000001c