[pkgsrc/trunk]: pkgsrc/games/wormz Make this package compile when using gcc 3.3.

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/games/wormz Make this package compile when using gcc 3.3.
From: kristerw <kristerw%pkgsrc.org@localhost>
Date: Wed, 13 Oct 2021 23:35:11 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/2003dbbbc56f
branches:  trunk
changeset: 469024:2003dbbbc56f
user:      kristerw <kristerw%pkgsrc.org@localhost>
date:      Wed Feb 18 23:09:03 2004 +0000

description:
Make this package compile when using gcc 3.3.

diffstat:

 games/wormz/distinfo         |   22 ++++++-
 games/wormz/patches/patch-aa |   57 ++++++++++++++++++-
 games/wormz/patches/patch-ae |   13 +++-
 games/wormz/patches/patch-al |   40 ++++++++++++-
 games/wormz/patches/patch-am |   23 ++++++++
 games/wormz/patches/patch-an |   12 ++++
 games/wormz/patches/patch-ao |   22 +++++++
 games/wormz/patches/patch-ap |   31 +++++++++++
 games/wormz/patches/patch-aq |   32 +++++++++++
 games/wormz/patches/patch-ar |  120 +++++++++++++++++++++++++++++++++++++++++++
 games/wormz/patches/patch-as |   31 +++++++++++
 games/wormz/patches/patch-at |   13 ++++
 games/wormz/patches/patch-au |   12 ++++
 games/wormz/patches/patch-av |   13 ++++
 games/wormz/patches/patch-aw |   40 ++++++++++++++
 games/wormz/patches/patch-ax |   13 ++++
 games/wormz/patches/patch-ay |   13 ++++
 games/wormz/patches/patch-az |    9 +++
 18 files changed, 501 insertions(+), 15 deletions(-)

diffs (truncated from 652 to 300 lines):

diff -r 14930f01623a -r 2003dbbbc56f games/wormz/distinfo
--- a/games/wormz/distinfo      Wed Feb 18 22:18:28 2004 +0000
+++ b/games/wormz/distinfo      Wed Feb 18 23:09:03 2004 +0000
@@ -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 -r 14930f01623a -r 2003dbbbc56f games/wormz/patches/patch-aa
--- a/games/wormz/patches/patch-aa      Wed Feb 18 22:18:28 2004 +0000
+++ b/games/wormz/patches/patch-aa      Wed Feb 18 23:09:03 2004 +0000
@@ -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 @@
  
  ifdef USE_GGI
  EXTRAGGILIBS=-lggi -lt1
-@@ -43,8 +48,8 @@
+@@ -43,11 +48,11 @@
  
  ifdef ARCH
  
@@ -42,7 +43,11 @@
 +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 @@
  
  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 -r 14930f01623a -r 2003dbbbc56f games/wormz/patches/patch-ae
--- a/games/wormz/patches/patch-ae      Wed Feb 18 22:18:28 2004 +0000
+++ b/games/wormz/patches/patch-ae      Wed Feb 18 23:09:03 2004 +0000
@@ -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 @@
    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 -r 14930f01623a -r 2003dbbbc56f games/wormz/patches/patch-al
--- a/games/wormz/patches/patch-al      Wed Feb 18 22:18:28 2004 +0000
+++ b/games/wormz/patches/patch-al      Wed Feb 18 23:09:03 2004 +0000
@@ -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 @@
  }
  
  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 @@
  }
  
  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 -r 14930f01623a -r 2003dbbbc56f games/wormz/patches/patch-am
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/games/wormz/patches/patch-am      Wed Feb 18 23:09:03 2004 +0000
@@ -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 -r 14930f01623a -r 2003dbbbc56f games/wormz/patches/patch-an
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/games/wormz/patches/patch-an      Wed Feb 18 23:09:03 2004 +0000
@@ -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 -r 14930f01623a -r 2003dbbbc56f games/wormz/patches/patch-ao
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/games/wormz/patches/patch-ao      Wed Feb 18 23:09:03 2004 +0000
@@ -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 -r 14930f01623a -r 2003dbbbc56f games/wormz/patches/patch-ap
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/games/wormz/patches/patch-ap      Wed Feb 18 23:09:03 2004 +0000
@@ -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 @@
+   }
Prev by Date: [pkgsrc/trunk]: pkgsrc/ham/xlog Added patch-ad file that was missed at previo...
Next by Date: [pkgsrc/trunk]: pkgsrc/emulators/ia64sim Make this package compile when using...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/ham/xlog Added patch-ad file that was missed at previo...
Next by Thread: [pkgsrc/trunk]: pkgsrc/emulators/ia64sim Make this package compile when using...
Indexes:
Home | Main Index | Thread Index | Old Index