Sun Mar 23 08:21:11 2014 UTC ()
build fix following the freetype2 update


(spz)
diff -r1.11 -r1.12 pkgsrc/games/openmortal/distinfo
diff -r1.1 -r1.2 pkgsrc/games/openmortal/patches/patch-ae
cvs diff -r1.11 -r1.12 pkgsrc/games/openmortal/distinfo (expand / switch to unified diff)

--- pkgsrc/games/openmortal/distinfo 2010/07/02 16:48:54 1.11
+++ pkgsrc/games/openmortal/distinfo 2014/03/23 08:21:11 1.12
@@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
1$NetBSD: distinfo,v 1.11 2010/07/02 16:48:54 joerg Exp $ 1$NetBSD: distinfo,v 1.12 2014/03/23 08:21:11 spz Exp $
2 2
3SHA1 (openmortal-0.7.tar.bz2) = a7177012e1c0eb04f357aa9ff013e53c8f7b835c 3SHA1 (openmortal-0.7.tar.bz2) = a7177012e1c0eb04f357aa9ff013e53c8f7b835c
4RMD160 (openmortal-0.7.tar.bz2) = 6a0fdd46445ed243db261227a93526b97c6f9d79 4RMD160 (openmortal-0.7.tar.bz2) = 6a0fdd46445ed243db261227a93526b97c6f9d79
5Size (openmortal-0.7.tar.bz2) = 51197736 bytes 5Size (openmortal-0.7.tar.bz2) = 51197736 bytes
6SHA1 (patch-aa) = 8f9438695de1dd8fcb0e68f6cee9ee8efd2229c3 6SHA1 (patch-aa) = 8f9438695de1dd8fcb0e68f6cee9ee8efd2229c3
7SHA1 (patch-ab) = 1f7f9075975994e76262df4d3153f1162cb40dd3 7SHA1 (patch-ab) = 1f7f9075975994e76262df4d3153f1162cb40dd3
8SHA1 (patch-ac) = 807cfb849a4a3408c5877b61690bf0cf37da59b6 8SHA1 (patch-ac) = 807cfb849a4a3408c5877b61690bf0cf37da59b6
9SHA1 (patch-ad) = ad0fbd55c11a6076e9e5212b717a4b220820b206 9SHA1 (patch-ad) = ad0fbd55c11a6076e9e5212b717a4b220820b206
10SHA1 (patch-ae) = d0434959250bad25932963efafe34bb7fe948cee 10SHA1 (patch-ae) = 3f9c3fbfda30aae5cbf3fd8bc4e5100879cf825f
cvs diff -r1.1 -r1.2 pkgsrc/games/openmortal/patches/patch-ae (expand / switch to unified diff)

--- pkgsrc/games/openmortal/patches/patch-ae 2007/08/08 20:53:47 1.1
+++ pkgsrc/games/openmortal/patches/patch-ae 2014/03/23 08:21:11 1.2
@@ -1,12 +1,28 @@ @@ -1,12 +1,28 @@
1$NetBSD: patch-ae,v 1.1 2007/08/08 20:53:47 joerg Exp $ 1$NetBSD: patch-ae,v 1.2 2014/03/23 08:21:11 spz Exp $
2 2
3--- src/sge_tt_text.cpp.orig 2007-08-08 20:28:55.000000000 +0000 3add malloc.h
 4make it deal gracefully with both freetype 2.4.* and 2.5.*
 5
 6--- src/sge_tt_text.cpp.orig 2004-03-03 20:17:48.000000000 +0000
4+++ src/sge_tt_text.cpp 7+++ src/sge_tt_text.cpp
5@@ -26,7 +26,6 @@ 8@@ -26,7 +26,6 @@
6  9
7 #include "SDL.h" 10 #include "SDL.h"
8 #include <stdlib.h> 11 #include <stdlib.h>
9-#include <malloc.h> 12-#include <malloc.h>
10 #include <memory.h> 13 #include <memory.h>
11 #include <string.h> 14 #include <string.h>
12 #include <stdarg.h> 15 #include <stdarg.h>
 16@@ -37,9 +36,9 @@
 17
 18 #ifndef _SGE_NOTTF
 19 #include <ft2build.h>
 20-#include <freetype/freetype.h>
 21-#include <freetype/ftoutln.h>
 22-#include <freetype/ttnameid.h>
 23+#include FT_FREETYPE_H
 24+#include FT_OUTLINE_H
 25+#include FT_TRUETYPE_IDS_H
 26
 27 /* The structure used to hold glyph information (cached) */
 28 struct glyph {