Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 19 Feb 2014 19:43:18 +0000 (UTC)
From:      Johan van Selst <johans@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r345138 - in head/games: gnushogi gnushogi/files xshogi xshogi/files
Message-ID:  <201402191943.s1JJhIb4032982@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: johans
Date: Wed Feb 19 19:43:17 2014
New Revision: 345138
URL: http://svnweb.freebsd.org/changeset/ports/345138
QAT: https://qat.redports.org/buildarchive/r345138/

Log:
  - Update gnushogi/xshogi to 1.4.2
  - No longer use a common Makefile

Added:
  head/games/gnushogi/files/patch-doc_gnushogi.texi   (contents, props changed)
  head/games/xshogi/files/patch-sysdeps.h   (contents, props changed)
Deleted:
  head/games/gnushogi/files/patch-doc::gnushogi.texinfo
  head/games/xshogi/files/patch-xshogi_sysdeps.h
Modified:
  head/games/gnushogi/Makefile
  head/games/gnushogi/distinfo
  head/games/gnushogi/pkg-plist
  head/games/xshogi/Makefile

Modified: head/games/gnushogi/Makefile
==============================================================================
--- head/games/gnushogi/Makefile	Wed Feb 19 19:37:28 2014	(r345137)
+++ head/games/gnushogi/Makefile	Wed Feb 19 19:43:17 2014	(r345138)
@@ -1,25 +1,19 @@
 # Created by: Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 # $FreeBSD$
 
-PORTNAME=	${GNUSHOGI_PORTNAME}
-PORTVERSION=	${GNUSHOGI_PORTVERSION}
+PORTNAME=	gnushogi
+PORTVERSION=	1.4.2
 CATEGORIES=	games
-MASTER_SITES=	${GNUSHOGI_MASTER_SITES}
-MASTER_SITE_SUBDIR=	${GNUSHOGI_MASTER_SITE_SUBDIR}
-DISTNAME=	${GNUSHOGI_DISTNAME}
+MASTER_SITES=	GNU
 
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	GNU version of Shogi
 
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--without-x --without-xshogi
+GNU_CONFIGURE=		yes
 MAKE_JOBS_UNSAFE=	yes
 
 INFO=		gnushogi
 
-.include "${.CURDIR}/../../games/gnushogi/Makefile.common"
-.include <bsd.port.pre.mk>
-
 post-extract:
 	-@${RM} ${WRKSRC}/doc/gnushogi.info*
 
@@ -28,6 +22,8 @@ post-patch:
 		${WRKSRC}/gnushogi/Makefile.in
 	@${REINPLACE_CMD} -e '/HAVE_SETLINEBUF/s|ifdef|ifndef|' \
 		${WRKSRC}/gnushogi/gnushogi.h
+	@${REINPLACE_CMD} -e '/<sys\/file.h>/d' \
+		${WRKSRC}/gnushogi/*dsp.c
 
 pre-build:
 	cd ${WRKSRC}/doc && makeinfo --no-split gnushogi
@@ -38,13 +34,10 @@ do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	@${INSTALL_DATA} ${WRKSRC}/gnushogi/gnushogi.bbk ${STAGEDIR}${DATADIR}
 	@${INSTALL_DATA} ${WRKSRC}/doc/gnushogi.info ${STAGEDIR}${PREFIX}/info
-.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/doc/BOOKFILES ${STAGEDIR}${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/doc/PORTING ${STAGEDIR}${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/doc/*.gam ${STAGEDIR}${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/doc/*.html ${STAGEDIR}${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/doc/*.rules ${STAGEDIR}${DOCSDIR}
-.endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/games/gnushogi/distinfo
==============================================================================
--- head/games/gnushogi/distinfo	Wed Feb 19 19:37:28 2014	(r345137)
+++ head/games/gnushogi/distinfo	Wed Feb 19 19:43:17 2014	(r345138)
@@ -1,2 +1,2 @@
-SHA256 (gnushogi-1.4.0.tar.bz2) = 466730f54ee6d6ad61a06ccfccf2dc63e47559697116b143b93c624a9ca9b301
-SIZE (gnushogi-1.4.0.tar.bz2) = 644998
+SHA256 (gnushogi-1.4.2.tar.gz) = 1ecc48a866303c63652552b325d685e7ef5e9893244080291a61d96505d52b29
+SIZE (gnushogi-1.4.2.tar.gz) = 383434

Added: head/games/gnushogi/files/patch-doc_gnushogi.texi
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/gnushogi/files/patch-doc_gnushogi.texi	Wed Feb 19 19:43:17 2014	(r345138)
@@ -0,0 +1,13 @@
+--- doc/gnushogi.texi.orig	2014-02-17 21:26:59.000000000 +0100
++++ doc/gnushogi.texi	2014-02-19 20:38:54.000000000 +0100
+@@ -3,6 +3,10 @@
+ @c % **  Start of header.
+ @setfilename gnushogi.info
+ @settitle GNU Shogi manual
++@dircategory
++@direntry Games
++* GNUShogi: (gnushogi).		GNU Shogi.
++@end direntry
+ @c % **  End of header.
+ 
+ @dircategory Games

Modified: head/games/gnushogi/pkg-plist
==============================================================================
--- head/games/gnushogi/pkg-plist	Wed Feb 19 19:37:28 2014	(r345137)
+++ head/games/gnushogi/pkg-plist	Wed Feb 19 19:43:17 2014	(r345138)
@@ -2,34 +2,6 @@ bin/gnushogi
 man/man6/gnushogi.6.gz
 %%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
-%%PORTDOCS%%%%DOCSDIR%%/gnushogi_13.html
-%%PORTDOCS%%%%DOCSDIR%%/gnushogi_14.html
-%%PORTDOCS%%%%DOCSDIR%%/gnushogi_15.html
-%%PORTDOCS%%%%DOCSDIR%%/gnushogi_16.html
-%%PORTDOCS%%%%DOCSDIR%%/gnushogi_17.html
-%%PORTDOCS%%%%DOCSDIR%%/gnushogi_18.html
-%%PORTDOCS%%%%DOCSDIR%%/gnushogi_19.html
-%%PORTDOCS%%%%DOCSDIR%%/gnushogi_20.html
-%%PORTDOCS%%%%DOCSDIR%%/gnushogi_21.html
-%%PORTDOCS%%%%DOCSDIR%%/gnushogi_22.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%%/shogi.rules
 %%PORTDOCS%%%%DOCSDIR%%/tutorial1.gam
 %%PORTDOCS%%%%DOCSDIR%%/tutorial2.gam

Modified: head/games/xshogi/Makefile
==============================================================================
--- head/games/xshogi/Makefile	Wed Feb 19 19:37:28 2014	(r345137)
+++ head/games/xshogi/Makefile	Wed Feb 19 19:43:17 2014	(r345138)
@@ -2,32 +2,22 @@
 # $FreeBSD$
 
 PORTNAME=	xshogi
-PORTVERSION=	${GNUSHOGI_PORTVERSION}
+PORTVERSION=	1.4.2
 CATEGORIES=	games
-MASTER_SITES=	${GNUSHOGI_MASTER_SITES}
-MASTER_SITE_SUBDIR=	${GNUSHOGI_MASTER_SITE_SUBDIR}
-DISTNAME=	${GNUSHOGI_DISTNAME}
+MASTER_SITES=	GNU
+MASTER_SITE_SUBDIR=	gnushogi
 
 MAINTAINER=	johans@FreeBSD.org
-COMMENT=	The Japanese chess-like game for X Window System
+COMMENT=	Japanese chess-like game for X Window System
 
 RUN_DEPENDS=	gnushogi:${PORTSDIR}/games/gnushogi
 
-BUILD_WRKSRC=	${WRKSRC}/xshogi
-
 USE_XORG=	xt xaw x11
 GNU_CONFIGURE=	yes
-USE_CSTD=	gnu99
-
-PLIST_FILES=	bin/xshogi man/man6/xshogi.6.gz
 
-.include "${.CURDIR}/../../games/gnushogi/Makefile.common"
-.include <bsd.port.pre.mk>
+CPPFLAGS+=	-I${LOCALBASE}/include
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/xshogi/xshogi \
-		${STAGEDIR}${PREFIX}/bin/xshogi
-	${INSTALL_MAN} ${WRKSRC}/doc/xshogi.6 \
-		${STAGEDIR}${MANPREFIX}/man/man6/xshogi.6
+PORTDOCS=	README.xboard BUGS
+PLIST_FILES=	bin/xshogi man/man6/xshogi.6.gz
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Added: head/games/xshogi/files/patch-sysdeps.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/xshogi/files/patch-sysdeps.h	Wed Feb 19 19:43:17 2014	(r345138)
@@ -0,0 +1,19 @@
+--- sysdeps.h.orig	2014-02-19 13:11:16.000000000 +0100
++++ sysdeps.h	2014-02-19 13:11:20.000000000 +0100
+@@ -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().



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402191943.s1JJhIb4032982>