Attachment 251839 Details for Bug 279993 – fix xshogi not working

[patch] fix xshogi not working

patch.gnushogi (text/plain), 3.79 KB, created by mew14930xvi on 2024-07-02 19:32:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: mew14930xvi

Created: 2024-07-02 19:32:03 UTC

Size: 3.79 KB

patch

obsolete

>diff --git a/games/gnushogi/Makefile b/games/gnushogi/Makefile
>index ec5da7c0df06..6e88c36f22a6 100644
>--- a/games/gnushogi/Makefile
>+++ b/games/gnushogi/Makefile
>@@ -1,49 +1,45 @@
> PORTNAME=	gnushogi
>-PORTVERSION=	1.4.2
>-PORTREVISION=	1
>+DISTVERSION=	1.4.2
>+PORTREVISION=	2
> CATEGORIES=	games
> MASTER_SITES=	GNU
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	mew14930xvi@inbox.lv
> COMMENT=	GNU version of Shogi
>-WWW=		http://www.cs.caltech.edu/~mvanier/hacking/gnushogi/gnushogi.html
>+WWW=		https://www.gnu.org/software/gnushogi/
> 
> LICENSE=	GPLv3
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
>-GNU_CONFIGURE=		yes
>-MAKE_JOBS_UNSAFE=	yes
>+USES=		makeinfo
> 
>-OPTIONS_DEFINE=	DOCS INFO
>-OPTIONS_DEFAULT=	INFO
>+GNU_CONFIGURE=	yes
> 
>-INFO_USES=		makeinfo
>-INFO_INFO=		gnushogi
>+INFO=		gnushogi
>+PLIST_FILES=	${DATADIR}/gnushogi.bbk \
>+		bin/gnushogi \
>+		share/man/man6/gnushogi.6.gz
>+PORTDOCS=	BOOKFILES PORTING shogi.rules tutorial1.gam tutorial2.gam
> 
>-post-extract-INFO-on:
>-	-@${RM} ${WRKSRC}/doc/gnushogi.info*
>+OPTIONS_DEFINE=	DOCS
> 
> post-patch:
>-	@${REINPLACE_CMD} -e '/<sys\/file.h>/d' \
>-		${WRKSRC}/gnushogi/*dsp.c
>+	@${REINPLACE_CMD} -e '/<sys\/file.h>/d' ${WRKSRC}/gnushogi/*dsp.c
> 
>-pre-build-INFO-on:
>+pre-build:
> 	cd ${WRKSRC}/doc && makeinfo --no-split gnushogi
> 
> do-install:
>-	@${INSTALL_PROGRAM} ${WRKSRC}/gnushogi/gnushogi ${STAGEDIR}${PREFIX}/bin
>-	@${INSTALL_MAN} ${WRKSRC}/doc/gnushogi.6 ${STAGEDIR}${PREFIX}/share/man/man6
>+	${INSTALL_PROGRAM} ${WRKSRC}/gnushogi/gnushogi ${STAGEDIR}${PREFIX}/bin
>+	${INSTALL_MAN} ${WRKSRC}/doc/gnushogi.6 \
>+		${STAGEDIR}${PREFIX}/share/man/man6
>+	${INSTALL_DATA} ${WRKSRC}/doc/gnushogi.info \
>+		${STAGEDIR}${PREFIX}/${INFO_PATH}
> 	@${MKDIR} ${STAGEDIR}${DATADIR}
>-	@${INSTALL_DATA} ${WRKSRC}/gnushogi/gnushogi.bbk ${STAGEDIR}${DATADIR}
>-
>-do-install-INFO-on:
>-	@${INSTALL_DATA} ${WRKSRC}/doc/gnushogi.info ${STAGEDIR}${PREFIX}/${INFO_PATH}
>+	${INSTALL_DATA} ${WRKSRC}/gnushogi/gnushogi.bbk ${STAGEDIR}${DATADIR}
> 
> do-install-DOCS-on:
> 	@${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/*.rules ${STAGEDIR}${DOCSDIR}
>+	cd ${WRKSRC}/doc && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
> 
> .include <bsd.port.mk>
>diff --git a/games/gnushogi/files/patch-gnushogi_init.c b/games/gnushogi/files/patch-gnushogi_init.c
>index a684d7f006f2..fff71ab72899 100644
>--- a/games/gnushogi/files/patch-gnushogi_init.c
>+++ b/games/gnushogi/files/patch-gnushogi_init.c
>@@ -1,14 +1,5 @@
> --- gnushogi/init.c.orig	2014-02-17 20:26:59 UTC
> +++ gnushogi/init.c
>-@@ -63,7 +63,7 @@ short nolist          = 1;  /* Don't list the game aft
>-  * or DISPLAY_X; the default is DISPLAY_X to make life easier for xshogi.
>-  */
>- 
>--display_t display_type = DISPLAY_X;
>-+display_t display_type = DISPLAY_CURSES;
>- 
>- /* .... MOVE GENERATION VARIABLES AND INITIALIZATIONS .... */
>- 
> @@ -100,7 +100,7 @@ distance(short a, short b)
>  short
>  distance(short a, short b)
>diff --git a/games/gnushogi/pkg-descr b/games/gnushogi/pkg-descr
>index 9d963554d5a9..22a1106b855d 100644
>--- a/games/gnushogi/pkg-descr
>+++ b/games/gnushogi/pkg-descr
>@@ -8,4 +8,4 @@ program gets its opening moves from the file gnushogi.book
> which is located in a directory specified in the makefile.
> 
> To invoke the program type:
>-	gnushogi
>+	gnushogi -C
>diff --git a/games/gnushogi/pkg-plist b/games/gnushogi/pkg-plist
>deleted file mode 100644
>index 18f2f522b45c..000000000000
>--- a/games/gnushogi/pkg-plist
>+++ /dev/null
>@@ -1,8 +0,0 @@
>-bin/gnushogi
>-share/man/man6/gnushogi.6.gz
>-%%PORTDOCS%%%%DOCSDIR%%/BOOKFILES
>-%%PORTDOCS%%%%DOCSDIR%%/PORTING
>-%%PORTDOCS%%%%DOCSDIR%%/shogi.rules
>-%%PORTDOCS%%%%DOCSDIR%%/tutorial1.gam
>-%%PORTDOCS%%%%DOCSDIR%%/tutorial2.gam
>-%%DATADIR%%/gnushogi.bbk

Actions: View | Diff

Attachments on bug 279993: 251700 | 251701 | 251711 | 251839 | 253991