Remove the renaming of Xft headers and library from the Xft (Xft2) port.

Remove installing of Xft1 from XFree86-4-libraries, and add dependencies
to the Xft port by all the ports that use it along with whatever patches are
necessary.

Approved by:	portmgr (kris), marcus

56 files changed, 278 insertions, 244 deletions

diff --git a/graphics/sodipodi/Makefile b/graphics/sodipodi/Makefile
index 0535e6ea5d2d..57a1f4294f46 100644
--- a/graphics/sodipodi/Makefile
+++ b/graphics/sodipodi/Makefile
@@ -33,9 +33,5 @@ MAN1=		sodipodi.1
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|X11/Xft/Xft\.h|X11/Xft/Xft2.h|g' \
-		${WRKSRC}/configure \
-		${WRKSRC}/src/libnrtype/nr-type-xft.c
-
 
 .include <bsd.port.mk>
diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
index c171fbafba7d..f5eb57557fa4 100644
--- a/sysutils/gnome-control-center/Makefile
+++ b/sysutils/gnome-control-center/Makefile
@@ -33,7 +33,5 @@ CONFIGURE_TARGET=       --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|Xft\.h|Xft2.h|g' \
-		${WRKSRC}/capplets/font/main.c
 
 .include <bsd.port.mk>
diff --git a/sysutils/gnomecontrolcenter2/Makefile b/sysutils/gnomecontrolcenter2/Makefile
index c171fbafba7d..f5eb57557fa4 100644
--- a/sysutils/gnomecontrolcenter2/Makefile
+++ b/sysutils/gnomecontrolcenter2/Makefile
@@ -33,7 +33,5 @@ CONFIGURE_TARGET=       --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|Xft\.h|Xft2.h|g' \
-		${WRKSRC}/capplets/font/main.c
 
 .include <bsd.port.mk>
diff --git a/www/firefox-devel/Makefile b/www/firefox-devel/Makefile
index a01bf2e81ec3..fd8f49bcb698 100644
--- a/www/firefox-devel/Makefile
+++ b/www/firefox-devel/Makefile
@@ -76,7 +76,7 @@ CONFIGURE_ENV+=	WITH_LOGGING=yes
 .if defined(WITHOUT_XFT)
 CONFIGURE_ENV+=	WITHOUT_XFT=yes
 .else
-LIB_DEPENDS+=	Xft2.2:${PORTSDIR}/x11-fonts/Xft
+LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/Xft
 .endif # !defined(WITHOUT_XFT)
 
 CPPFLAGS+=		-I${X11BASE}/include
@@ -101,12 +101,6 @@ post-extract::
 		-e 's|@PREFIX@|${LOCAL_PREFIX}|'	\
 		<${FILESDIR}/mozconfig.in >${WRKSRC}/.mozconfig
 
-# fix for Xft (thanks to marcus@)
-post-patch:
-	cd ${WRKSRC}/gfx/src/gtk;				\
-	${REINPLACE_CMD} -e 's|X11/Xft/Xft\.h|X11/Xft/Xft2.h|g'	\
-		nsDrawingSurfaceGTK.cpp	nsFontMetricsXft.h
-
 post-build:
 	${RM} -f ${PLIST}
 	${TOUCH} ${PLIST}
diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile
index a01bf2e81ec3..fd8f49bcb698 100644
--- a/www/firefox-esr/Makefile
+++ b/www/firefox-esr/Makefile
@@ -76,7 +76,7 @@ CONFIGURE_ENV+=	WITH_LOGGING=yes
 .if defined(WITHOUT_XFT)
 CONFIGURE_ENV+=	WITHOUT_XFT=yes
 .else
-LIB_DEPENDS+=	Xft2.2:${PORTSDIR}/x11-fonts/Xft
+LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/Xft
 .endif # !defined(WITHOUT_XFT)
 
 CPPFLAGS+=		-I${X11BASE}/include
@@ -101,12 +101,6 @@ post-extract::
 		-e 's|@PREFIX@|${LOCAL_PREFIX}|'	\
 		<${FILESDIR}/mozconfig.in >${WRKSRC}/.mozconfig
 
-# fix for Xft (thanks to marcus@)
-post-patch:
-	cd ${WRKSRC}/gfx/src/gtk;				\
-	${REINPLACE_CMD} -e 's|X11/Xft/Xft\.h|X11/Xft/Xft2.h|g'	\
-		nsDrawingSurfaceGTK.cpp	nsFontMetricsXft.h
-
 post-build:
 	${RM} -f ${PLIST}
 	${TOUCH} ${PLIST}
diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index a01bf2e81ec3..fd8f49bcb698 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -76,7 +76,7 @@ CONFIGURE_ENV+=	WITH_LOGGING=yes
 .if defined(WITHOUT_XFT)
 CONFIGURE_ENV+=	WITHOUT_XFT=yes
 .else
-LIB_DEPENDS+=	Xft2.2:${PORTSDIR}/x11-fonts/Xft
+LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/Xft
 .endif # !defined(WITHOUT_XFT)
 
 CPPFLAGS+=		-I${X11BASE}/include
@@ -101,12 +101,6 @@ post-extract::
 		-e 's|@PREFIX@|${LOCAL_PREFIX}|'	\
 		<${FILESDIR}/mozconfig.in >${WRKSRC}/.mozconfig
 
-# fix for Xft (thanks to marcus@)
-post-patch:
-	cd ${WRKSRC}/gfx/src/gtk;				\
-	${REINPLACE_CMD} -e 's|X11/Xft/Xft\.h|X11/Xft/Xft2.h|g'	\
-		nsDrawingSurfaceGTK.cpp	nsFontMetricsXft.h
-
 post-build:
 	${RM} -f ${PLIST}
 	${TOUCH} ${PLIST}
diff --git a/www/firefox10/Makefile b/www/firefox10/Makefile
index a01bf2e81ec3..fd8f49bcb698 100644
--- a/www/firefox10/Makefile
+++ b/www/firefox10/Makefile
@@ -76,7 +76,7 @@ CONFIGURE_ENV+=	WITH_LOGGING=yes
 .if defined(WITHOUT_XFT)
 CONFIGURE_ENV+=	WITHOUT_XFT=yes
 .else
-LIB_DEPENDS+=	Xft2.2:${PORTSDIR}/x11-fonts/Xft
+LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/Xft
 .endif # !defined(WITHOUT_XFT)
 
 CPPFLAGS+=		-I${X11BASE}/include
@@ -101,12 +101,6 @@ post-extract::
 		-e 's|@PREFIX@|${LOCAL_PREFIX}|'	\
 		<${FILESDIR}/mozconfig.in >${WRKSRC}/.mozconfig
 
-# fix for Xft (thanks to marcus@)
-post-patch:
-	cd ${WRKSRC}/gfx/src/gtk;				\
-	${REINPLACE_CMD} -e 's|X11/Xft/Xft\.h|X11/Xft/Xft2.h|g'	\
-		nsDrawingSurfaceGTK.cpp	nsFontMetricsXft.h
-
 post-build:
 	${RM} -f ${PLIST}
 	${TOUCH} ${PLIST}
diff --git a/www/firefox15/Makefile b/www/firefox15/Makefile
index a01bf2e81ec3..fd8f49bcb698 100644
--- a/www/firefox15/Makefile
+++ b/www/firefox15/Makefile
@@ -76,7 +76,7 @@ CONFIGURE_ENV+=	WITH_LOGGING=yes
 .if defined(WITHOUT_XFT)
 CONFIGURE_ENV+=	WITHOUT_XFT=yes
 .else
-LIB_DEPENDS+=	Xft2.2:${PORTSDIR}/x11-fonts/Xft
+LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/Xft
 .endif # !defined(WITHOUT_XFT)
 
 CPPFLAGS+=		-I${X11BASE}/include
@@ -101,12 +101,6 @@ post-extract::
 		-e 's|@PREFIX@|${LOCAL_PREFIX}|'	\
 		<${FILESDIR}/mozconfig.in >${WRKSRC}/.mozconfig
 
-# fix for Xft (thanks to marcus@)
-post-patch:
-	cd ${WRKSRC}/gfx/src/gtk;				\
-	${REINPLACE_CMD} -e 's|X11/Xft/Xft\.h|X11/Xft/Xft2.h|g'	\
-		nsDrawingSurfaceGTK.cpp	nsFontMetricsXft.h
-
 post-build:
 	${RM} -f ${PLIST}
 	${TOUCH} ${PLIST}
diff --git a/www/firefox3-devel/Makefile b/www/firefox3-devel/Makefile
index a01bf2e81ec3..fd8f49bcb698 100644
--- a/www/firefox3-devel/Makefile
+++ b/www/firefox3-devel/Makefile
@@ -76,7 +76,7 @@ CONFIGURE_ENV+=	WITH_LOGGING=yes
 .if defined(WITHOUT_XFT)
 CONFIGURE_ENV+=	WITHOUT_XFT=yes
 .else
-LIB_DEPENDS+=	Xft2.2:${PORTSDIR}/x11-fonts/Xft
+LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/Xft
 .endif # !defined(WITHOUT_XFT)
 
 CPPFLAGS+=		-I${X11BASE}/include
@@ -101,12 +101,6 @@ post-extract::
 		-e 's|@PREFIX@|${LOCAL_PREFIX}|'	\
 		<${FILESDIR}/mozconfig.in >${WRKSRC}/.mozconfig
 
-# fix for Xft (thanks to marcus@)
-post-patch:
-	cd ${WRKSRC}/gfx/src/gtk;				\
-	${REINPLACE_CMD} -e 's|X11/Xft/Xft\.h|X11/Xft/Xft2.h|g'	\
-		nsDrawingSurfaceGTK.cpp	nsFontMetricsXft.h
-
 post-build:
 	${RM} -f ${PLIST}
 	${TOUCH} ${PLIST}
diff --git a/www/firefox35/Makefile b/www/firefox35/Makefile
index a01bf2e81ec3..fd8f49bcb698 100644
--- a/www/firefox35/Makefile
+++ b/www/firefox35/Makefile
@@ -76,7 +76,7 @@ CONFIGURE_ENV+=	WITH_LOGGING=yes
 .if defined(WITHOUT_XFT)
 CONFIGURE_ENV+=	WITHOUT_XFT=yes
 .else
-LIB_DEPENDS+=	Xft2.2:${PORTSDIR}/x11-fonts/Xft
+LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/Xft
 .endif # !defined(WITHOUT_XFT)
 
 CPPFLAGS+=		-I${X11BASE}/include
@@ -101,12 +101,6 @@ post-extract::
 		-e 's|@PREFIX@|${LOCAL_PREFIX}|'	\
 		<${FILESDIR}/mozconfig.in >${WRKSRC}/.mozconfig
 
-# fix for Xft (thanks to marcus@)
-post-patch:
-	cd ${WRKSRC}/gfx/src/gtk;				\
-	${REINPLACE_CMD} -e 's|X11/Xft/Xft\.h|X11/Xft/Xft2.h|g'	\
-		nsDrawingSurfaceGTK.cpp	nsFontMetricsXft.h
-
 post-build:
 	${RM} -f ${PLIST}
 	${TOUCH} ${PLIST}
diff --git a/www/firefox36/Makefile b/www/firefox36/Makefile
index a01bf2e81ec3..fd8f49bcb698 100644
--- a/www/firefox36/Makefile
+++ b/www/firefox36/Makefile
@@ -76,7 +76,7 @@ CONFIGURE_ENV+=	WITH_LOGGING=yes
 .if defined(WITHOUT_XFT)
 CONFIGURE_ENV+=	WITHOUT_XFT=yes
 .else
-LIB_DEPENDS+=	Xft2.2:${PORTSDIR}/x11-fonts/Xft
+LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/Xft
 .endif # !defined(WITHOUT_XFT)
 
 CPPFLAGS+=		-I${X11BASE}/include
@@ -101,12 +101,6 @@ post-extract::
 		-e 's|@PREFIX@|${LOCAL_PREFIX}|'	\
 		<${FILESDIR}/mozconfig.in >${WRKSRC}/.mozconfig
 
-# fix for Xft (thanks to marcus@)
-post-patch:
-	cd ${WRKSRC}/gfx/src/gtk;				\
-	${REINPLACE_CMD} -e 's|X11/Xft/Xft\.h|X11/Xft/Xft2.h|g'	\
-		nsDrawingSurfaceGTK.cpp	nsFontMetricsXft.h
-
 post-build:
 	${RM} -f ${PLIST}
 	${TOUCH} ${PLIST}
diff --git a/www/flock/Makefile b/www/flock/Makefile
index a01bf2e81ec3..fd8f49bcb698 100644
--- a/www/flock/Makefile
+++ b/www/flock/Makefile
@@ -76,7 +76,7 @@ CONFIGURE_ENV+=	WITH_LOGGING=yes
 .if defined(WITHOUT_XFT)
 CONFIGURE_ENV+=	WITHOUT_XFT=yes
 .else
-LIB_DEPENDS+=	Xft2.2:${PORTSDIR}/x11-fonts/Xft
+LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/Xft
 .endif # !defined(WITHOUT_XFT)
 
 CPPFLAGS+=		-I${X11BASE}/include
@@ -101,12 +101,6 @@ post-extract::
 		-e 's|@PREFIX@|${LOCAL_PREFIX}|'	\
 		<${FILESDIR}/mozconfig.in >${WRKSRC}/.mozconfig
 
-# fix for Xft (thanks to marcus@)
-post-patch:
-	cd ${WRKSRC}/gfx/src/gtk;				\
-	${REINPLACE_CMD} -e 's|X11/Xft/Xft\.h|X11/Xft/Xft2.h|g'	\
-		nsDrawingSurfaceGTK.cpp	nsFontMetricsXft.h
-
 post-build:
 	${RM} -f ${PLIST}
 	${TOUCH} ${PLIST}
diff --git a/www/mozilla-devel/Makefile b/www/mozilla-devel/Makefile
index 17efc220ef6b..688a86e018cf 100644
--- a/www/mozilla-devel/Makefile
+++ b/www/mozilla-devel/Makefile
@@ -40,7 +40,7 @@ USE_GNOME=	gtk12 orbit
 .endif
 
 .if !defined(WITHOUT_XFT)
-LIB_DEPENDS+=	Xft2.2:${PORTSDIR}/x11-fonts/Xft
+LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/Xft
 .if exists(${X11BASE}/lib/X11/fonts/mozilla/fonts.dir)
 BROKEN=		Mozilla-devel and Xft2 render the mozilla-fonts \
 	 	illegibly. Please remove the mozilla-fonts package.
@@ -165,12 +165,6 @@ pre-everything::
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
 		${WRKSRC}/build/unix/run-mozilla.sh
-.if !defined(WITHOUT_XFT)
-	@${REINPLACE_CMD} -e 's|X11/Xft/Xft\.h|X11/Xft/Xft2.h|g' \
-		${WRKSRC}/gfx/src/gtk/nsDrawingSurfaceGTK.cpp \
-		${WRKSRC}/gfx/src/gtk/nsFontMetricsXft.h \
-		${WRKSRC}/gfx/src/gtk/nsDeviceContextGTK.cpp
-.endif
 	@${REINPLACE_CMD} -e 's|%%MOZILLA%%|${MOZILLA}|g' \
 		-e 's|%%HEADERS_SUFX%%|-devel|g' \
 			${WRKSRC}/config/autoconf.mk.in
diff --git a/www/mozilla-firebird/Makefile b/www/mozilla-firebird/Makefile
index a01bf2e81ec3..fd8f49bcb698 100644
--- a/www/mozilla-firebird/Makefile
+++ b/www/mozilla-firebird/Makefile
@@ -76,7 +76,7 @@ CONFIGURE_ENV+=	WITH_LOGGING=yes
 .if defined(WITHOUT_XFT)
 CONFIGURE_ENV+=	WITHOUT_XFT=yes
 .else
-LIB_DEPENDS+=	Xft2.2:${PORTSDIR}/x11-fonts/Xft
+LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/Xft
 .endif # !defined(WITHOUT_XFT)
 
 CPPFLAGS+=		-I${X11BASE}/include
@@ -101,12 +101,6 @@ post-extract::
 		-e 's|@PREFIX@|${LOCAL_PREFIX}|'	\
 		<${FILESDIR}/mozconfig.in >${WRKSRC}/.mozconfig
 
-# fix for Xft (thanks to marcus@)
-post-patch:
-	cd ${WRKSRC}/gfx/src/gtk;				\
-	${REINPLACE_CMD} -e 's|X11/Xft/Xft\.h|X11/Xft/Xft2.h|g'	\
-		nsDrawingSurfaceGTK.cpp	nsFontMetricsXft.h
-
 post-build:
 	${RM} -f ${PLIST}
 	${TOUCH} ${PLIST}
diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile
index 3152f71941d0..e68984f7f1be 100644
--- a/www/mozilla/Makefile
+++ b/www/mozilla/Makefile
@@ -40,7 +40,7 @@ USE_GNOME=	gtk12
 .endif
 
 .if !defined(WITHOUT_XFT)
-LIB_DEPENDS+=	Xft2.2:${PORTSDIR}/x11-fonts/Xft
+LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/Xft
 .if exists(${X11BASE}/lib/X11/fonts/mozilla/fonts.dir)
 BROKEN=		Mozilla and Xft2 render the mozilla-fonts \
 	 	illegibly. Please remove the mozilla-fonts package.
@@ -167,11 +167,6 @@ pre-everything::
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
 		${WRKSRC}/build/unix/run-mozilla.sh
-.if !defined(WITHOUT_XFT)
-	@${REINPLACE_CMD} -e 's|X11/Xft/Xft\.h|X11/Xft/Xft2.h|g' \
-		${WRKSRC}/gfx/src/gtk/nsDrawingSurfaceGTK.cpp \
-		${WRKSRC}/gfx/src/gtk/nsFontMetricsXft.h
-.endif
 	@${REINPLACE_CMD} -e 's|%%MOZILLA%%|${MOZILLA}|g' \
 		-e 's|%%HEADERS_SUFX%%||g' \
 			${WRKSRC}/config/autoconf.mk.in
diff --git a/www/phoenix/Makefile b/www/phoenix/Makefile
index a01bf2e81ec3..fd8f49bcb698 100644
--- a/www/phoenix/Makefile
+++ b/www/phoenix/Makefile
@@ -76,7 +76,7 @@ CONFIGURE_ENV+=	WITH_LOGGING=yes
 .if defined(WITHOUT_XFT)
 CONFIGURE_ENV+=	WITHOUT_XFT=yes
 .else
-LIB_DEPENDS+=	Xft2.2:${PORTSDIR}/x11-fonts/Xft
+LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/Xft
 .endif # !defined(WITHOUT_XFT)
 
 CPPFLAGS+=		-I${X11BASE}/include
@@ -101,12 +101,6 @@ post-extract::
 		-e 's|@PREFIX@|${LOCAL_PREFIX}|'	\
 		<${FILESDIR}/mozconfig.in >${WRKSRC}/.mozconfig
 
-# fix for Xft (thanks to marcus@)
-post-patch:
-	cd ${WRKSRC}/gfx/src/gtk;				\
-	${REINPLACE_CMD} -e 's|X11/Xft/Xft\.h|X11/Xft/Xft2.h|g'	\
-		nsDrawingSurfaceGTK.cpp	nsFontMetricsXft.h
-
 post-build:
 	${RM} -f ${PLIST}
 	${TOUCH} ${PLIST}
diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile
index 17efc220ef6b..688a86e018cf 100644
--- a/www/seamonkey/Makefile
+++ b/www/seamonkey/Makefile
@@ -40,7 +40,7 @@ USE_GNOME=	gtk12 orbit
 .endif
 
 .if !defined(WITHOUT_XFT)
-LIB_DEPENDS+=	Xft2.2:${PORTSDIR}/x11-fonts/Xft
+LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/Xft
 .if exists(${X11BASE}/lib/X11/fonts/mozilla/fonts.dir)
 BROKEN=		Mozilla-devel and Xft2 render the mozilla-fonts \
 	 	illegibly. Please remove the mozilla-fonts package.
@@ -165,12 +165,6 @@ pre-everything::
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
 		${WRKSRC}/build/unix/run-mozilla.sh
-.if !defined(WITHOUT_XFT)
-	@${REINPLACE_CMD} -e 's|X11/Xft/Xft\.h|X11/Xft/Xft2.h|g' \
-		${WRKSRC}/gfx/src/gtk/nsDrawingSurfaceGTK.cpp \
-		${WRKSRC}/gfx/src/gtk/nsFontMetricsXft.h \
-		${WRKSRC}/gfx/src/gtk/nsDeviceContextGTK.cpp
-.endif
 	@${REINPLACE_CMD} -e 's|%%MOZILLA%%|${MOZILLA}|g' \
 		-e 's|%%HEADERS_SUFX%%|-devel|g' \
 			${WRKSRC}/config/autoconf.mk.in
diff --git a/www/seamonkey2/Makefile b/www/seamonkey2/Makefile
index 17efc220ef6b..688a86e018cf 100644
--- a/www/seamonkey2/Makefile
+++ b/www/seamonkey2/Makefile
@@ -40,7 +40,7 @@ USE_GNOME=	gtk12 orbit
 .endif
 
 .if !defined(WITHOUT_XFT)
-LIB_DEPENDS+=	Xft2.2:${PORTSDIR}/x11-fonts/Xft
+LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/Xft
 .if exists(${X11BASE}/lib/X11/fonts/mozilla/fonts.dir)
 BROKEN=		Mozilla-devel and Xft2 render the mozilla-fonts \
 	 	illegibly. Please remove the mozilla-fonts package.
@@ -165,12 +165,6 @@ pre-everything::
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
 		${WRKSRC}/build/unix/run-mozilla.sh
-.if !defined(WITHOUT_XFT)
-	@${REINPLACE_CMD} -e 's|X11/Xft/Xft\.h|X11/Xft/Xft2.h|g' \
-		${WRKSRC}/gfx/src/gtk/nsDrawingSurfaceGTK.cpp \
-		${WRKSRC}/gfx/src/gtk/nsFontMetricsXft.h \
-		${WRKSRC}/gfx/src/gtk/nsDeviceContextGTK.cpp
-.endif
 	@${REINPLACE_CMD} -e 's|%%MOZILLA%%|${MOZILLA}|g' \
 		-e 's|%%HEADERS_SUFX%%|-devel|g' \
 			${WRKSRC}/config/autoconf.mk.in
diff --git a/x11-fonts/Xft/Makefile b/x11-fonts/Xft/Makefile
index 508c4094d2c6..5926df4a5239 100644
--- a/x11-fonts/Xft/Makefile
+++ b/x11-fonts/Xft/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Xft
 PORTVERSION=	2.1
+PORTREVISION=	1
 CATEGORIES=	x11-fonts
 MASTER_SITES=	http://fontconfig.org/fontconfig/release/
 DISTNAME=	fcpackage.${PORTVERSION:S/./_/}
diff --git a/x11-fonts/Xft/files/patch-Makefile.in b/x11-fonts/Xft/files/patch-Makefile.in
index 4beb13b79724..88ae45cf7348 100644
--- a/x11-fonts/Xft/files/patch-Makefile.in
+++ b/x11-fonts/Xft/files/patch-Makefile.in
@@ -1,13 +1,11 @@
---- Makefile.in.orig	Sun Oct  6 23:14:27 2002
-+++ Makefile.in	Sun Oct  6 23:16:21 2002
-@@ -62,9 +62,8 @@
- # include files
+--- 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
+ LIBBASE=libXft.so
 -LIBFILE=$(LIBBASE).@PACKAGE_MAJOR@.@PACKAGE_MINOR@
 -LIBMAJOR=$(LIBBASE).@PACKAGE_MAJOR@
-+LIBBASE=libXft2.so
 +LIBFILE=$(LIBBASE).@PACKAGE_MAJOR@
  
  LIBS=@LIBS@
@@ -21,7 +19,7 @@
  
  #
  # Build the library
-@@ -118,13 +117,9 @@
+@@ -118,86 +117,25 @@
  	rm -f $@
  	$(MKSHLIB) $(OBJS) $(LIBS)
  
@@ -37,44 +35,85 @@
  
  $(OBJS): $(HEADERS)
  
-@@ -151,19 +146,15 @@
- # install library
- #
- 
+-#
+-# 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)/$(LIB)
- install:: $(DESTDIR)$(LIBDIR)/$(LIBBASE)
- 
- $(DESTDIR)$(LIBDIR)/$(LIBFILE): $(LIBFILE)
- 	$(INSTALL_PROGRAM) $< $(DESTDIR)$(LIBDIR)
- 
+-install:: $(DESTDIR)$(LIBDIR)/$(LIBBASE)
+-
+-$(DESTDIR)$(LIBDIR)/$(LIBFILE): $(LIBFILE)
+-	$(INSTALL_PROGRAM) $< $(DESTDIR)$(LIBDIR)
+-
 -$(DESTDIR)$(LIBDIR)/$(LIBMAJOR): $(DESTDIR)$(LIBDIR)/$(LIBFILE)
-+$(DESTDIR)$(LIBDIR)/$(LIBBASE): $(DESTDIR)$(LIBDIR)/$(LIBFILE)
- 	rm -f  $@
+-	rm -f  $@
 -	$(LN_S) $(LIBFILE) $(DESTDIR)$(LIBDIR)/$(LIBMAJOR)
 -
 -$(DESTDIR)$(LIBDIR)/$(LIBBASE): $(DESTDIR)$(LIBDIR)/$(LIBMAJOR)
 -	rm -f  $@
 -	$(LN_S) $(LIBMAJOR) $(DESTDIR)$(LIBDIR)/$(LIBBASE)
-+	$(LN_S) $(LIBFILE) $(DESTDIR)$(LIBDIR)/$(LIBBASE)
- 
- #
- # install xft-config script
-@@ -188,10 +179,10 @@
- # install header files
- #
- 
+-
+-#
+-# 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
-+install::$(DESTDIR)$(INCLUDEDIR)/Xft2.h $(DESTDIR)$(INCLUDEDIR)/XftCompat.h
- 
+-
 -$(DESTDIR)$(INCLUDEDIR)/Xft.h: Xft.h
 -	$(INSTALL_DATA) $< $(DESTDIR)$(INCLUDEDIR)
-+$(DESTDIR)$(INCLUDEDIR)/Xft2.h: Xft.h
-+	$(INSTALL_DATA) $< $(DESTDIR)$(INCLUDEDIR)/Xft2.h
+-
+-$(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)
  
- $(DESTDIR)$(INCLUDEDIR)/XftCompat.h: XftCompat.h
- 	$(INSTALL_DATA) $< $(DESTDIR)$(INCLUDEDIR)
-@@ -200,4 +191,4 @@
+ #
  # delete generated files
  #
  clean::
diff --git a/x11-fonts/Xft/files/patch-configure b/x11-fonts/Xft/files/patch-configure
new file mode 100644
index 000000000000..87b709ef4d16
--- /dev/null
+++ b/x11-fonts/Xft/files/patch-configure
@@ -0,0 +1,11 @@
+--- 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-xft.pc.in b/x11-fonts/Xft/files/patch-xft.pc.in
index d97e0edbec06..249417935f94 100644
--- a/x11-fonts/Xft/files/patch-xft.pc.in
+++ b/x11-fonts/Xft/files/patch-xft.pc.in
@@ -9,10 +9,3 @@
  freetypecflags=@FREETYPE_CFLAGS@
  xrenderlibs=@XRENDER_LIBS@
  xrendercflags=@XRENDER_CFLAGS@
-@@ -11,5 +11,5 @@
- Description: X FreeType library
- Version: @PACKAGE_VERSION@
- Requires: fontconfig
--Libs: -L${libdir} -lXft ${freetypelibs} ${xrenderlibs}
-+Libs: -L${libdir} -lXft2 ${freetypelibs} ${xrenderlibs}
- Cflags: -I${includedir} ${freetypecflags} ${xrendercflags}
diff --git a/x11-fonts/Xft/pkg-plist b/x11-fonts/Xft/pkg-plist
index e0e33dae7922..0591e9bac912 100644
--- a/x11-fonts/Xft/pkg-plist
+++ b/x11-fonts/Xft/pkg-plist
@@ -1,6 +1,7 @@
 bin/xft-config
-include/X11/Xft/Xft2.h
+include/X11/Xft/Xft.h
 include/X11/Xft/XftCompat.h
-lib/libXft2.so
-lib/libXft2.so.2
+include/X11/Xft/XftFreetype.h
+lib/libXft.so
+lib/libXft.so.2
 libdata/pkgconfig/xft.pc
diff --git a/x11-fonts/libXft/Makefile b/x11-fonts/libXft/Makefile
index 508c4094d2c6..5926df4a5239 100644
--- a/x11-fonts/libXft/Makefile
+++ b/x11-fonts/libXft/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Xft
 PORTVERSION=	2.1
+PORTREVISION=	1
 CATEGORIES=	x11-fonts
 MASTER_SITES=	http://fontconfig.org/fontconfig/release/
 DISTNAME=	fcpackage.${PORTVERSION:S/./_/}
diff --git a/x11-fonts/libXft/files/patch-Makefile.in b/x11-fonts/libXft/files/patch-Makefile.in
index 4beb13b79724..88ae45cf7348 100644
--- a/x11-fonts/libXft/files/patch-Makefile.in
+++ b/x11-fonts/libXft/files/patch-Makefile.in
@@ -1,13 +1,11 @@
---- Makefile.in.orig	Sun Oct  6 23:14:27 2002
-+++ Makefile.in	Sun Oct  6 23:16:21 2002
-@@ -62,9 +62,8 @@
- # include files
+--- 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
+ LIBBASE=libXft.so
 -LIBFILE=$(LIBBASE).@PACKAGE_MAJOR@.@PACKAGE_MINOR@
 -LIBMAJOR=$(LIBBASE).@PACKAGE_MAJOR@
-+LIBBASE=libXft2.so
 +LIBFILE=$(LIBBASE).@PACKAGE_MAJOR@
  
  LIBS=@LIBS@
@@ -21,7 +19,7 @@
  
  #
  # Build the library
-@@ -118,13 +117,9 @@
+@@ -118,86 +117,25 @@
  	rm -f $@
  	$(MKSHLIB) $(OBJS) $(LIBS)
  
@@ -37,44 +35,85 @@
  
  $(OBJS): $(HEADERS)
  
-@@ -151,19 +146,15 @@
- # install library
- #
- 
+-#
+-# 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)/$(LIB)
- install:: $(DESTDIR)$(LIBDIR)/$(LIBBASE)
- 
- $(DESTDIR)$(LIBDIR)/$(LIBFILE): $(LIBFILE)
- 	$(INSTALL_PROGRAM) $< $(DESTDIR)$(LIBDIR)
- 
+-install:: $(DESTDIR)$(LIBDIR)/$(LIBBASE)
+-
+-$(DESTDIR)$(LIBDIR)/$(LIBFILE): $(LIBFILE)
+-	$(INSTALL_PROGRAM) $< $(DESTDIR)$(LIBDIR)
+-
 -$(DESTDIR)$(LIBDIR)/$(LIBMAJOR): $(DESTDIR)$(LIBDIR)/$(LIBFILE)
-+$(DESTDIR)$(LIBDIR)/$(LIBBASE): $(DESTDIR)$(LIBDIR)/$(LIBFILE)
- 	rm -f  $@
+-	rm -f  $@
 -	$(LN_S) $(LIBFILE) $(DESTDIR)$(LIBDIR)/$(LIBMAJOR)
 -
 -$(DESTDIR)$(LIBDIR)/$(LIBBASE): $(DESTDIR)$(LIBDIR)/$(LIBMAJOR)
 -	rm -f  $@
 -	$(LN_S) $(LIBMAJOR) $(DESTDIR)$(LIBDIR)/$(LIBBASE)
-+	$(LN_S) $(LIBFILE) $(DESTDIR)$(LIBDIR)/$(LIBBASE)
- 
- #
- # install xft-config script
-@@ -188,10 +179,10 @@
- # install header files
- #
- 
+-
+-#
+-# 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
-+install::$(DESTDIR)$(INCLUDEDIR)/Xft2.h $(DESTDIR)$(INCLUDEDIR)/XftCompat.h
- 
+-
 -$(DESTDIR)$(INCLUDEDIR)/Xft.h: Xft.h
 -	$(INSTALL_DATA) $< $(DESTDIR)$(INCLUDEDIR)
-+$(DESTDIR)$(INCLUDEDIR)/Xft2.h: Xft.h
-+	$(INSTALL_DATA) $< $(DESTDIR)$(INCLUDEDIR)/Xft2.h
+-
+-$(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)
  
- $(DESTDIR)$(INCLUDEDIR)/XftCompat.h: XftCompat.h
- 	$(INSTALL_DATA) $< $(DESTDIR)$(INCLUDEDIR)
-@@ -200,4 +191,4 @@
+ #
  # delete generated files
  #
  clean::
diff --git a/x11-fonts/libXft/files/patch-configure b/x11-fonts/libXft/files/patch-configure
new file mode 100644
index 000000000000..87b709ef4d16
--- /dev/null
+++ b/x11-fonts/libXft/files/patch-configure
@@ -0,0 +1,11 @@
+--- 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-xft.pc.in b/x11-fonts/libXft/files/patch-xft.pc.in
index d97e0edbec06..249417935f94 100644
--- a/x11-fonts/libXft/files/patch-xft.pc.in
+++ b/x11-fonts/libXft/files/patch-xft.pc.in
@@ -9,10 +9,3 @@
  freetypecflags=@FREETYPE_CFLAGS@
  xrenderlibs=@XRENDER_LIBS@
  xrendercflags=@XRENDER_CFLAGS@
-@@ -11,5 +11,5 @@
- Description: X FreeType library
- Version: @PACKAGE_VERSION@
- Requires: fontconfig
--Libs: -L${libdir} -lXft ${freetypelibs} ${xrenderlibs}
-+Libs: -L${libdir} -lXft2 ${freetypelibs} ${xrenderlibs}
- Cflags: -I${includedir} ${freetypecflags} ${xrendercflags}
diff --git a/x11-fonts/libXft/pkg-plist b/x11-fonts/libXft/pkg-plist
index e0e33dae7922..0591e9bac912 100644
--- a/x11-fonts/libXft/pkg-plist
+++ b/x11-fonts/libXft/pkg-plist
@@ -1,6 +1,7 @@
 bin/xft-config
-include/X11/Xft/Xft2.h
+include/X11/Xft/Xft.h
 include/X11/Xft/XftCompat.h
-lib/libXft2.so
-lib/libXft2.so.2
+include/X11/Xft/XftFreetype.h
+lib/libXft.so
+lib/libXft.so.2
 libdata/pkgconfig/xft.pc
diff --git a/x11-toolkits/gnustep-back/Makefile b/x11-toolkits/gnustep-back/Makefile
index c89a25975f3f..665405fb89b7 100644
--- a/x11-toolkits/gnustep-back/Makefile
+++ b/x11-toolkits/gnustep-back/Makefile
@@ -18,7 +18,8 @@ BUILD_DEPENDS=	${COMBOLIBDIR}/libgnustep-gui.so:${PORTSDIR}/x11-toolkits/gnustep
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libcallback.a:${PORTSDIR}/devel/ffcall
 RUN_DEPENDS=	${COMBOLIBDIR}/libgnustep-gui.so:${PORTSDIR}/x11-toolkits/gnustep-gui
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
-		tiff.4:${PORTSDIR}/graphics/tiff
+		tiff.4:${PORTSDIR}/graphics/tiff \
+		Xft.2:${PORTSDIR}/x11-fonts/Xft
 
 USE_XLIB=		yes
 BREAKS_IF_PEDANTIC=	yes
diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile
index 0c008a6dba21..56058548cba4 100644
--- a/x11-toolkits/gtk20/Makefile
+++ b/x11-toolkits/gtk20/Makefile
@@ -49,8 +49,6 @@ MAN1=		gdk-pixbuf-csource.1
 post-patch:
 	@find ${WRKSRC} -name "Makefile.in" | xargs ${GREP} -l lgmodule | \
 		xargs ${REINPLACE_CMD} -e 's|-lgmodule|@GMODULE_LIBS@|g'
-	@${FIND} ${WRKSRC} -name "*.[ch]" | ${XARGS} ${REINPLACE_CMD} -e \
-		's|Xft\.h|Xft2.h|g'
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|[(]libdir[)]/locale|(prefix)/share/locale|g' \
diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile
index 0c008a6dba21..56058548cba4 100644
--- a/x11-toolkits/gtk30/Makefile
+++ b/x11-toolkits/gtk30/Makefile
@@ -49,8 +49,6 @@ MAN1=		gdk-pixbuf-csource.1
 post-patch:
 	@find ${WRKSRC} -name "Makefile.in" | xargs ${GREP} -l lgmodule | \
 		xargs ${REINPLACE_CMD} -e 's|-lgmodule|@GMODULE_LIBS@|g'
-	@${FIND} ${WRKSRC} -name "*.[ch]" | ${XARGS} ${REINPLACE_CMD} -e \
-		's|Xft\.h|Xft2.h|g'
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|[(]libdir[)]/locale|(prefix)/share/locale|g' \
diff --git a/x11-toolkits/pango/Makefile b/x11-toolkits/pango/Makefile
index 0a9b9014751a..fe93b85ccae4 100644
--- a/x11-toolkits/pango/Makefile
+++ b/x11-toolkits/pango/Makefile
@@ -18,7 +18,7 @@ MAINTAINER=	gnome@FreeBSD.org
 
 BUILD_DEPENDS=	freetype-config:${PORTSDIR}/print/freetype2	# XXX
 LIB_DEPENDS=	glib-2.0.200:${PORTSDIR}/devel/glib20 \
-		Xft2.2:${PORTSDIR}/x11-fonts/Xft \
+		Xft.2:${PORTSDIR}/x11-fonts/Xft \
 		intl.4:${PORTSDIR}/devel/gettext
 
 USE_BZIP2=	yes
diff --git a/x11-toolkits/pango/files/patch-pangoxft.h b/x11-toolkits/pango/files/patch-pangoxft.h
deleted file mode 100644
index 939194042b12..000000000000
--- a/x11-toolkits/pango/files/patch-pangoxft.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- pango/pangoxft.h.orig	Sun Oct  6 23:03:37 2002
-+++ pango/pangoxft.h	Sun Oct  6 23:03:42 2002
-@@ -31,7 +31,7 @@
- #define _XFT_NO_COMPAT
- #define _XFTCOMPAT_H_
- #include <X11/Xlib.h>
--#include <X11/Xft/Xft.h>
-+#include <X11/Xft/Xft2.h>
- #if defined(XftVersion) && XftVersion >= 20000
- #else
- #error "must have Xft version 2 or newer"
diff --git a/x11-toolkits/qt23/Makefile b/x11-toolkits/qt23/Makefile
index 41f9f95c107e..95d66200f10f 100644
--- a/x11-toolkits/qt23/Makefile
+++ b/x11-toolkits/qt23/Makefile
@@ -18,7 +18,8 @@ MAINTAINER?=	kde@FreeBSD.org
 
 LIB_DEPENDS=	mng.1:${PORTSDIR}/graphics/libmng \
 		png.5:${PORTSDIR}/graphics/png \
-		jpeg.9:${PORTSDIR}/graphics/jpeg
+		jpeg.9:${PORTSDIR}/graphics/jpeg \
+		Xft.2:${PORTSDIR}/x11-fonts/Xft
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 USE_MESA=	yes
@@ -29,7 +30,8 @@ HAS_CONFIGURE=	yes
 # JUST BECAUSE -xft IS NOT LISTED BELOW DOESN'T MEAN IT'S NOT THERE!
 CONFIGURE_ARGS=	-system-zlib -system-libpng -system-jpeg -sm -gif \
 		-system-libmng -thread -no-opengl -no-g++-exceptions \
-		-I${LOCALBASE}/include -L${LOCALBASE}/lib
+		-I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2 \
+		-L${LOCALBASE}/lib
 
 .if defined(QT_DEBUG)
 CONFIGURE_ARGS+= -debug
diff --git a/x11-toolkits/qt23/files/patch-Makefile.in b/x11-toolkits/qt23/files/patch-Makefile.in
new file mode 100644
index 000000000000..632a62088d2f
--- /dev/null
+++ b/x11-toolkits/qt23/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- src/Makefile.in.orig	Wed Jun 13 01:57:02 2001
++++ src/Makefile.in	Sun Feb  9 23:31:39 2003
+@@ -8,7 +8,7 @@
+ CFLAGS	=	$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB) $(QT_CFLAGS_OPT)
+ INCPATH =	
+ LFLAGS	=	$(SYSCONF_LFLAGS_OPENGL) $(SYSCONF_LFLAGS_X11) $(SYSCONF_RPATH_X11) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
+-LIBS	=	$(SUBLIBS) $(SYSCONF_LIBS_OPENGL) $(SYSCONF_LIBS_X11) $(SYSCONF_LIBS_QTLIB)
++LIBS	=	$(SUBLIBS) $(SYSCONF_LIBS_OPENGL) $(SYSCONF_LIBS_X11) $(SYSCONF_LIBS_QTLIB) `pkg-config xft --libs`
+ MOC	=	$(SYSCONF_MOC)
+ UIC	=	$(SYSCONF_UIC)
+ 
diff --git a/x11-toolkits/qt23/files/patch-configure b/x11-toolkits/qt23/files/patch-configure
new file mode 100644
index 000000000000..40db4b2ee613
--- /dev/null
+++ b/x11-toolkits/qt23/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig	Wed Jun 13 01:57:02 2001
++++ configure	Mon Feb 17 18:54:28 2003
+@@ -1209,7 +1209,7 @@
+ fi
+ 
+ [ "x$SM" = "xyes" ] && QT_LIBS="${QT_LIBS} -lSM -lICE"
+-[ "x$XFT" = "xyes" ] && QT_LIBS="${QT_LIBS} -lXft"
++[ "x$XFT" = "xyes" ] && QT_LIBS="${QT_LIBS} `pkg-config xft --libs`"
+ if [ -z "$EMB" -o "$SHARED" = no ]
+ then
+     [ "x$LIBPNG" = "xyes" ] && QT_MODOBJ=$QT_MODOBJ' $(PNG_OBJECTS)'
diff --git a/x11-toolkits/qt23/files/patch-qpsprinter.cpp b/x11-toolkits/qt23/files/patch-qpsprinter.cpp
new file mode 100644
index 000000000000..21b9fdf561a6
--- /dev/null
+++ b/x11-toolkits/qt23/files/patch-qpsprinter.cpp
@@ -0,0 +1,11 @@
+--- src/kernel/qpsprinter.cpp.orig	Wed Jun 13 01:53:46 2001
++++ src/kernel/qpsprinter.cpp	Sun Feb  9 22:48:14 2003
+@@ -2772,7 +2772,7 @@
+ 
+ 
+ #ifndef _OS_OSF_
+-extern "C" char* getenv(char*);
++extern "C" char* getenv(const char*);
+ #endif
+ 
+ QPSPrinterFontTTF::QPSPrinterFontTTF(const QFont &f, QByteArray& d)
diff --git a/x11-toolkits/qt31/Makefile b/x11-toolkits/qt31/Makefile
index bfc49b88d0c3..e23d3a1f0236 100644
--- a/x11-toolkits/qt31/Makefile
+++ b/x11-toolkits/qt31/Makefile
@@ -22,7 +22,8 @@ MAINTAINER?=	kde@FreeBSD.org
 
 LIB_DEPENDS+=	mng.1:${PORTSDIR}/graphics/libmng \
 		png.5:${PORTSDIR}/graphics/png \
-		jpeg.9:${PORTSDIR}/graphics/jpeg
+		jpeg.9:${PORTSDIR}/graphics/jpeg \
+		Xft.2:${PORTSDIR}/x11-fonts/Xft
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
diff --git a/x11-toolkits/qt32/Makefile b/x11-toolkits/qt32/Makefile
index bfc49b88d0c3..e23d3a1f0236 100644
--- a/x11-toolkits/qt32/Makefile
+++ b/x11-toolkits/qt32/Makefile
@@ -22,7 +22,8 @@ MAINTAINER?=	kde@FreeBSD.org
 
 LIB_DEPENDS+=	mng.1:${PORTSDIR}/graphics/libmng \
 		png.5:${PORTSDIR}/graphics/png \
-		jpeg.9:${PORTSDIR}/graphics/jpeg
+		jpeg.9:${PORTSDIR}/graphics/jpeg \
+		Xft.2:${PORTSDIR}/x11-fonts/Xft
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
diff --git a/x11-toolkits/qt33/Makefile b/x11-toolkits/qt33/Makefile
index bfc49b88d0c3..e23d3a1f0236 100644
--- a/x11-toolkits/qt33/Makefile
+++ b/x11-toolkits/qt33/Makefile
@@ -22,7 +22,8 @@ MAINTAINER?=	kde@FreeBSD.org
 
 LIB_DEPENDS+=	mng.1:${PORTSDIR}/graphics/libmng \
 		png.5:${PORTSDIR}/graphics/png \
-		jpeg.9:${PORTSDIR}/graphics/jpeg
+		jpeg.9:${PORTSDIR}/graphics/jpeg \
+		Xft.2:${PORTSDIR}/x11-fonts/Xft
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
diff --git a/x11-wm/fbdesk/Makefile b/x11-wm/fbdesk/Makefile
index 4a767988d4e9..981505307aeb 100644
--- a/x11-wm/fbdesk/Makefile
+++ b/x11-wm/fbdesk/Makefile
@@ -12,7 +12,8 @@ MASTER_SITES=	http://fluxbox.sourceforge.net/download/
 
 MAINTAINER=	hendrik@scholz.net
 
-LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
+		Xft.2:${PORTSDIR}/x11-fonts/Xft
 
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
diff --git a/x11-wm/fluxbox-devel/Makefile b/x11-wm/fluxbox-devel/Makefile
index f61785df63ec..b3b0695bcd38 100644
--- a/x11-wm/fluxbox-devel/Makefile
+++ b/x11-wm/fluxbox-devel/Makefile
@@ -20,6 +20,7 @@ PATCHFILES=	remember-0.1.14-4.gz
 
 MAINTAINER=	hendrik@scholz.net
 
+LIB_DEPENDS=	Xft.2:${PORTSDIR}/x11-fonts/Xft
 RUN_DEPENDS=	bsetbg:${PORTSDIR}/x11-wm/boxtools \
 		xterm:${PORTSDIR}/x11/XFree86-4-clients
 BUILD_DEPENDS=	xterm:${PORTSDIR}/x11/XFree86-4-clients
diff --git a/x11-wm/fluxbox/Makefile b/x11-wm/fluxbox/Makefile
index f61785df63ec..b3b0695bcd38 100644
--- a/x11-wm/fluxbox/Makefile
+++ b/x11-wm/fluxbox/Makefile
@@ -20,6 +20,7 @@ PATCHFILES=	remember-0.1.14-4.gz
 
 MAINTAINER=	hendrik@scholz.net
 
+LIB_DEPENDS=	Xft.2:${PORTSDIR}/x11-fonts/Xft
 RUN_DEPENDS=	bsetbg:${PORTSDIR}/x11-wm/boxtools \
 		xterm:${PORTSDIR}/x11/XFree86-4-clients
 BUILD_DEPENDS=	xterm:${PORTSDIR}/x11/XFree86-4-clients
diff --git a/x11-wm/fvwm2-devel/Makefile b/x11-wm/fvwm2-devel/Makefile
index 7f061cc8c3ba..efb62083409e 100644
--- a/x11-wm/fvwm2-devel/Makefile
+++ b/x11-wm/fvwm2-devel/Makefile
@@ -15,6 +15,7 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	cy@FreeBSD.org
 
+LIB_DEPENDS=	Xft.2:${PORTSDIR}/x11-fonts/Xft
 RUN_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
 .if defined(WITH_STROKE)
diff --git a/x11-wm/sawfish/Makefile b/x11-wm/sawfish/Makefile
index 6d0e5b1dd497..63e7d12e8d72 100644
--- a/x11-wm/sawfish/Makefile
+++ b/x11-wm/sawfish/Makefile
@@ -17,7 +17,8 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-gtk1
 
 MAINTAINER=	gnome@FreeBSD.org
 
-LIB_DEPENDS=	rep.12:${PORTSDIR}/lang/librep
+LIB_DEPENDS=	rep.12:${PORTSDIR}/lang/librep \
+		Xft.2:${PORTSDIR}/x11-fonts/Xft
 BUILD_DEPENDS=	${X11BASE}/libexec/rep/${GNUHOST}/gtk.so:${PORTSDIR}/x11-toolkits/rep-gtk
 RUN_DEPENDS=	${X11BASE}/libexec/rep/${GNUHOST}/gtk.so:${PORTSDIR}/x11-toolkits/rep-gtk
 
@@ -32,8 +33,8 @@ WANT_GNOME=	yes
 USE_GNOME=	gnomehack gnomehier gtk12 imlib esound
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-readline
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include \
+		-I${LOCALBASE}/include/freetype2" LIBS="-L${LOCALBASE}/lib"
 CONFIGURE_TARGET=	${ARCH}-pc-freebsd${OSREL:C/\..*//}
 
 .if defined(PACKAGE_BUILDING) || defined(PARALLEL_PACKAGE_BUILD)
diff --git a/x11-wm/sawfish2/Makefile b/x11-wm/sawfish2/Makefile
index b468b12534f7..2e898c4568e7 100644
--- a/x11-wm/sawfish2/Makefile
+++ b/x11-wm/sawfish2/Makefile
@@ -17,7 +17,8 @@ DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 
-LIB_DEPENDS=	rep.12:${PORTSDIR}/lang/librep
+LIB_DEPENDS=	rep.12:${PORTSDIR}/lang/librep \
+		Xft.2:${PORTSDIR}/x11-fonts/Xft
 BUILD_DEPENDS=	${X11BASE}/libexec/rep/${GNUHOST}/gui/gtk-2/gtk.so:${PORTSDIR}/x11-toolkits/rep-gtk2
 RUN_DEPENDS=	${X11BASE}/libexec/rep/${GNUHOST}/gui/gtk-2/gtk.so:${PORTSDIR}/x11-toolkits/rep-gtk2
 
@@ -45,8 +46,6 @@ post-patch:
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g ; \
 		 s|USE_INCLUDED_LIBINTL=yes|#USE_INCLUDED_LIBINTL=yes|g ; \
 		 s|[$$][(]top_builddir[)]/intl/libintl.a|-lintl|g' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|X11/Xft/Xft\.h|X11/Xft/Xft2.h|g' \
-		${WRKSRC}/src/fonts.c
 
 post-install:
 	install-info --section="X11 window manager" \
diff --git a/x11-wm/waimea/Makefile b/x11-wm/waimea/Makefile
index 849c4fce9a0c..c4ac785ac863 100644
--- a/x11-wm/waimea/Makefile
+++ b/x11-wm/waimea/Makefile
@@ -7,12 +7,15 @@
 
 PORTNAME=	waimea
 PORTVERSION=	0.4.0
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	waimea
 
 MAINTAINER=	danfe@regency.nsu.ru
 
+LIB_DEPENDS=	Xft.2:${PORTSDIR}/x11-fonts/Xft
+
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_PERL5_RUN=	yes
@@ -25,8 +28,4 @@ MAN1=		waimea.1
 LIB_DEPENDS+=	Imlib2.1:${PORTSDIR}/graphics/imlib2
 .endif
 
-.if defined(WITH_XFT2)
-LIB_DEPENDS+=	Xft2.2:${PORTSDIR}/x11-fonts/Xft
-.endif
-
 .include <bsd.port.mk>
diff --git a/x11/XFree86-4-clients/Makefile b/x11/XFree86-4-clients/Makefile
index c7fe90ff65bf..eb2764026aae 100644
--- a/x11/XFree86-4-clients/Makefile
+++ b/x11/XFree86-4-clients/Makefile
@@ -22,7 +22,8 @@ PATCHFILES=		4.2.0-4.2.1-1-freebsd.patch.gz
 MAINTAINER=	anholt@freebsd.org
 
 LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2 \
-		GLU.1:${PORTSDIR}/x11/XFree86-4-libraries
+		GLU.1:${PORTSDIR}/x11/XFree86-4-libraries \
+		Xft.2:${PORTSDIR}/x11-fonts/Xft
 
 XFREE86_VERSION=	4
 USE_IMAKE=		YES
diff --git a/x11/XFree86-4-libraries/Makefile b/x11/XFree86-4-libraries/Makefile
index c41ec2b3cda4..0d7361907189 100644
--- a/x11/XFree86-4-libraries/Makefile
+++ b/x11/XFree86-4-libraries/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libraries
 PORTVERSION=	4.2.1
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XFREE:S/$/:x/} \
 		${MASTER_SITE_LOCAL:S/$/:local/}
@@ -50,7 +50,7 @@ MAKE_ENV=		PKGNAMEPREFIX=${PKGNAMEPREFIX} \
 			PORTNAME=${PORTNAME} \
 			PORTVERSION=${PORTVERSION}
 MAN1=			libxrx.1
-MAN3=			Xaw.3 Xft.3
+MAN3=			Xaw.3
 XBUILD_DIRS=		lib nls programs/Xserver/include \
 			programs/Xserver/hw/xfree86/parser \
 			programs/xrx
diff --git a/x11/XFree86-4-libraries/pkg-plist b/x11/XFree86-4-libraries/pkg-plist
index 4a48b4141c0b..bc7a65e634aa 100644
--- a/x11/XFree86-4-libraries/pkg-plist
+++ b/x11/XFree86-4-libraries/pkg-plist
@@ -158,8 +158,6 @@ include/X11/Xaw/XawInit.h
 include/X11/Xcms.h
 include/X11/Xdefs.h
 include/X11/Xdmcp.h
-include/X11/Xft/Xft.h
-include/X11/Xft/XftFreetype.h
 include/X11/Xfuncproto.h
 include/X11/Xfuncs.h
 include/X11/Xlib.h
@@ -378,7 +376,6 @@ include/xf86Optrec.h
 include/xf86Parser.h
 lib/X11/XErrorDB
 lib/X11/XKeysymDB
-lib/X11/XftConfig
 lib/X11/locale/C/XI18N_OBJS
 lib/X11/locale/C/XLC_LOCALE
 lib/X11/locale/armscii-8/Compose
@@ -555,9 +552,6 @@ lib/libXfont.a
 lib/libXfont.so
 lib/libXfont.so.1
 lib/libXfontcache.a
-lib/libXft.a
-lib/libXft.so
-lib/libXft.so.1
 lib/libXi.a
 lib/libXi.so
 lib/libXi.so.6
diff --git a/x11/XFree86-4-libraries/scripts/configure b/x11/XFree86-4-libraries/scripts/configure
index d37c78c4c1cc..b1aaeea01b30 100644
--- a/x11/XFree86-4-libraries/scripts/configure
+++ b/x11/XFree86-4-libraries/scripts/configure
@@ -76,6 +76,7 @@ configure () {
     echo "#define FreeBSDCC	${CC}" >> $LOCALDEF
     echo "#define FreeBSDCXX	${CXX}" >> $LOCALDEF
     echo "#define FreeBSDCFLAGS	${CFLAGS}" >> $LOCALDEF
+    echo "#define BuildXftLibrary NO" >> $LOCALDEF
 
     # Copy ORIGDEF to DESTDEF
     rm -f $DESTDEF
diff --git a/x11/fbdesk/Makefile b/x11/fbdesk/Makefile
index 4a767988d4e9..981505307aeb 100644
--- a/x11/fbdesk/Makefile
+++ b/x11/fbdesk/Makefile
@@ -12,7 +12,8 @@ MASTER_SITES=	http://fluxbox.sourceforge.net/download/
 
 MAINTAINER=	hendrik@scholz.net
 
-LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
+		Xft.2:${PORTSDIR}/x11-fonts/Xft
 
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
diff --git a/x11/fspanel/Makefile b/x11/fspanel/Makefile
index 3fc1a87cc8b7..fd9a3db87e02 100644
--- a/x11/fspanel/Makefile
+++ b/x11/fspanel/Makefile
@@ -13,6 +13,8 @@ DISTNAME=	fspanel-0.8beta1
 
 MAINTAINER=	anarcat@anarcat.dyndns.org
 
+LIB_DEPENDS=	Xft.2:${PORTSDIR}/x11-fonts/Xft
+
 USE_X_PREFIX=	yes
 HAS_CONFIGURE=	yes
 ALL_TARGET=	fspanel
diff --git a/x11/fspanel/files/patch-configure b/x11/fspanel/files/patch-configure
new file mode 100644
index 000000000000..7f162abf2a9e
--- /dev/null
+++ b/x11/fspanel/files/patch-configure
@@ -0,0 +1,13 @@
+--- configure.orig	Sat Jun 22 22:13:01 2002
++++ configure	Mon Feb 17 16:56:27 2003
+@@ -52,8 +52,8 @@
+ xft=no
+ if test -e "$X11_PATH/include/X11/Xft/Xft.h"; then
+ 	echo yes
+-	LDFLAGS="$LDFLAGS -lXft"
+-	CFLAGS="$CFLAGS -DXFT"
++	LDFLAGS="$LDFLAGS `pkg-config xft --libs`"
++	CFLAGS="$CFLAGS -DXFT `pkg-config xft --cflags`"
+ 	xft=yes
+ else
+ 	echo no
diff --git a/x11/mlterm/Makefile b/x11/mlterm/Makefile
index 1bb52e3937d5..23e0bfa67fbb 100644
--- a/x11/mlterm/Makefile
+++ b/x11/mlterm/Makefile
@@ -29,7 +29,7 @@ MAN1=	mlterm.1 mlclient.1
 PKGNAMESUFFIX=	-noaa
 .else
 CONFIGURE_ARGS+=	--enable-anti-alias
-LIB_DEPENDS=	Xft2.2:${PORTSDIR}/x11-fonts/Xft
+LIB_DEPENDS=	Xft.2:${PORTSDIR}/x11-fonts/Xft
 .endif
 
 post-configure:
diff --git a/x11/xstroke/Makefile b/x11/xstroke/Makefile
index 4dba512c6179..0b2bb72929a2 100644
--- a/x11/xstroke/Makefile
+++ b/x11/xstroke/Makefile
@@ -14,6 +14,8 @@ MASTER_SITES=	ftp://ftp.handhelds.org/pub/projects/xstroke/release-${PORTVERSION
 
 MAINTAINER=	ports@FreeBSD.org
 
+BROKEN=		Needs updates for Xft and XFree86 4.3
+
 LIB_DEPENDS=	gnugetopt:${PORTSDIR}/devel/libgnugetopt
 
 USE_REINPLACE=	yes