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

depending on compiler.

6 files changed, 35 insertions, 18 deletions

diff --git a/games/ccgo/Makefile b/games/ccgo/Makefile
index baca1030e4c..61e18c1a503 100644
--- a/games/ccgo/Makefile
+++ b/games/ccgo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2013/10/17 14:58:18 roy Exp $
+# $NetBSD: Makefile,v 1.53 2014/09/25 13:47:59 jperkin Exp $
 
 DISTNAME=	ccgo-0.3.6.3
 PKGREVISION=	22
@@ -29,4 +29,5 @@ PREFIX.gnugo_DEFAULT=	${LOCALBASE}
 .include "../../devel/gconfmm/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../x11/gtkmm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/ccgo/distinfo b/games/ccgo/distinfo
index d72b2eb6638..0091e6d9243 100644
--- a/games/ccgo/distinfo
+++ b/games/ccgo/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.6 2009/02/09 21:11:52 joerg Exp $
+$NetBSD: distinfo,v 1.7 2014/09/25 13:47:59 jperkin Exp $
 
 SHA1 (ccgo-0.3.6.3.tar.gz) = 3ef5f779aa7560937f9713b7c189f27033bbb5bb
 RMD160 (ccgo-0.3.6.3.tar.gz) = de97f1a726e0d3ca2c20022823499eeacd05923d
 Size (ccgo-0.3.6.3.tar.gz) = 565911 bytes
-SHA1 (patch-aa) = 7d70e68ac97b77ddd0e53cb97d79cca2948d7cc6
-SHA1 (patch-ab) = 7019660d487fc41062a8cedc1df57da279fcc922
-SHA1 (patch-ac) = 40bbc99e781bc7d46f2b54a1e47f55b9babc203e
-SHA1 (patch-ad) = 0663df8904fe608c7c63c545a52e37cf53db7356
+SHA1 (patch-aa) = dca8fb6d7765c128d289d6c5f082694b1f7df9f2
+SHA1 (patch-ab) = 7bdb6aab0424a3f785e184e8bf0e47b9aa7a017d
+SHA1 (patch-ac) = e3ace3ec2f31da4cb8df3205b8e9c725ba3a654a
+SHA1 (patch-ad) = 3ba989de543c1b97bd6c0f9aea5fd65682500635
 SHA1 (patch-ae) = cbfaa2fbf222e5690e927ec069a396eca2c47c7a
 SHA1 (patch-af) = abb949cc6729036439583dc544581b3db40f412c
 SHA1 (patch-ag) = 271e5dac7de0d206c1ea242c95f85ec1f3dd3ea8
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