[pkgsrc/trunk]: pkgsrc/fonts/ttf2pt1 build fix following the freetype2 update

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b34bb4522bbc
branches:  trunk
changeset: 632306:b34bb4522bbc
user:      spz <spz%pkgsrc.org@localhost>
date:      Sat Mar 22 22:02:11 2014 +0000

description:
build fix following the freetype2 update

diffstat:

 fonts/ttf2pt1/distinfo         |   4 ++--
 fonts/ttf2pt1/patches/patch-ab |  24 ++++++++++++++++++------
 2 files changed, 20 insertions(+), 8 deletions(-)

diffs (47 lines):

diff -r 7852c035c4d6 -r b34bb4522bbc fonts/ttf2pt1/distinfo
--- a/fonts/ttf2pt1/distinfo    Sat Mar 22 21:44:53 2014 +0000
+++ b/fonts/ttf2pt1/distinfo    Sat Mar 22 22:02:11 2014 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.5 2009/07/08 17:03:51 joerg Exp $
+$NetBSD: distinfo,v 1.6 2014/03/22 22:02:11 spz Exp $
 
 SHA1 (ttf2pt1-3.4.4.tgz) = 936771b11a740c16a8e0adb737b54b22cca18cb2
 RMD160 (ttf2pt1-3.4.4.tgz) = f88d7a26b30fa02055fd12ce1450220bd52d8df2
 Size (ttf2pt1-3.4.4.tgz) = 230547 bytes
 SHA1 (patch-aa) = 3168178e1801a876f5161e98f796c7796d40ab94
-SHA1 (patch-ab) = 4133a4ded43eec3da256eeea31ff35b9b8167351
+SHA1 (patch-ab) = 3c93b8179ed3d4e354813a79f492e6ddd9bcd132
diff -r 7852c035c4d6 -r b34bb4522bbc fonts/ttf2pt1/patches/patch-ab
--- a/fonts/ttf2pt1/patches/patch-ab    Sat Mar 22 21:44:53 2014 +0000
+++ b/fonts/ttf2pt1/patches/patch-ab    Sat Mar 22 22:02:11 2014 +0000
@@ -1,12 +1,24 @@
-$NetBSD: patch-ab,v 1.1 2004/04/27 15:18:08 adam Exp $
+$NetBSD: patch-ab,v 1.2 2014/03/22 22:02:11 spz Exp $
+
+make it deal gracefully with both freetype 2.4.* and 2.5.*
 
---- ft.c.orig  2004-04-27 10:58:11.000000000 +0000
+--- ft.c.orig  2003-12-31 21:30:50.000000000 +0000
 +++ ft.c
-@@ -12,6 +12,7 @@
+@@ -12,11 +12,12 @@
  #include <stdlib.h>
  #include <ctype.h>
  #include <sys/types.h>
+-#include <freetype/freetype.h>
+-#include <freetype/ftglyph.h>
+-#include <freetype/ftsnames.h>
+-#include <freetype/ttnameid.h>
+-#include <freetype/ftoutln.h>
 +#include <ft2build.h>
- #include <freetype/freetype.h>
- #include <freetype/ftglyph.h>
- #include <freetype/ftsnames.h>
++#include FT_FREETYPE_H
++#include FT_GLYPH_H
++#include FT_SFNT_NAMES_H
++#include FT_TRUETYPE_IDS_H
++#include FT_OUTLINE_H
+ #include "pt1.h"
+ #include "global.h"
+