Update to 2.1.92. This is a hacked development version that should solve

most of the Xft/fontconfig problems people are experiencing.  Note that
in this version, font caches do not have to exist for Xft applications
to function properly.

PR:	50482

16 files changed, 420 insertions, 326 deletions

diff --git a/x11-fonts/fontconfig/Makefile b/x11-fonts/fontconfig/Makefile
index 45878ede0df0..9ad537171e0b 100644
--- a/x11-fonts/fontconfig/Makefile
+++ b/x11-fonts/fontconfig/Makefile
@@ -6,11 +6,9 @@
 #
 
 PORTNAME=	fontconfig
-PORTVERSION=	2.1
-PORTREVISION=	7
+PORTVERSION=	2.1.92
 CATEGORIES=	x11-fonts
-MASTER_SITES=	http://www.fontconfig.org/fontconfig/release/
-DISTNAME=	fcpackage.${PORTVERSION:S/./_/}
+MASTER_SITES=	http://nexp.cs.pdx.edu/fontconfig/release/
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	An XML-based font configuration API for X Windows
@@ -23,17 +21,141 @@ RUN_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
 USE_GMAKE=	yes
 PREFIX?=	${X11BASE}
 INSTALLS_SHLIB=	yes
-GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
 USE_REINPLACE=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gnomehack
 CONFIGURE_ARGS=	--with-confdir=${PREFIX}/etc/fonts \
-		--with-expat=${LOCALBASE} \
+		--with-expat_includes=${LOCALBASE}/include \
+		--with-expat_lib=${LOCALBASE}/lib \
 		--with-default_fonts=${X11BASE}/lib/X11/fonts
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
-WRKSRC=	${WRKDIR}/${DISTNAME}/fontconfig
 MAKE_ENV=	LC_ALL=C
 
-MAN1=		fc-cache.1 fc-list.1
-MAN3=		fontconfig.3
+MAN3=		FcAtomicCreate.3  \
+		FcAtomicDeleteNew.3  \
+		FcAtomicDestroy.3  \
+		FcAtomicLock.3  \
+		FcAtomicNewFile.3  \
+		FcAtomicOrigFile.3  \
+		FcAtomicReplaceOrig.3  \
+		FcAtomicUnlock.3  \
+		FcBlanksAdd.3  \
+		FcBlanksCreate.3  \
+		FcBlanksDestroy.3  \
+		FcBlanksIsMember.3  \
+		FcCharSetAddChar.3  \
+		FcCharSetCopy.3  \
+		FcCharSetCount.3  \
+		FcCharSetCreate.3  \
+		FcCharSetDestroy.3  \
+		FcCharSetEqual.3  \
+		FcCharSetFirstPage.3  \
+		FcCharSetHasChar.3  \
+		FcCharSetIntersect.3  \
+		FcCharSetIntersectCount.3  \
+		FcCharSetIsSubset.3  \
+		FcCharSetNextPage.3  \
+		FcCharSetSubtract.3  \
+		FcCharSetSubtractCount.3  \
+		FcCharSetUnion.3  \
+		FcConfigAppFontAddDir.3  \
+		FcConfigAppFontAddFile.3  \
+		FcConfigAppFontClear.3  \
+		FcConfigBuildFonts.3  \
+		FcConfigCreate.3  \
+		FcConfigDestroy.3  \
+		FcConfigFilename.3  \
+		FcConfigGetBlanks.3  \
+		FcConfigGetCache.3  \
+		FcConfigGetConfigDirs.3  \
+		FcConfigGetConfigFiles.3  \
+		FcConfigGetCurrent.3  \
+		FcConfigGetFontDirs.3  \
+		FcConfigGetFonts.3  \
+		FcConfigGetRescanInverval.3  \
+		FcConfigParseAndLoad.3  \
+		FcConfigSetCurrent.3  \
+		FcConfigSetRescanInverval.3  \
+		FcConfigSubstitute.3  \
+		FcConfigSubstituteWithPat.3  \
+		FcConfigUptoDate.3  \
+		FcDefaultSubstitute.3  \
+		FcDirCacheValid.3  \
+		FcDirSave.3  \
+		FcDirScan.3  \
+		FcFileScan.3  \
+		FcFontList.3  \
+		FcFontMatch.3  \
+		FcFontRenderPrepare.3  \
+		FcFontSetAdd.3  \
+		FcFontSetCreate.3  \
+		FcFontSetDestroy.3  \
+		FcFontSort.3  \
+		FcFreeTypeCharIndex.3  \
+		FcFreeTypeCharSet.3  \
+		FcFreeTypeQuery.3  \
+		FcGetVersion.3  \
+		FcInit.3  \
+		FcInitBringUptoDate.3  \
+		FcInitLoadConfig.3  \
+		FcInitLoadConfigAndFonts.3  \
+		FcInitReinitialize.3  \
+		FcMatrixCopy.3  \
+		FcMatrixEqual.3  \
+		FcMatrixInit.3  \
+		FcMatrixMultiply.3  \
+		FcMatrixRotate.3  \
+		FcMatrixScale.3  \
+		FcMatrixShear.3  \
+		FcNameConstant.3  \
+		FcNameGetConstant.3  \
+		FcNameGetObjectType.3  \
+		FcNameParse.3  \
+		FcNameRegisterConstants.3  \
+		FcNameRegisterObjectTypes.3  \
+		FcNameUnparse.3  \
+		FcNameUnregisterConstants.3  \
+		FcNameUnregisterObjectTypes.3  \
+		FcObjectSetAdd.3  \
+		FcObjectSetBuild.3  \
+		FcObjectSetCreate.3  \
+		FcObjectSetDestroy.3  \
+		FcPatternAdd-Type.3  \
+		FcPatternAdd.3  \
+		FcPatternAddWeak.3  \
+		FcPatternBuild.3  \
+		FcPatternCreate.3  \
+		FcPatternDel.3  \
+		FcPatternDestroy.3  \
+		FcPatternEqual.3  \
+		FcPatternEqualSubset.3  \
+		FcPatternGet-Type.3  \
+		FcPatternGet.3  \
+		FcPatternHash.3  \
+		FcPatternPrint.3  \
+		FcStrBasename.3  \
+		FcStrCmpIgnoreCase.3  \
+		FcStrCopy.3  \
+		FcStrCopyFilename.3  \
+		FcStrDirname.3  \
+		FcStrListCreate.3  \
+		FcStrListDone.3  \
+		FcStrListNext.3  \
+		FcStrSetAdd.3  \
+		FcStrSetAddFilename.3  \
+		FcStrSetCreate.3  \
+		FcStrSetDel.3  \
+		FcStrSetDestroy.3  \
+		FcStrSetMember.3  \
+		FcUcs4ToUtf8.3  \
+		FcUtf16Len.3  \
+		FcUtf16ToUcs4.3  \
+		FcUtf8Len.3  \
+		FcUtf8ToUcs4.3  \
+		FcValueDestroy.3  \
+		FcValueSave.3
+MAN5=		fonts-conf.5
 
 .include <bsd.port.pre.mk>
 .if ${XFREE86_VERSION} == 3
@@ -42,16 +164,9 @@ MTREE_FILE=     /etc/mtree/BSD.x11.dist
 MTREE_FILE=     /etc/mtree/BSD.x11-4.dist
 .endif
 
-pre-patch:
-	@${REINPLACE_CMD} -e 's|[(]LIBDIR[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' ${WRKSRC}/Makefile.in
-
 post-install:
-	@${INSTALL_DATA} ${WRKSRC}/src/fontconfig.man \
-		${PREFIX}/man/man3/fontconfig.3
-	@${INSTALL_DATA} ${WRKSRC}/fc-cache/fc-cache.man \
-		${PREFIX}/man/man1/fc-cache.1
-	@${INSTALL_DATA} ${WRKSRC}/fc-list/fc-list.man \
-		${PREFIX}/man/man1/fc-list.1
+	@${SED} -e 's|%%PREFIX%%|${PREFIX}|' < ${FILESDIR}/pkg-install.in \
+		> ${PKGINSTALL}
 .if !defined(PACKAGE_BUILDING)
 	@${LDCONFIG} -m ${PREFIX}/lib
 	@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
diff --git a/x11-fonts/fontconfig/distinfo b/x11-fonts/fontconfig/distinfo
index 1414861ccc43..8bfdfd8e1b26 100644
--- a/x11-fonts/fontconfig/distinfo
+++ b/x11-fonts/fontconfig/distinfo
@@ -1 +1 @@
-MD5 (fcpackage.2_1.tar.gz) = 2f2852c80924a9b5356c3037a471c1a1
+MD5 (fontconfig-2.1.92.tar.gz) = bb804a692d6c1057ea2f456b6226e873
diff --git a/x11-fonts/fontconfig/files/patch-Makefile.in b/x11-fonts/fontconfig/files/patch-Makefile.in
new file mode 100644
index 000000000000..4e2214774486
--- /dev/null
+++ b/x11-fonts/fontconfig/files/patch-Makefile.in
@@ -0,0 +1,29 @@
+--- Makefile.in.orig	Mon Mar 31 20:48:41 2003
++++ Makefile.in	Mon Mar 31 20:52:04 2003
+@@ -116,7 +116,7 @@
+ 
+ SUBDIRS = fontconfig fc-lang src fc-cache fc-list doc test
+ 
+-EXTRA_DIST =          fontconfig.pc.in         fonts.conf.in 	fonts.dtd 	local.conf         fontconfig.spec.in         fontconfig.spec
++EXTRA_DIST =          fontconfig.pc.in         fonts.conf.in 	fonts.dtd 	fontconfig.spec.in         fontconfig.spec
+ 
+ 
+ pkgconfigdir = $(prefix)/libdata/pkgconfig
+@@ -457,16 +457,7 @@
+ 
+ 
+ install-data-local:
+-	if [ -f $(DESTDIR)$(configdir)/local.conf ]; then \
+-	  echo "not overwriting existing $(DESTDIR)$(configdir)/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; \
+-	else if [ -f local.conf ]; then \
+-	  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 $(bindir)/fc-cache -f -v; fi
++#	if [ x$(DESTDIR) = x ]; then $(bindir)/fc-cache -f -v; fi
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/x11-fonts/fontconfig/files/patch-config_Makedefs.in b/x11-fonts/fontconfig/files/patch-config_Makedefs.in
deleted file mode 100644
index 15be7083d300..000000000000
--- a/x11-fonts/fontconfig/files/patch-config_Makedefs.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- config/Makedefs.in.orig	Sun Oct  6 16:43:39 2002
-+++ config/Makedefs.in	Sun Oct  6 16:43:47 2002
-@@ -65,7 +65,7 @@
- CFLAGS=$(CDEBUGFLAGS) @DEFS@ $(FCPATH_DEF) $(INCLUDES)
- 
- LIBBASE=libfontconfig.so
--LIBFILE=$(LIBBASE).@PACKAGE_MAJOR@.@PACKAGE_MINOR@
-+LIBFILE=$(LIBBASE).@PACKAGE_MAJOR@
- LIBMAJOR=$(LIBBASE).@PACKAGE_MAJOR@
- 
- LIBFONTCONFIG=-L$(SRCDIR) -lfontconfig
diff --git a/x11-fonts/fontconfig/files/patch-configure b/x11-fonts/fontconfig/files/patch-configure
index 8a8378a7a11d..fe4f6be04cb5 100644
--- a/x11-fonts/fontconfig/files/patch-configure
+++ b/x11-fonts/fontconfig/files/patch-configure
@@ -1,6 +1,14 @@
---- configure.orig	Thu Mar 13 17:21:08 2003
-+++ configure	Thu Mar 13 17:21:15 2003
-@@ -611,7 +611,7 @@
+--- configure.orig	Fri Mar  7 16:06:13 2003
++++ configure	Mon Mar 31 13:31:40 2003
+@@ -5452,6 +5452,7 @@
+ 
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+@@ -6402,7 +6403,7 @@
  # Check whether --with-default_fonts or --without-default_fonts was given.
  if test "${with_default_fonts+set}" = set; then
    withval="$with_default_fonts"
diff --git a/x11-fonts/fontconfig/files/patch-fc-cvs b/x11-fonts/fontconfig/files/patch-fc-cvs
deleted file mode 100644
index e1eac2e98829..000000000000
--- a/x11-fonts/fontconfig/files/patch-fc-cvs
+++ /dev/null
@@ -1,212 +0,0 @@
---- fc-lang/fc-lang.c	2002/08/22 07:36:43	1.3
-+++ fc-lang/fc-lang.c	2002/12/14 02:03:58	1.4
-@@ -165,22 +165,38 @@ static int compare (const void *a, const
-     return FcStrCmpIgnoreCase (*as, *bs);
- }
- 
-+#define MAX_LANG	    1024
-+#define MAX_LANG_SET_MAP    ((MAX_LANG + 31) / 32)
-+
-+#define BitSet(map, id)   ((map)[(id)>>5] |= ((FcChar32) 1 << ((id) & 0x1f)))
-+#define BitGet(map, id)   ((map)[(id)>>5] >> ((id) & 0x1f)) & 1)
-+
- int
- main (int argc, char **argv)
- {
--    char	*files[1024];
--    FcCharSet	*sets[1024];
--    int		duplicate[1024];
--    char	*names[1024];
-+    char	*files[MAX_LANG];
-+    FcCharSet	*sets[MAX_LANG];
-+    int		duplicate[MAX_LANG];
-+    int		country[MAX_LANG];
-+    char	*names[MAX_LANG];
-+    char	*langs[MAX_LANG];
-     FILE	*f;
-+    int		ncountry = 0;
-     int		i = 0;
-     FcCharLeaf	**leaves, **sleaves;
-     int		total_leaves = 0;
-     int		l, sl, tl;
-+    int		c;
-     char	line[1024];
-+    FcChar32	map[MAX_LANG_SET_MAP];
-+    int		num_lang_set_map;
-     
-     while (*++argv)
-+    {
-+	if (i == MAX_LANG)
-+	    fatal (*argv, 0, "Too many languages");
- 	files[i++] = *argv;
-+    }
-     files[i] = 0;
-     qsort (files, i, sizeof (char *), compare);
-     i = 0;
-@@ -191,6 +207,10 @@ main (int argc, char **argv)
- 	    fatal (files[i], 0, strerror (errno));
- 	sets[i] = scan (f, files[i]);
- 	names[i] = get_name (files[i]);
-+	langs[i] = get_lang(names[i]);
-+	if (strchr (langs[i], '-'))
-+	    country[ncountry++] = i;
-+
- 	total_leaves += sets[i]->num;
- 	i++;
- 	fclose (f);
-@@ -319,10 +339,54 @@ main (int argc, char **argv)
- 		"      { FC_REF_CONSTANT, %d, "
- 		"(FcCharLeaf **) leaves_%s, "
- 		"(FcChar16 *) numbers_%s } },\n",
--		get_lang(names[i]),
-+		langs[i],
- 		sets[j]->num, names[j], names[j]);
-     }
-     printf ("};\n\n");
-+    printf ("#define NUM_LANG_CHAR_SET	%d\n", i);
-+    num_lang_set_map = (i + 31) / 32;
-+    printf ("#define NUM_LANG_SET_MAP	%d\n", num_lang_set_map);
-+    /*
-+     * Dump indices with country codes
-+     */
-+    if (ncountry)
-+    {
-+	int	ncountry_ent = 0;
-+	printf ("\n");
-+	printf ("static const FcChar32 fcLangCountrySets[][NUM_LANG_SET_MAP] = {\n");
-+	for (c = 0; c < ncountry; c++)
-+	{
-+	    i = country[c];
-+	    if (i >= 0)
-+	    {
-+		int l = strchr (langs[i], '-') - langs[i];
-+		int d, k;
-+
-+		for (k = 0; k < num_lang_set_map; k++)
-+		    map[k] = 0;
-+
-+		BitSet (map, i);
-+		for (d = c + 1; d < ncountry; d++)
-+		{
-+		    int j = country[d];
-+		    if (j >= 0 && !strncmp (langs[j], langs[i], l))
-+		    {
-+			BitSet(map, j);
-+			country[d] = -1;
-+		    }
-+		}
-+		printf ("    {");
-+		for (k = 0; k < num_lang_set_map; k++)
-+		    printf (" 0x%08x,", map[k]);
-+		printf (" }, /* %*.*s */\n",
-+			l, l, langs[i]);
-+		++ncountry_ent;
-+	    }
-+	}
-+	printf ("};\n\n");
-+	printf ("#define NUM_COUNTRY_SET %d\n", ncountry_ent);
-+    }
-+    
-     while (fgets (line, sizeof (line), stdin))
- 	fputs (line, stdout);
-     
---- src/fccfg.c	2002/08/31 22:17:32	1.23
-+++ src/fccfg.c	2002/12/21 02:31:53	1.24
-@@ -1141,7 +1141,11 @@ FcConfigSubstituteWithPat (FcConfig    *
- 		if ((t->kind == FcMatchFont || kind == FcMatchPattern) &&
- 		    !FcStrCmpIgnoreCase ((FcChar8 *) t->field, 
- 					 (FcChar8 *) e->field))
-+		{
-+		    if (!st[i].elt)
-+			t = 0;
- 		    break;
-+		}
- 	    }
- 	    switch (e->op) {
- 	    case FcOpAssign:
---- src/fclang.c	2002/08/26 23:34:31	1.7
-+++ src/fclang.c	2002/12/14 02:03:59	1.8
-@@ -31,9 +31,6 @@ typedef struct {
- 
- #include "../fc-lang/fclang.h"
- 
--#define NUM_LANG_CHAR_SET   (sizeof (fcLangCharSets) / sizeof (fcLangCharSets[0]))
--#define NUM_LANG_SET_MAP    ((NUM_LANG_CHAR_SET + 31) / 32)
--
- struct _FcLangSet {
-     FcChar32	map[NUM_LANG_SET_MAP];
-     FcStrSet	*extra;
-@@ -339,13 +336,21 @@ FcLangSetCompareStrSet (const FcLangSet 
- FcLangResult
- FcLangSetCompare (const FcLangSet *lsa, const FcLangSet *lsb)
- {
--    int		    i;
-+    int		    i, j;
-     FcLangResult    best, r;
- 
-     for (i = 0; i < NUM_LANG_SET_MAP; i++)
- 	if (lsa->map[i] & lsb->map[i])
- 	    return FcLangEqual;
-     best = FcLangDifferentLang;
-+    for (j = 0; j < NUM_COUNTRY_SET; j++)
-+	for (i = 0; i < NUM_LANG_SET_MAP; i++)
-+	    if ((lsa->map[i] & fcLangCountrySets[j][i]) &&
-+		(lsb->map[i] & fcLangCountrySets[j][i]))
-+	    {
-+		best = FcLangDifferentCountry;
-+		break;
-+	    }
-     if (lsa->extra)
-     {
- 	r = FcLangSetCompareStrSet (lsb, lsa->extra);
---- fc-lang/fclang.h	2002/10/21 17:03:47	1.20
-+++ fc-lang/fclang.h	2002/12/14 02:03:58	1.21
-@@ -3996,3 +3996,11 @@ static const FcLangCharSet  fcLangCharSe
-       { FC_REF_CONSTANT, 1, (FcCharLeaf **) leaves_fj, (FcChar16 *) numbers_fj } },
- };
- 
-+#define NUM_LANG_CHAR_SET	175
-+#define NUM_LANG_SET_MAP	6
-+
-+static const FcChar32 fcLangCountrySets[][NUM_LANG_SET_MAP] = {
-+    { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00003e00, }, /* zh */
-+};
-+
-+#define NUM_COUNTRY_SET 1
---- fontconfig/fcprivate.h	2002/08/22 07:36:44	1.6
-+++ fontconfig/fcprivate.h	2002/12/04 10:28:03	1.7
-@@ -87,7 +87,7 @@ _FcPatternVapBuild_bail1:					    \
-     if (!orig)							    \
- 	FcPatternDestroy (__p__);				    \
- _FcPatternVapBuild_bail0:					    \
--    result = 0;							    \
-+    result = (void*)0;						    \
- 								    \
- _FcPatternVapBuild_return:					    \
-     ;								    \
---- src/fcstr.c	2002/08/31 22:17:32	1.10
-+++ src/fcstr.c	2002/12/14 01:59:38	1.11
-@@ -283,7 +283,7 @@ FcUtf16ToUcs4 (const FcChar8	*src_orig,
- 	if ((b & 0xfc00) != 0xdc00)
- 	    return 0;
- 	result = ((((FcChar32) a & 0x3ff) << 10) |
--		  ((FcChar32) b & 0x3ff)) | 0x10000;
-+		  ((FcChar32) b & 0x3ff)) + 0x10000;
-     }
-     else
- 	result = a;
---- src/fontconfig.man	2002/10/02 07:11:30	1.7
-+++ src/fontconfig.man	2003/02/16 17:44:36	1.8
-@@ -1453,6 +1453,12 @@ match the available fonts.  It is in xml
- 
- .B fonts.dtd 
- is a DTD that describes the format of the configuration files.
-+
-+.B local.conf
-+is sourced by the default system-wide fonts.conf file. 
-+Note that the normal 'make install' procedure for XFree86 is to
-+replace any existing fonts.conf file with the new version.  Place
-+any local customizations in local.conf which this file references.
- 
- .B ~/.fonts.conf
- is the conventional location for per-user font configuration, although the
diff --git a/x11-fonts/fontconfig/files/patch-fonts.conf.in b/x11-fonts/fontconfig/files/patch-fonts.conf.in
deleted file mode 100644
index caf5560b98bc..000000000000
--- a/x11-fonts/fontconfig/files/patch-fonts.conf.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- fonts.conf.in.orig	Sun Oct  6 16:37:34 2002
-+++ fonts.conf.in	Sun Oct  6 16:37:41 2002
-@@ -21,7 +21,6 @@
- -->
- 
- 	<dir>/usr/X11R6/lib/X11/fonts</dir>
-- 	<dir>/usr/share/fonts</dir>
- 	<dir>~/.fonts</dir>
- 
- <!-- FONTPATH_END -->
diff --git a/x11-fonts/fontconfig/files/patch-src_Makefile.in b/x11-fonts/fontconfig/files/patch-src_Makefile.in
deleted file mode 100644
index f4869f5675a6..000000000000
--- a/x11-fonts/fontconfig/files/patch-src_Makefile.in
+++ /dev/null
@@ -1,51 +0,0 @@
---- src/Makefile.in.orig	Sun Oct  6 23:23:09 2002
-+++ src/Makefile.in	Sun Oct  6 23:26:11 2002
-@@ -71,7 +71,7 @@
- .c.@OBJEXT@:
- 	$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) -c $< -o $@
- 	
--all:: $(LIBFILE) $(LIBMAJOR) $(LIBBASE)
-+all:: $(LIBFILE) $(LIBBASE)
- 
- # 
- # build the library and the various version links
-@@ -80,13 +80,9 @@
- 	rm -f $@
- 	$(MKSHLIB) $(OBJS) $(LIBS)
- 
--$(LIBMAJOR): $(LIBFILE)
--	rm -f  $@
--	$(LN_S) $(LIBFILE) $(LIBMAJOR)
--
--$(LIBBASE): $(LIBMAJOR)
-+$(LIBBASE): $(LIBFILE)
- 	rm -f $@
--	$(LN_S) $(LIBMAJOR) $(LIBBASE)
-+	$(LN_S) $(LIBFILE) $(LIBBASE)
- 
- $(OBJS): fcint.h $(HEADERS)
- 
-@@ -102,19 +98,15 @@
- # install library
- #
- 
--install:: $(DESTDIR)$(LIBDIR)/$(LIB) $(DESTDIR)$(LIBDIR)/$(LIBMAJOR)
-+install:: $(DESTDIR)$(LIBDIR)/$(LIBFILE)
- install:: $(DESTDIR)$(LIBDIR)/$(LIBBASE)
- 
- $(DESTDIR)$(LIBDIR)/$(LIBFILE): $(LIBFILE)
- 	$(INSTALL_PROGRAM) $< $(DESTDIR)$(LIBDIR)/$<
- 
--$(DESTDIR)$(LIBDIR)/$(LIBMAJOR): $(DESTDIR)$(LIBDIR)/$(LIBFILE)
--	rm -f $(DESTDIR)$(LIBDIR)/$(LIBMAJOR)
--	$(LN_S) $(LIBFILE) $(DESTDIR)$(LIBDIR)/$(LIBMAJOR)
--
--$(DESTDIR)$(LIBDIR)/$(LIBBASE): $(DESTDIR)$(LIBDIR)/$(LIBMAJOR)
-+$(DESTDIR)$(LIBDIR)/$(LIBBASE): $(DESTDIR)$(LIBDIR)/$(LIBFILE)
- 	rm -f $(DESTDIR)$(LIBDIR)/$(LIBBASE)
--	$(LN_S) $(LIBMAJOR) $(DESTDIR)$(LIBDIR)/$(LIBBASE)
-+	$(LN_S) $(LIBFILE) $(DESTDIR)$(LIBDIR)/$(LIBBASE)
- 
- clean::
--	rm -f $(LIBFILE) $(LIBMAJOR) $(LIBBASE) $(OBJS)
-+	rm -f $(LIBFILE) $(LIBBASE) $(OBJS)
diff --git a/x11-fonts/fontconfig/files/patch-src_fccache.c b/x11-fonts/fontconfig/files/patch-src_fccache.c
new file mode 100644
index 000000000000..e8e8e34c1b4a
--- /dev/null
+++ b/x11-fonts/fontconfig/files/patch-src_fccache.c
@@ -0,0 +1,38 @@
+--- src/fccache.c	2003/03/05 05:51:27	1.17
++++ src/fccache.c	2003/03/12 22:15:39	1.18
+@@ -309,14 +309,14 @@
+  * Verify the saved timestamp for a file
+  */
+ FcBool
+-FcGlobalCacheCheckTime (FcGlobalCacheInfo *info)
++FcGlobalCacheCheckTime (const FcChar8 *file, FcGlobalCacheInfo *info)
+ {
+     struct stat	    statb;
+ 
+-    if (stat ((char *) info->file, &statb) < 0)
++    if (stat ((char *) file, &statb) < 0)
+     {
+ 	if (FcDebug () & FC_DBG_CACHE)
+-	    printf (" file missing\n");
++	    printf (" file %s missing\n", file);
+ 	return FcFalse;
+     }
+     if (statb.st_mtime != info->time)
+@@ -549,7 +549,7 @@
+      * See if the timestamp recorded in the global cache
+      * matches the directory time, if not, return False
+      */
+-    if (!FcGlobalCacheCheckTime (&d->info))
++    if (!FcGlobalCacheCheckTime (d->info.file, &d->info))
+     {
+ 	if (FcDebug () & FC_DBG_CACHE)
+ 	    printf ("\tdir cache entry time mismatch\n");
+@@ -633,7 +633,7 @@
+ 	}
+     }
+     if (count)
+-	*count = max;
++	*count = max + 1;
+     return match;
+ }
+     
diff --git a/x11-fonts/fontconfig/files/patch-src_fccfg.c b/x11-fonts/fontconfig/files/patch-src_fccfg.c
new file mode 100644
index 000000000000..27defad82071
--- /dev/null
+++ b/x11-fonts/fontconfig/files/patch-src_fccfg.c
@@ -0,0 +1,22 @@
+--- src/fccfg.c.orig	Mon Mar 31 15:11:28 2003
++++ src/fccfg.c	Mon Mar 31 15:12:06 2003
+@@ -1265,8 +1265,8 @@
+     return FcConfigSubstituteWithPat (config, p, 0, kind);
+ }
+ 
+-#ifndef FONTCONFIG_PATH
+-#define FONTCONFIG_PATH	"/etc/fonts"
++#ifndef CONFDIR
++#define CONFDIR	"/etc/fonts"
+ #endif
+ 
+ #ifndef FONTCONFIG_FILE
+@@ -1343,7 +1343,7 @@
+ 	}
+     }
+     
+-    dir = (FcChar8 *) FONTCONFIG_PATH;
++    dir = (FcChar8 *) CONFDIR;
+     path[i] = malloc (strlen ((char *) dir) + 1);
+     if (!path[i])
+ 	goto bail1;
diff --git a/x11-fonts/fontconfig/files/patch-src_fcdir.c b/x11-fonts/fontconfig/files/patch-src_fcdir.c
new file mode 100644
index 000000000000..042f89a6fd3b
--- /dev/null
+++ b/x11-fonts/fontconfig/files/patch-src_fcdir.c
@@ -0,0 +1,32 @@
+diff -u -r1.14 -r1.15
+--- src/fcdir.c	2003/03/05 05:51:27	1.14
++++ src/fcdir.c	2003/03/12 22:15:39	1.15
+@@ -70,7 +70,7 @@
+ 		/*
+ 		 * Found a cache entry for the file
+ 		 */
+-		if (FcGlobalCacheCheckTime (&cache_file->info))
++		if (FcGlobalCacheCheckTime (file, &cache_file->info))
+ 		{
+ 		    name = cache_file->name;
+ 		    need_scan = FcFalse;
+@@ -89,7 +89,8 @@
+ 						       strlen ((const char *) file),
+ 						       FcFalse)))
+ 	    {
+-		if (FcGlobalCacheCheckTime (&cache_dir->info))
++		if (FcGlobalCacheCheckTime (cache_dir->info.file, 
++					    &cache_dir->info))
+ 		{
+ 		    font = 0;
+ 		    need_scan = FcFalse;
+@@ -199,6 +200,9 @@
+     strcat ((char *) file, "/");
+     base = file + strlen ((char *) file);
+     
++    if (FcDebug () & FC_DBG_SCAN)
++	printf ("\tScanning dir %s\n", dir);
++	
+     d = opendir ((char *) dir);
+     
+     if (!d)
diff --git a/x11-fonts/fontconfig/files/patch-src_fcfreetype.c b/x11-fonts/fontconfig/files/patch-src_fcfreetype.c
deleted file mode 100644
index 6b23ad07d022..000000000000
--- a/x11-fonts/fontconfig/files/patch-src_fcfreetype.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/fcfreetype.c.orig	Fri Feb 28 10:44:26 2003
-+++ src/fcfreetype.c	Fri Feb 28 10:44:41 2003
-@@ -467,7 +467,7 @@
-     if (!FcPatternAddString (pat, FC_SOURCE, (FcChar8 *) "FreeType"))
- 	goto bail1;
- 
--#if 1
-+#if 0
-     if ((face->face_flags & FT_FACE_FLAG_FIXED_WIDTH) != 0)
- 	if (!FcPatternAddInteger (pat, FC_SPACING, FC_MONO))
- 	    goto bail1;
diff --git a/x11-fonts/fontconfig/files/patch-src_fcint.h b/x11-fonts/fontconfig/files/patch-src_fcint.h
new file mode 100644
index 000000000000..c469657e68ea
--- /dev/null
+++ b/x11-fonts/fontconfig/files/patch-src_fcint.h
@@ -0,0 +1,12 @@
+diff -u -r1.33 -r1.34
+--- src/fcint.h	2003/03/05 05:52:31	1.33
++++ src/fcint.h	2003/03/12 22:15:39	1.34
+@@ -338,7 +338,7 @@
+ FcGlobalCacheDestroy (FcGlobalCache *cache);
+ 
+ FcBool
+-FcGlobalCacheCheckTime (FcGlobalCacheInfo *info);
++FcGlobalCacheCheckTime (const FcChar8*file, FcGlobalCacheInfo *info);
+ 
+ void
+ FcGlobalCacheReferenced (FcGlobalCache	    *cache,
diff --git a/x11-fonts/fontconfig/files/pkg-install.in b/x11-fonts/fontconfig/files/pkg-install.in
new file mode 100644
index 000000000000..b00502db5f9d
--- /dev/null
+++ b/x11-fonts/fontconfig/files/pkg-install.in
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+PATH=/bin:/usr/bin:/sbin:/usr/sbin:%%PREFIX%%/bin
+export PATH
+
+if [ "$2" = "POST-INSTALL" ]; then
+    echo "Running fc-cache to build fontconfig cache..."
+    fc-cache -f -v
+fi
diff --git a/x11-fonts/fontconfig/pkg-install b/x11-fonts/fontconfig/pkg-install
deleted file mode 100644
index 62581669e328..000000000000
--- a/x11-fonts/fontconfig/pkg-install
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-PATH=/bin:/usr/bin:/sbin:/usr/sbin:/usr/X11R6/bin:${PATH}
-export PATH
-
-if [ "$2" = "POST-INSTALL" ]; then
-    fc-cache -f >/dev/null 2>&1
-fi
diff --git a/x11-fonts/fontconfig/pkg-plist b/x11-fonts/fontconfig/pkg-plist
index fb4c921f5350..8034fb010a78 100644
--- a/x11-fonts/fontconfig/pkg-plist
+++ b/x11-fonts/fontconfig/pkg-plist
@@ -1,13 +1,145 @@
 bin/fc-cache
 bin/fc-list
-bin/fontconfig-config
 etc/fonts/fonts.conf
 etc/fonts/fonts.dtd
 include/fontconfig/fcfreetype.h
 include/fontconfig/fcprivate.h
 include/fontconfig/fontconfig.h
+lib/libfontconfig.a
 lib/libfontconfig.so
 lib/libfontconfig.so.1
 libdata/pkgconfig/fontconfig.pc
+share/doc/fontconfig/fontconfig-devel.txt
+share/doc/fontconfig/fontconfig-devel/index.html
+share/doc/fontconfig/fontconfig-devel/r1016.html
+share/doc/fontconfig/fontconfig-devel/r1042.html
+share/doc/fontconfig/fontconfig-devel/r1064.html
+share/doc/fontconfig/fontconfig-devel/r1087.html
+share/doc/fontconfig/fontconfig-devel/r1111.html
+share/doc/fontconfig/fontconfig-devel/r1134.html
+share/doc/fontconfig/fontconfig-devel/r1159.html
+share/doc/fontconfig/fontconfig-devel/r1184.html
+share/doc/fontconfig/fontconfig-devel/r120.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/r1281.html
+share/doc/fontconfig/fontconfig-devel/r1306.html
+share/doc/fontconfig/fontconfig-devel/r1331.html
+share/doc/fontconfig/fontconfig-devel/r1356.html
+share/doc/fontconfig/fontconfig-devel/r1383.html
+share/doc/fontconfig/fontconfig-devel/r141.html
+share/doc/fontconfig/fontconfig-devel/r1414.html
+share/doc/fontconfig/fontconfig-devel/r1437.html
+share/doc/fontconfig/fontconfig-devel/r1460.html
+share/doc/fontconfig/fontconfig-devel/r1486.html
+share/doc/fontconfig/fontconfig-devel/r1515.html
+share/doc/fontconfig/fontconfig-devel/r1545.html
+share/doc/fontconfig/fontconfig-devel/r1575.html
+share/doc/fontconfig/fontconfig-devel/r1608.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/r1672.html
+share/doc/fontconfig/fontconfig-devel/r1693.html
+share/doc/fontconfig/fontconfig-devel/r1715.html
+share/doc/fontconfig/fontconfig-devel/r1736.html
+share/doc/fontconfig/fontconfig-devel/r1758.html
+share/doc/fontconfig/fontconfig-devel/r1780.html
+share/doc/fontconfig/fontconfig-devel/r1802.html
+share/doc/fontconfig/fontconfig-devel/r1823.html
+share/doc/fontconfig/fontconfig-devel/r183.html
+share/doc/fontconfig/fontconfig-devel/r1847.html
+share/doc/fontconfig/fontconfig-devel/r1868.html
+share/doc/fontconfig/fontconfig-devel/r1890.html
+share/doc/fontconfig/fontconfig-devel/r1913.html
+share/doc/fontconfig/fontconfig-devel/r1936.html
+share/doc/fontconfig/fontconfig-devel/r1959.html
+share/doc/fontconfig/fontconfig-devel/r1980.html
+share/doc/fontconfig/fontconfig-devel/r2009.html
+share/doc/fontconfig/fontconfig-devel/r2034.html
+share/doc/fontconfig/fontconfig-devel/r204.html
+share/doc/fontconfig/fontconfig-devel/r2062.html
+share/doc/fontconfig/fontconfig-devel/r2099.html
+share/doc/fontconfig/fontconfig-devel/r2130.html
+share/doc/fontconfig/fontconfig-devel/r2157.html
+share/doc/fontconfig/fontconfig-devel/r2181.html
+share/doc/fontconfig/fontconfig-devel/r2207.html
+share/doc/fontconfig/fontconfig-devel/r2231.html
+share/doc/fontconfig/fontconfig-devel/r2255.html
+share/doc/fontconfig/fontconfig-devel/r228.html
+share/doc/fontconfig/fontconfig-devel/r2280.html
+share/doc/fontconfig/fontconfig-devel/r2304.html
+share/doc/fontconfig/fontconfig-devel/r2328.html
+share/doc/fontconfig/fontconfig-devel/r2350.html
+share/doc/fontconfig/fontconfig-devel/r2378.html
+share/doc/fontconfig/fontconfig-devel/r2399.html
+share/doc/fontconfig/fontconfig-devel/r2420.html
+share/doc/fontconfig/fontconfig-devel/r2443.html
+share/doc/fontconfig/fontconfig-devel/r2469.html
+share/doc/fontconfig/fontconfig-devel/r249.html
+share/doc/fontconfig/fontconfig-devel/r2491.html
+share/doc/fontconfig/fontconfig-devel/r2513.html
+share/doc/fontconfig/fontconfig-devel/r2535.html
+share/doc/fontconfig/fontconfig-devel/r2557.html
+share/doc/fontconfig/fontconfig-devel/r2579.html
+share/doc/fontconfig/fontconfig-devel/r2600.html
+share/doc/fontconfig/fontconfig-devel/r2621.html
+share/doc/fontconfig/fontconfig-devel/r2646.html
+share/doc/fontconfig/fontconfig-devel/r2682.html
+share/doc/fontconfig/fontconfig-devel/r270.html
+share/doc/fontconfig/fontconfig-devel/r2717.html
+share/doc/fontconfig/fontconfig-devel/r2745.html
+share/doc/fontconfig/fontconfig-devel/r2770.html
+share/doc/fontconfig/fontconfig-devel/r2791.html
+share/doc/fontconfig/fontconfig-devel/r2816.html
+share/doc/fontconfig/fontconfig-devel/r2841.html
+share/doc/fontconfig/fontconfig-devel/r2866.html
+share/doc/fontconfig/fontconfig-devel/r2892.html
+share/doc/fontconfig/fontconfig-devel/r2914.html
+share/doc/fontconfig/fontconfig-devel/r2936.html
+share/doc/fontconfig/fontconfig-devel/r295.html
+share/doc/fontconfig/fontconfig-devel/r2958.html
+share/doc/fontconfig/fontconfig-devel/r2983.html
+share/doc/fontconfig/fontconfig-devel/r3012.html
+share/doc/fontconfig/fontconfig-devel/r3037.html
+share/doc/fontconfig/fontconfig-devel/r3069.html
+share/doc/fontconfig/fontconfig-devel/r3102.html
+share/doc/fontconfig/fontconfig-devel/r3138.html
+share/doc/fontconfig/fontconfig-devel/r3161.html
+share/doc/fontconfig/fontconfig-devel/r3184.html
+share/doc/fontconfig/fontconfig-devel/r3209.html
+share/doc/fontconfig/fontconfig-devel/r323.html
+share/doc/fontconfig/fontconfig-devel/r3231.html
+share/doc/fontconfig/fontconfig-devel/r344.html
+share/doc/fontconfig/fontconfig-devel/r372.html
+share/doc/fontconfig/fontconfig-devel/r401.html
+share/doc/fontconfig/fontconfig-devel/r476.html
+share/doc/fontconfig/fontconfig-devel/r504.html
+share/doc/fontconfig/fontconfig-devel/r591.html
+share/doc/fontconfig/fontconfig-devel/r632.html
+share/doc/fontconfig/fontconfig-devel/r655.html
+share/doc/fontconfig/fontconfig-devel/r676.html
+share/doc/fontconfig/fontconfig-devel/r704.html
+share/doc/fontconfig/fontconfig-devel/r726.html
+share/doc/fontconfig/fontconfig-devel/r750.html
+share/doc/fontconfig/fontconfig-devel/r771.html
+share/doc/fontconfig/fontconfig-devel/r792.html
+share/doc/fontconfig/fontconfig-devel/r818.html
+share/doc/fontconfig/fontconfig-devel/r839.html
+share/doc/fontconfig/fontconfig-devel/r862.html
+share/doc/fontconfig/fontconfig-devel/r883.html
+share/doc/fontconfig/fontconfig-devel/r917.html
+share/doc/fontconfig/fontconfig-devel/r940.html
+share/doc/fontconfig/fontconfig-devel/r963.html
+share/doc/fontconfig/fontconfig-devel/r99.html
+share/doc/fontconfig/fontconfig-devel/r994.html
+share/doc/fontconfig/fontconfig-devel/x19.html
+share/doc/fontconfig/fontconfig-devel/x31.html
+share/doc/fontconfig/fontconfig-devel/x93.html
+share/doc/fontconfig/fontconfig-user.html
+share/doc/fontconfig/fontconfig-user.txt
+@dirrm share/doc/fontconfig/fontconfig-devel
+@dirrm share/doc/fontconfig
 @dirrm include/fontconfig
 @dirrm etc/fonts