Fix build with newer GCC

5 files changed, 46 insertions, 4 deletions

diff --git a/games/qonk/distinfo b/games/qonk/distinfo
index 3055e16e4e4..073dd95dd65 100644
--- a/games/qonk/distinfo
+++ b/games/qonk/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2007/11/25 23:52:54 wiz Exp $
+$NetBSD: distinfo,v 1.2 2011/12/05 22:45:19 joerg Exp $
 
 SHA1 (qonk-0.3.1.tar.gz) = 703fc8282642ff20986c9a395dc6626d4b087ed9
 RMD160 (qonk-0.3.1.tar.gz) = 6ed1ad1fb67cea6677d39d1201da1eca9ea4479b
@@ -15,4 +15,7 @@ SHA1 (patch-al) = d25bbb4919862d3340c460d47fcb3282cc3d386f
 SHA1 (patch-am) = 0a2db8a22684137dddc8f8bbafbf9d8c194d42b1
 SHA1 (patch-an) = 2fdf8c2e7e30389fa253beaef79e39ea8bbe5eda
 SHA1 (patch-ao) = 36deb01bf80208e39e922738e0a181151f263a28
-SHA1 (patch-ap) = 401312074dd83ea63f2d7fdcb9606c673fd02956
+SHA1 (patch-ap) = 3f21ccc5a37e9c16648e532df10799c4a34675cd
+SHA1 (patch-src_lisp_lexer.cpp) = d122f69dc0289c509ba93ece509a2c59fca1286f
+SHA1 (patch-src_lisp_parser.cpp) = 4cafcda558d3b4a1bc0efb1ecbad55f045b58532
+SHA1 (patch-src_sdl__driver.cpp) = 338a2aa7fa17761ff88d088cdd701be8d7c5fedf
diff --git a/games/qonk/patches/patch-ap b/games/qonk/patches/patch-ap
index 37977ebec45..a353356b44e 100644
--- a/games/qonk/patches/patch-ap
+++ b/games/qonk/patches/patch-ap
@@ -1,8 +1,11 @@
-$NetBSD: patch-ap,v 1.1.1.1 2007/11/25 23:52:54 wiz Exp $
+$NetBSD: patch-ap,v 1.2 2011/12/05 22:45:19 joerg Exp $
 
 --- src/videooptions.cpp.orig	2007-09-14 05:43:03.000000000 +0000
 +++ src/videooptions.cpp
-@@ -3,7 +3,7 @@
+@@ -1,9 +1,10 @@
+ #include <vector>
+ #include <sstream>
++#include <algorithm>
  
  #include <SDL/SDL.h>
  
diff --git a/games/qonk/patches/patch-src_lisp_lexer.cpp b/games/qonk/patches/patch-src_lisp_lexer.cpp
new file mode 100644
index 00000000000..b2d29201b6e
--- /dev/null
+++ b/games/qonk/patches/patch-src_lisp_lexer.cpp
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_lisp_lexer.cpp,v 1.1 2011/12/05 22:45:19 joerg Exp $
+
+--- src/lisp/lexer.cpp.orig	2011-12-05 21:37:43.000000000 +0000
++++ src/lisp/lexer.cpp
+@@ -19,6 +19,7 @@
+ //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ #include <sstream>
+ #include <stdexcept>
++#include <cstring>
+ 
+ #include "lexer.hpp"
+ #include "translation.hpp"
diff --git a/games/qonk/patches/patch-src_lisp_parser.cpp b/games/qonk/patches/patch-src_lisp_parser.cpp
new file mode 100644
index 00000000000..4e0feee4879
--- /dev/null
+++ b/games/qonk/patches/patch-src_lisp_parser.cpp
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_lisp_parser.cpp,v 1.1 2011/12/05 22:45:19 joerg Exp $
+
+--- src/lisp/parser.cpp.orig	2011-12-05 21:38:05.000000000 +0000
++++ src/lisp/parser.cpp
+@@ -22,6 +22,7 @@
+ #include <fstream>
+ 
+ #include <cassert>
++#include <cstring>
+ 
+ #include "parser.hpp"
+ #include "lisp.hpp"
diff --git a/games/qonk/patches/patch-src_sdl__driver.cpp b/games/qonk/patches/patch-src_sdl__driver.cpp
new file mode 100644
index 00000000000..c82f54963b4
--- /dev/null
+++ b/games/qonk/patches/patch-src_sdl__driver.cpp
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_sdl__driver.cpp,v 1.1 2011/12/05 22:45:19 joerg Exp $
+
+--- src/sdl_driver.cpp.orig	2011-12-05 21:39:04.000000000 +0000
++++ src/sdl_driver.cpp
+@@ -5,6 +5,7 @@
+ #include <SDL/SDL.h>
+ #include <SDL/SDL_ttf.h>
+ #include <cstdio>
++#include <cstdlib>
+ 
+ #include "sdl_driver.h"
+ #include "canvas.h"