Fix build with newer GCC

4 files changed, 56 insertions, 12 deletions

diff --git a/games/wormz/distinfo b/games/wormz/distinfo
index ad572ec2273..95a28c871f0 100644
--- a/games/wormz/distinfo
+++ b/games/wormz/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2011/05/25 06:11:46 obache Exp $
+$NetBSD: distinfo,v 1.12 2011/12/05 22:47:13 joerg Exp $
 
 SHA1 (Wormz-1.0b5.tar.gz) = a5e45e90fcc0eb4d188508bdffe71220ddcd20a4
 RMD160 (Wormz-1.0b5.tar.gz) = 38411dcc3611d70d5873bf512439cd707372ef9e
@@ -10,7 +10,7 @@ SHA1 (patch-ad) = 8754a4a826273354e5b98586c44add9b818a3d53
 SHA1 (patch-ae) = deaf33d7d7e584965e9496f8214a9a2505e75caa
 SHA1 (patch-af) = 0ff265b68256d11581cb10a7a68234f9c3de834e
 SHA1 (patch-ag) = d1e50491f1dcdcc6e35540f4bebc40504263c8a3
-SHA1 (patch-ah) = 4b5cbc48bc7687f36ce9b634d38011bfedb4b11e
+SHA1 (patch-ah) = e3386f64aadbd8d6a1d9f1ed9a8677351321a5e1
 SHA1 (patch-ai) = 74bcb1fbb9ff8f3c7343e0a88a29b588306298c3
 SHA1 (patch-aj) = 08e2f50d2eda949f5280032dc261da7d17507d06
 SHA1 (patch-ak) = ee385419310c476d27703b856b8a11f9eddcae9d
@@ -21,7 +21,7 @@ SHA1 (patch-ao) = 90e77ae1d2f1e606eba06ee985b504e4fa4431c8
 SHA1 (patch-ap) = e8b24843effc24515ee81becd75c280b4ce6b548
 SHA1 (patch-aq) = 66ed99cc9521ce31f9d155f590ea0d296c0e9eb2
 SHA1 (patch-ar) = a43ccd48de0db0018495199af29e8fe6980c5b5b
-SHA1 (patch-as) = a01f27bf1187f02fa327c1bd2cf50e05d789641c
+SHA1 (patch-as) = 8cd06dd210d512644df2aad6fba1ce70abbf0245
 SHA1 (patch-at) = 503ecb98bf54787baf655b007daaa3006e591065
 SHA1 (patch-au) = e69f4050425dea7705782ac2688df6d19fbe6a2e
 SHA1 (patch-av) = 81b507fd7df38f3a894eb45482743027df49df08
@@ -31,3 +31,4 @@ SHA1 (patch-ay) = 9f673fd72c1b111163c95038933b9ffb68474138
 SHA1 (patch-az) = 334817c8e6f92a39f8df8e0e645ae13c0716bd52
 SHA1 (patch-ba) = 80da240b3439b4cbc30e2796189ee94750c9021d
 SHA1 (patch-bb) = fd59f3ccf4cd4cf3616199b2990abcced4e6fb42
+SHA1 (patch-include_Debug.hh) = 67d9fdf4e214be4695f00d1baf9b43910479c395
diff --git a/games/wormz/patches/patch-ah b/games/wormz/patches/patch-ah
index 4d4a56f1ae2..d22bae0e19f 100644
--- a/games/wormz/patches/patch-ah
+++ b/games/wormz/patches/patch-ah
@@ -1,7 +1,7 @@
-$NetBSD: patch-ah,v 1.1 2002/08/14 16:18:42 tron Exp $
+$NetBSD: patch-ah,v 1.2 2011/12/05 22:47:14 joerg Exp $
 
---- XVision/View.hh.orig	Sat Nov  1 12:50:51 1997
-+++ XVision/View.hh	Wed Aug 14 18:10:26 2002
+--- XVision/View.hh.orig	1997-11-01 11:50:51.000000000 +0000
++++ XVision/View.hh
 @@ -7,7 +7,7 @@
  enum Align { VAHorizontal, VAVertical };
  enum ColorIndex { ciForeground, ciHighlightedFG, ciDisabledFG,
@@ -11,3 +11,14 @@ $NetBSD: patch-ah,v 1.1 2002/08/14 16:18:42 tron Exp $
  
  const CommandType cmSizeChanged = 1000;
  const CommandType cmCancel = 1001;
+@@ -50,8 +50,8 @@ class View {
+     virtual void Hide();
+     virtual void SetColor(const Pixel_t color, const ColorIndex index);
+     Pixel_t GetColor(const ColorIndex index);
+-    inline const int GetX() const;
+-    inline const int GetY() const;
++    const int GetX() const;
++    const int GetY() const;
+     inline const int GetW() const { return Area.Size.X; };
+     inline const int GetH() const { return Area.Size.Y; };
+     virtual bool HandleEvent(Event& event);
diff --git a/games/wormz/patches/patch-as b/games/wormz/patches/patch-as
index b0be57f3229..c51f018bd72 100644
--- a/games/wormz/patches/patch-as
+++ b/games/wormz/patches/patch-as
@@ -1,8 +1,8 @@
-$NetBSD: patch-as,v 1.1 2004/02/18 23:09:03 kristerw Exp $
+$NetBSD: patch-as,v 1.2 2011/12/05 22:47:14 joerg Exp $
 
---- XVision/View.cc.orig	Wed Feb 18 23:29:22 2004
-+++ XVision/View.cc	Wed Feb 18 23:30:49 2004
-@@ -56,7 +56,7 @@
+--- XVision/View.cc.orig	1997-11-01 11:50:51.000000000 +0000
++++ XVision/View.cc
+@@ -56,7 +56,7 @@ void View::Deselect()
    Redraw();
  }
  
@@ -11,7 +11,7 @@ $NetBSD: patch-as,v 1.1 2004/02/18 23:09:03 kristerw Exp $
  {
    if (Enabled == _Enabled)
      return;
-@@ -214,7 +214,7 @@
+@@ -214,7 +214,7 @@ void View::SetOrigin(const Point& newori
      Area.Origin = neworigin;
  }
  
@@ -20,7 +20,7 @@ $NetBSD: patch-as,v 1.1 2004/02/18 23:09:03 kristerw Exp $
  {
    if (Area.Size == newsize)
      return;
-@@ -234,7 +234,7 @@
+@@ -234,7 +234,7 @@ void View::SetSize(const Point& newsize,
      Area.Size = newsize;
  }
  
@@ -29,3 +29,21 @@ $NetBSD: patch-as,v 1.1 2004/02/18 23:09:03 kristerw Exp $
  {
    if (_hidden == Hidden)
      return;
+@@ -317,7 +317,7 @@ bool SelectableView::HandleEvent(Event& 
+   return TRUE;
+ }
+ 
+-inline const int View::GetX() const
++const int View::GetX() const
+ {
+   int X = Area.Origin.X;
+   if (parent)
+@@ -325,7 +325,7 @@ inline const int View::GetX() const
+   return X;
+ }
+ 
+-inline const int View::GetY() const
++const int View::GetY() const
+ {
+   int Y = Area.Origin.Y;
+   if (parent)
diff --git a/games/wormz/patches/patch-include_Debug.hh b/games/wormz/patches/patch-include_Debug.hh
new file mode 100644
index 00000000000..dd36fdef7cb
--- /dev/null
+++ b/games/wormz/patches/patch-include_Debug.hh
@@ -0,0 +1,14 @@
+$NetBSD: patch-include_Debug.hh,v 1.1 2011/12/05 22:47:14 joerg Exp $
+
+--- include/Debug.hh.orig	1997-11-01 11:49:56.000000000 +0000
++++ include/Debug.hh
+@@ -12,7 +12,8 @@
+ #undef DEBUGPaint
+ #endif
+ 
+-#include <iostream.h>
++#include <iostream>
++using namespace std;
+ #ifdef DEBUG
+ #include <time.h>
+ #endif