From 2c0949bf8ea2a1d82e2c9995ade35dd2f6e0e7fc Mon Sep 17 00:00:00 2001
From: Michael Nottebrock <lofi@FreeBSD.org>
Date: Wed, 17 Mar 2004 07:04:14 +0000
Subject: Fix build with freetype2-2.1.7.

---
 x11/XFree86-4-clients/Makefile                  |  2 +-
 x11/XFree86-4-clients/files/patch-mkfontscale.c | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 x11/XFree86-4-clients/files/patch-mkfontscale.c

(limited to 'x11')

diff --git a/x11/XFree86-4-clients/Makefile b/x11/XFree86-4-clients/Makefile
index c75cef7ef77b..e6545b68cd6f 100644
--- a/x11/XFree86-4-clients/Makefile
+++ b/x11/XFree86-4-clients/Makefile
@@ -37,7 +37,7 @@ XINSTALL_DIRS=		programs fonts/util
 XINSTALL_MAN_DIRS=	programs
 
 .for pf in patch-bdftruncate.pl patch-ucs2any.pl \
-	   patch-Xres.cpp patch-Imake.rules
+	   patch-Xres.cpp patch-Imake.rules patch-mkfontscale.c
 EXTRA_PATCHES+=		${FILESDIR}/${pf}
 .endfor
 
diff --git a/x11/XFree86-4-clients/files/patch-mkfontscale.c b/x11/XFree86-4-clients/files/patch-mkfontscale.c
new file mode 100644
index 000000000000..8f9a2f2f6be3
--- /dev/null
+++ b/x11/XFree86-4-clients/files/patch-mkfontscale.c
@@ -0,0 +1,12 @@
+--- programs/mkfontscale/mkfontscale.c.orig	Wed Mar 17 07:01:52 2004
++++ programs/mkfontscale/mkfontscale.c	Wed Mar 17 07:03:10 2004
+@@ -29,7 +29,8 @@
+ #include <dirent.h>
+ 
+ #include <X11/fonts/fontenc.h>
+-#include <freetype/freetype.h>
++#include <ft2build.h>
++#include FT_FREETYPE_H
+ #include <freetype/ftsnames.h>
+ #include <freetype/tttables.h>
+ #include <freetype/ttnameid.h>
-- 
cgit v1.2.3