Update to 2.1.2. This wraps up a lot of our patches, and fixes some other

rendering bugs.

22 files changed, 120 insertions, 992 deletions

diff --git a/x11-fonts/Xft/Makefile b/x11-fonts/Xft/Makefile
index fe1bc43c6dae..b3c6e3a7541e 100644
--- a/x11-fonts/Xft/Makefile
+++ b/x11-fonts/Xft/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	Xft
-PORTVERSION=	2.1
-PORTREVISION=	8
+PORTVERSION=	2.1.2
 CATEGORIES=	x11-fonts
 MASTER_SITES=	http://fontconfig.org/fontconfig/release/
-DISTNAME=	fcpackage.${PORTVERSION:S/./_/}
+DISTNAME=	xft-${PORTVERSION}
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A client-sided font API for X applications
@@ -20,29 +19,18 @@ LIB_DEPENDS=	fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 INSTALLS_SHLIB=	yes
-GNU_CONFIGURE=	yes
+USE_GNOME=	gnomehack gnometarget
 USE_REINPLACE=	yes
-CONFIGURE_ARGS=	--with-fontconfig-config="pkg-config fontconfig"
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-unknown-freebsd${OSREL}
+GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include" \
-		LIBS="-L${X11BASE}/lib"
-WRKSRC=	${WRKDIR}/${DISTNAME}/Xft
+		LDFLAGS="-L${X11BASE}/lib"
 
 MAN3=		Xft.3
 
 .include <bsd.port.pre.mk>
 
 .if ${XFREE86_VERSION} == 3
-BROKEN=	Xft2 requires XFree86 4.x to build.
+BROKEN=	Xft requires XFree86 4.x to build.
 .endif
 
-pre-patch:
-	@${REINPLACE_CMD} -e 's|[(]LIBDIR[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' ${WRKSRC}/Makefile.in
-
-pre-install:
-	-${MKDIR} ${PREFIX}/include/X11/Xft
-
-post-install:
-	@${INSTALL_DATA} ${WRKSRC}/Xft.man ${PREFIX}/man/man3/Xft.3
-
 .include <bsd.port.post.mk>
diff --git a/x11-fonts/Xft/distinfo b/x11-fonts/Xft/distinfo
index 1414861ccc43..637a9d389820 100644
--- a/x11-fonts/Xft/distinfo
+++ b/x11-fonts/Xft/distinfo
@@ -1 +1 @@
-MD5 (fcpackage.2_1.tar.gz) = 2f2852c80924a9b5356c3037a471c1a1
+MD5 (xft-2.1.2.tar.gz) = defb7e801d4938b8b15a426ae57e2f3f
diff --git a/x11-fonts/Xft/files/patch-Makefile.in b/x11-fonts/Xft/files/patch-Makefile.in
deleted file mode 100644
index 88ae45cf7348..000000000000
--- a/x11-fonts/Xft/files/patch-Makefile.in
+++ /dev/null
@@ -1,121 +0,0 @@
---- Makefile.in.orig	Fri Feb  7 20:35:02 2003
-+++ Makefile.in	Fri Feb  7 20:35:21 2003
-@@ -63,8 +63,7 @@
- INCLUDEDIR=$(includedir)/X11/Xft
- 
- LIBBASE=libXft.so
--LIBFILE=$(LIBBASE).@PACKAGE_MAJOR@.@PACKAGE_MINOR@
--LIBMAJOR=$(LIBBASE).@PACKAGE_MAJOR@
-+LIBFILE=$(LIBBASE).@PACKAGE_MAJOR@
- 
- LIBS=@LIBS@
- 
-@@ -109,7 +108,7 @@
- .c.@OBJEXT@:
- 	$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) -c $< -o $@
- 	
--all:: $(LIBFILE) $(LIBMAJOR) $(LIBBASE)
-+all:: $(LIBFILE) $(LIBBASE)
- 
- #
- # Build the library
-@@ -118,86 +117,25 @@
- 	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): $(HEADERS)
- 
--#
--# install directories
--#
--
--install:: $(DESTDIR)$(LIBDIR) $(DESTDIR)$(prefix)/libdata/pkgconfig
--install:: $(DESTDIR)$(INCLUDEDIR) $(DESTDIR)$(BINDIR)
--
--$(DESTDIR)$(LIBDIR):
--	mkdir -p $@
--
--$(DESTDIR)$(prefix)/libdata/pkgconfig:
--	mkdir -p $@
--
--$(DESTDIR)$(INCLUDEDIR):
--	mkdir -p $@
--
--$(DESTDIR)$(BINDIR):
--	mkdir -p $@
--
--#
--# install library
--#
--
--install:: $(DESTDIR)$(LIBDIR)/$(LIB) $(DESTDIR)$(LIBDIR)/$(LIBMAJOR) 
--install:: $(DESTDIR)$(LIBDIR)/$(LIBBASE)
--
--$(DESTDIR)$(LIBDIR)/$(LIBFILE): $(LIBFILE)
--	$(INSTALL_PROGRAM) $< $(DESTDIR)$(LIBDIR)
--
--$(DESTDIR)$(LIBDIR)/$(LIBMAJOR): $(DESTDIR)$(LIBDIR)/$(LIBFILE)
--	rm -f  $@
--	$(LN_S) $(LIBFILE) $(DESTDIR)$(LIBDIR)/$(LIBMAJOR)
--
--$(DESTDIR)$(LIBDIR)/$(LIBBASE): $(DESTDIR)$(LIBDIR)/$(LIBMAJOR)
--	rm -f  $@
--	$(LN_S) $(LIBMAJOR) $(DESTDIR)$(LIBDIR)/$(LIBBASE)
--
--#
--# install xft-config script
--#
--
--install:: $(DESTDIR)$(BINDIR)/xft-config
--
--$(DESTDIR)$(BINDIR)/xft-config: xft-config
--	$(INSTALL_SCRIPT) $< $(DESTDIR)$(BINDIR)
--
--#
--# install pkgconfig control file
--#
--
--install:: $(DESTDIR)$(prefix)/libdata/pkgconfig/xft.pc
--
--$(DESTDIR)$(prefix)/libdata/pkgconfig/xft.pc: xft.pc
--	$(INSTALL_DATA) $< $(DESTDIR)$(prefix)/libdata/pkgconfig
--
--
--# 
--# install header files
--#
--
--install::$(DESTDIR)$(INCLUDEDIR)/Xft.h $(DESTDIR)$(INCLUDEDIR)/XftCompat.h
--
--$(DESTDIR)$(INCLUDEDIR)/Xft.h: Xft.h
--	$(INSTALL_DATA) $< $(DESTDIR)$(INCLUDEDIR)
--
--$(DESTDIR)$(INCLUDEDIR)/XftCompat.h: XftCompat.h
--	$(INSTALL_DATA) $< $(DESTDIR)$(INCLUDEDIR)
-+install:: Xft.h XftCompat.h XftFreetype.h xft-config xft.pc
-+	$(INSTALL_DATA) Xft.h $(DESTDIR)$(INCLUDEDIR)
-+	$(INSTALL_DATA) XftCompat.h $(DESTDIR)$(INCLUDEDIR)
-+	$(INSTALL_DATA) XftFreetype.h $(DESTDIR)$(INCLUDEDIR)
-+	$(INSTALL_SCRIPT) xft-config $(DESTDIR)$(BINDIR)
-+	mkdir -p $(DESTDIR)$(prefix)/libdata/pkgconfig
-+	$(INSTALL_DATA) xft.pc $(DESTDIR)$(prefix)/libdata/pkgconfig
-+	$(INSTALL_PROGRAM) $(LIBFILE) $(DESTDIR)$(LIBDIR)
-+	rm -f $(DESTDIR)$(LIBDIR)/$(LIBBASE)
-+	$(LN_S) $(LIBFILE) $(DESTDIR)$(LIBDIR)/$(LIBBASE)
- 
- #
- # delete generated files
- #
- clean::
--	rm -f $(LIBFILE) $(LIBMAJOR) $(LIBBASE) $(OBJS)
-+	rm -f $(LIBFILE) $(LIBFILE) $(LIBBASE) $(OBJS)
diff --git a/x11-fonts/Xft/files/patch-configure b/x11-fonts/Xft/files/patch-configure
deleted file mode 100644
index 87b709ef4d16..000000000000
--- a/x11-fonts/Xft/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Mon Feb 17 17:08:30 2003
-+++ configure	Mon Feb 17 17:08:32 2003
-@@ -1316,7 +1316,7 @@
- case "$have_x" in
- yes)
- 	XRENDER_CFLAGS="-I$x_includes"
--	XRENDER_LIBS="-L$x_libraries -lXrender"
-+	XRENDER_LIBS="-L$x_libraries -lXext -lXrender"
- 
- 	saved_LIBS="$LIBS"
- 	LIBS="$LIBS $XRENDER_LIBS"
diff --git a/x11-fonts/Xft/files/patch-ltmain.sh b/x11-fonts/Xft/files/patch-ltmain.sh
new file mode 100644
index 000000000000..dc508a25a122
--- /dev/null
+++ b/x11-fonts/Xft/files/patch-ltmain.sh
@@ -0,0 +1,51 @@
+--- ltmain.sh.orig	Sat Apr 19 21:11:30 2003
++++ ltmain.sh	Wed May 14 16:05:31 2003
+@@ -1277,7 +1277,7 @@
+ 	  esac
+ 	elif test "X$arg" = "X-lc_r"; then
+ 	 case $host in
+-	 *-*-openbsd* | *-*-freebsd*)
++	 *-*-openbsd* | *-*-freebsd4*)
+ 	   # Do not include libc_r directly, use -pthread flag.
+ 	   continue
+ 	   ;;
+@@ -1287,8 +1287,16 @@
+ 	continue
+ 	;;
+ 
++      -pthread)
++      compile_command="$compile_command -pthread"
++      finalize_command="$finalize_command -pthread"
++      compiler_flags="$compiler_flags -pthread"
++      continue
++      ;;
++
+       -module)
+ 	module=yes
++	build_old_libs=no
+ 	continue
+ 	;;
+ 
+@@ -2997,6 +3005,9 @@
+ 	    # problems, so we reset it completely
+ 	    verstring=
+ 	    ;;
++	  *-*-freebsd*)
++	    # FreeBSD doesn't need this...
++	    ;;
+ 	  *)
+ 	    verstring="0.0"
+ 	    ;;
+@@ -5425,10 +5436,12 @@
+ 	fi
+ 
+ 	# Install the pseudo-library for information purposes.
++	if /usr/bin/false; then
+ 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ 	instname="$dir/$name"i
+ 	$show "$install_prog $instname $destdir/$name"
+ 	$run eval "$install_prog $instname $destdir/$name" || exit $?
++	fi
+ 
+ 	# Maybe install the static library, too.
+ 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/x11-fonts/Xft/files/patch-xft-cvs b/x11-fonts/Xft/files/patch-xft-cvs
deleted file mode 100644
index 85355143df7e..000000000000
--- a/x11-fonts/Xft/files/patch-xft-cvs
+++ /dev/null
@@ -1,276 +0,0 @@
---- Xft.h	2002/10/11 17:53:02	1.30
-+++ Xft.h	2003/02/25 21:57:53	1.32
-@@ -26,8 +26,8 @@
- #define _XFT_H_
- 
- #define XFT_MAJOR	2
--#define XFT_MINOR	0
--#define XFT_REVISION	1
-+#define XFT_MINOR	1
-+#define XFT_REVISION	0
- #define XFT_VERSION	((XFT_MAJOR * 10000) + (XFT_MINOR * 100) + (XFT_REVISION))
- #define XftVersion	XFT_VERSION
- 
-@@ -325,11 +325,12 @@ XftTextExtentsUtf8 (Display	    *dpy,
- 		    XGlyphInfo	    *extents);
- 
- void
--XftTextExtentsUtf16 (XftFont		*pub,
-+XftTextExtentsUtf16 (Display		*dpy,
-+		     XftFont		*pub,
- 		     _Xconst FcChar8	*string, 
- 		     FcEndian		endian,
--		    int			len,
--		    XGlyphInfo		*extents);
-+		     int		len,
-+		     XGlyphInfo		*extents);
- 
- /* xftfont.c */
- FcPattern *
-@@ -605,6 +606,20 @@ XftTextRenderUtf8 (Display	    *dpy,
- 		   int		    y,
- 		   _Xconst FcChar8  *string,
- 		   int		    len);
-+
-+void
-+XftTextRenderUtf16 (Display	    *dpy,
-+		    int		    op,
-+		    Picture	    src,
-+		    XftFont	    *pub,
-+		    Picture	    dst,
-+		    int		    srcx,
-+		    int		    srcy,
-+		    int		    x,
-+		    int		    y,
-+		    _Xconst FcChar8 *string,
-+		    FcEndian	    endian,
-+		    int		    len);
- 
- /* xftstr.c */
- 
---- xftcore.c	2002/10/16 21:07:08	1.11
-+++ xftcore.c	2003/02/15 22:30:51	1.13
-@@ -355,7 +355,7 @@ _XftSmoothGlyphMono (XImage		*image,
- 	bits = *src++;
- 	
- 	xspan = x;
--	while (w)
-+	while (w--)
- 	{
- 	    if (bits & bitsMask)
- 		XPutPixel (image, xspan, y, pixel);
-@@ -1088,7 +1088,6 @@ XftGlyphSpecCore (XftDraw		*draw,
-     /*
-      * Load missing glyphs
-      */
--    nmissing = 0;
-     glyphs_loaded = FcFalse;
-     x1 = y1 = x2 = y2 = 0;
-     for (i = 0; i < nglyphs; i++)
-@@ -1096,8 +1095,12 @@ XftGlyphSpecCore (XftDraw		*draw,
- 	XGlyphInfo	gi;
- 	int		g_x1, g_x2, g_y1, g_y2;
- 	
-+	nmissing = 0;
- 	if (XftFontCheckGlyph (dpy, public, FcTrue, glyphs[i].glyph, missing, &nmissing))
- 	    glyphs_loaded = FcTrue;
-+	if (nmissing)
-+	    XftFontLoadGlyphs (dpy, public, FcTrue, missing, nmissing);
-+
- 	XftGlyphExtents (dpy, public, &glyphs[i].glyph, 1, &gi);
- 	g_x1 = glyphs[i].x - gi.x;
- 	g_y1 = glyphs[i].y - gi.y;
-@@ -1122,8 +1125,6 @@ XftGlyphSpecCore (XftDraw		*draw,
- 	    y2 = g_y2;
- 	}
-     }
--    if (nmissing)
--	XftFontLoadGlyphs (dpy, public, FcTrue, missing, nmissing);
-     
-     if (x1 == x2 || y1 == y2)
- 	goto bail1;
-@@ -1273,6 +1274,9 @@ XftGlyphFontSpecCore (XftDraw			*draw,
- 	}
-     }
-     
-+    if (x1 == x2 || y1 == y2)
-+	goto bail1;
-+
-     for (i = 0; i < nglyphs; i++)
- 	if (((XftFontInt *) glyphs[i].font)->info.antialias)
- 	    break;
---- xftextent.c	2002/10/11 17:53:02	1.9
-+++ xftextent.c	2002/12/14 01:59:38	1.10
-@@ -220,6 +220,50 @@ XftTextExtentsUtf8 (Display	    *dpy,
-     glyphs = glyphs_local;
-     size = NUM_LOCAL;
-     while (len && (l = FcUtf8ToUcs4 (string, &ucs4, len)) > 0)
-+    {
-+	if (i == size)
-+	{
-+	    glyphs_new = malloc (size * 2 * sizeof (FT_UInt));
-+	    if (!glyphs_new)
-+	    {
-+		if (glyphs != glyphs_local)
-+		    free (glyphs);
-+		memset (extents, '\0', sizeof (XGlyphInfo));
-+		return;
-+	    }
-+	    memcpy (glyphs_new, glyphs, size * sizeof (FT_UInt));
-+	    size *= 2;
-+	    if (glyphs != glyphs_local)
-+		free (glyphs);
-+	    glyphs = glyphs_new;
-+	}
-+	glyphs[i++] = XftCharIndex (dpy, pub, ucs4);
-+	string += l;
-+	len -= l;
-+    }
-+    XftGlyphExtents (dpy, pub, glyphs, i, extents);
-+    if (glyphs != glyphs_local)
-+	free (glyphs);
-+}
-+
-+void
-+XftTextExtentsUtf16 (Display		*dpy,
-+		     XftFont		*pub,
-+		     _Xconst FcChar8	*string, 
-+		     FcEndian		endian,
-+		     int		len,
-+		     XGlyphInfo		*extents)
-+{
-+    FT_UInt	    *glyphs, *glyphs_new, glyphs_local[NUM_LOCAL];
-+    FcChar32	    ucs4;
-+    int		    i;
-+    int		    l;
-+    int		    size;
-+
-+    i = 0;
-+    glyphs = glyphs_local;
-+    size = NUM_LOCAL;
-+    while (len && (l = FcUtf16ToUcs4 (string, endian, &ucs4, len)) > 0)
-     {
- 	if (i == size)
- 	{
---- xftrender.c	2002/10/11 17:53:02	1.14
-+++ xftrender.c	2002/12/14 01:59:38	1.15
-@@ -673,7 +673,7 @@ XftTextRender8 (Display		*dpy,
-     }
-     for (i = 0; i < len; i++)
- 	glyphs[i] = XftCharIndex (dpy, pub, string[i]);
--    XftGlyphRender (dpy, PictOpOver, src, pub, dst, 
-+    XftGlyphRender (dpy, op, src, pub, dst, 
- 		     srcx, srcy, x, y, glyphs, len);
-     if (glyphs != glyphs_local)
- 	free (glyphs);
-@@ -705,7 +705,7 @@ XftTextRender16 (Display	    *dpy,
-     }
-     for (i = 0; i < len; i++)
- 	glyphs[i] = XftCharIndex (dpy, pub, string[i]);
--    XftGlyphRender (dpy, PictOpOver, src, pub, dst, 
-+    XftGlyphRender (dpy, op, src, pub, dst, 
- 		     srcx, srcy, x, y, glyphs, len);
-     if (glyphs != glyphs_local)
- 	free (glyphs);
-@@ -738,7 +738,7 @@ XftTextRender16BE (Display	    *dpy,
-     for (i = 0; i < len; i++)
- 	glyphs[i] = XftCharIndex (dpy, pub, 
- 				  (string[i*2]<<8) | string[i*2+1]);
--    XftGlyphRender (dpy, PictOpOver, src, pub, dst, 
-+    XftGlyphRender (dpy, op, src, pub, dst, 
- 		     srcx, srcy, x, y, glyphs, len);
-     if (glyphs != glyphs_local)
- 	free (glyphs);
-@@ -771,7 +771,7 @@ XftTextRender16LE (Display	    *dpy,
-     for (i = 0; i < len; i++)
- 	glyphs[i] = XftCharIndex (dpy, pub, 
- 				  string[i*2] | (string[i*2+1]<<8));
--    XftGlyphRender (dpy, PictOpOver, src, pub, dst, 
-+    XftGlyphRender (dpy, op, src, pub, dst, 
- 		     srcx, srcy, x, y, glyphs, len);
-     if (glyphs != glyphs_local)
- 	free (glyphs);
-@@ -803,7 +803,7 @@ XftTextRender32 (Display	    *dpy,
-     }
-     for (i = 0; i < len; i++)
- 	glyphs[i] = XftCharIndex (dpy, pub, string[i]);
--    XftGlyphRender (dpy, PictOpOver, src, pub, dst, 
-+    XftGlyphRender (dpy, op, src, pub, dst, 
- 		     srcx, srcy, x, y, glyphs, len);
-     if (glyphs != glyphs_local)
- 	free (glyphs);
-@@ -839,7 +839,7 @@ XftTextRender32BE (Display	    *dpy,
- 				  (string[i*4+1] << 16) |
- 				  (string[i*4+2] << 8) |
- 				  (string[i*4+3]));
--    XftGlyphRender (dpy, PictOpOver, src, pub, dst, 
-+    XftGlyphRender (dpy, op, src, pub, dst, 
- 		     srcx, srcy, x, y, glyphs, len);
-     if (glyphs != glyphs_local)
- 	free (glyphs);
-@@ -875,7 +875,7 @@ XftTextRender32LE (Display	    *dpy,
- 				  (string[i*4+1] << 8) |
- 				  (string[i*4+2] << 16) |
- 				  (string[i*4+3] << 24));
--    XftGlyphRender (dpy, PictOpOver, src, pub, dst, 
-+    XftGlyphRender (dpy, op, src, pub, dst, 
- 		     srcx, srcy, x, y, glyphs, len);
-     if (glyphs != glyphs_local)
- 	free (glyphs);
-@@ -904,6 +904,56 @@ XftTextRenderUtf8 (Display	    *dpy,
-     glyphs = glyphs_local;
-     size = NUM_LOCAL;
-     while (len && (l = FcUtf8ToUcs4 (string, &ucs4, len)) > 0)
-+    {
-+	if (i == size)
-+	{
-+	    glyphs_new = malloc (size * 2 * sizeof (FT_UInt));
-+	    if (!glyphs_new)
-+	    {
-+		if (glyphs != glyphs_local)
-+		    free (glyphs);
-+		return;
-+	    }
-+	    memcpy (glyphs_new, glyphs, size * sizeof (FT_UInt));
-+	    size *= 2;
-+	    if (glyphs != glyphs_local)
-+		free (glyphs);
-+	    glyphs = glyphs_new;
-+	}
-+	glyphs[i++] = XftCharIndex (dpy, pub, ucs4);
-+	string += l;
-+	len -= l;
-+    }
-+    XftGlyphRender (dpy, op, src, pub, dst,
-+		     srcx, srcy, x, y, glyphs, i);
-+    if (glyphs != glyphs_local)
-+	free (glyphs);
-+}
-+
-+void
-+XftTextRenderUtf16 (Display	    *dpy,
-+		    int		    op,
-+		    Picture	    src,
-+		    XftFont	    *pub,
-+		    Picture	    dst,
-+		    int		    srcx,
-+		    int		    srcy,
-+		    int		    x,
-+		    int		    y,
-+		    _Xconst FcChar8 *string,
-+		    FcEndian	    endian,
-+		    int		    len)
-+{
-+    FT_UInt	    *glyphs, *glyphs_new, glyphs_local[NUM_LOCAL];
-+    FcChar32	    ucs4;
-+    int		    i;
-+    int		    l;
-+    int		    size;
-+
-+    i = 0;
-+    glyphs = glyphs_local;
-+    size = NUM_LOCAL;
-+    while (len && (l = FcUtf16ToUcs4 (string, endian, &ucs4, len)) > 0)
-     {
- 	if (i == size)
- 	{
diff --git a/x11-fonts/Xft/files/patch-xft.pc.in b/x11-fonts/Xft/files/patch-xft.pc.in
deleted file mode 100644
index 249417935f94..000000000000
--- a/x11-fonts/Xft/files/patch-xft.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- xft.pc.in.orig	Thu May 23 19:01:56 2002
-+++ xft.pc.in	Mon Oct  7 00:54:46 2002
-@@ -2,7 +2,7 @@
- exec_prefix=@exec_prefix@
- libdir=@libdir@
- includedir=@includedir@
--freetypelibs=@FREETYPE_LIBS@
-+freetypelibs=@FREETYPE_LIBS@ -lXext
- freetypecflags=@FREETYPE_CFLAGS@
- xrenderlibs=@XRENDER_LIBS@
- xrendercflags=@XRENDER_CFLAGS@
diff --git a/x11-fonts/Xft/files/patch-xftdraw.c b/x11-fonts/Xft/files/patch-xftdraw.c
deleted file mode 100644
index 564de234962b..000000000000
--- a/x11-fonts/Xft/files/patch-xftdraw.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- xftdraw.c	2002/10/11 17:53:02	1.25
-+++ xftdraw.c	2003/04/03 22:25:50	1.26
-@@ -724,7 +724,7 @@ XftDrawGlyphFontSpec (XftDraw			*draw,
- 	    {
- 		XftGlyphFontSpecRender (draw->dpy, _XftDrawOp (draw, color),
- 					src, draw->render.pict,
--					0, 0, glyphs, i - start);
-+					0, 0, glyphs + start , i - start);
- 	    }
- 	}
- 	else
-@@ -732,7 +732,7 @@ XftDrawGlyphFontSpec (XftDraw			*draw,
- 	    while (i < len && !((XftFontInt *) glyphs[i].font)->format)
- 		i++;
- 	    if (_XftDrawCorePrepare (draw, color))
--		XftGlyphFontSpecCore (draw, color, glyphs, len);
-+		XftGlyphFontSpecCore (draw, color, glyphs + start, i - start);
- 	}
-     }
- }
diff --git a/x11-fonts/Xft/files/patch-xftfreetype.c b/x11-fonts/Xft/files/patch-xftfreetype.c
deleted file mode 100644
index 20526f36b8c9..000000000000
--- a/x11-fonts/Xft/files/patch-xftfreetype.c
+++ /dev/null
@@ -1,36 +0,0 @@
---- xftfreetype.c	2003/04/17 04:29:24	1.31
-+++ xftfreetype.c	2003/04/24 16:14:58	1.32
-@@ -638,6 +638,7 @@
-     int			alloc_size;
-     int			ascent, descent, height;
-     int			i;
-+    int			num_glyphs;
- 
-     if (!info)
- 	return 0;
-@@ -769,8 +770,13 @@
- 	rehash_value = 0;
-     }
-     
-+    /*
-+     * Sometimes the glyphs are numbered 1..n, other times 0..n-1,
-+     * accept either numbering scheme by making room in the table
-+     */
-+    num_glyphs = face->num_glyphs + 1;
-     alloc_size = (sizeof (XftFontInt) + 
--		  face->num_glyphs * sizeof (XftGlyph *) +
-+		  num_glyphs * sizeof (XftGlyph *) +
- 		  hash_value * sizeof (XftUcsHash));
-     font = malloc (alloc_size);
-     
-@@ -867,8 +873,8 @@
-      * Per glyph information
-      */
-     font->glyphs = (XftGlyph **) (font + 1);
--    memset (font->glyphs, '\0', face->num_glyphs * sizeof (XftGlyph *));
--    font->num_glyphs = face->num_glyphs;
-+    memset (font->glyphs, '\0', num_glyphs * sizeof (XftGlyph *));
-+    font->num_glyphs = num_glyphs;
-     /*
-      * Unicode hash table information
-      */
diff --git a/x11-fonts/Xft/pkg-descr b/x11-fonts/Xft/pkg-descr
index 7ab6d24bb288..fed3119ce60d 100644
--- a/x11-fonts/Xft/pkg-descr
+++ b/x11-fonts/Xft/pkg-descr
@@ -1,4 +1,4 @@
-The current version of Xft (2.0) provides a client-side font API for X 
+The current version of Xft provides a client-side font API for X 
 applications. It uses Fontconfig to select fonts and the X protocol for 
 rendering them. When available, Xft uses the Render extension to accelerate 
 text drawing. When Render is not available, Xft uses the core protocol to draw 
diff --git a/x11-fonts/Xft/pkg-plist b/x11-fonts/Xft/pkg-plist
index 0591e9bac912..75c5e1209701 100644
--- a/x11-fonts/Xft/pkg-plist
+++ b/x11-fonts/Xft/pkg-plist
@@ -1,7 +1,7 @@
 bin/xft-config
 include/X11/Xft/Xft.h
 include/X11/Xft/XftCompat.h
-include/X11/Xft/XftFreetype.h
+lib/libXft.a
 lib/libXft.so
 lib/libXft.so.2
 libdata/pkgconfig/xft.pc
diff --git a/x11-fonts/libXft/Makefile b/x11-fonts/libXft/Makefile
index fe1bc43c6dae..b3c6e3a7541e 100644
--- a/x11-fonts/libXft/Makefile
+++ b/x11-fonts/libXft/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	Xft
-PORTVERSION=	2.1
-PORTREVISION=	8
+PORTVERSION=	2.1.2
 CATEGORIES=	x11-fonts
 MASTER_SITES=	http://fontconfig.org/fontconfig/release/
-DISTNAME=	fcpackage.${PORTVERSION:S/./_/}
+DISTNAME=	xft-${PORTVERSION}
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A client-sided font API for X applications
@@ -20,29 +19,18 @@ LIB_DEPENDS=	fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 INSTALLS_SHLIB=	yes
-GNU_CONFIGURE=	yes
+USE_GNOME=	gnomehack gnometarget
 USE_REINPLACE=	yes
-CONFIGURE_ARGS=	--with-fontconfig-config="pkg-config fontconfig"
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-unknown-freebsd${OSREL}
+GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include" \
-		LIBS="-L${X11BASE}/lib"
-WRKSRC=	${WRKDIR}/${DISTNAME}/Xft
+		LDFLAGS="-L${X11BASE}/lib"
 
 MAN3=		Xft.3
 
 .include <bsd.port.pre.mk>
 
 .if ${XFREE86_VERSION} == 3
-BROKEN=	Xft2 requires XFree86 4.x to build.
+BROKEN=	Xft requires XFree86 4.x to build.
 .endif
 
-pre-patch:
-	@${REINPLACE_CMD} -e 's|[(]LIBDIR[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' ${WRKSRC}/Makefile.in
-
-pre-install:
-	-${MKDIR} ${PREFIX}/include/X11/Xft
-
-post-install:
-	@${INSTALL_DATA} ${WRKSRC}/Xft.man ${PREFIX}/man/man3/Xft.3
-
 .include <bsd.port.post.mk>
diff --git a/x11-fonts/libXft/distinfo b/x11-fonts/libXft/distinfo
index 1414861ccc43..637a9d389820 100644
--- a/x11-fonts/libXft/distinfo
+++ b/x11-fonts/libXft/distinfo
@@ -1 +1 @@
-MD5 (fcpackage.2_1.tar.gz) = 2f2852c80924a9b5356c3037a471c1a1
+MD5 (xft-2.1.2.tar.gz) = defb7e801d4938b8b15a426ae57e2f3f
diff --git a/x11-fonts/libXft/files/patch-Makefile.in b/x11-fonts/libXft/files/patch-Makefile.in
deleted file mode 100644
index 88ae45cf7348..000000000000
--- a/x11-fonts/libXft/files/patch-Makefile.in
+++ /dev/null
@@ -1,121 +0,0 @@
---- Makefile.in.orig	Fri Feb  7 20:35:02 2003
-+++ Makefile.in	Fri Feb  7 20:35:21 2003
-@@ -63,8 +63,7 @@
- INCLUDEDIR=$(includedir)/X11/Xft
- 
- LIBBASE=libXft.so
--LIBFILE=$(LIBBASE).@PACKAGE_MAJOR@.@PACKAGE_MINOR@
--LIBMAJOR=$(LIBBASE).@PACKAGE_MAJOR@
-+LIBFILE=$(LIBBASE).@PACKAGE_MAJOR@
- 
- LIBS=@LIBS@
- 
-@@ -109,7 +108,7 @@
- .c.@OBJEXT@:
- 	$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) -c $< -o $@
- 	
--all:: $(LIBFILE) $(LIBMAJOR) $(LIBBASE)
-+all:: $(LIBFILE) $(LIBBASE)
- 
- #
- # Build the library
-@@ -118,86 +117,25 @@
- 	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): $(HEADERS)
- 
--#
--# install directories
--#
--
--install:: $(DESTDIR)$(LIBDIR) $(DESTDIR)$(prefix)/libdata/pkgconfig
--install:: $(DESTDIR)$(INCLUDEDIR) $(DESTDIR)$(BINDIR)
--
--$(DESTDIR)$(LIBDIR):
--	mkdir -p $@
--
--$(DESTDIR)$(prefix)/libdata/pkgconfig:
--	mkdir -p $@
--
--$(DESTDIR)$(INCLUDEDIR):
--	mkdir -p $@
--
--$(DESTDIR)$(BINDIR):
--	mkdir -p $@
--
--#
--# install library
--#
--
--install:: $(DESTDIR)$(LIBDIR)/$(LIB) $(DESTDIR)$(LIBDIR)/$(LIBMAJOR) 
--install:: $(DESTDIR)$(LIBDIR)/$(LIBBASE)
--
--$(DESTDIR)$(LIBDIR)/$(LIBFILE): $(LIBFILE)
--	$(INSTALL_PROGRAM) $< $(DESTDIR)$(LIBDIR)
--
--$(DESTDIR)$(LIBDIR)/$(LIBMAJOR): $(DESTDIR)$(LIBDIR)/$(LIBFILE)
--	rm -f  $@
--	$(LN_S) $(LIBFILE) $(DESTDIR)$(LIBDIR)/$(LIBMAJOR)
--
--$(DESTDIR)$(LIBDIR)/$(LIBBASE): $(DESTDIR)$(LIBDIR)/$(LIBMAJOR)
--	rm -f  $@
--	$(LN_S) $(LIBMAJOR) $(DESTDIR)$(LIBDIR)/$(LIBBASE)
--
--#
--# install xft-config script
--#
--
--install:: $(DESTDIR)$(BINDIR)/xft-config
--
--$(DESTDIR)$(BINDIR)/xft-config: xft-config
--	$(INSTALL_SCRIPT) $< $(DESTDIR)$(BINDIR)
--
--#
--# install pkgconfig control file
--#
--
--install:: $(DESTDIR)$(prefix)/libdata/pkgconfig/xft.pc
--
--$(DESTDIR)$(prefix)/libdata/pkgconfig/xft.pc: xft.pc
--	$(INSTALL_DATA) $< $(DESTDIR)$(prefix)/libdata/pkgconfig
--
--
--# 
--# install header files
--#
--
--install::$(DESTDIR)$(INCLUDEDIR)/Xft.h $(DESTDIR)$(INCLUDEDIR)/XftCompat.h
--
--$(DESTDIR)$(INCLUDEDIR)/Xft.h: Xft.h
--	$(INSTALL_DATA) $< $(DESTDIR)$(INCLUDEDIR)
--
--$(DESTDIR)$(INCLUDEDIR)/XftCompat.h: XftCompat.h
--	$(INSTALL_DATA) $< $(DESTDIR)$(INCLUDEDIR)
-+install:: Xft.h XftCompat.h XftFreetype.h xft-config xft.pc
-+	$(INSTALL_DATA) Xft.h $(DESTDIR)$(INCLUDEDIR)
-+	$(INSTALL_DATA) XftCompat.h $(DESTDIR)$(INCLUDEDIR)
-+	$(INSTALL_DATA) XftFreetype.h $(DESTDIR)$(INCLUDEDIR)
-+	$(INSTALL_SCRIPT) xft-config $(DESTDIR)$(BINDIR)
-+	mkdir -p $(DESTDIR)$(prefix)/libdata/pkgconfig
-+	$(INSTALL_DATA) xft.pc $(DESTDIR)$(prefix)/libdata/pkgconfig
-+	$(INSTALL_PROGRAM) $(LIBFILE) $(DESTDIR)$(LIBDIR)
-+	rm -f $(DESTDIR)$(LIBDIR)/$(LIBBASE)
-+	$(LN_S) $(LIBFILE) $(DESTDIR)$(LIBDIR)/$(LIBBASE)
- 
- #
- # delete generated files
- #
- clean::
--	rm -f $(LIBFILE) $(LIBMAJOR) $(LIBBASE) $(OBJS)
-+	rm -f $(LIBFILE) $(LIBFILE) $(LIBBASE) $(OBJS)
diff --git a/x11-fonts/libXft/files/patch-configure b/x11-fonts/libXft/files/patch-configure
deleted file mode 100644
index 87b709ef4d16..000000000000
--- a/x11-fonts/libXft/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Mon Feb 17 17:08:30 2003
-+++ configure	Mon Feb 17 17:08:32 2003
-@@ -1316,7 +1316,7 @@
- case "$have_x" in
- yes)
- 	XRENDER_CFLAGS="-I$x_includes"
--	XRENDER_LIBS="-L$x_libraries -lXrender"
-+	XRENDER_LIBS="-L$x_libraries -lXext -lXrender"
- 
- 	saved_LIBS="$LIBS"
- 	LIBS="$LIBS $XRENDER_LIBS"
diff --git a/x11-fonts/libXft/files/patch-ltmain.sh b/x11-fonts/libXft/files/patch-ltmain.sh
new file mode 100644
index 000000000000..dc508a25a122
--- /dev/null
+++ b/x11-fonts/libXft/files/patch-ltmain.sh
@@ -0,0 +1,51 @@
+--- ltmain.sh.orig	Sat Apr 19 21:11:30 2003
++++ ltmain.sh	Wed May 14 16:05:31 2003
+@@ -1277,7 +1277,7 @@
+ 	  esac
+ 	elif test "X$arg" = "X-lc_r"; then
+ 	 case $host in
+-	 *-*-openbsd* | *-*-freebsd*)
++	 *-*-openbsd* | *-*-freebsd4*)
+ 	   # Do not include libc_r directly, use -pthread flag.
+ 	   continue
+ 	   ;;
+@@ -1287,8 +1287,16 @@
+ 	continue
+ 	;;
+ 
++      -pthread)
++      compile_command="$compile_command -pthread"
++      finalize_command="$finalize_command -pthread"
++      compiler_flags="$compiler_flags -pthread"
++      continue
++      ;;
++
+       -module)
+ 	module=yes
++	build_old_libs=no
+ 	continue
+ 	;;
+ 
+@@ -2997,6 +3005,9 @@
+ 	    # problems, so we reset it completely
+ 	    verstring=
+ 	    ;;
++	  *-*-freebsd*)
++	    # FreeBSD doesn't need this...
++	    ;;
+ 	  *)
+ 	    verstring="0.0"
+ 	    ;;
+@@ -5425,10 +5436,12 @@
+ 	fi
+ 
+ 	# Install the pseudo-library for information purposes.
++	if /usr/bin/false; then
+ 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ 	instname="$dir/$name"i
+ 	$show "$install_prog $instname $destdir/$name"
+ 	$run eval "$install_prog $instname $destdir/$name" || exit $?
++	fi
+ 
+ 	# Maybe install the static library, too.
+ 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/x11-fonts/libXft/files/patch-xft-cvs b/x11-fonts/libXft/files/patch-xft-cvs
deleted file mode 100644
index 85355143df7e..000000000000
--- a/x11-fonts/libXft/files/patch-xft-cvs
+++ /dev/null
@@ -1,276 +0,0 @@
---- Xft.h	2002/10/11 17:53:02	1.30
-+++ Xft.h	2003/02/25 21:57:53	1.32
-@@ -26,8 +26,8 @@
- #define _XFT_H_
- 
- #define XFT_MAJOR	2
--#define XFT_MINOR	0
--#define XFT_REVISION	1
-+#define XFT_MINOR	1
-+#define XFT_REVISION	0
- #define XFT_VERSION	((XFT_MAJOR * 10000) + (XFT_MINOR * 100) + (XFT_REVISION))
- #define XftVersion	XFT_VERSION
- 
-@@ -325,11 +325,12 @@ XftTextExtentsUtf8 (Display	    *dpy,
- 		    XGlyphInfo	    *extents);
- 
- void
--XftTextExtentsUtf16 (XftFont		*pub,
-+XftTextExtentsUtf16 (Display		*dpy,
-+		     XftFont		*pub,
- 		     _Xconst FcChar8	*string, 
- 		     FcEndian		endian,
--		    int			len,
--		    XGlyphInfo		*extents);
-+		     int		len,
-+		     XGlyphInfo		*extents);
- 
- /* xftfont.c */
- FcPattern *
-@@ -605,6 +606,20 @@ XftTextRenderUtf8 (Display	    *dpy,
- 		   int		    y,
- 		   _Xconst FcChar8  *string,
- 		   int		    len);
-+
-+void
-+XftTextRenderUtf16 (Display	    *dpy,
-+		    int		    op,
-+		    Picture	    src,
-+		    XftFont	    *pub,
-+		    Picture	    dst,
-+		    int		    srcx,
-+		    int		    srcy,
-+		    int		    x,
-+		    int		    y,
-+		    _Xconst FcChar8 *string,
-+		    FcEndian	    endian,
-+		    int		    len);
- 
- /* xftstr.c */
- 
---- xftcore.c	2002/10/16 21:07:08	1.11
-+++ xftcore.c	2003/02/15 22:30:51	1.13
-@@ -355,7 +355,7 @@ _XftSmoothGlyphMono (XImage		*image,
- 	bits = *src++;
- 	
- 	xspan = x;
--	while (w)
-+	while (w--)
- 	{
- 	    if (bits & bitsMask)
- 		XPutPixel (image, xspan, y, pixel);
-@@ -1088,7 +1088,6 @@ XftGlyphSpecCore (XftDraw		*draw,
-     /*
-      * Load missing glyphs
-      */
--    nmissing = 0;
-     glyphs_loaded = FcFalse;
-     x1 = y1 = x2 = y2 = 0;
-     for (i = 0; i < nglyphs; i++)
-@@ -1096,8 +1095,12 @@ XftGlyphSpecCore (XftDraw		*draw,
- 	XGlyphInfo	gi;
- 	int		g_x1, g_x2, g_y1, g_y2;
- 	
-+	nmissing = 0;
- 	if (XftFontCheckGlyph (dpy, public, FcTrue, glyphs[i].glyph, missing, &nmissing))
- 	    glyphs_loaded = FcTrue;
-+	if (nmissing)
-+	    XftFontLoadGlyphs (dpy, public, FcTrue, missing, nmissing);
-+
- 	XftGlyphExtents (dpy, public, &glyphs[i].glyph, 1, &gi);
- 	g_x1 = glyphs[i].x - gi.x;
- 	g_y1 = glyphs[i].y - gi.y;
-@@ -1122,8 +1125,6 @@ XftGlyphSpecCore (XftDraw		*draw,
- 	    y2 = g_y2;
- 	}
-     }
--    if (nmissing)
--	XftFontLoadGlyphs (dpy, public, FcTrue, missing, nmissing);
-     
-     if (x1 == x2 || y1 == y2)
- 	goto bail1;
-@@ -1273,6 +1274,9 @@ XftGlyphFontSpecCore (XftDraw			*draw,
- 	}
-     }
-     
-+    if (x1 == x2 || y1 == y2)
-+	goto bail1;
-+
-     for (i = 0; i < nglyphs; i++)
- 	if (((XftFontInt *) glyphs[i].font)->info.antialias)
- 	    break;
---- xftextent.c	2002/10/11 17:53:02	1.9
-+++ xftextent.c	2002/12/14 01:59:38	1.10
-@@ -220,6 +220,50 @@ XftTextExtentsUtf8 (Display	    *dpy,
-     glyphs = glyphs_local;
-     size = NUM_LOCAL;
-     while (len && (l = FcUtf8ToUcs4 (string, &ucs4, len)) > 0)
-+    {
-+	if (i == size)
-+	{
-+	    glyphs_new = malloc (size * 2 * sizeof (FT_UInt));
-+	    if (!glyphs_new)
-+	    {
-+		if (glyphs != glyphs_local)
-+		    free (glyphs);
-+		memset (extents, '\0', sizeof (XGlyphInfo));
-+		return;
-+	    }
-+	    memcpy (glyphs_new, glyphs, size * sizeof (FT_UInt));
-+	    size *= 2;
-+	    if (glyphs != glyphs_local)
-+		free (glyphs);
-+	    glyphs = glyphs_new;
-+	}
-+	glyphs[i++] = XftCharIndex (dpy, pub, ucs4);
-+	string += l;
-+	len -= l;
-+    }
-+    XftGlyphExtents (dpy, pub, glyphs, i, extents);
-+    if (glyphs != glyphs_local)
-+	free (glyphs);
-+}
-+
-+void
-+XftTextExtentsUtf16 (Display		*dpy,
-+		     XftFont		*pub,
-+		     _Xconst FcChar8	*string, 
-+		     FcEndian		endian,
-+		     int		len,
-+		     XGlyphInfo		*extents)
-+{
-+    FT_UInt	    *glyphs, *glyphs_new, glyphs_local[NUM_LOCAL];
-+    FcChar32	    ucs4;
-+    int		    i;
-+    int		    l;
-+    int		    size;
-+
-+    i = 0;
-+    glyphs = glyphs_local;
-+    size = NUM_LOCAL;
-+    while (len && (l = FcUtf16ToUcs4 (string, endian, &ucs4, len)) > 0)
-     {
- 	if (i == size)
- 	{
---- xftrender.c	2002/10/11 17:53:02	1.14
-+++ xftrender.c	2002/12/14 01:59:38	1.15
-@@ -673,7 +673,7 @@ XftTextRender8 (Display		*dpy,
-     }
-     for (i = 0; i < len; i++)
- 	glyphs[i] = XftCharIndex (dpy, pub, string[i]);
--    XftGlyphRender (dpy, PictOpOver, src, pub, dst, 
-+    XftGlyphRender (dpy, op, src, pub, dst, 
- 		     srcx, srcy, x, y, glyphs, len);
-     if (glyphs != glyphs_local)
- 	free (glyphs);
-@@ -705,7 +705,7 @@ XftTextRender16 (Display	    *dpy,
-     }
-     for (i = 0; i < len; i++)
- 	glyphs[i] = XftCharIndex (dpy, pub, string[i]);
--    XftGlyphRender (dpy, PictOpOver, src, pub, dst, 
-+    XftGlyphRender (dpy, op, src, pub, dst, 
- 		     srcx, srcy, x, y, glyphs, len);
-     if (glyphs != glyphs_local)
- 	free (glyphs);
-@@ -738,7 +738,7 @@ XftTextRender16BE (Display	    *dpy,
-     for (i = 0; i < len; i++)
- 	glyphs[i] = XftCharIndex (dpy, pub, 
- 				  (string[i*2]<<8) | string[i*2+1]);
--    XftGlyphRender (dpy, PictOpOver, src, pub, dst, 
-+    XftGlyphRender (dpy, op, src, pub, dst, 
- 		     srcx, srcy, x, y, glyphs, len);
-     if (glyphs != glyphs_local)
- 	free (glyphs);
-@@ -771,7 +771,7 @@ XftTextRender16LE (Display	    *dpy,
-     for (i = 0; i < len; i++)
- 	glyphs[i] = XftCharIndex (dpy, pub, 
- 				  string[i*2] | (string[i*2+1]<<8));
--    XftGlyphRender (dpy, PictOpOver, src, pub, dst, 
-+    XftGlyphRender (dpy, op, src, pub, dst, 
- 		     srcx, srcy, x, y, glyphs, len);
-     if (glyphs != glyphs_local)
- 	free (glyphs);
-@@ -803,7 +803,7 @@ XftTextRender32 (Display	    *dpy,
-     }
-     for (i = 0; i < len; i++)
- 	glyphs[i] = XftCharIndex (dpy, pub, string[i]);
--    XftGlyphRender (dpy, PictOpOver, src, pub, dst, 
-+    XftGlyphRender (dpy, op, src, pub, dst, 
- 		     srcx, srcy, x, y, glyphs, len);
-     if (glyphs != glyphs_local)
- 	free (glyphs);
-@@ -839,7 +839,7 @@ XftTextRender32BE (Display	    *dpy,
- 				  (string[i*4+1] << 16) |
- 				  (string[i*4+2] << 8) |
- 				  (string[i*4+3]));
--    XftGlyphRender (dpy, PictOpOver, src, pub, dst, 
-+    XftGlyphRender (dpy, op, src, pub, dst, 
- 		     srcx, srcy, x, y, glyphs, len);
-     if (glyphs != glyphs_local)
- 	free (glyphs);
-@@ -875,7 +875,7 @@ XftTextRender32LE (Display	    *dpy,
- 				  (string[i*4+1] << 8) |
- 				  (string[i*4+2] << 16) |
- 				  (string[i*4+3] << 24));
--    XftGlyphRender (dpy, PictOpOver, src, pub, dst, 
-+    XftGlyphRender (dpy, op, src, pub, dst, 
- 		     srcx, srcy, x, y, glyphs, len);
-     if (glyphs != glyphs_local)
- 	free (glyphs);
-@@ -904,6 +904,56 @@ XftTextRenderUtf8 (Display	    *dpy,
-     glyphs = glyphs_local;
-     size = NUM_LOCAL;
-     while (len && (l = FcUtf8ToUcs4 (string, &ucs4, len)) > 0)
-+    {
-+	if (i == size)
-+	{
-+	    glyphs_new = malloc (size * 2 * sizeof (FT_UInt));
-+	    if (!glyphs_new)
-+	    {
-+		if (glyphs != glyphs_local)
-+		    free (glyphs);
-+		return;
-+	    }
-+	    memcpy (glyphs_new, glyphs, size * sizeof (FT_UInt));
-+	    size *= 2;
-+	    if (glyphs != glyphs_local)
-+		free (glyphs);
-+	    glyphs = glyphs_new;
-+	}
-+	glyphs[i++] = XftCharIndex (dpy, pub, ucs4);
-+	string += l;
-+	len -= l;
-+    }
-+    XftGlyphRender (dpy, op, src, pub, dst,
-+		     srcx, srcy, x, y, glyphs, i);
-+    if (glyphs != glyphs_local)
-+	free (glyphs);
-+}
-+
-+void
-+XftTextRenderUtf16 (Display	    *dpy,
-+		    int		    op,
-+		    Picture	    src,
-+		    XftFont	    *pub,
-+		    Picture	    dst,
-+		    int		    srcx,
-+		    int		    srcy,
-+		    int		    x,
-+		    int		    y,
-+		    _Xconst FcChar8 *string,
-+		    FcEndian	    endian,
-+		    int		    len)
-+{
-+    FT_UInt	    *glyphs, *glyphs_new, glyphs_local[NUM_LOCAL];
-+    FcChar32	    ucs4;
-+    int		    i;
-+    int		    l;
-+    int		    size;
-+
-+    i = 0;
-+    glyphs = glyphs_local;
-+    size = NUM_LOCAL;
-+    while (len && (l = FcUtf16ToUcs4 (string, endian, &ucs4, len)) > 0)
-     {
- 	if (i == size)
- 	{
diff --git a/x11-fonts/libXft/files/patch-xft.pc.in b/x11-fonts/libXft/files/patch-xft.pc.in
deleted file mode 100644
index 249417935f94..000000000000
--- a/x11-fonts/libXft/files/patch-xft.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- xft.pc.in.orig	Thu May 23 19:01:56 2002
-+++ xft.pc.in	Mon Oct  7 00:54:46 2002
-@@ -2,7 +2,7 @@
- exec_prefix=@exec_prefix@
- libdir=@libdir@
- includedir=@includedir@
--freetypelibs=@FREETYPE_LIBS@
-+freetypelibs=@FREETYPE_LIBS@ -lXext
- freetypecflags=@FREETYPE_CFLAGS@
- xrenderlibs=@XRENDER_LIBS@
- xrendercflags=@XRENDER_CFLAGS@
diff --git a/x11-fonts/libXft/files/patch-xftdraw.c b/x11-fonts/libXft/files/patch-xftdraw.c
deleted file mode 100644
index 564de234962b..000000000000
--- a/x11-fonts/libXft/files/patch-xftdraw.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- xftdraw.c	2002/10/11 17:53:02	1.25
-+++ xftdraw.c	2003/04/03 22:25:50	1.26
-@@ -724,7 +724,7 @@ XftDrawGlyphFontSpec (XftDraw			*draw,
- 	    {
- 		XftGlyphFontSpecRender (draw->dpy, _XftDrawOp (draw, color),
- 					src, draw->render.pict,
--					0, 0, glyphs, i - start);
-+					0, 0, glyphs + start , i - start);
- 	    }
- 	}
- 	else
-@@ -732,7 +732,7 @@ XftDrawGlyphFontSpec (XftDraw			*draw,
- 	    while (i < len && !((XftFontInt *) glyphs[i].font)->format)
- 		i++;
- 	    if (_XftDrawCorePrepare (draw, color))
--		XftGlyphFontSpecCore (draw, color, glyphs, len);
-+		XftGlyphFontSpecCore (draw, color, glyphs + start, i - start);
- 	}
-     }
- }
diff --git a/x11-fonts/libXft/files/patch-xftfreetype.c b/x11-fonts/libXft/files/patch-xftfreetype.c
deleted file mode 100644
index 20526f36b8c9..000000000000
--- a/x11-fonts/libXft/files/patch-xftfreetype.c
+++ /dev/null
@@ -1,36 +0,0 @@
---- xftfreetype.c	2003/04/17 04:29:24	1.31
-+++ xftfreetype.c	2003/04/24 16:14:58	1.32
-@@ -638,6 +638,7 @@
-     int			alloc_size;
-     int			ascent, descent, height;
-     int			i;
-+    int			num_glyphs;
- 
-     if (!info)
- 	return 0;
-@@ -769,8 +770,13 @@
- 	rehash_value = 0;
-     }
-     
-+    /*
-+     * Sometimes the glyphs are numbered 1..n, other times 0..n-1,
-+     * accept either numbering scheme by making room in the table
-+     */
-+    num_glyphs = face->num_glyphs + 1;
-     alloc_size = (sizeof (XftFontInt) + 
--		  face->num_glyphs * sizeof (XftGlyph *) +
-+		  num_glyphs * sizeof (XftGlyph *) +
- 		  hash_value * sizeof (XftUcsHash));
-     font = malloc (alloc_size);
-     
-@@ -867,8 +873,8 @@
-      * Per glyph information
-      */
-     font->glyphs = (XftGlyph **) (font + 1);
--    memset (font->glyphs, '\0', face->num_glyphs * sizeof (XftGlyph *));
--    font->num_glyphs = face->num_glyphs;
-+    memset (font->glyphs, '\0', num_glyphs * sizeof (XftGlyph *));
-+    font->num_glyphs = num_glyphs;
-     /*
-      * Unicode hash table information
-      */
diff --git a/x11-fonts/libXft/pkg-descr b/x11-fonts/libXft/pkg-descr
index 7ab6d24bb288..fed3119ce60d 100644
--- a/x11-fonts/libXft/pkg-descr
+++ b/x11-fonts/libXft/pkg-descr
@@ -1,4 +1,4 @@
-The current version of Xft (2.0) provides a client-side font API for X 
+The current version of Xft provides a client-side font API for X 
 applications. It uses Fontconfig to select fonts and the X protocol for 
 rendering them. When available, Xft uses the Render extension to accelerate 
 text drawing. When Render is not available, Xft uses the core protocol to draw 
diff --git a/x11-fonts/libXft/pkg-plist b/x11-fonts/libXft/pkg-plist
index 0591e9bac912..75c5e1209701 100644
--- a/x11-fonts/libXft/pkg-plist
+++ b/x11-fonts/libXft/pkg-plist
@@ -1,7 +1,7 @@
 bin/xft-config
 include/X11/Xft/Xft.h
 include/X11/Xft/XftCompat.h
-include/X11/Xft/XftFreetype.h
+lib/libXft.a
 lib/libXft.so
 lib/libXft.so.2
 libdata/pkgconfig/xft.pc