Update ccgo to 0.3.6.5. Primarily fixes compatibility issues with newer

libsigc++.

17 files changed, 201 insertions, 90 deletions

diff --git a/games/ccgo/Makefile b/games/ccgo/Makefile
index 771667de040..9f35832cf94 100644
--- a/games/ccgo/Makefile
+++ b/games/ccgo/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.56 2016/08/03 10:22:45 adam Exp $
+# $NetBSD: Makefile,v 1.57 2016/12/17 23:22:30 joerg Exp $
 
-DISTNAME=	ccgo-0.3.6.3
-PKGREVISION=	24
+DISTNAME=	ccgo-0.3.6.5
 CATEGORIES=	games
 MASTER_SITES=	http://ccdw.org/~cjj/prog/ccgo/src/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://ccdw.org/~cjj/prog/ccgo/
 COMMENT=	Go board with IGS and gnugo interface
+LICENSE=	gnu-gpl-v3
 
 DEPENDS+=	gnugo>=3.4:../../games/gnugo
 
@@ -22,6 +22,10 @@ SUBST_FILES.ccgo=	game_setup.cc settings.cc
 SUBST_MESSAGE.ccgo=	Fixing paths to gnugo.
 SUBST_SED.ccgo=		-e 's|/usr/games/gnugo|${LOCALBASE}/bin/gnugo|g'
 
+.include "../../mk/bsd.prefs.mk"
+
+CXXFLAGS+=	-std=c++11
+
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gconfmm/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/games/ccgo/distinfo b/games/ccgo/distinfo
index 492a9a58321..9ff9256874c 100644
--- a/games/ccgo/distinfo
+++ b/games/ccgo/distinfo
@@ -1,13 +1,19 @@
-$NetBSD: distinfo,v 1.8 2015/11/03 20:56:45 agc Exp $
+$NetBSD: distinfo,v 1.9 2016/12/17 23:22:30 joerg Exp $
 
-SHA1 (ccgo-0.3.6.3.tar.gz) = 3ef5f779aa7560937f9713b7c189f27033bbb5bb
-RMD160 (ccgo-0.3.6.3.tar.gz) = de97f1a726e0d3ca2c20022823499eeacd05923d
-SHA512 (ccgo-0.3.6.3.tar.gz) = 23791ef69cecdb5efa1870d5e6574929d2aa8d37678e905909b86643a71dbb32138bab119219390b68753f7ff338c64fb67121bb8264cd97529ba20d3606ea7d
-Size (ccgo-0.3.6.3.tar.gz) = 565911 bytes
-SHA1 (patch-aa) = dca8fb6d7765c128d289d6c5f082694b1f7df9f2
-SHA1 (patch-ab) = 7bdb6aab0424a3f785e184e8bf0e47b9aa7a017d
-SHA1 (patch-ac) = e3ace3ec2f31da4cb8df3205b8e9c725ba3a654a
-SHA1 (patch-ad) = 3ba989de543c1b97bd6c0f9aea5fd65682500635
+SHA1 (ccgo-0.3.6.5.tar.gz) = df4cbfc29867215dec8e46f14be09ee2a11f909f
+RMD160 (ccgo-0.3.6.5.tar.gz) = 55db13c15e6318d8fc3e5d61ac96da89d6d6be4e
+SHA512 (ccgo-0.3.6.5.tar.gz) = 268c228eee9c42e49df333bfa0707e7b72c39731ccd64239e3c426958f6c17b65658db91bc7ab89548c4cc647ade791a7c67c30c410a5b3935c8fd3f326bf36b
+Size (ccgo-0.3.6.5.tar.gz) = 639238 bytes
 SHA1 (patch-ae) = cbfaa2fbf222e5690e927ec069a396eca2c47c7a
 SHA1 (patch-af) = abb949cc6729036439583dc544581b3db40f412c
-SHA1 (patch-ag) = 271e5dac7de0d206c1ea242c95f85ec1f3dd3ea8
+SHA1 (patch-gmp_device.cc) = c796af1021f143034505bdfb79057301e68deb50
+SHA1 (patch-gmp_device.hh) = 5cbcfc1f60967129f7b8b49d9d017170186ad2d3
+SHA1 (patch-go_board.cc) = a099b74af931a49840634c17ed9816a6e53d2089
+SHA1 (patch-go_go0.cc) = e6de835e838c44725d93924cd03d7c9b8fb0a8de
+SHA1 (patch-igs_connect.hh) = 7032f14348f7d0039186cb78c721f4b126e6d1d6
+SHA1 (patch-igs_datetime.cc) = 96f87ef65092e4e4ea7ea430ba6358f4c7fbb349
+SHA1 (patch-igs_fork.cc) = 316671d65a3afbd88d8c1ad10b16328996e3c8ac
+SHA1 (patch-igs_game.hh) = 0b5c0a92e7d819bea4b2785e8eae1780682ff4da
+SHA1 (patch-igs_game__list.cc) = 3d81329683ca634d8d2210b3b5a106d5ef0efbbe
+SHA1 (patch-igs_player.hh) = 350c24ea8b662d984f192c439181dbfefd7a7884
+SHA1 (patch-igs_show.cc) = 3c40a3daebf74dc403da262d76804e0823fe4f01
diff --git a/games/ccgo/patches/patch-aa b/games/ccgo/patches/patch-aa
deleted file mode 100644
index 34ac68c4f9b..00000000000
--- a/games/ccgo/patches/patch-aa
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2014/09/25 13:47:59 jperkin Exp $
-
---- igs/datetime.cc.orig	2008-04-21 17:41:47.000000000 +0000
-+++ igs/datetime.cc
-@@ -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
- #endif
diff --git a/games/ccgo/patches/patch-ac b/games/ccgo/patches/patch-ac
deleted file mode 100644
index 797f538f925..00000000000
--- a/games/ccgo/patches/patch-ac
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2014/09/25 13:47:59 jperkin Exp $
-
---- igs/sock.cc.orig	2004-09-24 02:12:22.000000000 +0000
-+++ igs/sock.cc
-@@ -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>
- }
- #include <cerrno>
- 
diff --git a/games/ccgo/patches/patch-ad b/games/ccgo/patches/patch-ad
deleted file mode 100644
index 065b0d24856..00000000000
--- a/games/ccgo/patches/patch-ad
+++ /dev/null
@@ -1,25 +0,0 @@
-$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
-@@ -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 +362,7 @@ bool Device::fork_child(const std::strin
- 		close(c2p[0]);
- 		close(c2p[1]);
- 		// close(2); // close cerr
--		char * shell = "/bin/bash";
-+		char * shell = "/bin/sh";
- 		std::string c = std::string("exec ") + n;
- 		execl(shell, shell, "-c", c.c_str(), 0);
- 		// exec failed!
diff --git a/games/ccgo/patches/patch-ag b/games/ccgo/patches/patch-ag
deleted file mode 100644
index 80725f8f2a0..00000000000
--- a/games/ccgo/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2005/07/22 22:13:25 adam Exp $
-
---- Makefile.in.orig	2005-07-22 20:09:08.000000000 +0000
-+++ Makefile.in
-@@ -290,7 +290,7 @@ nctest_SOURCES = \
- 	nctest.cc \
- 	nc.cc nc.hh
- 
--nctest_LDADD = arg.o debug.o go/libgo.a -lncurses
-+nctest_LDADD = arg.o debug.o go/libgo.a -lcurses
- gtktest_SOURCES = gtktest.cc
- gtktest_LDADD = arg.o debug.o gtk/libgtk.a go/libgo.a $(GTKMM_LIBS)
- appicondir = $(datadir)/pixmaps
diff --git a/games/ccgo/patches/patch-gmp_device.cc b/games/ccgo/patches/patch-gmp_device.cc
new file mode 100644
index 00000000000..3fe415aba5d
--- /dev/null
+++ b/games/ccgo/patches/patch-gmp_device.cc
@@ -0,0 +1,25 @@
+$NetBSD: patch-gmp_device.cc,v 1.1 2016/12/17 23:22:30 joerg Exp $
+
+--- gmp/device.cc.orig	2015-05-23 14:48:57.000000000 +0000
++++ gmp/device.cc
+@@ -26,7 +26,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;
+@@ -370,7 +374,7 @@ bool Device::fork_child(const std::strin
+ 		close(c2p[0]);
+ 		close(c2p[1]);
+ 		// close(2); // close cerr
+-		const char * shell = "/bin/bash";
++		const char * shell = "/bin/sh";
+ 		std::string c = std::string("exec ") + n;
+ 		execl(shell, shell, "-c", c.c_str(), (void *) 0);
+ 		// exec failed!
diff --git a/games/ccgo/patches/patch-gmp_device.hh b/games/ccgo/patches/patch-gmp_device.hh
new file mode 100644
index 00000000000..73ba92f553a
--- /dev/null
+++ b/games/ccgo/patches/patch-gmp_device.hh
@@ -0,0 +1,12 @@
+$NetBSD: patch-gmp_device.hh,v 1.1 2016/12/17 23:22:30 joerg Exp $
+
+--- gmp/device.hh.orig	2015-11-20 13:38:41.000000000 +0000
++++ gmp/device.hh
+@@ -10,7 +10,6 @@
+ #ifndef GMP_DEVICE_HH
+ #define GMP_DEVICE_HH
+ #include "gmp.hh"
+-#include <sigc++/object.h>
+ #include <sigc++/signal.h>
+ #include <string>
+ #include <queue>
diff --git a/games/ccgo/patches/patch-go_board.cc b/games/ccgo/patches/patch-go_board.cc
new file mode 100644
index 00000000000..2d246841306
--- /dev/null
+++ b/games/ccgo/patches/patch-go_board.cc
@@ -0,0 +1,31 @@
+$NetBSD: patch-go_board.cc,v 1.1 2016/12/17 23:22:30 joerg Exp $
+
+--- go/board.cc.orig	2015-12-25 17:03:20.000000000 +0000
++++ go/board.cc
+@@ -323,7 +323,7 @@ void Board::score_terri(State * terri) c
+ 			}
+ 		}
+ 	} while (rr);
+-	delete marks;
++	delete[] marks;
+ }
+ 
+ void Board::get_group(Loc loc, vector<Loc> & group) const
+@@ -333,7 +333,7 @@ void Board::get_group(Loc loc, vector<Lo
+ 	bool * marks = new bool[r];
+ 	for (Loc i = 0; i < r; i ++) marks[i] = false;
+ 	qi_group(loc, group, b[loc], marks);
+-	delete marks;
++	delete[] marks;
+ }
+ 
+ void Board::dead_group(Loc loc, vector<Loc> & group) const
+@@ -343,7 +343,7 @@ void Board::dead_group(Loc loc, vector<L
+ 	bool * marks = new bool[r];
+ 	for (Loc i = 0; i < r; i ++) marks[i] = false;
+ 	terri_group(loc, b[loc], group, marks);
+-	delete marks;
++	delete[] marks;
+ }
+ void Board::find_terri(Loc loc, vector<Loc> & group, bool & w_seen, bool & b_seen, State * terri, bool * marks) const
+ // recursively find connected empty space including killed stones
diff --git a/games/ccgo/patches/patch-go_go0.cc b/games/ccgo/patches/patch-go_go0.cc
new file mode 100644
index 00000000000..97a2c8a9c40
--- /dev/null
+++ b/games/ccgo/patches/patch-go_go0.cc
@@ -0,0 +1,31 @@
+$NetBSD: patch-go_go0.cc,v 1.1 2016/12/17 23:22:30 joerg Exp $
+
+--- go/go0.cc.orig	2015-12-25 17:01:53.000000000 +0000
++++ go/go0.cc
+@@ -277,7 +277,7 @@ void Board::score_terri(Terri * terri) c
+ 			}
+ 		}
+ 	} while (rr);
+-	delete marks;
++	delete[] marks;
+ }
+ 
+ void Board::find_terri(int loc, std::vector<int> & group, bool & w_seen, bool & b_seen, Terri * terri, bool * marks) const
+@@ -319,7 +319,7 @@ void Board::get_group(int loc, std::vect
+ 	bool * marks = new bool[r];
+ 	for (int i = 0; i < r; i ++) marks[i] = false;
+ 	qi_group(loc, group, b[loc], marks);
+-	delete marks;
++	delete[] marks;
+ }
+ 
+ void Board::dead_group(int loc, std::vector<int> & group) const
+@@ -329,7 +329,7 @@ void Board::dead_group(int loc, std::vec
+ 	bool * marks = new bool[r];
+ 	for (int i = 0; i < r; i ++) marks[i] = false;
+ 	terri_group(loc, b[loc], group, marks);
+-	delete marks;
++	delete[] marks;
+ }
+ 
+ void Board::terri_group(int loc, State state, std::vector<int> & group, bool * marks) const
diff --git a/games/ccgo/patches/patch-igs_connect.hh b/games/ccgo/patches/patch-igs_connect.hh
new file mode 100644
index 00000000000..d9019679756
--- /dev/null
+++ b/games/ccgo/patches/patch-igs_connect.hh
@@ -0,0 +1,12 @@
+$NetBSD: patch-igs_connect.hh,v 1.1 2016/12/17 23:22:30 joerg Exp $
+
+--- igs/connect.hh.orig	2015-11-20 13:38:53.000000000 +0000
++++ igs/connect.hh
+@@ -9,7 +9,6 @@
+ 
+ #ifndef IGS_CONNECT_HH
+ #define IGS_CONNECT_HH
+-#include <sigc++/object.h>
+ #include <sigc++/signal.h>
+ #include <glibmm/refptr.h>
+ #include <glibmm/object.h>
diff --git a/games/ccgo/patches/patch-igs_datetime.cc b/games/ccgo/patches/patch-igs_datetime.cc
new file mode 100644
index 00000000000..e3a1fe3c84e
--- /dev/null
+++ b/games/ccgo/patches/patch-igs_datetime.cc
@@ -0,0 +1,12 @@
+$NetBSD: patch-igs_datetime.cc,v 1.1 2016/12/17 23:22:30 joerg Exp $
+
+--- igs/datetime.cc.orig	2015-12-25 17:00:08.000000000 +0000
++++ igs/datetime.cc
+@@ -19,7 +19,6 @@
+  * 
+  */
+ 
+-#define _XOPEN_SOURCE 1
+ #ifndef _GNU_SOURCE
+ #define _GNU_SOURCE 1
+ #endif
diff --git a/games/ccgo/patches/patch-ab b/games/ccgo/patches/patch-igs_fork.cc
index 180d874527f..edf8e894433 100644
--- a/games/ccgo/patches/patch-ab
+++ b/games/ccgo/patches/patch-igs_fork.cc
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.3 2014/09/25 13:47:59 jperkin Exp $
+$NetBSD: patch-igs_fork.cc,v 1.1 2016/12/17 23:22:30 joerg Exp $
 
---- igs/fork.cc.orig	2004-09-24 02:12:22.000000000 +0000
+--- igs/fork.cc.orig	2015-05-23 14:48:57.000000000 +0000
 +++ igs/fork.cc
-@@ -15,7 +15,11 @@ extern "C" {
+@@ -27,7 +27,11 @@ extern "C" {
  #include <sys/types.h>
  #include <sys/fcntl.h>
  #include <sys/wait.h>
@@ -14,12 +14,12 @@ $NetBSD: patch-ab,v 1.3 2014/09/25 13:47:59 jperkin Exp $
  }
  
  using namespace igs;
-@@ -139,7 +143,7 @@ bool Fork::open_conn(const std::string &
+@@ -151,7 +155,7 @@ bool Fork::open_conn(const std::string &
  		close(c2p[0]);
  		close(c2p[1]);
  		close(2); // close cerr
--		char * shell = "/bin/bash";
-+		char * shell = "/bin/sh";
+-		const char * shell = "/bin/bash";
++		const char * shell = "/bin/sh";
  		std::string c = std::string ("exec ") + n;
- 		execl(shell, shell, "-c", c.c_str(), 0);
+ 		execl(shell, shell, "-c", c.c_str(), (void *) 0);
  		std::cerr << "Fail to fork: " << n << std::endl;
diff --git a/games/ccgo/patches/patch-igs_game.hh b/games/ccgo/patches/patch-igs_game.hh
new file mode 100644
index 00000000000..ce8adc365ae
--- /dev/null
+++ b/games/ccgo/patches/patch-igs_game.hh
@@ -0,0 +1,12 @@
+$NetBSD: patch-igs_game.hh,v 1.1 2016/12/17 23:22:30 joerg Exp $
+
+--- igs/game.hh.orig	2015-11-20 13:39:00.000000000 +0000
++++ igs/game.hh
+@@ -11,7 +11,6 @@
+ #define IGS_GAME_HH
+ #include "player.hh"
+ #include <string>
+-#include <sigc++/object.h>
+ namespace igs
+ {
+ 	class Game :
diff --git a/games/ccgo/patches/patch-igs_game__list.cc b/games/ccgo/patches/patch-igs_game__list.cc
new file mode 100644
index 00000000000..a88caf335ff
--- /dev/null
+++ b/games/ccgo/patches/patch-igs_game__list.cc
@@ -0,0 +1,13 @@
+$NetBSD: patch-igs_game__list.cc,v 1.1 2016/12/17 23:22:30 joerg Exp $
+
+--- igs/game_list.cc.orig	2015-12-25 16:58:38.000000000 +0000
++++ igs/game_list.cc
+@@ -253,7 +253,7 @@ void GameList::update(const Game & g)
+ 
+ 			skip_move(i->game.get_num());
+ 			i->state = GS_NORMAL;
+-			i->show->input_line.connect(bind(game_input_kibitz.make_slot(), i->game.get_num()));
++			i->show->input_line.connect(bind(game_input_kibitz.make_slot(), std::placeholders::_1, std::placeholders::_2, i->game.get_num()));
+ 			i->show->set_play(i->game.get_white() == name, i->game.get_black() == name);
+ 			if (i->game.get_white() == name || i->game.get_black() == name) { // am i playing
+ 				my_match = i->game.get_num();
diff --git a/games/ccgo/patches/patch-igs_player.hh b/games/ccgo/patches/patch-igs_player.hh
new file mode 100644
index 00000000000..571172f0335
--- /dev/null
+++ b/games/ccgo/patches/patch-igs_player.hh
@@ -0,0 +1,12 @@
+$NetBSD: patch-igs_player.hh,v 1.1 2016/12/17 23:22:30 joerg Exp $
+
+--- igs/player.hh.orig	2015-11-20 13:39:18.000000000 +0000
++++ igs/player.hh
+@@ -12,7 +12,6 @@
+ #include "custom_text.hh"
+ #include "datetime.hh"
+ #include <string>
+-#include <sigc++/object.h>
+ #include <ctime>
+ 
+ namespace igs
diff --git a/games/ccgo/patches/patch-igs_show.cc b/games/ccgo/patches/patch-igs_show.cc
new file mode 100644
index 00000000000..23c011ba70b
--- /dev/null
+++ b/games/ccgo/patches/patch-igs_show.cc
@@ -0,0 +1,11 @@
+$NetBSD: patch-igs_show.cc,v 1.1 2016/12/17 23:22:30 joerg Exp $
+
+--- igs/show.cc.orig	2015-12-25 16:59:26.000000000 +0000
++++ igs/show.cc
+@@ -359,5 +359,5 @@ void Show::show_score_board(const Board 
+ 	}
+  out:
+ 	if (is_score) part.add_score(t); // don't delete t
+-	else delete t;
++	else delete[] t;
+ }