From 182373cbb4d3e857689ca9b26b6846ba94e6d829 Mon Sep 17 00:00:00 2001
From: espie <espie@openbsd.org>
Date: Sun, 7 Nov 2004 10:11:23 +0000
Subject: [PATCH] fix X.org fallout, partly from the idiots at X.org, and from
 the morons that do libwmf (how stupid can you get while looking for headers
 ???)

---
 graphics/libwmf/patches/patch-configure_ac    | 25 +++++++++++++++++++
 .../patches/patch-include_libwmf_types_h      | 13 ++++++++++
 .../libwmf/patches/patch-src_extra_gd_gdft_c  | 15 +++++++++++
 3 files changed, 53 insertions(+)
 create mode 100644 graphics/libwmf/patches/patch-configure_ac
 create mode 100644 graphics/libwmf/patches/patch-include_libwmf_types_h
 create mode 100644 graphics/libwmf/patches/patch-src_extra_gd_gdft_c

diff --git a/graphics/libwmf/patches/patch-configure_ac b/graphics/libwmf/patches/patch-configure_ac
new file mode 100644
index 00000000000..44d05d1198d
--- /dev/null
+++ b/graphics/libwmf/patches/patch-configure_ac
@@ -0,0 +1,25 @@
+$OpenBSD: patch-configure_ac,v 1.1 2004/11/07 10:11:23 espie Exp $
+--- configure.ac.orig	Sun Nov  7 10:48:31 2004
++++ configure.ac	Sun Nov  7 10:52:01 2004
+@@ -433,16 +433,12 @@ AC_CHECK_HEADER(freetype/freetype.h,[
+ ])
+ 
+ if [ test "$have_ft_header" != "yes" ]; then
+-	no_ft_cppflags=$CPPFLAGS
+-	CPPFLAGS="-I/usr/include/freetype2 $CPPFLAGS"
+ 	AC_CHECK_HEADER(freetype/ftglyph.h,[
+-		WMF_FT_CFLAGS="-I/usr/include/freetype2"
+-		WMF_FT_CONFIG_CFLAGS="-I/usr/include/freetype2"
+-	],[	CPPFLAGS=$no_ft_cppflags
+-		CPPFLAGS="-I/usr/local/include/freetype2 -I/usr/local/include $CPPFLAGS"
+-		AC_CHECK_HEADER(freetype/fttypes.h,[
+-			WMF_FT_CFLAGS="-I/usr/local/include/freetype2 -I/usr/local/include"
+-			WMF_FT_CONFIG_CFLAGS="-I/usr/local/include/freetype2 -I/usr/local/include"
++		WMF_FT_CFLAGS="$freetype_cflags"
++		WMF_FT_CONFIG_CFLAGS="$freetype_cflags"
++	],[	AC_CHECK_HEADER(freetype/fttypes.h,[
++			WMF_FT_CFLAGS="$freetype_cflags"
++			WMF_FT_CONFIG_CFLAGS="$freetype_cflags"
+ 		],[	AC_MSG_ERROR([* * * Okay, I give up. Where are those darned headers? * * *])
+ 		])
+ 	])
diff --git a/graphics/libwmf/patches/patch-include_libwmf_types_h b/graphics/libwmf/patches/patch-include_libwmf_types_h
new file mode 100644
index 00000000000..73df7e79650
--- /dev/null
+++ b/graphics/libwmf/patches/patch-include_libwmf_types_h
@@ -0,0 +1,13 @@
+$OpenBSD: patch-include_libwmf_types_h,v 1.1 2004/11/07 10:11:23 espie Exp $
+--- include/libwmf/types.h.orig	Sun Nov  7 10:56:56 2004
++++ include/libwmf/types.h	Sun Nov  7 10:57:14 2004
+@@ -23,7 +23,8 @@
+ #include <stdio.h>
+ #include <sys/types.h>
+ 
+-#include <freetype/freetype.h>
++#include <ft2build.h>
++#include FT_FREETYPE_H
+ 
+ #include <libwmf/fund.h>
+ 
diff --git a/graphics/libwmf/patches/patch-src_extra_gd_gdft_c b/graphics/libwmf/patches/patch-src_extra_gd_gdft_c
new file mode 100644
index 00000000000..c200ca53b37
--- /dev/null
+++ b/graphics/libwmf/patches/patch-src_extra_gd_gdft_c
@@ -0,0 +1,15 @@
+$OpenBSD: patch-src_extra_gd_gdft_c,v 1.1 2004/11/07 10:11:23 espie Exp $
+--- src/extra/gd/gdft.c.orig	Sun Nov  7 10:53:55 2004
++++ src/extra/gd/gdft.c	Sun Nov  7 10:56:03 2004
+@@ -39,8 +39,9 @@ gdImageStringFT (gdImage * im, int *brec
+ #else
+ 
+ #include "gdcache.h"
+-#include "freetype/freetype.h"
+-#include "freetype/ftglyph.h"
++#include <ft2build.h>
++#include FT_FREETYPE_H
++#include FT_GLYPH_H
+ 
+ /* number of fonts cached before least recently used is replaced */
+ #define FONTCACHESIZE 6