Thu Sep 25 13:47:59 2014 UTC ()
Apply some patches to get the build further on SunOS.  May build
depending on compiler.


(jperkin)
diff -r1.52 -r1.53 pkgsrc/games/ccgo/Makefile
diff -r1.6 -r1.7 pkgsrc/games/ccgo/distinfo
diff -r1.3 -r1.4 pkgsrc/games/ccgo/patches/patch-aa
diff -r1.2 -r1.3 pkgsrc/games/ccgo/patches/patch-ab
diff -r1.2 -r1.3 pkgsrc/games/ccgo/patches/patch-ad
diff -r1.1.1.1 -r1.2 pkgsrc/games/ccgo/patches/patch-ac
cvs diff -r1.52 -r1.53 pkgsrc/games/ccgo/Makefile (expand / switch to unified diff)

--- pkgsrc/games/ccgo/Makefile 2013/10/17 14:58:18 1.52
+++ pkgsrc/games/ccgo/Makefile 2014/09/25 13:47:59 1.53
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.52 2013/10/17 14:58:18 roy Exp $ 1# $NetBSD: Makefile,v 1.53 2014/09/25 13:47:59 jperkin Exp $
2 2
3DISTNAME= ccgo-0.3.6.3 3DISTNAME= ccgo-0.3.6.3
4PKGREVISION= 22 4PKGREVISION= 22
5CATEGORIES= games 5CATEGORIES= games
6MASTER_SITES= http://ccdw.org/~cjj/prog/ccgo/src/ 6MASTER_SITES= http://ccdw.org/~cjj/prog/ccgo/src/
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://ccdw.org/~cjj/prog/ccgo/ 9HOMEPAGE= http://ccdw.org/~cjj/prog/ccgo/
10COMMENT= Go board with IGS and gnugo interface 10COMMENT= Go board with IGS and gnugo interface
11 11
12DEPENDS+= gnugo>=3.4:../../games/gnugo 12DEPENDS+= gnugo>=3.4:../../games/gnugo
13 13
14USE_LANGUAGES= c c++ 14USE_LANGUAGES= c c++
@@ -19,14 +19,15 @@ GNU_CONFIGURE= yes @@ -19,14 +19,15 @@ GNU_CONFIGURE= yes
19SUBST_CLASSES+= ccgo 19SUBST_CLASSES+= ccgo
20SUBST_STAGE.ccgo= pre-configure 20SUBST_STAGE.ccgo= pre-configure
21SUBST_FILES.ccgo= game_setup.cc settings.cc 21SUBST_FILES.ccgo= game_setup.cc settings.cc
22SUBST_MESSAGE.ccgo= Fixing paths to gnugo. 22SUBST_MESSAGE.ccgo= Fixing paths to gnugo.
23SUBST_SED.ccgo= -e 's|/usr/games/gnugo|${PREFIX.gnugo}/bin/gnugo|g' 23SUBST_SED.ccgo= -e 's|/usr/games/gnugo|${PREFIX.gnugo}/bin/gnugo|g'
24 24
25EVAL_PREFIX+= PREFIX.gnugo 25EVAL_PREFIX+= PREFIX.gnugo
26PREFIX.gnugo_DEFAULT= ${LOCALBASE} 26PREFIX.gnugo_DEFAULT= ${LOCALBASE}
27 27
28.include "../../converters/libiconv/buildlink3.mk" 28.include "../../converters/libiconv/buildlink3.mk"
29.include "../../devel/gconfmm/buildlink3.mk" 29.include "../../devel/gconfmm/buildlink3.mk"
30.include "../../devel/gettext-lib/buildlink3.mk" 30.include "../../devel/gettext-lib/buildlink3.mk"
31.include "../../sysutils/desktop-file-utils/desktopdb.mk" 31.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 32.include "../../x11/gtkmm/buildlink3.mk"
32.include "../../mk/bsd.pkg.mk" 33.include "../../mk/bsd.pkg.mk"
cvs diff -r1.6 -r1.7 pkgsrc/games/ccgo/distinfo (expand / switch to unified diff)

--- pkgsrc/games/ccgo/distinfo 2009/02/09 21:11:52 1.6
+++ pkgsrc/games/ccgo/distinfo 2014/09/25 13:47:59 1.7
@@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
1$NetBSD: distinfo,v 1.6 2009/02/09 21:11:52 joerg Exp $ 1$NetBSD: distinfo,v 1.7 2014/09/25 13:47:59 jperkin Exp $
2 2
3SHA1 (ccgo-0.3.6.3.tar.gz) = 3ef5f779aa7560937f9713b7c189f27033bbb5bb 3SHA1 (ccgo-0.3.6.3.tar.gz) = 3ef5f779aa7560937f9713b7c189f27033bbb5bb
4RMD160 (ccgo-0.3.6.3.tar.gz) = de97f1a726e0d3ca2c20022823499eeacd05923d 4RMD160 (ccgo-0.3.6.3.tar.gz) = de97f1a726e0d3ca2c20022823499eeacd05923d
5Size (ccgo-0.3.6.3.tar.gz) = 565911 bytes 5Size (ccgo-0.3.6.3.tar.gz) = 565911 bytes
6SHA1 (patch-aa) = 7d70e68ac97b77ddd0e53cb97d79cca2948d7cc6 6SHA1 (patch-aa) = dca8fb6d7765c128d289d6c5f082694b1f7df9f2
7SHA1 (patch-ab) = 7019660d487fc41062a8cedc1df57da279fcc922 7SHA1 (patch-ab) = 7bdb6aab0424a3f785e184e8bf0e47b9aa7a017d
8SHA1 (patch-ac) = 40bbc99e781bc7d46f2b54a1e47f55b9babc203e 8SHA1 (patch-ac) = e3ace3ec2f31da4cb8df3205b8e9c725ba3a654a
9SHA1 (patch-ad) = 0663df8904fe608c7c63c545a52e37cf53db7356 9SHA1 (patch-ad) = 3ba989de543c1b97bd6c0f9aea5fd65682500635
10SHA1 (patch-ae) = cbfaa2fbf222e5690e927ec069a396eca2c47c7a 10SHA1 (patch-ae) = cbfaa2fbf222e5690e927ec069a396eca2c47c7a
11SHA1 (patch-af) = abb949cc6729036439583dc544581b3db40f412c 11SHA1 (patch-af) = abb949cc6729036439583dc544581b3db40f412c
12SHA1 (patch-ag) = 271e5dac7de0d206c1ea242c95f85ec1f3dd3ea8 12SHA1 (patch-ag) = 271e5dac7de0d206c1ea242c95f85ec1f3dd3ea8
cvs diff -r1.3 -r1.4 pkgsrc/games/ccgo/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/games/ccgo/patches/Attic/patch-aa 2009/02/09 21:11:52 1.3
+++ pkgsrc/games/ccgo/patches/Attic/patch-aa 2014/09/25 13:47:59 1.4
@@ -1,12 +1,15 @@ @@ -1,12 +1,15 @@
1$NetBSD: patch-aa,v 1.3 2009/02/09 21:11:52 joerg Exp $ 1$NetBSD: patch-aa,v 1.4 2014/09/25 13:47:59 jperkin Exp $
2 2
3--- igs/datetime.cc.orig 2009-02-09 21:39:32.000000000 +0100 3--- igs/datetime.cc.orig 2008-04-21 17:41:47.000000000 +0000
4+++ igs/datetime.cc 4+++ igs/datetime.cc
5@@ -8,6 +8,7 @@ 5@@ -7,7 +7,10 @@
 6 * published by the Free Software Foundation.
6 */ 7 */
7  8
 9+#ifndef __sun
8 #define _XOPEN_SOURCE 10 #define _XOPEN_SOURCE
 11+#endif
9+#define _NETBSD_SOURCE 12+#define _NETBSD_SOURCE
10 #ifndef _GNU_SOURCE 13 #ifndef _GNU_SOURCE
11 #define _GNU_SOURCE 1 14 #define _GNU_SOURCE 1
12 #endif 15 #endif
cvs diff -r1.2 -r1.3 pkgsrc/games/ccgo/patches/Attic/patch-ab (expand / switch to unified diff)

--- pkgsrc/games/ccgo/patches/Attic/patch-ab 2005/07/22 22:13:25 1.2
+++ pkgsrc/games/ccgo/patches/Attic/patch-ab 2014/09/25 13:47:59 1.3
@@ -1,21 +1,25 @@ @@ -1,21 +1,25 @@
1$NetBSD: patch-ab,v 1.2 2005/07/22 22:13:25 adam Exp $ 1$NetBSD: patch-ab,v 1.3 2014/09/25 13:47:59 jperkin Exp $
2 2
3--- igs/fork.cc.orig 2004-09-24 02:12:22.000000000 +0000 3--- igs/fork.cc.orig 2004-09-24 02:12:22.000000000 +0000
4+++ igs/fork.cc 4+++ igs/fork.cc
5@@ -16,6 +16,7 @@ extern "C" { 5@@ -15,7 +15,11 @@ extern "C" {
 6 #include <sys/types.h>
6 #include <sys/fcntl.h> 7 #include <sys/fcntl.h>
7 #include <sys/wait.h> 8 #include <sys/wait.h>
 9+#ifdef __sun
 10+#include <fcntl.h>
 11+#endif
8 #include <unistd.h> 12 #include <unistd.h>
9+#include <signal.h> 13+#include <signal.h>
10 } 14 }
11  15
12 using namespace igs; 16 using namespace igs;
13@@ -139,7 +140,7 @@ bool Fork::open_conn(const std::string & 17@@ -139,7 +143,7 @@ bool Fork::open_conn(const std::string &
14 close(c2p[0]); 18 close(c2p[0]);
15 close(c2p[1]); 19 close(c2p[1]);
16 close(2); // close cerr 20 close(2); // close cerr
17- char * shell = "/bin/bash"; 21- char * shell = "/bin/bash";
18+ char * shell = "/bin/sh"; 22+ char * shell = "/bin/sh";
19 std::string c = std::string ("exec ") + n; 23 std::string c = std::string ("exec ") + n;
20 execl(shell, shell, "-c", c.c_str(), 0); 24 execl(shell, shell, "-c", c.c_str(), 0);
21 std::cerr << "Fail to fork: " << n << std::endl; 25 std::cerr << "Fail to fork: " << n << std::endl;
cvs diff -r1.2 -r1.3 pkgsrc/games/ccgo/patches/Attic/patch-ad (expand / switch to unified diff)

--- pkgsrc/games/ccgo/patches/Attic/patch-ad 2005/07/22 22:13:25 1.2
+++ pkgsrc/games/ccgo/patches/Attic/patch-ad 2014/09/25 13:47:59 1.3
@@ -1,21 +1,25 @@ @@ -1,21 +1,25 @@
1$NetBSD: patch-ad,v 1.2 2005/07/22 22:13:25 adam Exp $ 1$NetBSD: patch-ad,v 1.3 2014/09/25 13:47:59 jperkin Exp $
2 2
3--- gmp/device.cc.orig 2004-09-24 02:12:20.000000000 +0000 3--- gmp/device.cc.orig 2004-09-24 02:12:20.000000000 +0000
4+++ gmp/device.cc 4+++ gmp/device.cc
5@@ -15,6 +15,7 @@ extern "C" { 5@@ -14,7 +14,11 @@
 6 extern "C" {
6 #include <sys/fcntl.h> 7 #include <sys/fcntl.h>
7 #include <sys/wait.h> 8 #include <sys/wait.h>
 9+#ifdef __sun
 10+#include <fcntl.h>
 11+#endif
8 #include <unistd.h> 12 #include <unistd.h>
9+#include <signal.h> 13+#include <signal.h>
10 } 14 }
11  15
12 using namespace gmp; 16 using namespace gmp;
13@@ -358,7 +359,7 @@ bool Device::fork_child(const std::strin 17@@ -358,7 +362,7 @@ bool Device::fork_child(const std::strin
14 close(c2p[0]); 18 close(c2p[0]);
15 close(c2p[1]); 19 close(c2p[1]);
16 // close(2); // close cerr 20 // close(2); // close cerr
17- char * shell = "/bin/bash"; 21- char * shell = "/bin/bash";
18+ char * shell = "/bin/sh"; 22+ char * shell = "/bin/sh";
19 std::string c = std::string("exec ") + n; 23 std::string c = std::string("exec ") + n;
20 execl(shell, shell, "-c", c.c_str(), 0); 24 execl(shell, shell, "-c", c.c_str(), 0);
21 // exec failed! 25 // exec failed!
cvs diff -r1.1.1.1 -r1.2 pkgsrc/games/ccgo/patches/Attic/patch-ac (expand / switch to unified diff)

--- pkgsrc/games/ccgo/patches/Attic/patch-ac 2003/03/16 03:56:27 1.1.1.1
+++ pkgsrc/games/ccgo/patches/Attic/patch-ac 2014/09/25 13:47:59 1.2
@@ -1,12 +1,17 @@ @@ -1,12 +1,17 @@
1$NetBSD: patch-ac,v 1.1.1.1 2003/03/16 03:56:27 rh Exp $ 1$NetBSD: patch-ac,v 1.2 2014/09/25 13:47:59 jperkin Exp $
2 2
3--- igs/sock.cc.orig 2002-11-27 07:35:46.000000000 +1000 3--- igs/sock.cc.orig 2004-09-24 02:12:22.000000000 +0000
4+++ igs/sock.cc 4+++ igs/sock.cc
5@@ -16,6 +16,7 @@ extern "C" { 5@@ -14,8 +14,12 @@ extern "C" {
 6 #include <sys/fcntl.h>
 7 #include <sys/wait.h>
6 #include <sys/socket.h> 8 #include <sys/socket.h>
 9+#ifdef __sun
 10+#include <fcntl.h>
 11+#endif
7 #include <unistd.h> 12 #include <unistd.h>
8 #include <netdb.h> 13 #include <netdb.h>
9+#include <netinet/in.h> 14+#include <netinet/in.h>
10 } 15 }
11 #include <cerrno> 16 #include <cerrno>
12  17