Remove the MESSAGE. It is not required. The library will build

caches for individuals as needed.

Remove gnome from CATEGORIES.

Redo the added font paths because ${LOCALBASE}/lib/X11/fonts is
already default as configured above, so don't need to add again.
And don't need to list sub-directories of "fonts" because fontconfig
already looks in sub-directories too. (I have been using this over
a year on various systems like this.)

Update to 2.3.2. Changes include:
        * fc-cache/fc-cache.c: (scanDirs):
        Fix a few minor leaks in error cases.
        * fc-cache/fc-cache.c: (main):
        Destroy font configuration on exit to help valgrind
        * fonts.conf.in:
        * src/fcfreetype.c: (FcSfntNameTranscode), (FcFreeTypeCharIndex),
        (FcFreeTypeCheckGlyph):
        Use own transcoding routines in preference to iconv
        which appears to have leaks in some translators.
        Call iconv_close after using iconv (oops).

        Prefer unicode encoding of Euro char as some
        fonts mis-encode Euro in other ones.

        Must fetch bitmap glyphs to get width values
        to check for monospace/dual-width fonts.

Complete changes at
http://www.fontconfig.org/release/ChangeLog-2.3.2

Note that manpage for fc-cache(1) is not installed yet. It is in SGML.

Also note that the new version provides same library version
libfontconfig.so.1.0.4. This was reported to developer and was an
accidently oversite. Nevertheless, it is still ABI compatible.

3 files changed, 12 insertions, 22 deletions

diff --git a/fonts/fontconfig/MESSAGE b/fonts/fontconfig/MESSAGE
deleted file mode 100644
index fd1e2bc0721..00000000000
--- a/fonts/fontconfig/MESSAGE
+++ /dev/null
@@ -1,11 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.2 2003/10/11 07:42:36 grant Exp $
-
-You will need to run 'fc-cache' as root to build the X11 font cache
-before attempting to use applications which use ${PKGNAME}.
-
-Note that 'fc-cache' can take a VERY long time to complete depending
-on your system speed and the fonts you have available. You may wish to
-use the -v flag for some verbosity.
-
-===========================================================================
diff --git a/fonts/fontconfig/Makefile b/fonts/fontconfig/Makefile
index 687b6497723..3d257b0bd62 100644
--- a/fonts/fontconfig/Makefile
+++ b/fonts/fontconfig/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.43 2005/06/07 19:38:52 jlam Exp $
+# $NetBSD: Makefile,v 1.44 2005/07/28 16:40:03 reed Exp $
 #
 
-DISTNAME=	fontconfig-2.3.1
-PKGREVISION=	1
-CATEGORIES=	fonts gnome
+DISTNAME=	fontconfig-2.3.2
+CATEGORIES=	fonts
 MASTER_SITES=	http://www.fontconfig.org/release/
 
 MAINTAINER=	tech-pkg@NetBSD.org
@@ -36,9 +35,11 @@ CONFIGURE_ENV+=		HASDOCBOOK=no
 
 .include "../../mk/bsd.prefs.mk"
 
-FONT_PATH=	${X11PREFIX}/lib/X11/fonts/TTF,${X11PREFIX}/lib/X11/fonts/Type1
-.if ${X11PREFIX} != ${X11BASE}
-FONT_PATH2=	,${X11BASE}/lib/X11/fonts,${X11BASE}/lib/X11/fonts/TTF,${X11BASE}/lib/X11/fonts/Type1
+.if defined($X11PREFIX) && (${LOCALBASE} != {$X11PREFIX})
+FONT_PATH=	${X11PREFIX}/lib/X11/fonts
+.endif
+.if (${X11PREFIX} != ${X11BASE})
+FONT_PATH2=	,${X11BASE}/lib/X11/fonts
 .endif
 CONFIGURE_ARGS+=	--with-add-fonts=${FONT_PATH}${FONT_PATH2}
 
diff --git a/fonts/fontconfig/distinfo b/fonts/fontconfig/distinfo
index 84c780e68ec..d0797c3a9ef 100644
--- a/fonts/fontconfig/distinfo
+++ b/fonts/fontconfig/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.13 2005/03/22 14:05:54 wiz Exp $
+$NetBSD: distinfo,v 1.14 2005/07/28 16:40:03 reed Exp $
 
-SHA1 (fontconfig-2.3.1.tar.gz) = f429ee221a2e6cb76eda4b85c07c853990a93d94
-RMD160 (fontconfig-2.3.1.tar.gz) = 93bf6234958dc9ec7488e1e622f9d97450976af3
-Size (fontconfig-2.3.1.tar.gz) = 962724 bytes
+SHA1 (fontconfig-2.3.2.tar.gz) = 8ec60da668618383b539db9d70b8e320bd7dd031
+RMD160 (fontconfig-2.3.2.tar.gz) = 42668475cca88f265a3b12c289eea2ff61ddaa2b
+Size (fontconfig-2.3.2.tar.gz) = 964045 bytes
 SHA1 (patch-aa) = 4f39b7726c11cc9d91fba0c840f26404702c0353
 SHA1 (patch-ac) = df8b145c38476e5caa1f4636be4eb56654bd11d0