diff --git a/games/xshisen/Makefile b/games/xshisen/Makefile
index c7f0b926e48c..9900c1696c28 100644
--- a/games/xshisen/Makefile
+++ b/games/xshisen/Makefile
@@ -1,41 +1,44 @@
 PORTNAME=	xshisen
 PORTVERSION=	1.51
 PORTREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	LOCAL/hrs
 
 MAINTAINER=	TsurutaniNaoki@gmail.com
 COMMENT=	Shisen-sho puzzle game for X11
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		cpe xorg
-USE_XORG=	xpm
+USE_CXXSTD=	c++14
+USE_XORG=	ice sm x11 xmu xpm xt
+
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--sharedstatedir="${DATADIR}"
+
 INSTALL_TARGET=	install-prog
 
 OPTIONS_DEFINE=		MOTIF
 OPTIONS_DEFAULT=	MOTIF
 
 MOTIF_USES=		motif
 MOTIF_CONFIGURE_WITH=	motif
 
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|XSHISEN_VERSION|${PORTVERSION}|g' ${WRKSRC}/lang/XShisen.ad*
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/man/xshisen.6 \
 		${STAGEDIR}${MAN6PREFIX}/man/man6/xshisen.6
 	${INSTALL_MAN} ${WRKSRC}/man/xshisen.6.ja_JP.eucJP \
 		${STAGEDIR}${MAN6PREFIX}/man/ja/man6/xshisen.6
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/X11/app-defaults
 	${INSTALL_DATA} ${WRKSRC}/lang/XShisen.ad \
 		${STAGEDIR}${PREFIX}/lib/X11/app-defaults/XShisen
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/X11/ja_JP.eucJP/app-defaults
 	${INSTALL_DATA} ${WRKSRC}/lang/XShisen.ad.ja_JP.eucJP \
 		${STAGEDIR}${PREFIX}/lib/X11/ja_JP.eucJP/app-defaults/XShisen
 
 .include <bsd.port.mk>
diff --git a/games/xshisen/pkg-plist b/games/xshisen/pkg-plist
index 0d7449818080..b19bd9820ccb 100644
--- a/games/xshisen/pkg-plist
+++ b/games/xshisen/pkg-plist
@@ -1,80 +1,79 @@
 @(,games,2555) bin/xshisen
 lib/X11/app-defaults/XShisen
 lib/X11/ja_JP.eucJP/app-defaults/XShisen
 %%DATADIR%%/s1/chun.xpm
 %%DATADIR%%/s1/haku.xpm
 %%DATADIR%%/s1/hana.xpm
 %%DATADIR%%/s1/hatsu.xpm
 %%DATADIR%%/s1/hishi.xpm
 %%DATADIR%%/s1/m1.xpm
 %%DATADIR%%/s1/m2.xpm
 %%DATADIR%%/s1/m3.xpm
 %%DATADIR%%/s1/m4.xpm
 %%DATADIR%%/s1/m5.xpm
 %%DATADIR%%/s1/m6.xpm
 %%DATADIR%%/s1/m7.xpm
 %%DATADIR%%/s1/m8.xpm
 %%DATADIR%%/s1/m9.xpm
 %%DATADIR%%/s1/nan.xpm
 %%DATADIR%%/s1/p1.xpm
 %%DATADIR%%/s1/p2.xpm
 %%DATADIR%%/s1/p3.xpm
 %%DATADIR%%/s1/p4.xpm
 %%DATADIR%%/s1/p5.xpm
 %%DATADIR%%/s1/p6.xpm
 %%DATADIR%%/s1/p7.xpm
 %%DATADIR%%/s1/p8.xpm
 %%DATADIR%%/s1/p9.xpm
 %%DATADIR%%/s1/pei.xpm
 %%DATADIR%%/s1/s1.xpm
 %%DATADIR%%/s1/s2.xpm
 %%DATADIR%%/s1/s3.xpm
 %%DATADIR%%/s1/s4.xpm
 %%DATADIR%%/s1/s5.xpm
 %%DATADIR%%/s1/s6.xpm
 %%DATADIR%%/s1/s7.xpm
 %%DATADIR%%/s1/s8.xpm
 %%DATADIR%%/s1/s9.xpm
 %%DATADIR%%/s1/sha.xpm
 %%DATADIR%%/s1/ton.xpm
 %%DATADIR%%/s2/chun.xpm
 %%DATADIR%%/s2/haku.xpm
 %%DATADIR%%/s2/hana.xpm
 %%DATADIR%%/s2/hatsu.xpm
 %%DATADIR%%/s2/hishi.xpm
 %%DATADIR%%/s2/m1.xpm
 %%DATADIR%%/s2/m2.xpm
 %%DATADIR%%/s2/m3.xpm
 %%DATADIR%%/s2/m4.xpm
 %%DATADIR%%/s2/m5.xpm
 %%DATADIR%%/s2/m6.xpm
 %%DATADIR%%/s2/m7.xpm
 %%DATADIR%%/s2/m8.xpm
 %%DATADIR%%/s2/m9.xpm
 %%DATADIR%%/s2/nan.xpm
 %%DATADIR%%/s2/p1.xpm
 %%DATADIR%%/s2/p2.xpm
 %%DATADIR%%/s2/p3.xpm
 %%DATADIR%%/s2/p4.xpm
 %%DATADIR%%/s2/p5.xpm
 %%DATADIR%%/s2/p6.xpm
 %%DATADIR%%/s2/p7.xpm
 %%DATADIR%%/s2/p8.xpm
 %%DATADIR%%/s2/p9.xpm
 %%DATADIR%%/s2/pei.xpm
 %%DATADIR%%/s2/s1.xpm
 %%DATADIR%%/s2/s2.xpm
 %%DATADIR%%/s2/s3.xpm
 %%DATADIR%%/s2/s4.xpm
 %%DATADIR%%/s2/s5.xpm
 %%DATADIR%%/s2/s6.xpm
 %%DATADIR%%/s2/s7.xpm
 %%DATADIR%%/s2/s8.xpm
 %%DATADIR%%/s2/s9.xpm
 %%DATADIR%%/s2/sha.xpm
 %%DATADIR%%/s2/ton.xpm
 @(,games,0660) %%DATADIR%%/xshisen.scores
 man/man6/xshisen.6.gz
 man/ja/man6/xshisen.6.gz
-@exec [ -d %D/lib/X11/ja_JP.EUC/ -a -d %D/lib/X11/ja_JP.EUC/app-defaults ] && ln -s %D/lib/X11/ja_JP.eucJP/app-defaults/XShisen %D/lib/X11/ja_JP.EUC/app-defaults || true
-@unexec rm %D/lib/X11/ja_JP.EUC/app-defaults/XShisen 2>/dev/null || true
+@preexec [ -d %D/lib/X11/ja_JP.EUC/ -a -d %D/lib/X11/ja_JP.EUC/app-defaults ] && ln -s %D/lib/X11/ja_JP.eucJP/app-defaults/XShisen %D/lib/X11/ja_JP.EUC/app-defaults || true