Make build with gcc3.

4 files changed, 45 insertions, 22 deletions

diff --git a/games/xfreecell/distinfo b/games/xfreecell/distinfo
index e26d3461b96..18fb4135bbe 100644
--- a/games/xfreecell/distinfo
+++ b/games/xfreecell/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.1.1.1 2001/12/22 21:17:25 hubertf Exp $
+$NetBSD: distinfo,v 1.2 2004/07/10 23:03:47 wiz Exp $
 
 SHA1 (xfreecell-1.0.5b.tgz) = b0453b09ea2211822a5f03f532097c9eb14db2a6
 Size (xfreecell-1.0.5b.tgz) = 49367 bytes
 SHA1 (patch-aa) = 9ae72142536bac8feb8e1ae1576cf56c2f30ae55
-SHA1 (patch-ab) = 5cdece49362d32b1673180268ffc2d4eb5bdfe6a
+SHA1 (patch-ab) = 74326c5b4e731a32a404210cdc13b87a5b15119a
+SHA1 (patch-ac) = 38f7fccb36b841662d1f4682dbdee41e3c35f17f
+SHA1 (patch-ad) = ab39728f9cb2f9cfb8b55c87185546e93ae5a231
diff --git a/games/xfreecell/patches/patch-ab b/games/xfreecell/patches/patch-ab
index 0f583841292..12cc56a72f0 100644
--- a/games/xfreecell/patches/patch-ab
+++ b/games/xfreecell/patches/patch-ab
@@ -1,21 +1,13 @@
-$NetBSD: patch-ab,v 1.1.1.1 2001/12/22 21:17:25 hubertf Exp $
+$NetBSD: patch-ab,v 1.2 2004/07/10 23:03:47 wiz Exp $
 
-*** widget/makefile.orig	Sun Aug  5 11:10:13 2001
---- widget/makefile	Sun Aug  5 10:49:28 2001
-***************
-*** 1,7 ****
-  OBJECTS=window.o plate.o string.o button.o label.o textfield.o container.o frame.o util.o scrollbar.o font.o main.o
-  #C=/usr/local/gcc-2.8.1/bin/g++
-  CC=g++
-! CFLAGS=-g -Wall
-  LIBS=-L/usr/X11R6/lib -lX11
-  LIBNAME=libns.a
-  
---- 1,7 ----
-  OBJECTS=window.o plate.o string.o button.o label.o textfield.o container.o frame.o util.o scrollbar.o font.o main.o
-  #C=/usr/local/gcc-2.8.1/bin/g++
-  CC=g++
-! CFLAGS=-g -Wall -I/usr/X11R6/include
-  LIBS=-L/usr/X11R6/lib -lX11
-  LIBNAME=libns.a
-  
+--- widget/makefile.orig	1999-03-18 06:54:57.000000000 +0100
++++ widget/makefile
+@@ -1,7 +1,7 @@
+ OBJECTS=window.o plate.o string.o button.o label.o textfield.o container.o frame.o util.o scrollbar.o font.o main.o
+ #C=/usr/local/gcc-2.8.1/bin/g++
+ CC=g++
+-CFLAGS=-g -Wall
++CFLAGS=-g -Wall -I/usr/X11R6/include
+ LIBS=-L/usr/X11R6/lib -lX11
+ LIBNAME=libns.a
+ 
diff --git a/games/xfreecell/patches/patch-ac b/games/xfreecell/patches/patch-ac
new file mode 100644
index 00000000000..4072db57d95
--- /dev/null
+++ b/games/xfreecell/patches/patch-ac
@@ -0,0 +1,16 @@
+$NetBSD: patch-ac,v 1.1 2004/07/10 23:03:47 wiz Exp $
+
+--- gnmanager.h.orig	1999-03-29 15:07:19.000000000 +0200
++++ gnmanager.h
+@@ -2,7 +2,10 @@
+ #define GNManager_H
+ 
+ #include <string>
+-#include <hash_set>
++#include <ext/hash_set>
++
++using namespace __gnu_cxx;
++using namespace std;
+ 
+ class GameNumberManager {
+ public:
diff --git a/games/xfreecell/patches/patch-ad b/games/xfreecell/patches/patch-ad
new file mode 100644
index 00000000000..6c95cc13a5d
--- /dev/null
+++ b/games/xfreecell/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2004/07/10 23:03:47 wiz Exp $
+
+--- widget/widget.h.orig	1999-03-15 17:29:32.000000000 +0100
++++ widget/widget.h
+@@ -8,6 +8,8 @@
+ #include <vector>
+ #include <string>
+ 
++using namespace std;
++
+ const char defaultFont[] = "7x14";
+ 
+ extern Display* NSdpy;