Apply some patches to get the build further on SunOS. May build

depending on compiler.

4 files changed, 28 insertions, 12 deletions

diff --git a/games/ccgo/patches/patch-aa b/games/ccgo/patches/patch-aa
index e6a9d973373..34ac68c4f9b 100644
--- a/games/ccgo/patches/patch-aa
+++ b/games/ccgo/patches/patch-aa
@@ -1,11 +1,14 @@
-$NetBSD: patch-aa,v 1.3 2009/02/09 21:11:52 joerg Exp $
+$NetBSD: patch-aa,v 1.4 2014/09/25 13:47:59 jperkin Exp $
 
---- igs/datetime.cc.orig	2009-02-09 21:39:32.000000000 +0100
+--- igs/datetime.cc.orig	2008-04-21 17:41:47.000000000 +0000
 +++ igs/datetime.cc
-@@ -8,6 +8,7 @@
+@@ -7,7 +7,10 @@
+  * published by the Free Software Foundation.
   */
  
++#ifndef __sun
  #define _XOPEN_SOURCE
++#endif
 +#define _NETBSD_SOURCE
  #ifndef _GNU_SOURCE
  #define _GNU_SOURCE 1
diff --git a/games/ccgo/patches/patch-ab b/games/ccgo/patches/patch-ab
index c5cf39788ae..180d874527f 100644
--- a/games/ccgo/patches/patch-ab
+++ b/games/ccgo/patches/patch-ab
@@ -1,16 +1,20 @@
-$NetBSD: patch-ab,v 1.2 2005/07/22 22:13:25 adam Exp $
+$NetBSD: patch-ab,v 1.3 2014/09/25 13:47:59 jperkin Exp $
 
 --- igs/fork.cc.orig	2004-09-24 02:12:22.000000000 +0000
 +++ igs/fork.cc
-@@ -16,6 +16,7 @@ extern "C" {
+@@ -15,7 +15,11 @@ extern "C" {
+ #include <sys/types.h>
  #include <sys/fcntl.h>
  #include <sys/wait.h>
++#ifdef __sun
++#include <fcntl.h>
++#endif
  #include <unistd.h>
 +#include <signal.h>
  }
  
  using namespace igs;
-@@ -139,7 +140,7 @@ bool Fork::open_conn(const std::string &
+@@ -139,7 +143,7 @@ bool Fork::open_conn(const std::string &
  		close(c2p[0]);
  		close(c2p[1]);
  		close(2); // close cerr
diff --git a/games/ccgo/patches/patch-ac b/games/ccgo/patches/patch-ac
index ab6eeb7fd04..797f538f925 100644
--- a/games/ccgo/patches/patch-ac
+++ b/games/ccgo/patches/patch-ac
@@ -1,9 +1,14 @@
-$NetBSD: patch-ac,v 1.1.1.1 2003/03/16 03:56:27 rh Exp $
+$NetBSD: patch-ac,v 1.2 2014/09/25 13:47:59 jperkin Exp $
 
---- igs/sock.cc.orig	2002-11-27 07:35:46.000000000 +1000
+--- igs/sock.cc.orig	2004-09-24 02:12:22.000000000 +0000
 +++ igs/sock.cc
-@@ -16,6 +16,7 @@ extern "C" {
+@@ -14,8 +14,12 @@ extern "C" {
+ #include <sys/fcntl.h>
+ #include <sys/wait.h>
  #include <sys/socket.h>
++#ifdef __sun
++#include <fcntl.h>
++#endif
  #include <unistd.h>
  #include <netdb.h>
 +#include <netinet/in.h>
diff --git a/games/ccgo/patches/patch-ad b/games/ccgo/patches/patch-ad
index 8b1ccd6c545..065b0d24856 100644
--- a/games/ccgo/patches/patch-ad
+++ b/games/ccgo/patches/patch-ad
@@ -1,16 +1,20 @@
-$NetBSD: patch-ad,v 1.2 2005/07/22 22:13:25 adam Exp $
+$NetBSD: patch-ad,v 1.3 2014/09/25 13:47:59 jperkin Exp $
 
 --- gmp/device.cc.orig	2004-09-24 02:12:20.000000000 +0000
 +++ gmp/device.cc
-@@ -15,6 +15,7 @@ extern "C" {
+@@ -14,7 +14,11 @@
+ extern "C" {
  #include <sys/fcntl.h>
  #include <sys/wait.h>
++#ifdef __sun
++#include <fcntl.h>
++#endif
  #include <unistd.h>
 +#include <signal.h>
  }
  
  using namespace gmp;
-@@ -358,7 +359,7 @@ bool Device::fork_child(const std::strin
+@@ -358,7 +362,7 @@ bool Device::fork_child(const std::strin
  		close(c2p[0]);
  		close(c2p[1]);
  		// close(2); // close cerr