Fix build with newer freetype2.

Patches obtained from FreeBSD.

4 files changed, 52 insertions, 6 deletions

diff --git a/fonts/ttmkfdir2/distinfo b/fonts/ttmkfdir2/distinfo
index a2dcaa7f70d..ed543215b5a 100644
--- a/fonts/ttmkfdir2/distinfo
+++ b/fonts/ttmkfdir2/distinfo
@@ -1,8 +1,10 @@
-$NetBSD: distinfo,v 1.4 2004/04/03 22:59:03 recht Exp $
+$NetBSD: distinfo,v 1.5 2004/04/28 00:10:04 recht Exp $
 
 SHA1 (ttmkfdir2.20021109.tar.bz2) = bee1944ce3e5b6c4503a14e6429737cc558a24c0
 Size (ttmkfdir2.20021109.tar.bz2) = 701900 bytes
 SHA1 (patch-aa) = b87eb0d1076674e18ac80840b97e73bfb265d9cb
 SHA1 (patch-ab) = 5c7e936fead9551b2b206abb512a9bbdcaadd101
-SHA1 (patch-ac) = 23eb6e500522a1ce826a9b0899d7afff6017d096
+SHA1 (patch-ac) = c29cd845647d67102a89476d931e5ee6bae63078
 SHA1 (patch-ad) = 0c328908ffae3397293ff6b00094444e23164788
+SHA1 (patch-ae) = 8544a176af1c079405371789955391b400f0154e
+SHA1 (patch-af) = 9153a8c65960ce70a176418da2c507370a06d98b
diff --git a/fonts/ttmkfdir2/patches/patch-ac b/fonts/ttmkfdir2/patches/patch-ac
index a77bf0c229d..b0345b532b7 100644
--- a/fonts/ttmkfdir2/patches/patch-ac
+++ b/fonts/ttmkfdir2/patches/patch-ac
@@ -1,8 +1,25 @@
-$NetBSD: patch-ac,v 1.2 2004/04/03 11:31:02 recht Exp $
+$NetBSD: patch-ac,v 1.3 2004/04/28 00:10:04 recht Exp $
 
---- ttf.h.orig	2002-11-07 06:28:44.000000000 +0100
-+++ ttf.h
-@@ -13,6 +13,8 @@
+--- ttf.h.orig	2004-04-28 02:03:16.000000000 +0200
++++ ttf.h	2004-04-28 02:03:35.000000000 +0200
+@@ -3,16 +3,19 @@
+ #define TTF_H__
+ 
+ #include <string>
+-#include "freetype/freetype.h"
+-#include "freetype/tttables.h"
+-#include "freetype/ftsnames.h"
+-#include "freetype/ttnameid.h"
+-#include "freetype/fterrors.h"
+-#include "freetype/ftmodule.h"
++#include <ft2build.h>
++#include FT_FREETYPE_H
++#include FT_TRUETYPE_TABLES_H
++#include FT_SFNT_NAMES_H
++#include FT_TRUETYPE_IDS_H
++#include FT_ERRORS_H
++#include FT_MODULE_H
+ 
  #include "util.h"
  #include "encoding.h"
  
diff --git a/fonts/ttmkfdir2/patches/patch-ae b/fonts/ttmkfdir2/patches/patch-ae
new file mode 100644
index 00000000000..f95a340653a
--- /dev/null
+++ b/fonts/ttmkfdir2/patches/patch-ae
@@ -0,0 +1,14 @@
+$NetBSD: patch-ae,v 1.1 2004/04/28 00:10:04 recht Exp $
+
+--- encoding.h.orig	2002-11-07 06:28:44.000000000 +0100
++++ encoding.h	2004-04-28 02:04:06.000000000 +0200
+@@ -6,7 +6,8 @@
+ #include <map>
+ #include <string>
+ 
+-#include "freetype/freetype.h"
++#include <ft2build.h>
++#include FT_FREETYPE_H
+ 
+ #include "util.h"
+ 
diff --git a/fonts/ttmkfdir2/patches/patch-af b/fonts/ttmkfdir2/patches/patch-af
new file mode 100644
index 00000000000..b725851af8a
--- /dev/null
+++ b/fonts/ttmkfdir2/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1 2004/04/28 00:10:04 recht Exp $
+
+--- encoding.cpp.orig	2002-11-07 06:28:44.000000000 +0100
++++ encoding.cpp	2004-04-28 02:04:02.000000000 +0200
+@@ -2,7 +2,7 @@
+ #include <cstdio>
+ #include <cstdlib>
+ #include <cstring>
+-#include "freetype/freetype.h"
++#include <ft2build.h>
+ 
+ #include "ttmkfdir.h"
+ #include "encoding.h"