diff --git a/games/ponscripter-07th-mod/Makefile b/games/ponscripter-07th-mod/Makefile
index d4e67e9c492a..40d1214b2cb2 100644
--- a/games/ponscripter-07th-mod/Makefile
+++ b/games/ponscripter-07th-mod/Makefile
@@ -1,93 +1,93 @@
 PORTNAME=	ponscripter
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.1.0
+DISTVERSION=	2.2.0_test-3
+DISTVERSIONSUFFIX=	-gfd57193
 CATEGORIES=	games
 PKGNAMESUFFIX=	-${GH_ACCOUNT}
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
 PATCHFILES+=	69068bf83653.patch:-p1 # https://github.com/sekaiproject/ponscripter-fork/pull/98
+PATCHFILES+=	6a8795f0dc4e.patch:-p1 # https://github.com/07th-mod/ponscripter-fork/pull/7
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	NScripter-like novel-game interpreter with Unicode support
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libsmpeg2.so:multimedia/smpeg2 \
 		libfreetype.so:print/freetype2
 
 CONFLICTS=	ponscripter-[0-9]* # doesn't exist yet
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	07th-mod
 GH_PROJECT=	${PORTNAME}-fork
 
 USES=		compiler:c++11-lang gmake pkgconfig sdl shebangfix
 USE_SDL=	image2 mixer2
 EXTRACT_AFTER_ARGS=--exclude src/extlib
 SHEBANG_FILES=	util/xml-template
 HAS_CONFIGURE=	yes
-# XXX Pretend clang is like lang/gcc and can USE_CPU_GFX
-CONFIGURE_ENV=	CC_VER="4.8" CC="${CC} ${CFLAGS}" CXX="${CXX} ${CXXFLAGS}" \
-		CPATH="${LOCALBASE}/include" LIBRARY_PATH="${LOCALBASE}/lib"
+CONFIGURE_ENV=	CC="${CC} ${CFLAGS}" CXX="${CXX} ${CXXFLAGS}"
 CONFIGURE_ARGS=	--prefix="${STAGEDIR}${PREFIX}" --unsupported-compiler
 LDFLAGS+=	-Wl,--as-needed
 PORTDOCS=	BUGS CHANGES MANUAL README.md TODO
 PLIST_FILES=	bin/ponscr \
 		share/emacs/site-lisp/ponscripter-mode.el
 
 OPTIONS_DEFINE=	DOCS MANPAGES NOTIFY TREMOR
 OPTIONS_DEFAULT=MANPAGES NOTIFY ${MACHINE_CPU:Msoftfp:C/.+/TREMOR/}
 
 MANPAGES_BUILD_DEPENDS=	xmlto:textproc/xmlto
 MANPAGES_PLIST_FILES=\
 	man/man6/ponscr.6.gz \
 	man/man7/ponscr-ext.7.gz \
 	man/man7/ponscr-syntax.7.gz \
 	man/man7/ponscripter.7.gz
 
 NOTIFY_LIB_DEPENDS=	libnotify.so:devel/libnotify
 NOTIFY_CONFIGURE_WITH=	libnotify
 
 TREMOR_LIB_DEPENDS=	libvorbisidec.so:audio/libtremor
 TREMOR_CFLAGS=		-DINTEGER_OGG_VORBIS
 TREMOR_LIB_DEPENDS_OFF=	libvorbisfile.so:audio/libvorbis
 
 post-patch:
 	@${REINPLACE_CMD} -e '/^ifdef DEBUG/,/^$$/d' \
 		-e 's/$$STRIPFLAG/${STRIP}/' \
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's/$$(LIBS)/$$(LDFLAGS) &/' \
 		${WRKSRC}/src/Makefile.ponscripter
 
 post-patch-MANPAGES-off:
 	@${REINPLACE_CMD} -i .manpages.bak \
 		-e '/install-man/d' \
 		-e 's/xmlto/${FALSE}/' \
 		${WRKSRC}/configure
 
 post-patch-TREMOR-on:
 	@${REINPLACE_CMD} -i .tremor.bak \
 		-e 's/"libogg, libvorbis"/libvorbisidec/' \
 		-e 's,vorbis/vorbisfile,tremor/ivorbisfile,' \
 		-e 's,vorbis/codec,tremor/ivorbiscodec,' \
 		-e '/genlink/ { s/vorbisfile/vorbisidec/; \
 			/ogg/d; /vorbis$$/d; }' \
 		-e 's/ $$LINKogg//; s/ $$LINKvorbis//' \
 		-e 's/LINKvorbisfile/LINKvorbisidec/' \
 		${WRKSRC}/configure
 
 post-build-MANPAGES-on:
 	# Remove extraneous whitespace to unbreak manpage syntax
 	${REINPLACE_CMD} -e 's/^[[:space:]]*//; /^$$/d' \
 		${WRKSRC}/doc/*.[0-9]
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/misc/ponscripter-mode.el \
 		${STAGEDIR}${PREFIX}/share/emacs/site-lisp
 
 post-install-DOCS-on:
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} \
 		"${PORTDOCS}" ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
diff --git a/games/ponscripter-07th-mod/distinfo b/games/ponscripter-07th-mod/distinfo
index f81728f56a0e..6fa1c57fc5fc 100644
--- a/games/ponscripter-07th-mod/distinfo
+++ b/games/ponscripter-07th-mod/distinfo
@@ -1,5 +1,7 @@
-TIMESTAMP = 1612426210
-SHA256 (07th-mod-ponscripter-fork-v2.1.0_GH0.tar.gz) = 736f5816cac22ec913b946e7b0190aeadc019ef300c4d4d1a25342d32a21d6a2
-SIZE (07th-mod-ponscripter-fork-v2.1.0_GH0.tar.gz) = 33188400
+TIMESTAMP = 1623621016
+SHA256 (07th-mod-ponscripter-fork-v2.2.0_test-3-gfd57193_GH0.tar.gz) = 1f739caaee42415c1e4160298849e3610929dad21352aed5a834162c194fa87e
+SIZE (07th-mod-ponscripter-fork-v2.2.0_test-3-gfd57193_GH0.tar.gz) = 34656322
 SHA256 (69068bf83653.patch) = ab7ace6c01bff5690c58dcf7e824d1bed5211f52e5984510c114a78d01f62de7
 SIZE (69068bf83653.patch) = 826
+SHA256 (6a8795f0dc4e.patch) = bc6bc0351bc23b9961156d3d0bbe3381dffb104b45f02a149b36cbb24aa75a8e
+SIZE (6a8795f0dc4e.patch) = 1039