[pkgsrc/trunk]: pkgsrc/graphics/dia build fix following the freetype2 update

[spz <spz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/43fb966bf4b6
branches:  trunk
changeset: 632317:43fb966bf4b6
user:      spz <spz%pkgsrc.org@localhost>
date:      Sun Mar 23 09:07:15 2014 +0000

description:
build fix following the freetype2 update

diffstat:

 graphics/dia/distinfo                                             |   3 +-
 graphics/dia/patches/patch-plug-ins_postscript_diapsft2renderer.c |  18 ++++++++++
 2 files changed, 20 insertions(+), 1 deletions(-)

diffs (38 lines):

diff -r beb44f6d9b1f -r 43fb966bf4b6 graphics/dia/distinfo
--- a/graphics/dia/distinfo     Sun Mar 23 08:14:23 2014 +0000
+++ b/graphics/dia/distinfo     Sun Mar 23 09:07:15 2014 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.29 2013/07/16 12:11:29 prlw1 Exp $
+$NetBSD: distinfo,v 1.30 2014/03/23 09:07:15 spz Exp $
 
 SHA1 (dia-0.97.2.tar.xz) = dc7ed6f8cd83acc8f421d28f30e4042fe370e9ba
 RMD160 (dia-0.97.2.tar.xz) = f9270f1f2cb6ad505219463827d02e3759693796
@@ -12,5 +12,6 @@
 SHA1 (patch-cd) = b7dd72a359fe6f36a56d2c16f94427c6977b0477
 SHA1 (patch-da) = 4ed80c2a7eaa2dbbebd8265c8b74faac20c4f6c2
 SHA1 (patch-objects_custom_shape__typeinfo_c) = 128477ab7cc363a490e042062379585800893626
+SHA1 (patch-plug-ins_postscript_diapsft2renderer.c) = c4933ba0133aca4e6816e796499f9710158f333d
 SHA1 (patch-tests_test-boundingbox_c) = f05fe01fd2d79bf5b519808aa491458040097fb7
 SHA1 (patch-tests_test-objects_c) = 759b788aa55e3256758514906c1ce812fb3b6aba
diff -r beb44f6d9b1f -r 43fb966bf4b6 graphics/dia/patches/patch-plug-ins_postscript_diapsft2renderer.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/dia/patches/patch-plug-ins_postscript_diapsft2renderer.c Sun Mar 23 09:07:15 2014 +0000
@@ -0,0 +1,18 @@
+$NetBSD: patch-plug-ins_postscript_diapsft2renderer.c,v 1.1 2014/03/23 09:07:15 spz Exp $
+
+make it deal gracefully with both freetype 2.4.* and 2.5.*
+
+--- plug-ins/postscript/diapsft2renderer.c.orig        2009-11-07 17:13:53.000000000 +0000
++++ plug-ins/postscript/diapsft2renderer.c
+@@ -29,8 +29,9 @@
+ #include <pango/pangoft2.h>
+ #include <pango/pango-engine.h>
+ /* I'd really rather avoid this */
+-#include <freetype/ftglyph.h>
+-#include <freetype/ftoutln.h>
++#include <ft2build.h>
++#include FT_GLYPH_H
++#include FT_OUTLINE_H
+ 
+ #define DPI 300
+