From 285870d46ff6d5c5c774bb527535285d918b7c46 Mon Sep 17 00:00:00 2001
From: naddy <naddy@openbsd.org>
Date: Sat, 6 Nov 2004 16:15:08 +0000
Subject: [PATCH] update freetype includes

---
 x11/ttmkfdir/patches/patch-encoding_cpp | 17 ++++++++++++++---
 x11/ttmkfdir/patches/patch-encoding_h   | 13 +++++++++++++
 x11/ttmkfdir/patches/patch-ttf_h        | 23 +++++++++++++++++++++++
 3 files changed, 50 insertions(+), 3 deletions(-)
 create mode 100644 x11/ttmkfdir/patches/patch-encoding_h
 create mode 100644 x11/ttmkfdir/patches/patch-ttf_h

diff --git a/x11/ttmkfdir/patches/patch-encoding_cpp b/x11/ttmkfdir/patches/patch-encoding_cpp
index 080f47dc51d..59ccef055ff 100644
--- a/x11/ttmkfdir/patches/patch-encoding_cpp
+++ b/x11/ttmkfdir/patches/patch-encoding_cpp
@@ -1,6 +1,17 @@
---- encoding.cpp.orig	2002-11-07 05:28:44.000000000 +0000
-+++ encoding.cpp	2004-02-11 17:04:21.000000000 +0000
-@@ -44,7 +44,7 @@ namespace {
+$OpenBSD: patch-encoding_cpp,v 1.2 2004/11/06 16:15:08 naddy Exp $
+--- encoding.cpp.orig	Thu Nov  7 06:28:44 2002
++++ encoding.cpp	Sat Nov  6 16:49:09 2004
+@@ -2,7 +2,8 @@
+ #include <cstdio>
+ #include <cstdlib>
+ #include <cstring>
+-#include "freetype/freetype.h"
++#include <ft2build.h>
++#include FT_FREETYPE_H
+ 
+ #include "ttmkfdir.h"
+ #include "encoding.h"
+@@ -44,7 +45,7 @@ namespace {
  	
  	    strcat (name, file_name);
  
diff --git a/x11/ttmkfdir/patches/patch-encoding_h b/x11/ttmkfdir/patches/patch-encoding_h
new file mode 100644
index 00000000000..aab340aaa5d
--- /dev/null
+++ b/x11/ttmkfdir/patches/patch-encoding_h
@@ -0,0 +1,13 @@
+$OpenBSD: patch-encoding_h,v 1.1 2004/11/06 16:15:08 naddy Exp $
+--- encoding.h.orig	Sat Nov  6 16:51:50 2004
++++ encoding.h	Sat Nov  6 16:52:19 2004
+@@ -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/x11/ttmkfdir/patches/patch-ttf_h b/x11/ttmkfdir/patches/patch-ttf_h
new file mode 100644
index 00000000000..04a9376af94
--- /dev/null
+++ b/x11/ttmkfdir/patches/patch-ttf_h
@@ -0,0 +1,23 @@
+$OpenBSD: patch-ttf_h,v 1.1 2004/11/06 16:15:08 naddy Exp $
+--- ttf.h.orig	Sat Nov  6 16:39:58 2004
++++ ttf.h	Sat Nov  6 16:46:46 2004
+@@ -3,12 +3,13 @@
+ #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"