Fix build with newer GCC.

12 files changed, 128 insertions, 35 deletions

diff --git a/games/xevil/distinfo b/games/xevil/distinfo
index d29d2bb7008..6a2e97c7e01 100644
--- a/games/xevil/distinfo
+++ b/games/xevil/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2008/08/17 23:50:06 dholland Exp $
+$NetBSD: distinfo,v 1.8 2011/11/27 19:43:33 joerg Exp $
 
 SHA1 (xevilsrc2.02r2.zip) = e9a262daffc7ee5c06196dc94cf35c199be86bbc
 RMD160 (xevilsrc2.02r2.zip) = dca82298ac2dfe66e4e92a02731bb6851563b67e
@@ -11,15 +11,20 @@ SHA1 (patch-af) = 4d1e6e7cfa7c1b4423ac9edc8f3ece68dbab9b79
 SHA1 (patch-ag) = c826c7ee631b3661ca78fe243b6aeb1ff37d73e2
 SHA1 (patch-ah) = b78acf6e01bd555024eb1a6a5d80ab8c393de4c5
 SHA1 (patch-ai) = 8579f4f6594ff2d01c35c2becc7cf395a5195550
-SHA1 (patch-aj) = e7ec143b757de6f07693bc6e192f6d9e913ce252
-SHA1 (patch-ak) = 28afd60df44748a759fbce3a989d3b44b5cf63f4
+SHA1 (patch-aj) = 78214c3bf9d643f9f8ade8c24944eea6b976ea6c
+SHA1 (patch-ak) = a83854de16104e124213e3990597555c21533411
 SHA1 (patch-al) = 2530864b88b66b5c45b0996cb65269899b115e3f
 SHA1 (patch-am) = 9250c6c734b22f1edf63040e2c70579917593f59
 SHA1 (patch-an) = 4325b3ff1f32a9b09b540bcc0b482acdf8e96237
-SHA1 (patch-ao) = 6ded6c8cc125765928b363dda435c14a3f58fd1c
-SHA1 (patch-ap) = a4e4ab0655c218c18d195964ed65db2e1487c895
+SHA1 (patch-ao) = 85f4b0f2238ea1cbfe3ed16a9cd58ed2c64a0da1
+SHA1 (patch-ap) = 7fb4d991f629ee5f36718a047ce4667c563fd95b
 SHA1 (patch-aq) = 2a781bd3118bda38244f7b7a0bb1a202a90c3983
 SHA1 (patch-ar) = 8be1ce3f1ed2bd55dfc77042fa5f62fc6b036903
-SHA1 (patch-as) = 8220ca95a190cc40eab516a8f3bc47491a4c9874
-SHA1 (patch-at) = 308f449ad894daba7da6ad6e6c2239e2d713b660
+SHA1 (patch-as) = 4c4e4ef0e626b8f04a120c996ec155cacf0c0ddf
+SHA1 (patch-at) = 79eeea82adaa8727cb5104068168cd9c0ffff621
 SHA1 (patch-au) = f1092ff4228d4bb6f13e6aeb0ea70a5b4b9635b6
+SHA1 (patch-cmn_game.h) = 47db702d729158290118cf75a0c437362f9af1c3
+SHA1 (patch-cmn_streams.cpp) = bb32e15807cc5ff2289df2e1dc1c1661c8949ad4
+SHA1 (patch-cmn_world.cpp) = 7bae7dfe426bf7dcf06906d62cd60c50efe98d4f
+SHA1 (patch-x11_main.cpp) = 425c3be3de05666293e47ce37ec9ff255c456c25
+SHA1 (patch-x11_xdata.cpp) = 0942dda395ca3bf1038a900e985a27b3e655d484
diff --git a/games/xevil/patches/patch-aj b/games/xevil/patches/patch-aj
index aed1af721d4..5a49f15ab73 100644
--- a/games/xevil/patches/patch-aj
+++ b/games/xevil/patches/patch-aj
@@ -1,8 +1,8 @@
-$NetBSD: patch-aj,v 1.1.1.1 2005/01/25 15:59:27 xtraeme Exp $
+$NetBSD: patch-aj,v 1.2 2011/11/27 19:43:33 joerg Exp $
 
---- cmn/game.cpp.orig	2003-11-22 11:25:45.000000000 -0800
-+++ cmn/game.cpp	2003-11-22 11:26:04.000000000 -0800
-@@ -34,7 +34,8 @@
+--- cmn/game.cpp.orig	2003-03-22 22:20:00.000000000 +0000
++++ cmn/game.cpp
+@@ -34,13 +34,14 @@ extern "C" {
  }
  
  #if X11
@@ -12,3 +12,10 @@ $NetBSD: patch-aj,v 1.1.1.1 2005/01/25 15:59:27 xtraeme Exp $
  #endif
  #if WIN32
  #include <strstrea.h>
+ #endif
+ 
+-#include <iomanip.h>
++#include <iomanip>
+ 
+ #include "utils.h"
+ #include "coord.h"
diff --git a/games/xevil/patches/patch-ak b/games/xevil/patches/patch-ak
index aa3eb68676c..03406c0f7cb 100644
--- a/games/xevil/patches/patch-ak
+++ b/games/xevil/patches/patch-ak
@@ -1,12 +1,13 @@
-$NetBSD: patch-ak,v 1.2 2008/08/17 23:50:06 dholland Exp $
+$NetBSD: patch-ak,v 1.3 2011/11/27 19:43:33 joerg Exp $
 
---- cmn/physical.cpp.orig	2000-01-19 20:38:14.000000000 -0500
-+++ cmn/physical.cpp	2008-08-17 19:15:00.000000000 -0400
-@@ -33,10 +33,11 @@
+--- cmn/physical.cpp.orig	2000-01-19 20:38:14.000000000 +0000
++++ cmn/physical.cpp
+@@ -33,10 +33,12 @@
  // Include Files
  #include "xdata.h"
  #include "physical.h"
 -#include <iostream.h>
++#include <inttypes.h>
 +#include <iostream>
 +using namespace std;
  
@@ -16,7 +17,7 @@ $NetBSD: patch-ak,v 1.2 2008/08/17 23:50:06 dholland Exp $
  #endif
  #if WIN32
  #include <strstrea.h>
-@@ -1844,7 +1845,7 @@ void* Moving::compute_key(Dir dir,int an
+@@ -1844,7 +1846,7 @@ void* Moving::compute_key(Dir dir,int an
    }
  
    // Use the pixmap resource id as the base.
diff --git a/games/xevil/patches/patch-ao b/games/xevil/patches/patch-ao
index d56f53cc8e6..3776bf2ef99 100644
--- a/games/xevil/patches/patch-ao
+++ b/games/xevil/patches/patch-ao
@@ -1,8 +1,8 @@
-$NetBSD: patch-ao,v 1.2 2008/08/17 23:50:06 dholland Exp $
+$NetBSD: patch-ao,v 1.3 2011/11/27 19:43:33 joerg Exp $
 
---- cmn/game_style.cpp.orig	2003-03-22 20:47:42.000000000 -0500
-+++ cmn/game_style.cpp	2008-08-17 19:16:52.000000000 -0400
-@@ -29,12 +29,11 @@
+--- cmn/game_style.cpp.orig	2003-03-22 20:47:42.000000000 +0000
++++ cmn/game_style.cpp
+@@ -29,19 +29,18 @@
  
  // Include Files
  #include "stdafx.h"
@@ -18,6 +18,14 @@ $NetBSD: patch-ao,v 1.2 2008/08/17 23:50:06 dholland Exp $
  #endif
  
  #if WIN32
+ #include <strstrea.h>
+ #endif
+ 
+-#include <iomanip.h>
++#include <iomanip>
+ #include "utils.h"
+ #include "coord.h"
+ #include "world.h"
 @@ -2680,7 +2679,7 @@ int ZigZag::new_level_check(int,WorldP w
      HumanP human = locator->get_human(n);
      if (human) {
diff --git a/games/xevil/patches/patch-ap b/games/xevil/patches/patch-ap
index cb5c2cf2b8a..73536261f45 100644
--- a/games/xevil/patches/patch-ap
+++ b/games/xevil/patches/patch-ap
@@ -1,12 +1,14 @@
-$NetBSD: patch-ap,v 1.1.1.1 2005/01/25 15:59:27 xtraeme Exp $
+$NetBSD: patch-ap,v 1.2 2011/11/27 19:43:33 joerg Exp $
 
---- x11/panel.cpp.orig	2003-11-27 15:23:40.000000000 -0800
-+++ x11/panel.cpp	2003-11-27 15:24:00.000000000 -0800
-@@ -32,7 +32,8 @@
+--- x11/panel.cpp.orig	2003-03-22 20:50:44.000000000 +0000
++++ x11/panel.cpp
+@@ -31,8 +31,9 @@ extern "C" {
+ #include <X11/Xutil.h>
  #include <X11/keysym.h>
  }
- #include <iostream.h>
+-#include <iostream.h>
 -#include <strstream.h>
++#include <iostream>
 +#include <strstream>
 +using namespace std;
  
diff --git a/games/xevil/patches/patch-as b/games/xevil/patches/patch-as
index 232d8ed3bf3..8b3ea6486f5 100644
--- a/games/xevil/patches/patch-as
+++ b/games/xevil/patches/patch-as
@@ -1,12 +1,14 @@
-$NetBSD: patch-as,v 1.2 2008/08/17 23:50:06 dholland Exp $
+$NetBSD: patch-as,v 1.3 2011/11/27 19:43:33 joerg Exp $
 
---- x11/ui.cpp.orig	2003-03-19 10:05:38.000000000 -0500
-+++ x11/ui.cpp	2008-08-17 19:20:26.000000000 -0400
-@@ -41,7 +41,8 @@ extern "C" {
+--- x11/ui.cpp.orig	2003-03-19 10:05:38.000000000 +0000
++++ x11/ui.cpp
+@@ -40,8 +40,9 @@ extern "C" {
+ #include <X11/Xatom.h>
  }
  
- #include <iostream.h>
+-#include <iostream.h>
 -#include <strstream.h>
++#include <iostream>
 +#include <strstream>
 +using namespace std;
  
diff --git a/games/xevil/patches/patch-at b/games/xevil/patches/patch-at
index 9c69b7e3228..2b636d5b823 100644
--- a/games/xevil/patches/patch-at
+++ b/games/xevil/patches/patch-at
@@ -1,12 +1,14 @@
-$NetBSD: patch-at,v 1.1.1.1 2005/01/25 15:59:27 xtraeme Exp $
+$NetBSD: patch-at,v 1.2 2011/11/27 19:43:33 joerg Exp $
 
---- x11/serverping.cpp.orig	2003-11-27 15:33:36.000000000 -0800
-+++ x11/serverping.cpp	2003-11-27 15:33:48.000000000 -0800
-@@ -26,7 +26,8 @@
+--- x11/serverping.cpp.orig	2003-03-22 21:55:12.000000000 +0000
++++ x11/serverping.cpp
+@@ -25,8 +25,9 @@
+ // code and should be reasonably easy to compile on Windows.
  
  
- #include <iostream.h>
+-#include <iostream.h>
 -#include <strstream.h>
++#include <iostream>
 +#include <strstream>
 +using namespace std;
  #include "utils.h"
diff --git a/games/xevil/patches/patch-cmn_game.h b/games/xevil/patches/patch-cmn_game.h
new file mode 100644
index 00000000000..dc0fe345c44
--- /dev/null
+++ b/games/xevil/patches/patch-cmn_game.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-cmn_game.h,v 1.1 2011/11/27 19:43:33 joerg Exp $
+
+--- cmn/game.h.orig	2011-11-27 02:22:18.000000000 +0000
++++ cmn/game.h
+@@ -35,7 +35,7 @@
+ extern "C" {
+ #include <time.h>
+ }
+-#include <iostream.h>
++#include <iostream>
+ #include "utils.h"
+ #include "ui.h"
+ #include "world.h"
diff --git a/games/xevil/patches/patch-cmn_streams.cpp b/games/xevil/patches/patch-cmn_streams.cpp
new file mode 100644
index 00000000000..a89b1b45c3f
--- /dev/null
+++ b/games/xevil/patches/patch-cmn_streams.cpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-cmn_streams.cpp,v 1.1 2011/11/27 19:43:33 joerg Exp $
+
+--- cmn/streams.cpp.orig	2011-11-27 02:22:01.000000000 +0000
++++ cmn/streams.cpp
+@@ -31,7 +31,7 @@
+ #include "utils.h"
+ #include "neth.h" // needed for recv, send, recvfrom, sendto
+ 
+-#include <iostream.h>
++#include <iostream>
+ 
+ #include "streams.h"
+ #include "xetp.h" // yuck, need this for XETP::versionStr
diff --git a/games/xevil/patches/patch-cmn_world.cpp b/games/xevil/patches/patch-cmn_world.cpp
new file mode 100644
index 00000000000..fa0b9247930
--- /dev/null
+++ b/games/xevil/patches/patch-cmn_world.cpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-cmn_world.cpp,v 1.1 2011/11/27 19:43:33 joerg Exp $
+
+--- cmn/world.cpp.orig	2011-11-27 02:22:11.000000000 +0000
++++ cmn/world.cpp
+@@ -35,7 +35,7 @@
+ #endif
+ 
+ // Include Files.
+-#include <iostream.h>
++#include <iostream>
+ 
+ #include "utils.h"
+ #include "coord.h"
diff --git a/games/xevil/patches/patch-x11_main.cpp b/games/xevil/patches/patch-x11_main.cpp
new file mode 100644
index 00000000000..fa8fc07e1af
--- /dev/null
+++ b/games/xevil/patches/patch-x11_main.cpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-x11_main.cpp,v 1.1 2011/11/27 19:43:33 joerg Exp $
+
+--- x11/main.cpp.orig	2011-11-27 02:21:41.000000000 +0000
++++ x11/main.cpp
+@@ -33,7 +33,7 @@ extern "C" {
+ #include <X11/Xos.h>
+ }
+ 
+-#include <iostream.h>
++#include <iostream>
+ 
+ #include "utils.h"
+ #include "neth.h"
diff --git a/games/xevil/patches/patch-x11_xdata.cpp b/games/xevil/patches/patch-x11_xdata.cpp
new file mode 100644
index 00000000000..9e196e92bd4
--- /dev/null
+++ b/games/xevil/patches/patch-x11_xdata.cpp
@@ -0,0 +1,14 @@
+$NetBSD: patch-x11_xdata.cpp,v 1.1 2011/11/27 19:43:33 joerg Exp $
+
+--- x11/xdata.cpp.orig	2011-11-27 02:24:33.000000000 +0000
++++ x11/xdata.cpp
+@@ -30,7 +30,8 @@
+ #include "xdata.h"
+ #include "area.h"
+ 
+-#include <iostream.h>
++#include <iostream>
++using namespace std;
+ #include <X11/Xutil.h>
+ #include <X11/xpm.h>
+ #include <X11/Xatom.h>