- Update gnushogi/xshogi to 1.3.2

- Grab maintainership
- Update MASTER_SITES, add WWW

8 files changed, 43 insertions, 30 deletions

diff --git a/games/gnushogi/Makefile b/games/gnushogi/Makefile
index d5f65ca23ed9..24a4b8b46def 100644
--- a/games/gnushogi/Makefile
+++ b/games/gnushogi/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	${GNUSHOGI_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${GNUSHOGI_MASTER_SITE_SUBDIR}
 DISTNAME=	${GNUSHOGI_DISTNAME}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	johans@FreeBSD.org
 COMMENT=	GNU version of Shogi
 
 GNU_CONFIGURE=	yes
@@ -31,6 +31,8 @@ post-extract:
 post-patch:
 	@${REINPLACE_CMD} -e 's|/lib/gnushogi|/share/gnushogi|g' \
 		${WRKSRC}/gnushogi/Makefile.in
+	@${REINPLACE_CMD} -e '/HAVE_SETLINEBUF/s|ifdef|ifndef|' \
+		${WRKSRC}/gnushogi/gnushogi.h
 
 pre-build:
 	cd ${WRKSRC}/doc && makeinfo --no-split gnushogi
@@ -47,7 +49,6 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/PORTING ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/*.gam ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/*.ref ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/*.rules ${DOCSDIR}
 .endif
 
diff --git a/games/gnushogi/Makefile.common b/games/gnushogi/Makefile.common
index 0ab9ac7b840e..9c1e7de8b6f2 100644
--- a/games/gnushogi/Makefile.common
+++ b/games/gnushogi/Makefile.common
@@ -3,9 +3,8 @@
 #
 
 GNUSHOGI_PORTNAME=	gnushogi
-GNUSHOGI_PORTVERSION=	1.3
-GNUSHOGI_MASTER_SITES=	${MASTER_SITE_GNU}
-GNUSHOGI_MASTER_SITE_SUBDIR=	${GNUSHOGI_PORTNAME}
+GNUSHOGI_PORTVERSION=	1.3.2
+GNUSHOGI_MASTER_SITES=	http://www.cs.caltech.edu/~mvanier/hacking/gnushogi/
 GNUSHOGI_DISTNAME=	${GNUSHOGI_PORTNAME}-${GNUSHOGI_PORTVERSION}
 
 DISTINFO_FILE=	${.CURDIR}/../../games/gnushogi/distinfo
diff --git a/games/gnushogi/distinfo b/games/gnushogi/distinfo
index 7f836aba32e2..46b29128e0f8 100644
--- a/games/gnushogi/distinfo
+++ b/games/gnushogi/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnushogi-1.3.tar.gz) = 57148a89e4ab2702b2434c10f6e261bc26ea0954754c3d0b3e3eac67b589e5c2
-SIZE (gnushogi-1.3.tar.gz) = 558642
+SHA256 (gnushogi-1.3.2.tar.gz) = 1daebfb4268f0d7fe7103c86ec45da76bb8ef4fafef936e4163a74d97ec8f5c6
+SIZE (gnushogi-1.3.2.tar.gz) = 602613
diff --git a/games/gnushogi/files/patch-gnushogi-genmove.c b/games/gnushogi/files/patch-gnushogi-genmove.c
deleted file mode 100644
index cf4b576e4ebf..000000000000
--- a/games/gnushogi/files/patch-gnushogi-genmove.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- gnushogi/genmove.c.orig	Fri Dec 15 00:14:06 2006
-+++ gnushogi/genmove.c	Fri Dec 15 00:15:04 2006
-@@ -40,7 +40,7 @@
- static short InCheck = false, GenerateAllMoves = false;
- static short check_determined = false;
- 
--static short INCscore = 0;
-+short INCscore = 0;
- 
- short deepsearchcut = true;
- short tas = false, taxs = false, ssa = false;
diff --git a/games/gnushogi/pkg-descr b/games/gnushogi/pkg-descr
index 9d963554d5a9..9f4219eed4b6 100644
--- a/games/gnushogi/pkg-descr
+++ b/games/gnushogi/pkg-descr
@@ -9,3 +9,5 @@ which is located in a directory specified in the makefile.
 
 To invoke the program type:
 	gnushogi
+
+WWW: http://www.cs.caltech.edu/~mvanier/hacking/gnushogi/gnushogi.html
diff --git a/games/gnushogi/pkg-plist b/games/gnushogi/pkg-plist
index a4ed6baf86e1..c086df8ccd35 100644
--- a/games/gnushogi/pkg-plist
+++ b/games/gnushogi/pkg-plist
@@ -1,7 +1,16 @@
 bin/gnushogi
 %%PORTDOCS%%%%DOCSDIR%%/BOOKFILES
 %%PORTDOCS%%%%DOCSDIR%%/PORTING
+%%PORTDOCS%%%%DOCSDIR%%/gnushogi.html
 %%PORTDOCS%%%%DOCSDIR%%/gnushogi_1.html
+%%PORTDOCS%%%%DOCSDIR%%/gnushogi_2.html
+%%PORTDOCS%%%%DOCSDIR%%/gnushogi_3.html
+%%PORTDOCS%%%%DOCSDIR%%/gnushogi_4.html
+%%PORTDOCS%%%%DOCSDIR%%/gnushogi_5.html
+%%PORTDOCS%%%%DOCSDIR%%/gnushogi_6.html
+%%PORTDOCS%%%%DOCSDIR%%/gnushogi_7.html
+%%PORTDOCS%%%%DOCSDIR%%/gnushogi_8.html
+%%PORTDOCS%%%%DOCSDIR%%/gnushogi_9.html
 %%PORTDOCS%%%%DOCSDIR%%/gnushogi_10.html
 %%PORTDOCS%%%%DOCSDIR%%/gnushogi_11.html
 %%PORTDOCS%%%%DOCSDIR%%/gnushogi_12.html
@@ -12,20 +21,14 @@ bin/gnushogi
 %%PORTDOCS%%%%DOCSDIR%%/gnushogi_17.html
 %%PORTDOCS%%%%DOCSDIR%%/gnushogi_18.html
 %%PORTDOCS%%%%DOCSDIR%%/gnushogi_19.html
-%%PORTDOCS%%%%DOCSDIR%%/gnushogi_2.html
 %%PORTDOCS%%%%DOCSDIR%%/gnushogi_20.html
 %%PORTDOCS%%%%DOCSDIR%%/gnushogi_21.html
 %%PORTDOCS%%%%DOCSDIR%%/gnushogi_22.html
-%%PORTDOCS%%%%DOCSDIR%%/gnushogi_3.html
-%%PORTDOCS%%%%DOCSDIR%%/gnushogi_4.html
-%%PORTDOCS%%%%DOCSDIR%%/gnushogi_5.html
-%%PORTDOCS%%%%DOCSDIR%%/gnushogi_6.html
-%%PORTDOCS%%%%DOCSDIR%%/gnushogi_7.html
-%%PORTDOCS%%%%DOCSDIR%%/gnushogi_8.html
-%%PORTDOCS%%%%DOCSDIR%%/gnushogi_9.html
-%%PORTDOCS%%%%DOCSDIR%%/gnushogi_stoc.html
+%%PORTDOCS%%%%DOCSDIR%%/gnushogi_23.html
+%%PORTDOCS%%%%DOCSDIR%%/gnushogi_24.html
+%%PORTDOCS%%%%DOCSDIR%%/gnushogi_abt.html
+%%PORTDOCS%%%%DOCSDIR%%/gnushogi_ovr.html
 %%PORTDOCS%%%%DOCSDIR%%/gnushogi_toc.html
-%%PORTDOCS%%%%DOCSDIR%%/listserv.ref
 %%PORTDOCS%%%%DOCSDIR%%/shogi.rules
 %%PORTDOCS%%%%DOCSDIR%%/tutorial1.gam
 %%PORTDOCS%%%%DOCSDIR%%/tutorial2.gam
diff --git a/games/xshogi/Makefile b/games/xshogi/Makefile
index db8ca1287566..43074b61a8c4 100644
--- a/games/xshogi/Makefile
+++ b/games/xshogi/Makefile
@@ -7,13 +7,12 @@
 
 PORTNAME=	xshogi
 PORTVERSION=	${GNUSHOGI_PORTVERSION}
-PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	${GNUSHOGI_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${GNUSHOGI_MASTER_SITE_SUBDIR}
 DISTNAME=	${GNUSHOGI_DISTNAME}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	johans@FreeBSD.org
 COMMENT=	The Japanese chess-like game for X Window System
 
 RUN_DEPENDS=	gnushogi:${PORTSDIR}/games/gnushogi
@@ -22,6 +21,7 @@ BUILD_WRKSRC=	${WRKSRC}/xshogi
 
 USE_XORG=	xt xaw x11
 GNU_CONFIGURE=	yes
+USE_CSTD=	gnu99
 
 MAN6=		xshogi.6
 PLIST_FILES=	bin/xshogi
diff --git a/games/xshogi/files/patch-xshogi_sysdeps.h b/games/xshogi/files/patch-xshogi_sysdeps.h
new file mode 100644
index 000000000000..da73946e8264
--- /dev/null
+++ b/games/xshogi/files/patch-xshogi_sysdeps.h
@@ -0,0 +1,19 @@
+--- xshogi/sysdeps.h.orig	2011-10-16 17:53:35.000000000 +0200
++++ xshogi/sysdeps.h	2011-10-16 17:54:05.000000000 +0200
+@@ -74,16 +74,6 @@
+ #include <sys/time.h>
+ #include <fcntl.h>
+ 
+-/*
+- * Stuff that isn't reliably included (on Linux, anyway).
+- */
+-
+-extern FILE *fdopen(int fd, const char *modes);
+-extern int   fileno(FILE *stream);
+-extern int   kill(pid_t pid, int sig);
+-extern int   strcasecmp(const char *s1, const char *s2);
+-extern int   gethostname(char *name, size_t len);
+-
+ 
+ /*
+  * Check for POSIX-compatible wait().