diff --git a/games/gnushogi/Makefile b/games/gnushogi/Makefile
index ec5da7c0df06..89806b927c78 100644
--- a/games/gnushogi/Makefile
+++ b/games/gnushogi/Makefile
@@ -1,49 +1,41 @@
 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
-
-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_commondsp.c b/games/gnushogi/files/patch-gnushogi_commondsp.c
new file mode 100644
index 000000000000..578796e84465
--- /dev/null
+++ b/games/gnushogi/files/patch-gnushogi_commondsp.c
@@ -0,0 +1,10 @@
+--- gnushogi/commondsp.c.orig	2014-02-17 20:26:59 UTC
++++ gnushogi/commondsp.c
+@@ -45,7 +45,6 @@
+
+ #include <sys/param.h>
+ #include <sys/types.h>
+-#include <sys/file.h>
+
+ #include "gnushogi.h"
+
diff --git a/games/gnushogi/files/patch-gnushogi_cursesdsp.c b/games/gnushogi/files/patch-gnushogi_cursesdsp.c
index f3312c9357e2..91485b03f70c 100644
--- a/games/gnushogi/files/patch-gnushogi_cursesdsp.c
+++ b/games/gnushogi/files/patch-gnushogi_cursesdsp.c
@@ -1,6 +1,14 @@
---- gnushogi/cursesdsp.c.orig	2021-02-05 15:24:17 UTC
+--- gnushogi/cursesdsp.c.orig	2014-02-17 20:26:59 UTC
 +++ gnushogi/cursesdsp.c
-@@ -61,17 +61,11 @@
+@@ -40,7 +40,6 @@
+
+ #include <sys/param.h>
+ #include <sys/types.h>
+-#include <sys/file.h>
+ #include <curses.h>
+
+ #include "gnushogi.h"
+@@ -62,17 +61,11 @@
  
  #define FLUSH_SCANW fflush(stdout), scanw
  
diff --git a/games/gnushogi/files/patch-gnushogi_globals.c b/games/gnushogi/files/patch-gnushogi_globals.c
index 48a5296e6875..ae18fe4d0f93 100644
--- a/games/gnushogi/files/patch-gnushogi_globals.c
+++ b/games/gnushogi/files/patch-gnushogi_globals.c
@@ -1,6 +1,6 @@
 --- gnushogi/globals.c.orig	2014-02-16 18:20:24 UTC
 +++ gnushogi/globals.c
-@@ -51,6 +51,10 @@ char ColorStr[2][10];
+@@ -51,6 +51,10 @@ long znodes;
  
  long znodes;
  
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/files/patch-gnushogi_rawdsp.c b/games/gnushogi/files/patch-gnushogi_rawdsp.c
index e310669df9fc..b5adff5f6cd2 100644
--- a/games/gnushogi/files/patch-gnushogi_rawdsp.c
+++ b/games/gnushogi/files/patch-gnushogi_rawdsp.c
@@ -1,6 +1,14 @@
---- gnushogi/rawdsp.c.orig	2021-02-05 15:24:17 UTC
+--- gnushogi/rawdsp.c.orig	2014-02-17 20:26:59 UTC
 +++ gnushogi/rawdsp.c
-@@ -43,11 +43,6 @@
+@@ -35,7 +35,6 @@
+ #include <stdarg.h>
+ #include <sys/param.h>
+ #include <sys/types.h>
+-#include <sys/file.h>
+ #ifndef WIN32
+ #include <poll.h>
+ #include <unistd.h>
+@@ -44,11 +43,6 @@
  #include "gnushogi.h"
  #include "rawdsp.h"
  
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