Make this package compile when using gcc 3.3.

18 files changed, 501 insertions, 15 deletions

diff --git a/games/wormz/distinfo b/games/wormz/distinfo
index 8e48ed480d6..a488f6b131c 100644
--- a/games/wormz/distinfo
+++ b/games/wormz/distinfo
@@ -1,16 +1,30 @@
-$NetBSD: distinfo,v 1.5 2003/10/23 23:01:33 kristerw Exp $
+$NetBSD: distinfo,v 1.6 2004/02/18 23:09:03 kristerw Exp $
 
 SHA1 (Wormz-1.0b5.tar.gz) = a5e45e90fcc0eb4d188508bdffe71220ddcd20a4
 Size (Wormz-1.0b5.tar.gz) = 436954 bytes
-SHA1 (patch-aa) = d662af7e771fe1cec709bc09dbc9df5d9e634adf
+SHA1 (patch-aa) = 415ee135ea0ea1e08a02c74b89a96bfa7f9b2672
 SHA1 (patch-ab) = 44c938189653de05b48a3ea8ec01442a1c5f22f6
 SHA1 (patch-ac) = 7a7764b24bd5c1c6f5121508b9bf618a71cdc8de
 SHA1 (patch-ad) = 8754a4a826273354e5b98586c44add9b818a3d53
-SHA1 (patch-ae) = bb53d7bb3eefb2ea144798435cb4266a884acecb
+SHA1 (patch-ae) = deaf33d7d7e584965e9496f8214a9a2505e75caa
 SHA1 (patch-af) = 0ff265b68256d11581cb10a7a68234f9c3de834e
 SHA1 (patch-ag) = d1e50491f1dcdcc6e35540f4bebc40504263c8a3
 SHA1 (patch-ah) = 4b5cbc48bc7687f36ce9b634d38011bfedb4b11e
 SHA1 (patch-ai) = 74bcb1fbb9ff8f3c7343e0a88a29b588306298c3
 SHA1 (patch-aj) = 08e2f50d2eda949f5280032dc261da7d17507d06
 SHA1 (patch-ak) = ee385419310c476d27703b856b8a11f9eddcae9d
-SHA1 (patch-al) = 2a02642b1c3f1aad2e28020770a0d046b568abd7
+SHA1 (patch-al) = 77ccd9a3d087024b66c9b9d77e742e3c8ed767ce
+SHA1 (patch-am) = aa0b9f0b06998f1138795a1d13cd2e968cf48c49
+SHA1 (patch-an) = 23be2ceb357f31160d6c820385e88a0c0251a20e
+SHA1 (patch-ao) = 90e77ae1d2f1e606eba06ee985b504e4fa4431c8
+SHA1 (patch-ap) = e8b24843effc24515ee81becd75c280b4ce6b548
+SHA1 (patch-aq) = 66ed99cc9521ce31f9d155f590ea0d296c0e9eb2
+SHA1 (patch-ar) = c99bd633119925d556b1ad17cc262159a9aa63ae
+SHA1 (patch-as) = a01f27bf1187f02fa327c1bd2cf50e05d789641c
+SHA1 (patch-at) = 4acee68d04170e4fabacac37232a1e841306daa0
+SHA1 (patch-au) = e69f4050425dea7705782ac2688df6d19fbe6a2e
+SHA1 (patch-av) = 81b507fd7df38f3a894eb45482743027df49df08
+SHA1 (patch-aw) = b2d855826ffc9b67876acfe7da3b91a7ff5ea34a
+SHA1 (patch-ax) = 514898af5dcf6b88adcbbc2e910dab463099e2f5
+SHA1 (patch-ay) = 9f673fd72c1b111163c95038933b9ffb68474138
+SHA1 (patch-az) = 334817c8e6f92a39f8df8e0e645ae13c0716bd52
diff --git a/games/wormz/patches/patch-aa b/games/wormz/patches/patch-aa
index c24b66047ba..bb0a3a08402 100644
--- a/games/wormz/patches/patch-aa
+++ b/games/wormz/patches/patch-aa
@@ -1,6 +1,7 @@
-$NetBSD: patch-aa,v 1.2 2002/07/17 18:22:24 wiz Exp $
---- Makefile.orig	Tue Jul 14 06:41:40 1998
-+++ Makefile	Wed Nov  4 21:36:13 1998
+$NetBSD: patch-aa,v 1.3 2004/02/18 23:09:03 kristerw Exp $
+
+--- Makefile.orig	Tue Jul 14 15:41:40 1998
++++ Makefile	Wed Feb 18 22:53:19 2004
 @@ -3,8 +3,8 @@
  
  #BinInstallPath=$(ARCH)/
@@ -32,7 +33,7 @@ $NetBSD: patch-aa,v 1.2 2002/07/17 18:22:24 wiz Exp $
  
  ifdef USE_GGI
  EXTRAGGILIBS=-lggi -lt1
-@@ -43,8 +48,8 @@
+@@ -43,11 +48,11 @@
  
  ifdef ARCH
  
@@ -42,7 +43,11 @@ $NetBSD: patch-aa,v 1.2 2002/07/17 18:22:24 wiz Exp $
 +INSTALLBIN=install -c -s
  INSTALLDIR=install -d
  
- CC=gcc
+-CC=gcc
++#CC=gcc
+ CDEFS=-D$(ARCH) -DARCHDIR=\"$(ARCHDIR)\" -DColorDepth=$(Depth)
+ 
+ OPTFLAGS=-O2
 @@ -60,8 +65,8 @@
  #-lefence
  CFLAGS=-pipe $(INCLUDE) $(OPTFLAGS) $(DEBUGFLAGS) $(WARNFLAGS) $(CDEFS)
@@ -72,6 +77,48 @@ $NetBSD: patch-aa,v 1.2 2002/07/17 18:22:24 wiz Exp $
  
  AllDSrcs=$(foreach dir,$(DepthDepenceDirs),$(wildcard $(dir)/*.cc))
  AllNSrcs=$(foreach dir,$(NotDepthDepenceDirs),$(wildcard $(dir)/*.cc))
+@@ -130,10 +135,10 @@
+ 
+ 
+ $(OBJDIR)%$(Depth).o: %.cc
+-	$(CC) $(CFLAGS) -c $< -o $@
++	$(CXX) $(CFLAGS) -c $< -o $@
+ 
+ $(OBJDIR)%.o: %.cc
+-	$(CC) $(CFLAGS) -c $< -o $@
++	$(CXX) $(CFLAGS) -c $< -o $@
+ 
+ DEPEND=$(OBJDIR).depend
+ 
+@@ -147,9 +152,9 @@
+ 	Depth=xxx $(MAKE) real-depend
+ 	
+ real-depend:
+-	$(CC) $(CFLAGS) -MM $(AllNSrcs) | \
++	$(CXX) $(CFLAGS) -MM $(AllNSrcs) | \
+ 	awk '/^[^ ]/ { print "$(OBJDIR)" $$0 } /^ / { print $$0 }' > $(DEPEND)
+-	$(CC) $(CFLAGS) -MM $(AllDSrcs) | \
++	$(CXX) $(CFLAGS) -MM $(AllDSrcs) | \
+ 	awk '/^[^ ]/ { print "$(OBJDIR)" $$0 } /^ / { print $$0 }' > .deptmp
+ 	for i in $(AllDepths); do \
+ 	sed s/\\\.o/$$i\\\.o/g < .deptmp >> $(DEPEND) ; done
+@@ -160,13 +165,13 @@
+ 	rm -f `find . -name \*~`
+ 	
+ $(TargetClient): $(ObjsClient)
+-	$(CC) $(CFLAGS) -o $(TargetClient) $(LibsClient) $(ObjsClient)
++	$(CXX) $(CFLAGS) -o $(TargetClient) $(LibsClient) $(ObjsClient)
+ 
+ $(TargetRunner): $(ObjsRunner)
+-	$(CC) $(CFLAGS) -o $(TargetRunner) $(LibsRunner) $(ObjsRunner)
++	$(CXX) $(CFLAGS) -o $(TargetRunner) $(LibsRunner) $(ObjsRunner)
+ 	
+ $(TargetServer): $(ObjsServer)
+-	$(CC) $(CFLAGS) -o $(TargetServer) $(LibsServer) $(ObjsServer)
++	$(CXX) $(CFLAGS) -o $(TargetServer) $(LibsServer) $(ObjsServer)
+ 
+ Client-target: $(TargetClient)
+ 
 @@ -178,14 +183,14 @@
  Create-PathConfig:
  	echo '#ifndef _PathConfig_hh_' > $(PathConfig)
diff --git a/games/wormz/patches/patch-ae b/games/wormz/patches/patch-ae
index 7ee0ff0868a..d6a6c05ff0f 100644
--- a/games/wormz/patches/patch-ae
+++ b/games/wormz/patches/patch-ae
@@ -1,7 +1,7 @@
-$NetBSD: patch-ae,v 1.2 2003/10/23 23:01:33 kristerw Exp $
+$NetBSD: patch-ae,v 1.3 2004/02/18 23:09:03 kristerw Exp $
 
 --- Network/UDPConnection.cc.orig	Tue Jul  7 23:02:47 1998
-+++ Network/UDPConnection.cc	Fri Oct 24 00:06:52 2003
++++ Network/UDPConnection.cc	Wed Feb 18 23:05:15 2004
 @@ -66,7 +66,7 @@
    }
     
@@ -20,6 +20,15 @@ $NetBSD: patch-ae,v 1.2 2003/10/23 23:01:33 kristerw Exp $
    if (getsockname (socket_fd, (sockaddr *) &addr, &addr_len)) {
      close(socket_fd);
      StdError("can't get sockname");
+@@ -148,7 +148,7 @@
+   return TRUE;
+ }
+ 
+-int UDPConnection::Receive(char * buffer, int maxsize, bool Wait=TRUE)
++int UDPConnection::Receive(char * buffer, int maxsize, bool Wait)
+ {
+   fd_set set;
+   timeval timeout;
 @@ -166,9 +166,9 @@
      return 0;
  
diff --git a/games/wormz/patches/patch-al b/games/wormz/patches/patch-al
index 7ccccb4fd73..6eda0bcfb16 100644
--- a/games/wormz/patches/patch-al
+++ b/games/wormz/patches/patch-al
@@ -1,8 +1,31 @@
-$NetBSD: patch-al,v 1.1 2002/08/14 16:18:42 tron Exp $
+$NetBSD: patch-al,v 1.2 2004/02/18 23:09:03 kristerw Exp $
 
 --- Client/WormApp.cc.orig	Tue Apr  7 14:34:35 1998
-+++ Client/WormApp.cc	Wed Aug 14 18:15:25 2002
-@@ -374,7 +374,7 @@
++++ Client/WormApp.cc	Wed Feb 18 23:48:19 2004
+@@ -1,3 +1,4 @@
++#include "stdlib.h"
+ #include "WormApp.hh"
+ #include "XVision/Menu.hh"
+ #include "PaintInterface/TargaPicture.hh"
+@@ -36,7 +37,7 @@
+     void Show();
+ };
+ 
+-WormMenu::WormMenu(StaticText * _title, const char * _text, const Align _align=VAVertical)
++WormMenu::WormMenu(StaticText * _title, const char * _text, const Align _align)
+     : Menu(_align), title(_title), text(_text)
+ {
+ }
+@@ -228,7 +229,7 @@
+   Application::Initialize();
+ }
+ 
+-void WormApp::SwitchMenu(bool Flip=TRUE, bool DoShow=TRUE)
++void WormApp::SwitchMenu(bool Flip, bool DoShow)
+ {
+   if (!Flip && ((Visible && DoShow) || (!Visible && !DoShow)))
+     return;
+@@ -374,7 +375,7 @@
      sprintf(s, "Player %s wins round %i!", w->GetName(), current_round);
    else
      sp = "No winner";
@@ -11,7 +34,7 @@ $NetBSD: patch-al,v 1.1 2002/08/14 16:18:42 tron Exp $
  }
  
  void WormApp::EndRoundCallback1()
-@@ -401,13 +401,13 @@
+@@ -401,13 +402,13 @@
    players->NewRound();
    char s[40];
    sprintf(s, "Round %i of %i", current_round, rounds);
@@ -27,3 +50,12 @@ $NetBSD: patch-al,v 1.1 2002/08/14 16:18:42 tron Exp $
  }
  
  void WormApp::StartRoundCallback2()
+@@ -455,7 +456,7 @@
+   RecvChatLine(network->status);
+ }
+ 
+-void WormApp::CreateServer(bool OnlySetHostname=FALSE)
++void WormApp::CreateServer(bool OnlySetHostname)
+ {
+   char s[max_hostname_len];
+   strcpy(s, default_server_hostname);
diff --git a/games/wormz/patches/patch-am b/games/wormz/patches/patch-am
new file mode 100644
index 00000000000..68c095888e6
--- /dev/null
+++ b/games/wormz/patches/patch-am
@@ -0,0 +1,23 @@
+$NetBSD: patch-am,v 1.1 2004/02/18 23:09:03 kristerw Exp $
+
+--- include/Utils.hh.orig	Wed Feb 18 22:59:25 2004
++++ include/Utils.hh	Wed Feb 18 23:01:36 2004
+@@ -32,15 +32,15 @@
+ class Point {
+   public:
+     int X, Y;
+-    Point(const int _X=0, const int _Y=0) : X(_X), Y(_Y) { };
++    Point(const int tmp_X=0, const int tmp_Y=0) : X(tmp_X), Y(tmp_Y) { };
+     bool operator==(const Point& p) { return (p.X == X) && (p.Y == Y); };
+ };
+ 
+ class Rectangle {
+   public:
+     Point Origin, Size;
+-    Rectangle(const int _X=0, const int _Y=0, const int _W=0, const int _H=0)
+-      : Origin(_X, _Y), Size(_W, _H) { };
++    Rectangle(const int tmp_X=0, const int tmp_Y=0, const int _W=0, const int _H=0)
++      : Origin(tmp_X, tmp_Y), Size(_W, _H) { };
+     bool Inside(const Point& p) const;
+     bool Intersect(const Rectangle& second) const;
+     const int Right() const { return Origin.X+Size.X; };
diff --git a/games/wormz/patches/patch-an b/games/wormz/patches/patch-an
new file mode 100644
index 00000000000..413035792e0
--- /dev/null
+++ b/games/wormz/patches/patch-an
@@ -0,0 +1,12 @@
+$NetBSD: patch-an,v 1.1 2004/02/18 23:09:03 kristerw Exp $
+
+--- Runner/Runner.cc.orig	Wed Feb 18 22:41:03 2004
++++ Runner/Runner.cc	Wed Feb 18 22:42:27 2004
+@@ -2,6 +2,7 @@
+ #include <X11/Xutil.h>
+ #include <stdio.h> // can't use Utils.hh
+ #include <unistd.h>
++#include <stdlib.h>
+ #include "PathConfig.hh"
+ 
+ #define client_path ClientBinInstallPath
diff --git a/games/wormz/patches/patch-ao b/games/wormz/patches/patch-ao
new file mode 100644
index 00000000000..8246bb97c3f
--- /dev/null
+++ b/games/wormz/patches/patch-ao
@@ -0,0 +1,22 @@
+$NetBSD: patch-ao,v 1.1 2004/02/18 23:09:03 kristerw Exp $
+
+--- XVision/Application.cc.orig	Wed Feb 18 23:14:06 2004
++++ XVision/Application.cc	Wed Feb 18 23:14:24 2004
+@@ -5,7 +5,7 @@
+ Application * app_global = 0;
+ 
+ Application::Application(FrontBuffer * _front, FrameBuffer * _fb,
+-			 EventManager * _evman, const Align _align=VAVertical)
++			 EventManager * _evman, const Align _align)
+     : Group(_align), evman(_evman), front(_front), fb_save(_fb),
+   fbstop_count(0), rearrange_count(0), fb(_fb)
+ {
+@@ -52,7 +52,7 @@
+ }
+ 
+ 
+-void Application::ReArrange(bool CallParent=TRUE, View * except=0)
++void Application::ReArrange(bool CallParent, View * except)
+ {
+   StopRedraw();
+   Group::ReArrange(CallParent, except);
diff --git a/games/wormz/patches/patch-ap b/games/wormz/patches/patch-ap
new file mode 100644
index 00000000000..cbb3e119f81
--- /dev/null
+++ b/games/wormz/patches/patch-ap
@@ -0,0 +1,31 @@
+$NetBSD: patch-ap,v 1.1 2004/02/18 23:09:03 kristerw Exp $
+
+--- XVision/Group.cc.orig	Wed Feb 18 23:15:27 2004
++++ XVision/Group.cc	Wed Feb 18 23:17:37 2004
+@@ -5,7 +5,7 @@
+ #define GroupBackground RGB(0, 0x22, 0x95)
+ //#define GroupBackground RGB(0x20, 0x20, 0x20)
+ 
+-Group::Group(const Align _align=VAVertical)
++Group::Group(const Align _align)
+     : first(0), last(0), current(0), ChildAlign(_align)
+ {
+   SetColor(GroupBackground, ciBackground);
+@@ -109,7 +109,7 @@
+   }
+ }
+ 
+-void Group::ReArrange(bool CallParent=TRUE, View * except=0)
++void Group::ReArrange(bool CallParent, View * except)
+ {
+   if (!app_global->CanReArrange)
+     return;
+@@ -282,7 +282,7 @@
+   View::PutEvent(event);
+ }
+ 
+-void Group::SetHidden(bool _hidden, bool rearrange=TRUE)
++void Group::SetHidden(bool _hidden, bool rearrange)
+ {
+   if ((!_hidden) && (rearrange))
+     app_global->StopRedraw();
diff --git a/games/wormz/patches/patch-aq b/games/wormz/patches/patch-aq
new file mode 100644
index 00000000000..6a61b12c7cc
--- /dev/null
+++ b/games/wormz/patches/patch-aq
@@ -0,0 +1,32 @@
+$NetBSD: patch-aq,v 1.1 2004/02/18 23:09:03 kristerw Exp $
+
+--- XVision/Menu.cc.orig	Wed Feb 18 23:18:47 2004
++++ XVision/Menu.cc	Wed Feb 18 23:20:32 2004
+@@ -1,7 +1,7 @@
+ #include "Menu.hh"
+ 
+-Submenu::Submenu(const char * _text, Group * _submenu=0,
+-		 TextDirection _direction=tdNorth, FontShape _fontshape=fsOblique)
++Submenu::Submenu(const char * _text, Group * _submenu,
++		 TextDirection _direction, FontShape _fontshape)
+     : Label(_text, cmInvalid, TRUE, _direction, _fontshape), submenu(_submenu)
+ {
+   if (submenu)
+@@ -23,7 +23,7 @@
+   }
+ }
+ 
+-Menu::Menu(const Align _align=VAVertical)
++Menu::Menu(const Align _align)
+     : Group(_align), upmenu(0)
+ {
+   AutoCenter = TRUE;
+@@ -76,7 +76,7 @@
+ }
+ 
+ MenuItem::MenuItem(const char * _text, const CommandType _cc2 /* = cmInvalid */,
+-	  FontShape _fontshape = fsOblique)
++	  FontShape _fontshape)
+     : Label(_text, _cc2, TRUE, tdNorth, _fontshape)
+ {
+ }
diff --git a/games/wormz/patches/patch-ar b/games/wormz/patches/patch-ar
new file mode 100644
index 00000000000..d5c50d950f1
--- /dev/null
+++ b/games/wormz/patches/patch-ar
@@ -0,0 +1,120 @@
+$NetBSD: patch-ar,v 1.1 2004/02/18 23:09:03 kristerw Exp $
+
+--- XVision/SimpleViews.cc.orig	Wed Feb 18 23:21:00 2004
++++ XVision/SimpleViews.cc	Wed Feb 18 23:28:53 2004
+@@ -6,8 +6,8 @@
+ #include "XVisionGlobal.hh"
+ #include <stdio.h>
+ 
+-StaticText::StaticText(const char * _text, TextDirection _direction=tdNorth,
+-		       FontShape _fontshape=fsRegular)
++StaticText::StaticText(const char * _text, TextDirection _direction,
++		       FontShape _fontshape)
+     : text(0), buffer1(0), buffer2(0), buffer3(0),
+   direction(_direction), fontshape(_fontshape)
+ {
+@@ -67,7 +67,7 @@
+   if (Visible && (!Hidden)) {
+ //    Hide();
+ //    Show();
+-    (parent ? parent : this)->Redraw();
++    if (parent) parent->Redraw(); else this->Redraw();
+   }
+ }
+ 
+@@ -105,8 +105,8 @@
+ }
+ 
+ Label::Label(const char * _text, const CommandType _cc,
+-	     const bool _AutoResize=TRUE, TextDirection _direction=tdNorth,
+-	     FontShape _fontshape=fsRegular)
++	     const bool _AutoResize, TextDirection _direction,
++	     FontShape _fontshape)
+     : StaticText(_text, _direction, _fontshape)
+ {
+   AutoResize = _AutoResize;
+@@ -114,7 +114,7 @@
+   Selectable = TRUE;
+ }
+    
+-Padding::Padding(const Align direction=VAVertical, const int Size=20)
++Padding::Padding(const Align direction, const int Size)
+ {
+   if (direction == VAVertical)
+     SetSize(Point(1, Size));
+@@ -123,14 +123,14 @@
+   MinSize = Area.Size;
+ }
+ 
+-Title::Title(const char * _text, TextDirection _direction=tdNorth,
+-	     FontShape _fontshape=fsRegular)
++Title::Title(const char * _text, TextDirection _direction,
++	     FontShape _fontshape)
+     : StaticText(_text, _direction, _fontshape)
+ {
+   SetColor(Pixel_t_Yellow, ciForeground);
+ }
+ 
+-PictureView::PictureView(Picture * _picture=0, bool _DeleteP = TRUE, const CommandType _cc/*  = cmInvalid */)
++PictureView::PictureView(Picture * _picture, bool _DeleteP, const CommandType _cc/*  = cmInvalid */)
+     : picture(_picture), DeleteP(_DeleteP)
+ {
+   if (_cc != cmInvalid) {
+@@ -197,8 +197,8 @@
+   parent->SendDataChanged();
+ }
+ 
+-CheckBox::CheckBox(const char * _text, bool _Checked=FALSE,
+-		   bool * _Valuep=0, FontShape _fontshape=fsRegular)
++CheckBox::CheckBox(const char * _text, bool _Checked,
++		   bool * _Valuep, FontShape _fontshape)
+     : Group(VAHorizontal), Checked(_Checked), Valuep(_Valuep)
+ {
+   AutoResize = TRUE;
+@@ -217,9 +217,9 @@
+   Status_v->Choose();
+ }
+ 
+-Selector::Selector(const char ** _Items, const int _NumItems, const int _SelectedItem=0,
+-	 const bool _AutoResize = TRUE, TextDirection _direction=tdNorth,
+-		   FontShape _fontshape=fsRegular)
++Selector::Selector(const char ** _Items, const int _NumItems, const int _SelectedItem,
++	 const bool _AutoResize , TextDirection _direction,
++		   FontShape _fontshape)
+     : Label(_Items[_SelectedItem], cmInvalid, _AutoResize, _direction, _fontshape),
+   Items(_Items), NumItems(_NumItems), SelectedItem(_SelectedItem)
+ {
+@@ -234,8 +234,8 @@
+ }
+ 
+ InputLine::InputLine(const char * _text, const int _MAXTextLen, const CommandType _cc /* = cmInvalid */,
+-	  const bool _AutoResize = TRUE, TextDirection _direction=tdNorth,
+-	  FontShape _fontshape=fsRegular)
++	  const bool _AutoResize, TextDirection _direction,
++	  FontShape _fontshape)
+     : Label(_text, _cc, _AutoResize, _direction, _fontshape),
+   MAXTextLen(_MAXTextLen)
+ {
+@@ -300,10 +300,10 @@
+ static const int invalid_number = -4888839; // can't initialize on this number
+ 
+ InputNumber::InputNumber(const int _Number, const int _MinNumber, const int _MaxNumber,
+-		int * const _Valuep=0,
++		int * const _Valuep,
+ 		const CommandType _cc /* = cmInvalid */,
+-		const bool _AutoResize = TRUE, TextDirection _direction=tdNorth,
+-		FontShape _fontshape=fsRegular)
++		const bool _AutoResize, TextDirection _direction,
++		FontShape _fontshape)
+     : Label(" ", _cc, _AutoResize, _direction, _fontshape),
+   Number(invalid_number), Valuep(_Valuep), MinNumber(_MinNumber), MaxNumber(_MaxNumber)
+ {
+@@ -335,7 +335,7 @@
+   Label::Deselect();
+ }
+ 
+-void InputNumber::SetNumber(const int _Number, bool DoCheck=TRUE)
++void InputNumber::SetNumber(const int _Number, bool DoCheck)
+ {
+   if (DoCheck && (_Number > MaxNumber))
+     return;
diff --git a/games/wormz/patches/patch-as b/games/wormz/patches/patch-as
new file mode 100644
index 00000000000..b0be57f3229
--- /dev/null
+++ b/games/wormz/patches/patch-as
@@ -0,0 +1,31 @@
+$NetBSD: patch-as,v 1.1 2004/02/18 23:09:03 kristerw 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 @@
+   Redraw();
+ }
+ 
+-void View::SetEnabled(bool _Enabled=TRUE)
++void View::SetEnabled(bool _Enabled)
+ {
+   if (Enabled == _Enabled)
+     return;
+@@ -214,7 +214,7 @@
+     Area.Origin = neworigin;
+ }
+ 
+-void View::SetSize(const Point& newsize, bool redraw=TRUE)
++void View::SetSize(const Point& newsize, bool redraw)
+ {
+   if (Area.Size == newsize)
+     return;
+@@ -234,7 +234,7 @@
+     Area.Size = newsize;
+ }
+ 
+-void View::SetHidden(bool _hidden, bool rearrange=TRUE)
++void View::SetHidden(bool _hidden, bool rearrange)
+ {
+   if (_hidden == Hidden)
+     return;
diff --git a/games/wormz/patches/patch-at b/games/wormz/patches/patch-at
new file mode 100644
index 00000000000..31429da4c18
--- /dev/null
+++ b/games/wormz/patches/patch-at
@@ -0,0 +1,13 @@
+$NetBSD: patch-at,v 1.1 2004/02/18 23:09:03 kristerw Exp $
+
+--- Game/Players.cc.orig	Wed Feb 18 23:37:31 2004
++++ Game/Players.cc	Wed Feb 18 23:37:59 2004
+@@ -42,7 +42,7 @@
+   delete crashBuffer;
+ }
+ 
+-int Players::AddPlayer(Worm * player, int number=-1)
++int Players::AddPlayer(Worm * player, int number)
+ {
+   bool IsSame = FALSE;
+   if (between(number, 0, MAXPlayers-1)) {
diff --git a/games/wormz/patches/patch-au b/games/wormz/patches/patch-au
new file mode 100644
index 00000000000..6ccd6a73a87
--- /dev/null
+++ b/games/wormz/patches/patch-au
@@ -0,0 +1,12 @@
+$NetBSD: patch-au,v 1.1 2004/02/18 23:09:03 kristerw Exp $
+
+--- Game/Record.cc.orig	Wed Feb 18 23:38:26 2004
++++ Game/Record.cc	Wed Feb 18 23:38:57 2004
+@@ -1,6 +1,6 @@
+ #include "Record.hh"
+ 
+-void Record::NewRound(int sX=-1, int sY=-1, int sA=-1)
++void Record::NewRound(int sX, int sY, int sA)
+ {
+   Worm::NewRound(sX, sY, sA);
+   lCount = 0;
diff --git a/games/wormz/patches/patch-av b/games/wormz/patches/patch-av
new file mode 100644
index 00000000000..b63a5e4397c
--- /dev/null
+++ b/games/wormz/patches/patch-av
@@ -0,0 +1,13 @@
+$NetBSD: patch-av,v 1.1 2004/02/18 23:09:03 kristerw Exp $
+
+--- Game/Worm.cc.orig	Wed Feb 18 23:39:21 2004
++++ Game/Worm.cc	Wed Feb 18 23:39:43 2004
+@@ -33,7 +33,7 @@
+ 
+ static const int MinBorderGap = 50;
+ 
+-void Worm::NewRound(int sX=-1, int sY=-1, int sA=-1)
++void Worm::NewRound(int sX, int sY, int sA)
+ {
+   if (!between(sA, 0, MAXAngle-1)) {
+     int sa2 = Rand(MAXAngle); 
diff --git a/games/wormz/patches/patch-aw b/games/wormz/patches/patch-aw
new file mode 100644
index 00000000000..6b5a2436c82
--- /dev/null
+++ b/games/wormz/patches/patch-aw
@@ -0,0 +1,40 @@
+$NetBSD: patch-aw,v 1.1 2004/02/18 23:09:03 kristerw Exp $
+
+--- Client/Fillers.cc.orig	Wed Feb 18 23:42:54 2004
++++ Client/Fillers.cc	Wed Feb 18 23:43:51 2004
+@@ -23,7 +23,7 @@
+   return RGB(r, g, b);
+ }
+ 
+-FlatFiller::FlatFiller(int _color=0)
++FlatFiller::FlatFiller(int _color)
+     : Filler(ftFlat), color(_color)
+ {
+   CreateImage();
+@@ -40,7 +40,7 @@
+   TileBuffer(im, ImageSize, ImageSize);  
+ }
+ 
+-CircleFiller::CircleFiller(int _circle_color=0, int _bg_color=0)
++CircleFiller::CircleFiller(int _circle_color, int _bg_color)
+     : TwoOptFiller(ftCircle, _circle_color, _bg_color)
+ {
+   CreateImage();
+@@ -67,7 +67,7 @@
+   TileBuffer(im, R, R);
+ }
+     
+-CheckerFiller::CheckerFiller(int _white=0, int _black=0)
++CheckerFiller::CheckerFiller(int _white, int _black)
+     : TwoOptFiller(ftChecker, _white, _black)
+ {
+   CreateImage();
+@@ -90,7 +90,7 @@
+   TileBuffer(im, R, R);
+ }
+ 
+-PictureFiller::PictureFiller(int _NumPictures, Picture ** _pictures, int _ActualPicture=0)
++PictureFiller::PictureFiller(int _NumPictures, Picture ** _pictures, int _ActualPicture)
+     : Filler(ftPicture), pictures(_pictures), NumPictures(_NumPictures), ActualPicture(_ActualPicture)
+ {
+   CreateImage();
diff --git a/games/wormz/patches/patch-ax b/games/wormz/patches/patch-ax
new file mode 100644
index 00000000000..93c5fee8562
--- /dev/null
+++ b/games/wormz/patches/patch-ax
@@ -0,0 +1,13 @@
+$NetBSD: patch-ax,v 1.1 2004/02/18 23:09:03 kristerw Exp $
+
+--- Client/PlayerControlView.cc.orig	Wed Feb 18 23:44:27 2004
++++ Client/PlayerControlView.cc	Wed Feb 18 23:45:03 2004
+@@ -1,7 +1,7 @@
+ #include "PlayerControlView.hh"
+ #include <string.h>
+ 
+-PlayerControlView::PlayerControlView(TextDirection _direction=tdNorth, FontShape _fontshape=fsRegular)
++PlayerControlView::PlayerControlView(TextDirection _direction, FontShape _fontshape)
+     : Label("<none>", cmInvalid, TRUE, _direction, _fontshape),
+   savel(ktInvalid), saver(ktInvalid),
+   WaitForLKey(FALSE), WaitForRKey(FALSE),
diff --git a/games/wormz/patches/patch-ay b/games/wormz/patches/patch-ay
new file mode 100644
index 00000000000..be365a17d72
--- /dev/null
+++ b/games/wormz/patches/patch-ay
@@ -0,0 +1,13 @@
+$NetBSD: patch-ay,v 1.1 2004/02/18 23:09:03 kristerw Exp $
+
+--- Client/PlayerSelector.cc.orig	Wed Feb 18 23:45:34 2004
++++ Client/PlayerSelector.cc	Wed Feb 18 23:45:59 2004
+@@ -199,7 +199,7 @@
+   return TRUE;
+ }
+ 
+-void PlayerSelector::SetHidden(bool _hidden, bool rearrange=TRUE)
++void PlayerSelector::SetHidden(bool _hidden, bool rearrange)
+ {
+   Group::SetHidden(_hidden, rearrange);
+   if (!_hidden)
diff --git a/games/wormz/patches/patch-az b/games/wormz/patches/patch-az
new file mode 100644
index 00000000000..6e92ad45834
--- /dev/null
+++ b/games/wormz/patches/patch-az
@@ -0,0 +1,9 @@
+$NetBSD: patch-az,v 1.1 2004/02/18 23:09:03 kristerw Exp $
+
+--- PaintInterface/Picture.cc.orig	Wed Feb 18 23:51:42 2004
++++ PaintInterface/Picture.cc	Wed Feb 18 23:51:58 2004
+@@ -1,3 +1,4 @@
++#include <string.h>
+ #include "Picture.hh"
+ 
+ Picture * Picture::CreateCopy()