ports/116834: [PATCH] games/armagetron: Fix buil with gcc 4.2

[Martin Wilke]

>Number:         116834
>Category:       ports
>Synopsis:       [PATCH] games/armagetron: Fix buil with gcc 4.2
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Oct 02 16:50:01 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Martin Wilke
>Release:        FreeBSD 7.0-CURRENT i386
>Organization:
>Environment:
System: FreeBSD miwi.homeunix.com 7.0-CURRENT FreeBSD 7.0-CURRENT #305: Fri Sep 28 12:07:59 CEST 2007
>Description:
- Unbreak
- Fix build with gcc4.2

Tindy tested:
i386
http://head.miwibox.org/tb/index.php?action=describe_port&id=2164
amd64
http://amd64.miwibox.org/tb/index.php?action=describe_port&id=1605

Added file(s):
- files/patch-src-engine_eGrid.h
- files/patch-src-engine_eVoter.cpp
- files/patch-src-engine_eWall.h
- files/patch-src-network_nPriorizing.h
- files/patch-src-tron_gCycle.h

Port maintainer (mux at FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:

--- armagetron-0.2.7.1_2.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/games/armagetron/Makefile,v
retrieving revision 1.5
diff -u -u -r1.5 Makefile
--- Makefile	2 Oct 2007 10:46:22 -0000	1.5
+++ Makefile	2 Oct 2007 16:29:38 -0000
@@ -30,10 +30,6 @@
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 700042
-BROKEN=		Does not compile with GCC 4.2
-.endif
-
 .if !defined(WITHOUT_MUSIC)
 USE_SDL+=	mixer
 CONFIGURE_ARGS+=--enable-music
Index: files/patch-src-engine_eGrid.h
===================================================================
RCS file: files/patch-src-engine_eGrid.h
diff -N files/patch-src-engine_eGrid.h
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-src-engine_eGrid.h	2 Oct 2007 16:15:38 -0000
@@ -0,0 +1,10 @@
+--- src/engine/eGrid.h.orig	2007-10-02 18:09:58.000000000 +0200
++++ src/engine/eGrid.h	2007-10-02 18:10:10.000000000 +0200
+@@ -39,6 +39,7 @@
+ class ePoint;
+ class eFace;
+ class eHalfEdge;
++class eGameObject;
+ class eWall;
+ class eGrid;
+ class eWallView;
Index: files/patch-src-engine_eVoter.cpp
===================================================================
RCS file: files/patch-src-engine_eVoter.cpp
diff -N files/patch-src-engine_eVoter.cpp
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-src-engine_eVoter.cpp	2 Oct 2007 16:15:46 -0000
@@ -0,0 +1,11 @@
+--- src/engine/eVoter.cpp.orig	2007-10-02 18:10:33.000000000 +0200
++++ src/engine/eVoter.cpp	2007-10-02 18:10:58.000000000 +0200
+@@ -39,6 +39,8 @@
+ #include "ePlayer.h"
+ #include "eGrid.h"
+ 
++class eMenuItemVote;
++
+ static unsigned short se_votingItemID = 0;
+ static float se_votingTimeout = 300.0f;
+ static nSettingItem< float > se_vt( "VOTING_TIMEOUT", se_votingTimeout );
Index: files/patch-src-engine_eWall.h
===================================================================
RCS file: files/patch-src-engine_eWall.h
diff -N files/patch-src-engine_eWall.h
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-src-engine_eWall.h	2 Oct 2007 16:15:56 -0000
@@ -0,0 +1,11 @@
+--- src/engine/eWall.h.orig	2007-10-02 18:12:07.000000000 +0200
++++ src/engine/eWall.h	2007-10-02 18:13:02.000000000 +0200
+@@ -53,6 +53,8 @@
+ 
+ 
+ class eWall;
++class eWallView;
++class eWallHolder;
+ class eGameObject;
+ 
+ class eWallView:public tHeapElement{
Index: files/patch-src-network_nPriorizing.h
===================================================================
RCS file: files/patch-src-network_nPriorizing.h
diff -N files/patch-src-network_nPriorizing.h
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-src-network_nPriorizing.h	2 Oct 2007 16:20:36 -0000
@@ -0,0 +1,10 @@
+--- src/network/nPriorizing.h.orig	2007-10-02 18:17:42.000000000 +0200
++++ src/network/nPriorizing.h	2007-10-02 18:18:00.000000000 +0200
+@@ -36,6 +36,7 @@
+ class nSendBuffer;
+ class nBandwidthControl;
+ class nBandwidthTask;
++class nBandwidthTaskPriorizer;
+ 
+ tDECLARE_REFOBJ( nBandwidthTask );
+ tDECLARE_REFOBJ( nBandwidthArbitrator );
Index: files/patch-src-tron_gCycle.h
===================================================================
RCS file: files/patch-src-tron_gCycle.h
diff -N files/patch-src-tron_gCycle.h
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-src-tron_gCycle.h	2 Oct 2007 16:20:44 -0000
@@ -0,0 +1,13 @@
+--- src/tron/gCycle.h.orig	2007-10-02 18:18:27.000000000 +0200
++++ src/tron/gCycle.h	2007-10-02 18:18:51.000000000 +0200
+@@ -40,6 +40,10 @@
+ class gTextureCycle;
+ class eSoundPlayer;
+ class gSensor;
++class gCycle;
++class gPlayerWall;
++class gNetPlayerWall;
++class gDestination;
+ 
+ // minimum time between two cycle turns
+ extern REAL sg_delayCycle;
--- armagetron-0.2.7.1_2.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: