Fix build with png-1.5.

3 files changed, 42 insertions, 2 deletions

diff --git a/games/criticalmass/distinfo b/games/criticalmass/distinfo
index 29e49d8d09d..7dd9146f65d 100644
--- a/games/criticalmass/distinfo
+++ b/games/criticalmass/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.8 2010/06/13 22:44:18 wiz Exp $
+$NetBSD: distinfo,v 1.9 2011/06/20 09:30:03 wiz Exp $
 
 SHA1 (CriticalMass-1.0.2.tar.bz2) = d2d1f35183e9fbed76fd8da2a948745a4c89f20b
 RMD160 (CriticalMass-1.0.2.tar.bz2) = 6c0b6988f6a52c4b19fbca2525b1daec0202693d
 Size (CriticalMass-1.0.2.tar.bz2) = 5122126 bytes
-SHA1 (patch-aa) = c8f329fdf20df88a961e95b2a1fb8dbca85871f0
+SHA1 (patch-aa) = a5caa2facea22cd5e7d208540626ed2163d81f18
+SHA1 (patch-game_main.cpp) = 9dbf9b3de9de4ce97b0ed99ab4f4c983159124c0
+SHA1 (patch-utilssdl_PNG.cpp) = bf46226338a75c50c25f273f8b6cd956eb7d656c
diff --git a/games/criticalmass/patches/patch-game_main.cpp b/games/criticalmass/patches/patch-game_main.cpp
new file mode 100644
index 00000000000..b74dc4dc420
--- /dev/null
+++ b/games/criticalmass/patches/patch-game_main.cpp
@@ -0,0 +1,14 @@
+$NetBSD: patch-game_main.cpp,v 1.1 2011/06/20 09:30:03 wiz Exp $
+
+Add missing include (uncovered by png-1.5).
+
+--- game/main.cpp.orig	2006-06-30 03:46:11.000000000 +0000
++++ game/main.cpp
+@@ -24,6 +24,7 @@
+ #include <ResourceManager.hpp>
+ #include <GetDataPath.hpp>
+ #include <OnlineUpdate.hpp>
++#include <zlib.h>
+ 
+ #include <sys/stat.h>
+ #include <sys/types.h>
diff --git a/games/criticalmass/patches/patch-utilssdl_PNG.cpp b/games/criticalmass/patches/patch-utilssdl_PNG.cpp
new file mode 100644
index 00000000000..b0704c4fc12
--- /dev/null
+++ b/games/criticalmass/patches/patch-utilssdl_PNG.cpp
@@ -0,0 +1,24 @@
+$NetBSD: patch-utilssdl_PNG.cpp,v 1.1 2011/06/20 09:30:03 wiz Exp $
+
+Fix build with png-1.5.
+
+--- utilssdl/PNG.cpp.orig	2004-12-18 02:41:42.000000000 +0000
++++ utilssdl/PNG.cpp
+@@ -45,7 +45,7 @@ void PNG::writeData( png_structp png, pn
+ {
+     png_size_t check;
+ 
+-    check = fwrite( data, 1, length, (FILE *)(png->io_ptr));
++    check = fwrite( data, 1, length, (FILE *)(png_get_io_ptr(png)));
+     if( check != length)
+     {
+ 	png_error( png, "Write Error");
+@@ -72,7 +72,7 @@ bool PNG::init( FILE *fp, int width, int
+ 	return false;
+     }
+ 
+-    if( setjmp(_png->jmpbuf))
++    if( setjmp(png_jmpbuf(_png)))
+     {
+ 	fclose( fp);
+ 	png_destroy_write_struct(&_png, (png_infopp)NULL);