diff --git a/emulators/xsystem35/Makefile b/emulators/xsystem35/Makefile
index a4c83ce19edf..45cf6222a739 100644
--- a/emulators/xsystem35/Makefile
+++ b/emulators/xsystem35/Makefile
@@ -1,66 +1,66 @@
 PORTNAME=	xsystem35
 DISTVERSION=	1.7.3-pre5
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	emulators games
 MASTER_SITES=	DEBIAN
 DISTFILES=	${DISTNAME:S/-/_/}.orig${EXTRACT_SUFX}
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	AliceSoft System 3.5/3.6/3.8/3.9 on X Window System
 WWW=		https://web.archive.org/web/20121222144009/http://8ne.sakura.ne.jp:20008/chika/unitbase/xsys35/
 
 LICENSE=	GPLv2+
 
 LIB_DEPENDS=	libvorbisfile.so:audio/libvorbis \
 		libltdl.so:devel/libltdl \
 		libfreetype.so:print/freetype2
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 OPTIONS_DEFINE_i386=	MMX
 OPTIONS_DEFAULT_i386=	${MACHINE_CPU:tu:MMMX}
 
 MMX_BUILD_DEPENDS=nasm:devel/nasm
 MMX_CONFIGURE_ENABLE=mmx
 
 EXTRACT_AFTER_ARGS=--exclude libltdl
 USES=		gettext gmake gnome jpeg libtool localbase pkgconfig \
 		shebangfix xorg
 USE_GNOME=	gtk20
 SHEBANG_FILES=	contrib/instgame
 USE_XORG=	x11 xext xxf86vm
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	X_LIBS="-lX11"
 CONFIGURE_ARGS=	\
 		--with-cachesize=20 \
 		--with-glib-prefix=${NONEXISTENT} \
 		--with-gtk-prefix=${NONEXISTENT} \
 		--disable-static \
 		--enable-audio=oss \
 		--with-default-output=oss \
 		--enable-midi=seq,extp,raw \
 		--enable-cdrom=bsd,mp3
 INSTALL_TARGET=	install-strip
 
 SUB_FILES=	pkg-message
 
 DOCSDIR=	${PREFIX}/share/doc/ja/${PORTNAME}
 
 post-patch:
 	@${CP} ${WRKSRC}/INSTALL ${WRKSRC}/doc/INSTALL
 	@${REINPLACE_CMD} -e '/-lxpg4/d' \
 		-e '/INCLTDL=/d; /LTDLINCL=/d' \
 		-e '/LIBLTDL=/s/=.*/="-lltdl"/' \
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} '/^SUBDIRS/s/ libltdl//' ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} 's|__COUNTER__|__COUNTER_H__|' ${WRKSRC}/src/counter.h
 
 post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/contrib/instgame ${STAGEDIR}${PREFIX}/bin
 	(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
 	(cd ${WRKSRC}/contrib && ${COPYTREE_SHARE} \
 		"*.*" ${STAGEDIR}${EXAMPLESDIR})
 	${INSTALL_DATA} ${WRKSRC}/patch/pastel.diff \
 		${WRKSRC}/src/xsys35rc.sample \
 		${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/emulators/xsystem35/files/patch-clang15 b/emulators/xsystem35/files/patch-clang15
new file mode 100644
index 000000000000..6e167ce3e9ac
--- /dev/null
+++ b/emulators/xsystem35/files/patch-clang15
@@ -0,0 +1,61 @@
+Get value instead of pointer in Set*Flag() like other modules
+
+nDEMO.c:22:6: error: incompatible pointer to integer conversion initializing 'int' with an expression of type 'int *'; dereference with * [-Wint-conversion]
+        int p1 = getCaliVariable();
+            ^    ~~~~~~~~~~~~~~~~~
+                 *
+nDEMO.c:28:6: error: incompatible pointer to integer conversion initializing 'int' with an expression of type 'int *'; dereference with * [-Wint-conversion]
+        int p1 = getCaliVariable();
+            ^    ~~~~~~~~~~~~~~~~~
+                 *
+
+Avoid implicit function declaration for sjis2euc()
+
+nt_msg.c:189:9: error: incompatible integer to pointer conversion initializing 'char *' with an expression of type 'int' [-Wint-conversion]
+                char *b = sjis2euc(msg);
+                      ^   ~~~~~~~~~~~~~
+nt_msg.c:261:10: error: incompatible integer to pointer conversion initializing 'char *' with an expression of type 'int' [-Wint-conversion]
+                        char *b = sjis2euc(mbuf);
+                              ^   ~~~~~~~~~~~~~~
+sactcg.c:211:9: error: incompatible integer to pointer conversion initializing 'char *' with an expression of type 'int' [-Wint-conversion]
+                char *b = sjis2euc(cText);
+                      ^   ~~~~~~~~~~~~~~~
+
+--- modules/NIGHTDLL/nt_msg.c.orig	2003-11-09 15:06:12 UTC
++++ modules/NIGHTDLL/nt_msg.c
+@@ -18,6 +18,7 @@
+ #include "sactcg.h"
+ #include "sjisname.h"
+ #include "sactstring.h"
++#include "eucsjis.h"
+ 
+ 
+ extern int ntsel_dosel(void);
+--- modules/NIGHTDLL/sactcg.c.orig	2003-11-16 15:29:52 UTC
++++ modules/NIGHTDLL/sactcg.c
+@@ -34,6 +34,7 @@
+ #include "ags.h"
+ #include "surface.h"
+ #include "ngraph.h"
++#include "eucsjis.h"
+ #include "sactcg.h"
+ 
+ #define CGMAX 65536
+--- modules/nDEMO/nDEMO.c.orig	2001-07-30 22:58:40 UTC
++++ modules/nDEMO/nDEMO.c
+@@ -19,13 +19,13 @@ void SetKeyCancelFlag() {
+ }
+ 
+ void SetKeyCancelFlag() {
+-	int p1 = getCaliVariable();
++	int p1 = getCaliValue();
+ 	
+ 	DEBUG_COMMAND_YET("nDEMO.SetKeyCancelFlag %d:\n", p1);
+ }
+ 
+ void SetLoopFlag() {
+-	int p1 = getCaliVariable();
++	int p1 = getCaliValue();
+ 	
+ 	DEBUG_COMMAND_YET("nDEMO.SetLoopFlag %d:\n", p1);
+ }