From 8cb15c6b37b1118213328b5859c61851c677d366 Mon Sep 17 00:00:00 2001
From: rillig <rillig@pkgsrc.org>
Date: Mon, 14 Mar 2005 14:48:20 +0000
Subject: Added two patches to make urban compile on NetBSD-1.6.2 with
 g++-2.95.3. The compiler doesn't like class members that have the same name
 as the class. Approved by wiz.

---
 games/urban/distinfo         |  4 +++-
 games/urban/patches/patch-ah | 32 ++++++++++++++++++++++++++++++++
 games/urban/patches/patch-ai | 16 ++++++++++++++++
 3 files changed, 51 insertions(+), 1 deletion(-)
 create mode 100644 games/urban/patches/patch-ah
 create mode 100644 games/urban/patches/patch-ai

(limited to 'games')

diff --git a/games/urban/distinfo b/games/urban/distinfo
index 2a86be41b2d..37d3558f135 100644
--- a/games/urban/distinfo
+++ b/games/urban/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2005/02/23 23:12:03 agc Exp $
+$NetBSD: distinfo,v 1.3 2005/03/14 14:48:20 rillig Exp $
 
 SHA1 (urban-1.5.2.tar.gz) = 3f388da8053a26cd34749aa6989cebd528925c2c
 RMD160 (urban-1.5.2.tar.gz) = f63be0cb0f09e84b31587d1d5cdc9a603521941f
@@ -13,3 +13,5 @@ SHA1 (patch-ad) = 0cc28ab990d79fdf34a094ad392a1e5a5e742f0e
 SHA1 (patch-ae) = 637883461b08a002fc75bb49ae18298f1d35bd79
 SHA1 (patch-af) = 5e0b228e0abe748d310c3b0c4964263cfafc6167
 SHA1 (patch-ag) = 05388b585cb59e46d17409b1f2c241b5c07c0edb
+SHA1 (patch-ah) = 67441b0103dbd128ffc55348284aead501c79ec7
+SHA1 (patch-ai) = 923fb922ca1679c9a09f9ee28b2fcbc9fb627ca8
diff --git a/games/urban/patches/patch-ah b/games/urban/patches/patch-ah
new file mode 100644
index 00000000000..36ab66e8ae2
--- /dev/null
+++ b/games/urban/patches/patch-ah
@@ -0,0 +1,32 @@
+$NetBSD: patch-ah,v 1.1 2005/03/14 14:48:20 rillig Exp $
+
+g++-2.95.3 does not allow class members that have the same name as the
+class.
+
+--- src/highscor/highscor.cc.orig	Sun Jun  6 21:58:28 1999
++++ src/highscor/highscor.cc	Sat Mar 12 11:20:50 2005
+@@ -75,7 +75,7 @@ HighScore::HighScore() {
+ 
+ 		if(highscore[i].Level)
+ 	        	sprintf(buffer, " %-10s%6d   %1d:%1d", highscore[i].Name,
+-	        		highscore[i].Score, ((highscore[i].Level-1) / 3) + 1, ((highscore[i].Level-1) % 3) + 1);
++	        		highscore[i].S_Score, ((highscore[i].Level-1) / 3) + 1, ((highscore[i].Level-1) % 3) + 1);
+ 		else
+ 	        	sprintf(buffer, " %-10s%6d   0:0", "Empty", 0);
+ 
+@@ -166,13 +166,13 @@ HighScore::HighScore(int score, int leve
+ 
+         for(int i = 0; i < NUM_HIGHSCORES; i++) {
+ 
+-        	if(score > highscore[i].Score) {
++        	if(score > highscore[i].S_Score) {
+ 
+                 	memmove(&highscore[i + 1], &highscore[i],
+                 		sizeof(Score) * (NUM_HIGHSCORES - i - 1));
+ 
+                         strcpy(highscore[i].Name, GetName());
+-                        highscore[i].Score = score;
++                        highscore[i].S_Score = score;
+                         highscore[i].Level = level;
+                         break;
+         	}
diff --git a/games/urban/patches/patch-ai b/games/urban/patches/patch-ai
new file mode 100644
index 00000000000..0bd5d099c50
--- /dev/null
+++ b/games/urban/patches/patch-ai
@@ -0,0 +1,16 @@
+$NetBSD: patch-ai,v 1.1 2005/03/14 14:48:20 rillig Exp $
+
+g++-2.95.3 does not allow class members that have the same name as the
+class.
+
+--- src/include/highscor.h.orig	Sun Jun  6 15:38:15 1999
++++ src/include/highscor.h	Sat Mar 12 11:14:51 2005
+@@ -6,7 +6,7 @@
+ /***************************************************************************/
+ struct Score {
+ 	char Name[64];
+-        int Score;
++        int S_Score;
+         int Level;
+ };
+ /***************************************************************************/
-- 
cgit v1.2.3