build fix following the freetype2 update

4 files changed, 40 insertions, 5 deletions

diff --git a/games/openmortal/distinfo b/games/openmortal/distinfo
index 315588e3ca2..3b7922b002c 100644
--- a/games/openmortal/distinfo
+++ b/games/openmortal/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2010/07/02 16:48:54 joerg Exp $
+$NetBSD: distinfo,v 1.12 2014/03/23 08:21:11 spz Exp $
 
 SHA1 (openmortal-0.7.tar.bz2) = a7177012e1c0eb04f357aa9ff013e53c8f7b835c
 RMD160 (openmortal-0.7.tar.bz2) = 6a0fdd46445ed243db261227a93526b97c6f9d79
@@ -7,4 +7,4 @@ SHA1 (patch-aa) = 8f9438695de1dd8fcb0e68f6cee9ee8efd2229c3
 SHA1 (patch-ab) = 1f7f9075975994e76262df4d3153f1162cb40dd3
 SHA1 (patch-ac) = 807cfb849a4a3408c5877b61690bf0cf37da59b6
 SHA1 (patch-ad) = ad0fbd55c11a6076e9e5212b717a4b220820b206
-SHA1 (patch-ae) = d0434959250bad25932963efafe34bb7fe948cee
+SHA1 (patch-ae) = 3f9c3fbfda30aae5cbf3fd8bc4e5100879cf825f
diff --git a/games/openmortal/patches/patch-ae b/games/openmortal/patches/patch-ae
index d9cf42a4159..10559e9dbfc 100644
--- a/games/openmortal/patches/patch-ae
+++ b/games/openmortal/patches/patch-ae
@@ -1,6 +1,9 @@
-$NetBSD: patch-ae,v 1.1 2007/08/08 20:53:47 joerg Exp $
+$NetBSD: patch-ae,v 1.2 2014/03/23 08:21:11 spz Exp $
 
---- src/sge_tt_text.cpp.orig	2007-08-08 20:28:55.000000000 +0000
+add malloc.h
+make it deal gracefully with both freetype 2.4.* and 2.5.*
+
+--- src/sge_tt_text.cpp.orig	2004-03-03 20:17:48.000000000 +0000
 +++ src/sge_tt_text.cpp
 @@ -26,7 +26,6 @@
  
@@ -10,3 +13,16 @@ $NetBSD: patch-ae,v 1.1 2007/08/08 20:53:47 joerg Exp $
  #include <memory.h>
  #include <string.h>
  #include <stdarg.h>
+@@ -37,9 +36,9 @@
+ 
+ #ifndef _SGE_NOTTF
+ #include <ft2build.h>
+-#include <freetype/freetype.h>
+-#include <freetype/ftoutln.h>
+-#include <freetype/ttnameid.h>
++#include FT_FREETYPE_H
++#include FT_OUTLINE_H
++#include FT_TRUETYPE_IDS_H
+ 
+ /* The structure used to hold glyph information (cached) */
+ struct glyph {
diff --git a/print/paps/distinfo b/print/paps/distinfo
index 784df812ee3..46f78d65126 100644
--- a/print/paps/distinfo
+++ b/print/paps/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2012/02/14 20:07:32 wiz Exp $
+$NetBSD: distinfo,v 1.2 2014/03/23 08:14:23 spz Exp $
 
 SHA1 (paps-0.6.8.tar.gz) = 83646b0de89deb8321f260c2c5a665bc7c8f5928
 RMD160 (paps-0.6.8.tar.gz) = f8dda178279a4e5903b45b803e8a3ae42df3afdd
 Size (paps-0.6.8.tar.gz) = 460062 bytes
+SHA1 (patch-src_libpaps.c) = 5bb4d91497500bfe53f25f03b33dff75c3431028
diff --git a/print/paps/patches/patch-src_libpaps.c b/print/paps/patches/patch-src_libpaps.c
new file mode 100644
index 00000000000..e8bc2a399bb
--- /dev/null
+++ b/print/paps/patches/patch-src_libpaps.c
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_libpaps.c,v 1.1 2014/03/23 08:14:23 spz Exp $
+
+make it deal gracefully with both freetype 2.4.* and 2.5.*
+
+--- src/libpaps.c.orig	2007-01-19 11:17:11.000000000 +0000
++++ src/libpaps.c
+@@ -25,8 +25,9 @@
+ 
+ #include <pango/pango.h>
+ #include <pango/pangoft2.h>
+-#include <freetype/ftglyph.h>
+-#include <freetype/ftoutln.h>
++#include <ft2build.h>
++#include FT_GLYPH_H
++#include FT_OUTLINE_H
+ #include <errno.h>
+ #include <stdlib.h>
+ #include <stdio.h>