Index: branches/2020Q4/games/rlvm/Makefile
===================================================================
--- branches/2020Q4/games/rlvm/Makefile	(revision 557088)
+++ branches/2020Q4/games/rlvm/Makefile	(revision 557089)
@@ -1,103 +1,104 @@
 # $FreeBSD$
 
 PORTNAME=	rlvm
 DISTVERSIONPREFIX=	release-
 DISTVERSION=	0.14-67
 DISTVERSIONSUFFIX=	-g9350209
 PORTREVISION=	22
 CATEGORIES=	games
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
 PATCHFILES=	fb627bad9129.patch:-p1
+PATCHFILES+=	97c808194c56.patch:-p1 # https://github.com/eglaysher/rlvm/pull/89
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	RealLive virtual machine clone
 
 LICENSE=	GPLv2 GPLv3 MIT
 LICENSE_COMB=	multi
 
 BROKEN_FreeBSD_11_powerpc64=	fails to link on powerpc64 elfv1: gcn_platform.cc: undefined reference to gcn::Exception::Exception
 BROKEN_FreeBSD_12_powerpc64=	fails to link on powerpc64 elfv1: gcn_platform.cc: undefined reference to gcn::Exception::Exception
 
 BUILD_DEPENDS=	${LOCALBASE}/include/utf8.h:devel/utf8cpp
 LIB_DEPENDS=	libvorbisfile.so:audio/libvorbis \
 		libboost_serialization.so:devel/boost-libs \
 		libguichan.so:devel/guichan
 RUN_DEPENDS=	${LOCALBASE}/share/fonts/dejavu/DejaVuSans.ttf:x11-fonts/dejavu
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	eglaysher
 
-USES=		compiler:c++11-lib gl gnome pkgconfig scons:python2 sdl
+USES=		compiler:c++11-lib gl gnome pkgconfig scons sdl
 USE_GL=		glew glu
 USE_GNOME=	gtk20
 USE_SDL=	image mixer ttf
 EXCLUDE=	GLEW SDL_image SDL_mixer SDL_ttf gmock gtest guichan \
 		luabind utf8cpp # leaving only pygame, xclannad, *.cpp
 EXTRACT_AFTER_ARGS=${EXCLUDE:S,^,--exclude vendor/,}
 LDFLAGS+=	-Wl,--as-needed # avoid overlinking (gtk deps)
 MAKE_ARGS=	VERBOSE=1
 INSTALLS_ICONS=	yes
 PORTDOCS=	AUTHORS.TXT NEWS.TXT README.md STATUS.TXT notes
 
 OPTIONS_DEFINE=	DEBUG DOCS NLS TEST
 OPTIONS_DEFAULT=MONA
 OPTIONS_MULTI=	JAPANESE_FONT
 OPTIONS_MULTI_JAPANESE_FONT=KOCHI MONA SAZANAMI
 OPTIONS_SUB=	yes
 
 JAPANESE_FONT_DESC=msgothic.ttc alternatives with verified metrics (unless --font)
 KOCHI_DESC=	kochi-gothic-subst.ttf from japanese/font-kochi
 KOCHI_RUN_DEPENDS=${LOCALBASE}/share/fonts/kochi/kochi-gothic-subst.ttf:japanese/font-kochi
 MONA_DESC=	mona.ttf from japanese/font-mona-ttf
 MONA_RUN_DEPENDS=${LOCALBASE}/share/fonts/mona-ttf/mona.ttf:japanese/font-mona-ttf
 SAZANAMI_DESC=	sazanami-gothic.ttf from japanese/font-sazanami
 SAZANAMI_RUN_DEPENDS=${LOCALBASE}/share/fonts/sazanami/sazanami-gothic.ttf:japanese/font-sazanami
 
 DEBUG_MAKE_ARGS_OFF=--release
 NLS_USES=	gettext
 NLS_EXTRA_PATCHES_OFF=${FILESDIR}/extra-patch-disable-nls
 TEST_USES=	lua:51
 TEST_BUILD_DEPENDS=googletest>=1.7.0:devel/googletest \
 		luabind>0:devel/luabind
 TEST_EXTRA_PATCHES_OFF=${FILESDIR}/extra-patch-disable-test
 
 post-patch:
 	@${GREP} -Flr 'utf8cpp/' ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} \
 		-i .bak.utf8cpp -e 's,utf8cpp/,,'
 	@${REINPLACE_CMD} -e 's,/usr/share,${PREFIX}/share,' \
 		${WRKSRC}/src/platforms/gtk/gtk_rlvm_instance.cc
 	@${REINPLACE_CMD} -e 's,/usr/share,${LOCALBASE}/share,' \
 		-e 's,truetype/ttf-dejavu,dejavu,' \
 		-e 's,truetype/[^/"]*/,TTF/,' \
 		${WRKSRC}/src/utilities/find_font_file.cc
 
 do-test-TEST-on:
 	(cd ${WRKSRC} && build/${PORTNAME}_unittests)
 
 pre-install-TEST-on: do-test-TEST-on
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/build/${PORTNAME} \
 		${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/debian/${PORTNAME}.6 \
 		${STAGEDIR}${PREFIX}/share/man/man6
 	${INSTALL_DATA} ${WRKSRC}/src/platforms/gtk/${PORTNAME}.desktop \
 		${STAGEDIR}${DESKTOPDIR}
 	@(cd ${WRKSRC}/resources && for f in */${PORTNAME}.png; do \
 		${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/$${f%/*}x$${f%/*}/apps; \
 		${INSTALL_DATA} -v $$f \
 			${STAGEDIR}${PREFIX}/share/icons/hicolor/$${f%/*}x$${f%/*}/apps; \
 	done)
 
 post-install-NLS-on:
 	(cd ${WRKSRC}/build/locale && ${COPYTREE_SHARE} \
 		. ${STAGEDIR}${PREFIX}/share/locale)
 
 post-install-DOCS-on:
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} \
 		"${PORTDOCS:Nnotes}" ${STAGEDIR}${DOCSDIR})
 	(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} \
 		notes ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
Index: branches/2020Q4/games/rlvm/distinfo
===================================================================
--- branches/2020Q4/games/rlvm/distinfo	(revision 557088)
+++ branches/2020Q4/games/rlvm/distinfo	(revision 557089)
@@ -1,5 +1,7 @@
 TIMESTAMP = 1475126655
 SHA256 (eglaysher-rlvm-release-0.14-67-g9350209_GH0.tar.gz) = 70a48aeca8e9298c1c5d3e4c7c4d9abd49bfc96e1afad5f2141039feb304df50
 SIZE (eglaysher-rlvm-release-0.14-67-g9350209_GH0.tar.gz) = 1895634
 SHA256 (fb627bad9129.patch) = a949dc649fac6cdff44ddf7f76480de82035b979b4bf8d959ae07ab648c5589d
 SIZE (fb627bad9129.patch) = 837
+SHA256 (97c808194c56.patch) = 8d2e8acf8bcb1f8fd5c78373dbea29036ccee1947a31ea99ae92af72b8ca84fd
+SIZE (97c808194c56.patch) = 6788
Index: branches/2020Q4/games/rlvm/files/patch-SConstruct
===================================================================
--- branches/2020Q4/games/rlvm/files/patch-SConstruct	(revision 557088)
+++ branches/2020Q4/games/rlvm/files/patch-SConstruct	(revision 557089)
@@ -1,46 +1,46 @@
 --- SConstruct~
 +++ SConstruct
 @@ -19,7 +19,12 @@ AddOption('--fullstatic', action='store_
  
  # Set libraries used by all configurations and all binaries in rlvm.
  env = Environment(
 +  ENV=os.environ,
    tools = ["default", "rlvm"],
-+  **dict((k, v.split()) for k, v in ARGUMENTS.iteritems())
++  **dict((k, v.split()) for k, v in ARGUMENTS.items())
 +)
 +
 +env.Append(
  
    LIBS = ["z"],
  
 @@ -278,6 +275,7 @@ if not config.CheckGuichan():
  # Get the configuration from sdl and freetype
  env.ParseConfig("sdl-config --cflags")
  env.ParseConfig("freetype-config --cflags --libs")
 +config.CheckLibWithHeader('intl', 'libintl.h', "cpp")
  
  env = config.Finish()
  
 @@ -314,7 +311,6 @@ if GetOption('release'):
    # Now add release optimizations to the environment
    env.Append(
      CPPFLAGS = [
 -      "-Os",
        "-DNDEBUG",
        "-DBOOST_DISABLE_ASSERTS"
      ]
 @@ -360,13 +356,7 @@ elif GetOption('pprof'):
               "profiler"]
    )
  else:
 -  # Add debugging flags to all binaries here
 -  env.Append(
 -    CPPFLAGS = [
 -      "-g",
 -      "-O0"
 -    ]
 -  )
 +  pass
  
  # Cross platform core of rlvm. Produces librlvm.a and libsystem_sdl.a
  env.SConscript("SConscript",
Index: branches/2020Q4
===================================================================
--- branches/2020Q4	(revision 557088)
+++ branches/2020Q4	(revision 557089)

Property changes on: branches/2020Q4
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r557088