build fix following the freetype2 update

note it still messes up run-time search paths for libXmu and libXext
for native X
This commit is contained in:
spz 2014-03-22 22:26:44 +00:00
parent a2503f0a86
commit 20048807c7
2 changed files with 12 additions and 7 deletions

View file

@ -1,8 +1,8 @@
$NetBSD: distinfo,v 1.6 2013/10/20 18:10:11 joerg Exp $
$NetBSD: distinfo,v 1.7 2014/03/22 22:26:44 spz Exp $
SHA1 (xmbdfed-4.5.tar.gz) = 325f2f3a8ae68b3f5d22ff9bdd115d30cdd743db
RMD160 (xmbdfed-4.5.tar.gz) = a6c1d9202e6d978dbc0aaa1fb6389a3d14b16c26
Size (xmbdfed-4.5.tar.gz) = 282055 bytes
SHA1 (patch-aa) = 9c01eb9c4d160e8747fe2f9d68bb16a2b6afc197
SHA1 (patch-ab) = eb5c46e723988cf9febf65f64e0b142ce8dccde3
SHA1 (patch-ab) = 2ddd129850dfc53e46ba0df8d62239ffb5fac0eb
SHA1 (patch-ac) = c62140d171ea96418d48ee4b236cde8bb87b545d

View file

@ -1,12 +1,17 @@
$NetBSD: patch-ab,v 1.1.1.1 2002/10/15 12:29:19 kei Exp $
$NetBSD: patch-ab,v 1.2 2014/03/22 22:26:44 spz Exp $
--- bdf.h.orig Wed Jul 4 10:21:42 2001
+++ bdf.h Wed Jul 4 10:22:01 2001
@@ -41,7 +41,7 @@
make it deal gracefully with both freetype 2.4.* and 2.5.*
--- bdf.h.orig 2001-09-19 21:00:42.000000000 +0000
+++ bdf.h
@@ -40,8 +40,9 @@
#endif /* HAVE_XLIB */
#ifdef HAVE_FREETYPE
#include <freetype.h>
-#include <freetype.h>
-#include <extend/ftxsbit.h>
+#include <ft2build.h>
+#include FT_FREETYPE_H
+#include <ftxsbit.h>
#endif /* HAVE_FREETYPE */