Fix XFree86-4-libraries after Xft renaming removal:

Add `pkg-config xft --cflags` and --libs to Imakefiles of programs that use Xft
and remove a bit of code not needed for Xft2, remove xftcache program.

Reported by:	many

8 files changed, 62 insertions, 3 deletions

diff --git a/x11/XFree86-4-clients/Makefile b/x11/XFree86-4-clients/Makefile
index eb2764026aae..1752afac36d8 100644
--- a/x11/XFree86-4-clients/Makefile
+++ b/x11/XFree86-4-clients/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	clients
 PORTVERSION=	4.2.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XFREE}
 MASTER_SITE_SUBDIR=	4.2.0
diff --git a/x11/XFree86-4-clients/files/manpages b/x11/XFree86-4-clients/files/manpages
index a8229eff870e..c7b83b350efe 100644
--- a/x11/XFree86-4-clients/files/manpages
+++ b/x11/XFree86-4-clients/files/manpages
@@ -57,7 +57,6 @@ MAN1=	Xmark.1 \
 	xfindproxy.1 \
 	xfontsel.1 \
 	xfsinfo.1 \
-	xftcache.1 \
 	xfwp.1 \
 	xgamma.1 \
 	xgc.1 \
diff --git a/x11/XFree86-4-clients/pkg-plist b/x11/XFree86-4-clients/pkg-plist
index f8772e3c973c..70ce68def1dd 100644
--- a/x11/XFree86-4-clients/pkg-plist
+++ b/x11/XFree86-4-clients/pkg-plist
@@ -60,7 +60,6 @@ bin/xfd
 bin/xfindproxy
 bin/xfontsel
 bin/xfsinfo
-bin/xftcache
 bin/xfwp
 bin/xgamma
 bin/xgc
diff --git a/x11/XFree86-4-libraries/files/patch-do_text.c b/x11/XFree86-4-libraries/files/patch-do_text.c
new file mode 100644
index 000000000000..adfd02fb0db4
--- /dev/null
+++ b/x11/XFree86-4-libraries/files/patch-do_text.c
@@ -0,0 +1,17 @@
+--- programs/x11perf/do_text.c.orig	Wed Feb 19 07:39:37 2003
++++ programs/x11perf/do_text.c	Wed Feb 19 07:39:39 2003
+@@ -421,14 +421,6 @@
+ 	       p->font);
+ 	return 0;
+     }
+-
+-    if (aafont->core)
+-    {
+-	printf ("FreeType font '%s' not available, benchmark omitted\n",
+-		p->font);
+-	XftFontClose (xp->d, aafont);
+-	return 0;
+-    }
+     
+     aadraw = XftDrawCreate (xp->d, xp->w, 
+ 			    DefaultVisual (xp->d, DefaultScreen (xp->d)), 
diff --git a/x11/XFree86-4-libraries/files/patch-programs-Imakefile b/x11/XFree86-4-libraries/files/patch-programs-Imakefile
new file mode 100644
index 000000000000..3647855ffe53
--- /dev/null
+++ b/x11/XFree86-4-libraries/files/patch-programs-Imakefile
@@ -0,0 +1,11 @@
+--- programs/Imakefile.orig	Tue Feb 18 23:53:09 2003
++++ programs/Imakefile	Tue Feb 18 23:54:11 2003
+@@ -127,7 +127,7 @@
+ 	$(XTERMSRCDIR) $(XTRAPCLIENTDIRS) $(XVIDTUNESRCDIR) xwd xwininfo xwud \
+ 	$(XPMCLIENTDIRS) $(XVINFOSRCDIR) \
+ 	$(XSSRCDIR) $(XASSRCDIR) $(LBXPROXYSRCDIR) $(SCRIPTSDIR) \
+-	$(GLXCLIENTDIRS) $(XFTCACHEDIR) $(XRANDRDIR)
++	$(GLXCLIENTDIRS) $(XRANDRDIR)
+ #endif
+ 
+ MakeSubdirs($(SUBDIRS))
diff --git a/x11/XFree86-4-libraries/files/patch-x11perf-Imakefile b/x11/XFree86-4-libraries/files/patch-x11perf-Imakefile
new file mode 100644
index 000000000000..f39a57cc03e5
--- /dev/null
+++ b/x11/XFree86-4-libraries/files/patch-x11perf-Imakefile
@@ -0,0 +1,11 @@
+--- programs/x11perf/Imakefile.orig	Tue Feb 18 23:05:33 2003
++++ programs/x11perf/Imakefile	Tue Feb 18 23:06:18 2003
+@@ -17,6 +17,8 @@
+         XFTDEPS = XftClientDepLibs $(DEPXRENDERLIB)
+         XFTLIBS = XftClientLibs $(XRENDERLIB)
+ #endif
++        XFTDEFS = -DXFT `pkg-config xft --cflags`
++        XFTLIBS = `pkg-config xft --libs`
+         DEFINES = $(SIGNAL_DEFINES) $(SHMDEFS) $(XFTDEFS)
+         PERFLIB = X11perfcompLib
+         HEADERS = x11perf.h bitmaps.h
diff --git a/x11/XFree86-4-libraries/files/patch-xditview-Imakefile b/x11/XFree86-4-libraries/files/patch-xditview-Imakefile
new file mode 100644
index 000000000000..74fc94cabb96
--- /dev/null
+++ b/x11/XFree86-4-libraries/files/patch-xditview-Imakefile
@@ -0,0 +1,11 @@
+--- programs/xditview/Imakefile.orig	Tue Feb 18 23:44:48 2003
++++ programs/xditview/Imakefile	Tue Feb 18 23:45:10 2003
+@@ -12,6 +12,8 @@
+        FONTLIBS = XftClientLibs
+        FONTDEFS = -DUSE_XFT
+ #endif
++       FONTLIBS = `pkg-config xft --libs`
++       FONTDEFS = -DUSE_XFT `pkg-config xft --cflags`
+ #if HasMkstemp
+        TEMPDEFS = -DHAS_MKSTEMP
+ #endif
diff --git a/x11/XFree86-4-libraries/files/patch-xterm-Imakefile b/x11/XFree86-4-libraries/files/patch-xterm-Imakefile
new file mode 100644
index 000000000000..d8a85f8e929d
--- /dev/null
+++ b/x11/XFree86-4-libraries/files/patch-xterm-Imakefile
@@ -0,0 +1,11 @@
+--- programs/xterm/Imakefile.orig	Tue Feb 18 23:49:54 2003
++++ programs/xterm/Imakefile	Tue Feb 18 23:50:10 2003
+@@ -103,6 +103,8 @@
+         XRFLIBS = XftClientLibs $(XRENDERLIB)
+      XRFDEPLIBS = XftClientDepLibs $(DEPXRENDERLIB)
+ #endif
++         XRFDEF = -DXRENDERFONT `pkg-config xft --cflags`
++        XRFLIBS = `pkg-config xft --libs`
+ 
+    MAIN_DEFINES = $(UTMPDEF) $(TTYGROUPDEF) $(PUCCPTYDDEF) $(NOPOSIXTERMIOS) \
+ 		  -DOSMAJORVERSION=$(OSMAJORVERSION) \