Update grhino to 0.16.1:

- Fix compilation error with newer GCC versions.
- Backport changes from Debian by Vincent Legout, Martin Michlmayr.
- Fix bad interaction between edit board and preference dialog box.
- Fix bad interaction between edit board and toolbar.
- Fix midgame search when the game finishes without filling the board.

Add patch-Makefile.in to fix PR pkg/34215

Remove patch-book.cc patch-game.cc patch-log__proc.h as:

        Change from Debian port by Martin Michlmayr <tbm@cyrius.com>
        * book.cc, game.cc, log_proc.h: Include <cstdlib>.

6 files changed, 67 insertions, 46 deletions

diff --git a/games/grhino/Makefile b/games/grhino/Makefile
index 9cbddc3cd77..20c4ba4d0aa 100644
--- a/games/grhino/Makefile
+++ b/games/grhino/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.59 2013/02/16 11:21:20 wiz Exp $
+# $NetBSD: Makefile,v 1.60 2013/04/08 22:10:59 prlw1 Exp $
 #
 
-DISTNAME=		grhino-0.16.0
-PKGREVISION=		21
+DISTNAME=		grhino-0.16.1
 CATEGORIES=		games
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=rhino/}
 
diff --git a/games/grhino/distinfo b/games/grhino/distinfo
index 135396b7f5f..8c51d54b00d 100644
--- a/games/grhino/distinfo
+++ b/games/grhino/distinfo
@@ -1,12 +1,10 @@
-$NetBSD: distinfo,v 1.13 2011/11/24 14:08:05 joerg Exp $
+$NetBSD: distinfo,v 1.14 2013/04/08 22:10:59 prlw1 Exp $
 
-SHA1 (grhino-0.16.0.tar.gz) = ca76895fc2370995e4942aec98e4359ce5549925
-RMD160 (grhino-0.16.0.tar.gz) = f91415e5263eec3837a2a0cb06b610f0ba64668f
-Size (grhino-0.16.0.tar.gz) = 1172321 bytes
+SHA1 (grhino-0.16.1.tar.gz) = d9c13d88980bb37d5172193bdab088c7a987c1c2
+RMD160 (grhino-0.16.1.tar.gz) = e0b77cfe4ba8215dda5701c3ddcf753a5fbc9358
+Size (grhino-0.16.1.tar.gz) = 1178091 bytes
+SHA1 (patch-Makefile.in) = 877fcdf01b7de51b33370a71ef0dcee6a286fba6
 SHA1 (patch-aa) = 762ad3cffe3ab40a070cdf89f06d5b302a963965
 SHA1 (patch-aiai.cc) = 01c99b4d16c9ead4a0c95c8e91a8111c59f9446d
-SHA1 (patch-book.cc) = a120f2c718c85666dfe6acd76bb3b49a8e5863fa
-SHA1 (patch-game.cc) = d6c0a2036653d1920f4b0ea9f770c00fd1718ada
 SHA1 (patch-gen__book.cc) = 9cefade318b76df658d0d5959cc6378f5275a971
 SHA1 (patch-gen__pattern.cc) = 90ef9ca71921e0a1bd86dcb5aacdad7a4d0aa360
-SHA1 (patch-log__proc.h) = 058fc9c9052a5126c0de137ad0087c667bb663c4
diff --git a/games/grhino/patches/patch-Makefile.in b/games/grhino/patches/patch-Makefile.in
new file mode 100644
index 00000000000..204a3c8f7a5
--- /dev/null
+++ b/games/grhino/patches/patch-Makefile.in
@@ -0,0 +1,60 @@
+$NetBSD: patch-Makefile.in,v 1.1 2013/04/08 22:10:59 prlw1 Exp $
+
+Fix solaris build - PR pkg/34215
+https://sourceforge.net/tracker/?func=detail&aid=3610330&group_id=13362&atid=113362
+--- Makefile.in.orig	2013-04-07 08:31:30.000000000 +0000
++++ Makefile.in
+@@ -452,43 +452,43 @@ distclean : distclean_curdir
+ 	$(adBeginSubdir) $@ $(adEndSubdir)
+ 
+ install_mkdir :
+-	if [ ! -e "$(DESTDIR)$(bindir)" ]; then		\
++	if [ ! -d "$(DESTDIR)$(bindir)" ]; then		\
+ 		mkdir -p "$(DESTDIR)$(bindir)";		\
+ 		chmod 755 "$(DESTDIR)$(bindir)";		\
+ 	fi
+-	if [ ! -e "$(DESTDIR)$(icon_dir)" ]; then		\
++	if [ ! -d "$(DESTDIR)$(icon_dir)" ]; then		\
+ 		mkdir -p "$(DESTDIR)$(icon_dir)";		\
+ 		chmod 755 "$(DESTDIR)$(icon_dir)";	\
+ 	fi
+-	if [ ! -e "$(DESTDIR)$(pattern_dir)" ]; then	\
++	if [ ! -d "$(DESTDIR)$(pattern_dir)" ]; then	\
+ 		mkdir -p "$(DESTDIR)$(pattern_dir)";	\
+ 		chmod 755 "$(DESTDIR)$(pattern_dir)";	\
+ 	fi
+-	if [ ! -e "$(DESTDIR)$(book_dir)" ]; then		\
++	if [ ! -d "$(DESTDIR)$(book_dir)" ]; then		\
+ 		mkdir -p "$(DESTDIR)$(book_dir)";		\
+ 		chmod 755 "$(DESTDIR)$(book_dir)";	\
+ 	fi
+-	if [ ! -e "$(DESTDIR)$(theme_dir)" ]; then	\
++	if [ ! -d "$(DESTDIR)$(theme_dir)" ]; then	\
+ 		mkdir -p "$(DESTDIR)$(theme_dir)";	\
+ 		chmod 755 "$(DESTDIR)$(theme_dir)";	\
+ 	fi
+-	if [ ! -e "$(DESTDIR)$(theme_dir)/small" ]; then	\
++	if [ ! -d "$(DESTDIR)$(theme_dir)/small" ]; then	\
+ 		mkdir -p "$(DESTDIR)$(theme_dir)/small";	\
+ 		chmod 755 "$(DESTDIR)$(theme_dir)/small";	\
+ 	fi
+-	if [ ! -e "$(DESTDIR)$(omfdir)" ]; then		\
++	if [ ! -d "$(DESTDIR)$(omfdir)" ]; then		\
+ 		mkdir -p "$(DESTDIR)$(omfdir)";		\
+ 		chmod 755 "$(DESTDIR)$(omfdir)";		\
+ 	fi
+-	if [ ! -e "$(DESTDIR)$(helpdir)" ]; then		\
++	if [ ! -d "$(DESTDIR)$(helpdir)" ]; then		\
+ 		mkdir -p "$(DESTDIR)$(helpdir)";		\
+ 		chmod 755 "$(DESTDIR)$(helpdir)";		\
+ 	fi
+-	if [ ! -e "$(DESTDIR)$(helpdir)/C" ]; then	\
++	if [ ! -d "$(DESTDIR)$(helpdir)/C" ]; then	\
+ 		mkdir -p "$(DESTDIR)$(helpdir)/C";	\
+ 		chmod 755 "$(DESTDIR)$(helpdir)/C";	\
+ 	fi
+-	if [ ! -e "$(DESTDIR)$(helpdir)/C/figures" ]; then  \
++	if [ ! -d "$(DESTDIR)$(helpdir)/C/figures" ]; then  \
+ 		mkdir -p "$(DESTDIR)$(helpdir)/C/figures";  \
+ 		chmod 755 "$(DESTDIR)$(helpdir)/C/figures"; \
+ 	fi
diff --git a/games/grhino/patches/patch-book.cc b/games/grhino/patches/patch-book.cc
deleted file mode 100644
index 27532135c15..00000000000
--- a/games/grhino/patches/patch-book.cc
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-book.cc,v 1.1 2011/11/24 14:08:05 joerg Exp $
-
---- book.cc.orig	2011-11-24 01:11:40.000000000 +0000
-+++ book.cc
-@@ -25,6 +25,7 @@
- #include "rand.h"
- #include "gtstream.h"
- 
-+#include <cstdlib>
- #include <vector>
- #include <iostream>
- #include <stdexcept>
diff --git a/games/grhino/patches/patch-game.cc b/games/grhino/patches/patch-game.cc
deleted file mode 100644
index de3bbef5f1e..00000000000
--- a/games/grhino/patches/patch-game.cc
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-game.cc,v 1.1 2011/11/24 14:08:05 joerg Exp $
-
---- game.cc.orig	2011-11-24 01:12:02.000000000 +0000
-+++ game.cc
-@@ -37,6 +37,7 @@
- #include <sys/stat.h> 
- #include <unistd.h>
- #include <fcntl.h>
-+#include <stdlib.h>
- 
- #ifdef _
- #  undef _
diff --git a/games/grhino/patches/patch-log__proc.h b/games/grhino/patches/patch-log__proc.h
deleted file mode 100644
index ca789419ff9..00000000000
--- a/games/grhino/patches/patch-log__proc.h
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-log__proc.h,v 1.1 2011/11/24 14:08:05 joerg Exp $
-
---- log_proc.h.orig	2011-11-24 01:12:41.000000000 +0000
-+++ log_proc.h
-@@ -25,6 +25,7 @@
- #include <string>
- #include <fstream>
- #include <iomanip>
-+#include <cstdlib>
- 
- #include "board.h"
- #include "order.h"