From affbc636fef13fc8d8bfb2ff360dd91879dd4b31 Mon Sep 17 00:00:00 2001
From: Brian Feldman <green@FreeBSD.org>
Date: Sat, 25 Jan 2003 05:23:48 +0000
Subject: [PATCH] Make the xft-config script use -lXft2, not the old -lXft. 
 This will potentially unbreak all the ports which depend on x11-fonts/Xft.

---
 x11-fonts/Xft/Makefile                     |  1 +
 x11-fonts/Xft/files/patch-xft-config.in    | 11 +++++++++++
 x11-fonts/libXft/Makefile                  |  1 +
 x11-fonts/libXft/files/patch-xft-config.in | 11 +++++++++++
 4 files changed, 24 insertions(+)
 create mode 100644 x11-fonts/Xft/files/patch-xft-config.in
 create mode 100644 x11-fonts/libXft/files/patch-xft-config.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-xft-config.in b/x11-fonts/Xft/files/patch-xft-config.in
new file mode 100644
index 000000000000..3bc6bbb1277f
--- /dev/null
+++ b/x11-fonts/Xft/files/patch-xft-config.in
@@ -0,0 +1,11 @@
+--- xft-config.in.orig	Sat Jan 25 00:16:48 2003
++++ xft-config.in	Sat Jan 25 00:17:02 2003
+@@ -89,7 +89,7 @@
+ fi
+ 
+ if test "$echo_libs" = "yes" ; then
+- libs="-lXft ${freetypelibs} ${fontconfiglibs} ${xrenderlibs}"
++ libs="-lXft2 ${freetypelibs} ${fontconfiglibs} ${xrenderlibs}"
+  if test "${libdir}" != "/usr/lib" ; then
+   echo -L${libdir} $libs
+  else
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-xft-config.in b/x11-fonts/libXft/files/patch-xft-config.in
new file mode 100644
index 000000000000..3bc6bbb1277f
--- /dev/null
+++ b/x11-fonts/libXft/files/patch-xft-config.in
@@ -0,0 +1,11 @@
+--- xft-config.in.orig	Sat Jan 25 00:16:48 2003
++++ xft-config.in	Sat Jan 25 00:17:02 2003
+@@ -89,7 +89,7 @@
+ fi
+ 
+ if test "$echo_libs" = "yes" ; then
+- libs="-lXft ${freetypelibs} ${fontconfiglibs} ${xrenderlibs}"
++ libs="-lXft2 ${freetypelibs} ${fontconfiglibs} ${xrenderlibs}"
+  if test "${libdir}" != "/usr/lib" ; then
+   echo -L${libdir} $libs
+  else