Mon Dec 5 22:45:19 2011 UTC ()
Fix build with newer GCC


(joerg)
diff -r1.1.1.1 -r1.2 pkgsrc/games/qonk/distinfo
diff -r1.1.1.1 -r1.2 pkgsrc/games/qonk/patches/patch-ap
diff -r0 -r1.1 pkgsrc/games/qonk/patches/patch-src_lisp_lexer.cpp
diff -r0 -r1.1 pkgsrc/games/qonk/patches/patch-src_lisp_parser.cpp
diff -r0 -r1.1 pkgsrc/games/qonk/patches/patch-src_sdl__driver.cpp
cvs diff -r1.1.1.1 -r1.2 pkgsrc/games/qonk/distinfo (expand / switch to unified diff)

--- pkgsrc/games/qonk/distinfo 2007/11/25 23:52:54 1.1.1.1
+++ pkgsrc/games/qonk/distinfo 2011/12/05 22:45:19 1.2
@@ -1,18 +1,21 @@ @@ -1,18 +1,21 @@
1$NetBSD: distinfo,v 1.1.1.1 2007/11/25 23:52:54 wiz Exp $ 1$NetBSD: distinfo,v 1.2 2011/12/05 22:45:19 joerg Exp $
2 2
3SHA1 (qonk-0.3.1.tar.gz) = 703fc8282642ff20986c9a395dc6626d4b087ed9 3SHA1 (qonk-0.3.1.tar.gz) = 703fc8282642ff20986c9a395dc6626d4b087ed9
4RMD160 (qonk-0.3.1.tar.gz) = 6ed1ad1fb67cea6677d39d1201da1eca9ea4479b 4RMD160 (qonk-0.3.1.tar.gz) = 6ed1ad1fb67cea6677d39d1201da1eca9ea4479b
5Size (qonk-0.3.1.tar.gz) = 339374 bytes 5Size (qonk-0.3.1.tar.gz) = 339374 bytes
6SHA1 (patch-ac) = 8c592743dea66c79f66ed837b6654fe9876c0f1f 6SHA1 (patch-ac) = 8c592743dea66c79f66ed837b6654fe9876c0f1f
7SHA1 (patch-ad) = 08af7e53cfbcd759de117b9282901cc199cf5807 7SHA1 (patch-ad) = 08af7e53cfbcd759de117b9282901cc199cf5807
8SHA1 (patch-ae) = d12b8b49630b7f8493463ff1f5bd7d67e069b32c 8SHA1 (patch-ae) = d12b8b49630b7f8493463ff1f5bd7d67e069b32c
9SHA1 (patch-af) = f62af29a57fa85c0533f40297e351ee2cce65efb 9SHA1 (patch-af) = f62af29a57fa85c0533f40297e351ee2cce65efb
10SHA1 (patch-ag) = bdad6c84e4e30a4efd4bdb4b71b0c7989ce9e663 10SHA1 (patch-ag) = bdad6c84e4e30a4efd4bdb4b71b0c7989ce9e663
11SHA1 (patch-ai) = 30d460ba8fefa5750de57f21e388de943676be2c 11SHA1 (patch-ai) = 30d460ba8fefa5750de57f21e388de943676be2c
12SHA1 (patch-aj) = 3552364e02f60e32bbd1845a7ac8e3132fe13f52 12SHA1 (patch-aj) = 3552364e02f60e32bbd1845a7ac8e3132fe13f52
13SHA1 (patch-ak) = cc2f9d2d36d7ddcf983d856192133fe5979dbaec 13SHA1 (patch-ak) = cc2f9d2d36d7ddcf983d856192133fe5979dbaec
14SHA1 (patch-al) = d25bbb4919862d3340c460d47fcb3282cc3d386f 14SHA1 (patch-al) = d25bbb4919862d3340c460d47fcb3282cc3d386f
15SHA1 (patch-am) = 0a2db8a22684137dddc8f8bbafbf9d8c194d42b1 15SHA1 (patch-am) = 0a2db8a22684137dddc8f8bbafbf9d8c194d42b1
16SHA1 (patch-an) = 2fdf8c2e7e30389fa253beaef79e39ea8bbe5eda 16SHA1 (patch-an) = 2fdf8c2e7e30389fa253beaef79e39ea8bbe5eda
17SHA1 (patch-ao) = 36deb01bf80208e39e922738e0a181151f263a28 17SHA1 (patch-ao) = 36deb01bf80208e39e922738e0a181151f263a28
18SHA1 (patch-ap) = 401312074dd83ea63f2d7fdcb9606c673fd02956 18SHA1 (patch-ap) = 3f21ccc5a37e9c16648e532df10799c4a34675cd
 19SHA1 (patch-src_lisp_lexer.cpp) = d122f69dc0289c509ba93ece509a2c59fca1286f
 20SHA1 (patch-src_lisp_parser.cpp) = 4cafcda558d3b4a1bc0efb1ecbad55f045b58532
 21SHA1 (patch-src_sdl__driver.cpp) = 338a2aa7fa17761ff88d088cdd701be8d7c5fedf
cvs diff -r1.1.1.1 -r1.2 pkgsrc/games/qonk/patches/patch-ap (expand / switch to unified diff)

--- pkgsrc/games/qonk/patches/patch-ap 2007/11/25 23:52:54 1.1.1.1
+++ pkgsrc/games/qonk/patches/patch-ap 2011/12/05 22:45:19 1.2
@@ -1,13 +1,16 @@ @@ -1,13 +1,16 @@
1$NetBSD: patch-ap,v 1.1.1.1 2007/11/25 23:52:54 wiz Exp $ 1$NetBSD: patch-ap,v 1.2 2011/12/05 22:45:19 joerg Exp $
2 2
3--- src/videooptions.cpp.orig 2007-09-14 05:43:03.000000000 +0000 3--- src/videooptions.cpp.orig 2007-09-14 05:43:03.000000000 +0000
4+++ src/videooptions.cpp 4+++ src/videooptions.cpp
5@@ -3,7 +3,7 @@ 5@@ -1,9 +1,10 @@
 6 #include <vector>
 7 #include <sstream>
 8+#include <algorithm>
6  9
7 #include <SDL/SDL.h> 10 #include <SDL/SDL.h>
8  11
9-#include "guichan/guichan.hpp" 12-#include "guichan/guichan.hpp"
10+#include "guichan.hpp" 13+#include "guichan.hpp"
11  14
12 #include "ui/menuaction.h" 15 #include "ui/menuaction.h"
13  16
File Added: pkgsrc/games/qonk/patches/patch-src_lisp_lexer.cpp
$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"
File Added: pkgsrc/games/qonk/patches/patch-src_lisp_parser.cpp
$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"
File Added: pkgsrc/games/qonk/patches/patch-src_sdl__driver.cpp
$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"