Fix build with newer GCC versions

8 files changed, 80 insertions, 5 deletions

diff --git a/games/xfreecell/distinfo b/games/xfreecell/distinfo
index 393ee3a5ffe..8db0c32b6ad 100644
--- a/games/xfreecell/distinfo
+++ b/games/xfreecell/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2008/05/24 15:59:27 obache Exp $
+$NetBSD: distinfo,v 1.9 2011/11/22 18:11:14 joerg Exp $
 
 SHA1 (xfreecell-1.0.5b.tgz) = b0453b09ea2211822a5f03f532097c9eb14db2a6
 RMD160 (xfreecell-1.0.5b.tgz) = 2629217bf29734bb25b30ca8aaec62ae19d0ff6f
@@ -7,4 +7,10 @@ SHA1 (patch-aa) = d5235b5a34df4ea12c249d680cc6e674f1c50626
 SHA1 (patch-ab) = a34285fa7e8564d18d91cdb23affd1afb5cd8938
 SHA1 (patch-ac) = f2fb8f2db71c4051eb28352f02a0fed09f69f97f
 SHA1 (patch-ad) = cfdf8f50b5bba32ea8a1bc048e89e0594e85c072
-SHA1 (patch-ae) = b1d9a7cf0a9a692c4ec04379b3153e41268f0315
+SHA1 (patch-ae) = cbdf88cf997d8f4dfd683dc0e0d10a46d3ec848b
+SHA1 (patch-card.cpp) = 7a1f8f07d1a9cdba4427771ab3e7553ae667d7df
+SHA1 (patch-freecell.cpp) = 298cc7c3c65b9371ed65a1e987a5d5c790e2ee73
+SHA1 (patch-option.cpp) = 31cc65ae105f5fa3885717a4ff99341a864978dc
+SHA1 (patch-widget_font.cpp) = 968f4142220d7470819e8ead79e00195ba2837dd
+SHA1 (patch-widget_scrollbar.cpp) = 006e69e6dcb96448fd04d21d049f113fde756cc3
+SHA1 (patch-widget_util.cpp) = 5ea757fee16555cec98b6ba0d983fde22c2345c1
diff --git a/games/xfreecell/patches/patch-ae b/games/xfreecell/patches/patch-ae
index e5ea4ddd1f4..7b1e04f2f8e 100644
--- a/games/xfreecell/patches/patch-ae
+++ b/games/xfreecell/patches/patch-ae
@@ -1,15 +1,20 @@
-$NetBSD: patch-ae,v 1.2 2008/05/24 15:59:27 obache Exp $
+$NetBSD: patch-ae,v 1.3 2011/11/22 18:11:14 joerg Exp $
 
 --- subwindows.cpp.orig	1999-07-27 14:15:36.000000000 +0000
 +++ subwindows.cpp
-@@ -1,5 +1,6 @@
+@@ -1,9 +1,11 @@
  #include <sys/stat.h>
  #include <sys/types.h>
 +#include <errno.h>
  #include <fcntl.h>
  #include <dirent.h>
  #include <unistd.h>
-@@ -62,7 +63,6 @@ void QueryWindow::waitForEvent()
+ #include <stdio.h>
++#include <stdlib.h>
+ 
+ #include "general.h"
+ #include "subwindows.h"
+@@ -62,7 +64,6 @@ void QueryWindow::waitForEvent()
  }
  
  //Score
diff --git a/games/xfreecell/patches/patch-card.cpp b/games/xfreecell/patches/patch-card.cpp
new file mode 100644
index 00000000000..f0791e2b0cd
--- /dev/null
+++ b/games/xfreecell/patches/patch-card.cpp
@@ -0,0 +1,9 @@
+$NetBSD: patch-card.cpp,v 1.1 2011/11/22 18:11:14 joerg Exp $
+
+--- card.cpp.orig	2011-11-22 17:05:24.000000000 +0000
++++ card.cpp
+@@ -1,3 +1,4 @@
++#include <cstdlib>
+ #include <cstdio>
+ #include <math.h>
+ #ifdef SHAPE
diff --git a/games/xfreecell/patches/patch-freecell.cpp b/games/xfreecell/patches/patch-freecell.cpp
new file mode 100644
index 00000000000..854b5c75358
--- /dev/null
+++ b/games/xfreecell/patches/patch-freecell.cpp
@@ -0,0 +1,12 @@
+$NetBSD: patch-freecell.cpp,v 1.1 2011/11/22 18:11:14 joerg Exp $
+
+--- freecell.cpp.orig	2011-11-22 17:06:14.000000000 +0000
++++ freecell.cpp
+@@ -1,6 +1,7 @@
+ #include <dirent.h>
+ #include <fcntl.h>
+ #include <stdlib.h>
++#include <string.h>
+ #include <sys/stat.h>
+ #include <sys/time.h>
+ #include <sys/types.h>
diff --git a/games/xfreecell/patches/patch-option.cpp b/games/xfreecell/patches/patch-option.cpp
new file mode 100644
index 00000000000..e172c9f33b5
--- /dev/null
+++ b/games/xfreecell/patches/patch-option.cpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-option.cpp,v 1.1 2011/11/22 18:11:14 joerg Exp $
+
+--- option.cpp.orig	2011-11-22 17:06:36.000000000 +0000
++++ option.cpp
+@@ -4,6 +4,8 @@
+ #include <dirent.h>
+ #include <unistd.h>
+ #include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
+ 
+ #include "general.h"
+ #include "option.h"
diff --git a/games/xfreecell/patches/patch-widget_font.cpp b/games/xfreecell/patches/patch-widget_font.cpp
new file mode 100644
index 00000000000..ebd4ada3a3a
--- /dev/null
+++ b/games/xfreecell/patches/patch-widget_font.cpp
@@ -0,0 +1,10 @@
+$NetBSD: patch-widget_font.cpp,v 1.1 2011/11/22 18:11:14 joerg Exp $
+
+--- widget/font.cpp.orig	2011-11-22 17:07:50.000000000 +0000
++++ widget/font.cpp
+@@ -1,4 +1,5 @@
+ #include "widget.h"
++#include <string.h>
+ 
+ NSFont::NSFont()
+ {
diff --git a/games/xfreecell/patches/patch-widget_scrollbar.cpp b/games/xfreecell/patches/patch-widget_scrollbar.cpp
new file mode 100644
index 00000000000..78bc12b26ea
--- /dev/null
+++ b/games/xfreecell/patches/patch-widget_scrollbar.cpp
@@ -0,0 +1,10 @@
+$NetBSD: patch-widget_scrollbar.cpp,v 1.1 2011/11/22 18:11:14 joerg Exp $
+
+--- widget/scrollbar.cpp.orig	2011-11-22 17:07:38.000000000 +0000
++++ widget/scrollbar.cpp
+@@ -1,4 +1,5 @@
+ #include "widget.h"
++#include <stdlib.h>
+ 
+ // ## NSVScrollbar ##
+ const unsigned int NSVScrollbar::_defaultWidth = 15;
diff --git a/games/xfreecell/patches/patch-widget_util.cpp b/games/xfreecell/patches/patch-widget_util.cpp
new file mode 100644
index 00000000000..14eda727094
--- /dev/null
+++ b/games/xfreecell/patches/patch-widget_util.cpp
@@ -0,0 +1,10 @@
+$NetBSD: patch-widget_util.cpp,v 1.1 2011/11/22 18:11:14 joerg Exp $
+
+--- widget/util.cpp.orig	2011-11-22 17:07:23.000000000 +0000
++++ widget/util.cpp
+@@ -1,4 +1,5 @@
+ #include "widget.h"
++#include <stdlib.h>
+ 
+ unsigned long allocColor(Display* NSdpy, unsigned int red, unsigned int green, unsigned int blue)
+ {