Ren'Py 6.18.3

This release adds the showif statement to screen language. The showif statement shows and hides its children based on a condition. When its children are ATL transforms, showif delivers ATL events to manage the show and hide process.

Ren'Py's image prediction mechanism now models the return stack, and can predict images through a call and return pair. Previously, a call followed by a return would block image prediction.

Ren'Py now predicts that the start label will be called from the main menu. This will help to avoid unpredicted image loads at the very start of a game.

The ATL on statement now can take a comma-separated list of event names.

The new updater.UpdateVersion() function contacts an update server and determines if an update is available.

The new renpy.invoke_in_thread() function runs a function in a background thread, and restarts the interaction when that thread finishes.

While in self-voicing mode, the {w} and {p} tags are ignored.

The Traditional Chinese and Russian translations have been updated.


Bug Fixes
---------
Fixed a regression that could cause hiding transforms to skip time.

Fixed a bug that would cause the screen language if statement to show children from blocks with a false condition, if those child blocks were run during prediction.

Fixed an issue where SetScreenVariable and ToggleScreenVariable were declared as pure functions, but weren't. They now have been reimplemented as pure functions.

Fixed an issue where a grab could fail to transfer between interactions, leaving Ren'Py unresponsive.

7 files changed, 261 insertions, 200 deletions

diff --git a/games/py-renpy/Makefile b/games/py-renpy/Makefile
index 7777afdb840..511a836c2eb 100644
--- a/games/py-renpy/Makefile
+++ b/games/py-renpy/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.15 2017/01/16 23:45:12 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2017/06/24 19:39:47 adam Exp $
 
-DISTNAME=	renpy-6.16.5-source
+DISTNAME=	renpy-6.18.3-source
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/-source//}
-PKGREVISION=	6
 CATEGORIES=	games
-MASTER_SITES=	http://www.renpy.org/dl/6.16.5/
+MASTER_SITES=	http://www.renpy.org/dl/${PKGVERSION_NOREV}/
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	ryoon@NetBSD.org
@@ -13,19 +12,20 @@ COMMENT=	Visual Novel Engine written in Python
 LICENSE=	mit
 
 USE_TOOLS+=	pax
-
 PYSETUPSUBDIR=	module
-EGG_NAME=	Ren_Py-${PKGVERSION_NOREV}.525
-PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # not yet ported as of 6.16.5
+EGG_NAME=	Ren_Py-${PKGVERSION_NOREV}.761
+
+PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # not yet ported
 
 RENPY_DEPS_INSTALL+=	${BUILDLINK_PREFIX.SDL}
 RENPY_DEPS_INSTALL+=	${BUILDLINK_PREFIX.freetype2}
 RENPY_DEPS_INSTALL+=	${BUILDLINK_PREFIX.zlib}
-RENPY_DEPS_INSTALL+=	${BUILDLINK_PREFIX.ffmpeg010}/${BUILDLINK_LIBDIRS.ffmpeg010}
+RENPY_DEPS_INSTALL+=	${BUILDLINK_PREFIX.ffmpeg2}/${BUILDLINK_LIBDIRS.ffmpeg2}
 
 MAKE_ENV+=	RENPY_DEPS_INSTALL=${RENPY_DEPS_INSTALL:ts;:S,;,::,g:Q}
+MAKE_ENV+=	RENPY_CYTHON=cython${PYVERSSUFFIX}
 
-INSTALLATION_DIRS=	bin
+INSTALLATION_DIRS=	bin ${RENPY_DIR}
 
 REPLACE_PYTHON=		renpy.py launcher/game/tkaskdir.py
 
@@ -43,11 +43,12 @@ post-install:
 	cd ${DESTDIR}${PREFIX}/bin && ${LN} -fs ../${RENPY_DIR}/renpy.py .
 
 .include "../../converters/fribidi/buildlink3.mk"
+.include "../../devel/py-cython/buildlink3.mk"
 .include "../../devel/py-game/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/glew/buildlink3.mk"
 .include "../../lang/python/application.mk"
 .include "../../lang/python/distutils.mk"
-.include "../../multimedia/ffmpeg010/buildlink3.mk"
+.include "../../multimedia/ffmpeg2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/py-renpy/PLIST b/games/py-renpy/PLIST
index 3d21d13dbf9..2975c74d5f0 100644
--- a/games/py-renpy/PLIST
+++ b/games/py-renpy/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2014/01/19 22:44:14 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2017/06/24 19:39:47 adam Exp $
 bin/renpy.py
 ${PYSITELIB}/${EGG_FILE}
 ${PYSITELIB}/_renpy.so
@@ -16,6 +16,8 @@ ${PYSITELIB}/renpy/gl/glenviron_shader.so
 ${PYSITELIB}/renpy/gl/glrtt_copy.so
 ${PYSITELIB}/renpy/gl/glrtt_fbo.so
 ${PYSITELIB}/renpy/gl/gltexture.so
+${PYSITELIB}/renpy/style.so
+${PYSITELIB}/renpy/styleclass.so
 ${PYSITELIB}/renpy/text/ftfont.so
 ${PYSITELIB}/renpy/text/textsupport.so
 ${PYSITELIB}/renpy/text/texwrap.so
@@ -36,6 +38,7 @@ share/renpy/doc/_static/down.png
 share/renpy/doc/_static/environment.txt
 share/renpy/doc/_static/file.png
 share/renpy/doc/_static/ie.css
+share/renpy/doc/_static/jquery-1.11.1.js
 share/renpy/doc/_static/jquery.js
 share/renpy/doc/_static/logo.png
 share/renpy/doc/_static/minus.png
@@ -46,6 +49,7 @@ share/renpy/doc/_static/pygments.css
 share/renpy/doc/_static/renpydoc.css
 share/renpy/doc/_static/screen.css
 share/renpy/doc/_static/searchtools.js
+share/renpy/doc/_static/underscore-1.3.1.js
 share/renpy/doc/_static/underscore.js
 share/renpy/doc/_static/up-pressed.png
 share/renpy/doc/_static/up.png
@@ -73,6 +77,9 @@ share/renpy/doc/environment_variables.html
 share/renpy/doc/file_python.html
 share/renpy/doc/functions.html
 share/renpy/doc/genindex.html
+share/renpy/doc/iap.html
+share/renpy/doc/inc/const.html
+share/renpy/doc/inc/pure.html
 share/renpy/doc/incompatible.html
 share/renpy/doc/index.html
 share/renpy/doc/input.html
@@ -96,11 +103,13 @@ share/renpy/doc/reserved.html
 share/renpy/doc/rooms.html
 share/renpy/doc/save_load_rollback.html
 share/renpy/doc/screen_actions.html
+share/renpy/doc/screen_optimization.html
 share/renpy/doc/screen_python.html
 share/renpy/doc/screen_special.html
 share/renpy/doc/screens.html
 share/renpy/doc/search.html
 share/renpy/doc/searchindex.js
+share/renpy/doc/self_voicing.html
 share/renpy/doc/side_image.html
 share/renpy/doc/skins.html
 share/renpy/doc/sprites.html
@@ -108,7 +117,9 @@ share/renpy/doc/statement_equivalents.html
 share/renpy/doc/std-style-property-index.html
 share/renpy/doc/std-transform-property-index.html
 share/renpy/doc/std-var-index.html
+share/renpy/doc/store_variables.html
 share/renpy/doc/style.html
+share/renpy/doc/style_properties.html
 share/renpy/doc/text.html
 share/renpy/doc/thequestion.html
 share/renpy/doc/thequestion_nvl.html
@@ -123,148 +134,231 @@ share/renpy/doc/updater.html
 share/renpy/doc/voice.html
 share/renpy/launcher/None.edit.py
 share/renpy/launcher/System Editor.edit.py
-share/renpy/launcher/errors.txt
 share/renpy/launcher/game/EasyDialogsResources.py
 share/renpy/launcher/game/EasyDialogsWin.py
 share/renpy/launcher/game/Roboto-Light.ttf
 share/renpy/launcher/game/Roboto-Regular.ttf
 share/renpy/launcher/game/ability.rpy
-share/renpy/launcher/game/ability.rpyc
 share/renpy/launcher/game/about.rpy
-share/renpy/launcher/game/about.rpyc
 share/renpy/launcher/game/add_file.rpy
-share/renpy/launcher/game/add_file.rpyc
 share/renpy/launcher/game/android.rpy
-share/renpy/launcher/game/android.rpyc
 share/renpy/launcher/game/archiver.rpy
-share/renpy/launcher/game/archiver.rpyc
-share/renpy/launcher/game/background.png
-share/renpy/launcher/game/bytecode.rpyb
 share/renpy/launcher/game/change_icon.py
-share/renpy/launcher/game/checkbox_empty.png
-share/renpy/launcher/game/checkbox_full.png
 share/renpy/launcher/game/choose_theme.rpy
-share/renpy/launcher/game/choose_theme.rpyc
 share/renpy/launcher/game/distribute.rpy
-share/renpy/launcher/game/distribute.rpyc
 share/renpy/launcher/game/distribute_gui.rpy
-share/renpy/launcher/game/distribute_gui.rpyc
 share/renpy/launcher/game/download.rpy
-share/renpy/launcher/game/download.rpyc
 share/renpy/launcher/game/editor.rpy
-share/renpy/launcher/game/editor.rpyc
 share/renpy/launcher/game/front_page.rpy
-share/renpy/launcher/game/front_page.rpyc
+share/renpy/launcher/game/images/background.png
+share/renpy/launcher/game/images/checkbox_empty.png
+share/renpy/launcher/game/images/checkbox_full.png
+share/renpy/launcher/game/images/logo.png
+share/renpy/launcher/game/images/logo32.png
+share/renpy/launcher/game/images/pattern.png
+share/renpy/launcher/game/images/scrollbar_center.png
+share/renpy/launcher/game/images/vscrollbar_center.png
+share/renpy/launcher/game/images/window.png
 share/renpy/launcher/game/interface.rpy
-share/renpy/launcher/game/interface.rpyc
-share/renpy/launcher/game/logo.png
-share/renpy/launcher/game/logo32.png
 share/renpy/launcher/game/navigation.rpy
-share/renpy/launcher/game/navigation.rpyc
 share/renpy/launcher/game/new_project.rpy
-share/renpy/launcher/game/new_project.rpyc
 share/renpy/launcher/game/options.rpy
-share/renpy/launcher/game/options.rpyc
 share/renpy/launcher/game/package_formats.rpy
-share/renpy/launcher/game/package_formats.rpyc
-share/renpy/launcher/game/pattern.png
 share/renpy/launcher/game/pefile.py
 share/renpy/launcher/game/preferences.rpy
-share/renpy/launcher/game/preferences.rpyc
 share/renpy/launcher/game/project.rpy
-share/renpy/launcher/game/project.rpyc
 share/renpy/launcher/game/renpy_public.pem
 share/renpy/launcher/game/script_version.rpy
-share/renpy/launcher/game/script_version.rpyc
-share/renpy/launcher/game/scrollbar_center.png
 share/renpy/launcher/game/style.rpy
-share/renpy/launcher/game/style.rpyc
 share/renpy/launcher/game/tail.rpy
-share/renpy/launcher/game/tail.rpyc
 share/renpy/launcher/game/theme_data.rpy
-share/renpy/launcher/game/theme_data.rpyc
 share/renpy/launcher/game/tkaskdir.py
+share/renpy/launcher/game/tl/arabic/about.rpy
+share/renpy/launcher/game/tl/arabic/add_file.rpy
+share/renpy/launcher/game/tl/arabic/android.rpy
+share/renpy/launcher/game/tl/arabic/choose_theme.rpy
+share/renpy/launcher/game/tl/arabic/common.rpy
+share/renpy/launcher/game/tl/arabic/distribute.rpy
+share/renpy/launcher/game/tl/arabic/distribute_gui.rpy
+share/renpy/launcher/game/tl/arabic/editor.rpy
+share/renpy/launcher/game/tl/arabic/front_page.rpy
+share/renpy/launcher/game/tl/arabic/interface.rpy
+share/renpy/launcher/game/tl/arabic/navigation.rpy
+share/renpy/launcher/game/tl/arabic/new_project.rpy
+share/renpy/launcher/game/tl/arabic/preferences.rpy
+share/renpy/launcher/game/tl/arabic/project.rpy
+share/renpy/launcher/game/tl/arabic/style.rpy
+share/renpy/launcher/game/tl/arabic/translations.rpy
+share/renpy/launcher/game/tl/arabic/updater.rpy
+share/renpy/launcher/game/tl/french/about.rpy
+share/renpy/launcher/game/tl/french/add_file.rpy
+share/renpy/launcher/game/tl/french/android.rpy
+share/renpy/launcher/game/tl/french/choose_theme.rpy
+share/renpy/launcher/game/tl/french/common.rpy
+share/renpy/launcher/game/tl/french/distribute.rpy
+share/renpy/launcher/game/tl/french/distribute_gui.rpy
+share/renpy/launcher/game/tl/french/editor.rpy
+share/renpy/launcher/game/tl/french/front_page.rpy
+share/renpy/launcher/game/tl/french/interface.rpy
+share/renpy/launcher/game/tl/french/navigation.rpy
+share/renpy/launcher/game/tl/french/new_project.rpy
+share/renpy/launcher/game/tl/french/preferences.rpy
+share/renpy/launcher/game/tl/french/project.rpy
+share/renpy/launcher/game/tl/french/style.rpy
+share/renpy/launcher/game/tl/french/translations.rpy
+share/renpy/launcher/game/tl/french/updater.rpy
+share/renpy/launcher/game/tl/german/about.rpy
+share/renpy/launcher/game/tl/german/add_file.rpy
+share/renpy/launcher/game/tl/german/android.rpy
+share/renpy/launcher/game/tl/german/choose_theme.rpy
+share/renpy/launcher/game/tl/german/common.rpy
+share/renpy/launcher/game/tl/german/distribute.rpy
+share/renpy/launcher/game/tl/german/distribute_gui.rpy
+share/renpy/launcher/game/tl/german/editor.rpy
+share/renpy/launcher/game/tl/german/front_page.rpy
+share/renpy/launcher/game/tl/german/interface.rpy
+share/renpy/launcher/game/tl/german/navigation.rpy
+share/renpy/launcher/game/tl/german/new_project.rpy
+share/renpy/launcher/game/tl/german/preferences.rpy
+share/renpy/launcher/game/tl/german/project.rpy
+share/renpy/launcher/game/tl/german/strings.rpy
+share/renpy/launcher/game/tl/german/translations.rpy
+share/renpy/launcher/game/tl/german/updater.rpy
+share/renpy/launcher/game/tl/italian/about.rpy
+share/renpy/launcher/game/tl/italian/add_file.rpy
+share/renpy/launcher/game/tl/italian/android.rpy
+share/renpy/launcher/game/tl/italian/choose_theme.rpy
+share/renpy/launcher/game/tl/italian/common.rpy
+share/renpy/launcher/game/tl/italian/distribute.rpy
+share/renpy/launcher/game/tl/italian/distribute_gui.rpy
+share/renpy/launcher/game/tl/italian/editor.rpy
+share/renpy/launcher/game/tl/italian/front_page.rpy
+share/renpy/launcher/game/tl/italian/interface.rpy
+share/renpy/launcher/game/tl/italian/navigation.rpy
+share/renpy/launcher/game/tl/italian/new_project.rpy
+share/renpy/launcher/game/tl/italian/preferences.rpy
+share/renpy/launcher/game/tl/italian/project.rpy
+share/renpy/launcher/game/tl/italian/style.rpy
+share/renpy/launcher/game/tl/italian/translations.rpy
+share/renpy/launcher/game/tl/italian/updater.rpy
 share/renpy/launcher/game/tl/japanese/MTLc3m-LICENSE
 share/renpy/launcher/game/tl/japanese/MTLc3m.ttf
 share/renpy/launcher/game/tl/japanese/about.rpy
-share/renpy/launcher/game/tl/japanese/about.rpyc
 share/renpy/launcher/game/tl/japanese/add_file.rpy
-share/renpy/launcher/game/tl/japanese/add_file.rpyc
 share/renpy/launcher/game/tl/japanese/android.rpy
-share/renpy/launcher/game/tl/japanese/android.rpyc
 share/renpy/launcher/game/tl/japanese/choose_theme.rpy
-share/renpy/launcher/game/tl/japanese/choose_theme.rpyc
 share/renpy/launcher/game/tl/japanese/common.rpy
-share/renpy/launcher/game/tl/japanese/common.rpyc
 share/renpy/launcher/game/tl/japanese/distribute.rpy
-share/renpy/launcher/game/tl/japanese/distribute.rpyc
 share/renpy/launcher/game/tl/japanese/distribute_gui.rpy
-share/renpy/launcher/game/tl/japanese/distribute_gui.rpyc
 share/renpy/launcher/game/tl/japanese/editor.rpy
-share/renpy/launcher/game/tl/japanese/editor.rpyc
 share/renpy/launcher/game/tl/japanese/front_page.rpy
-share/renpy/launcher/game/tl/japanese/front_page.rpyc
 share/renpy/launcher/game/tl/japanese/interface.rpy
-share/renpy/launcher/game/tl/japanese/interface.rpyc
 share/renpy/launcher/game/tl/japanese/navigation.rpy
-share/renpy/launcher/game/tl/japanese/navigation.rpyc
 share/renpy/launcher/game/tl/japanese/new_project.rpy
-share/renpy/launcher/game/tl/japanese/new_project.rpyc
 share/renpy/launcher/game/tl/japanese/preferences.rpy
-share/renpy/launcher/game/tl/japanese/preferences.rpyc
 share/renpy/launcher/game/tl/japanese/project.rpy
-share/renpy/launcher/game/tl/japanese/project.rpyc
 share/renpy/launcher/game/tl/japanese/style.rpy
-share/renpy/launcher/game/tl/japanese/style.rpyc
 share/renpy/launcher/game/tl/japanese/translations.rpy
-share/renpy/launcher/game/tl/japanese/translations.rpyc
 share/renpy/launcher/game/tl/japanese/updater.rpy
-share/renpy/launcher/game/tl/japanese/updater.rpyc
+share/renpy/launcher/game/tl/korean/NanumGothic.ttf
+share/renpy/launcher/game/tl/korean/Naver Nanum Font License.txt
+share/renpy/launcher/game/tl/korean/about.rpy
+share/renpy/launcher/game/tl/korean/add_file.rpy
+share/renpy/launcher/game/tl/korean/android.rpy
+share/renpy/launcher/game/tl/korean/choose_theme.rpy
+share/renpy/launcher/game/tl/korean/common.rpy
+share/renpy/launcher/game/tl/korean/distribute.rpy
+share/renpy/launcher/game/tl/korean/distribute_gui.rpy
+share/renpy/launcher/game/tl/korean/editor.rpy
+share/renpy/launcher/game/tl/korean/front_page.rpy
+share/renpy/launcher/game/tl/korean/interface.rpy
+share/renpy/launcher/game/tl/korean/navigation.rpy
+share/renpy/launcher/game/tl/korean/new_project.rpy
+share/renpy/launcher/game/tl/korean/preferences.rpy
+share/renpy/launcher/game/tl/korean/project.rpy
+share/renpy/launcher/game/tl/korean/style.rpy
+share/renpy/launcher/game/tl/korean/translations.rpy
+share/renpy/launcher/game/tl/korean/updater.rpy
+share/renpy/launcher/game/tl/russian/about.rpy
+share/renpy/launcher/game/tl/russian/add_file.rpy
+share/renpy/launcher/game/tl/russian/android.rpy
+share/renpy/launcher/game/tl/russian/choose_theme.rpy
+share/renpy/launcher/game/tl/russian/common.rpy
+share/renpy/launcher/game/tl/russian/distribute.rpy
+share/renpy/launcher/game/tl/russian/distribute_gui.rpy
+share/renpy/launcher/game/tl/russian/editor.rpy
+share/renpy/launcher/game/tl/russian/front_page.rpy
+share/renpy/launcher/game/tl/russian/interface.rpy
+share/renpy/launcher/game/tl/russian/navigation.rpy
+share/renpy/launcher/game/tl/russian/new_project.rpy
+share/renpy/launcher/game/tl/russian/preferences.rpy
+share/renpy/launcher/game/tl/russian/project.rpy
+share/renpy/launcher/game/tl/russian/style.rpy
+share/renpy/launcher/game/tl/russian/translations.rpy
+share/renpy/launcher/game/tl/russian/updater.rpy
+share/renpy/launcher/game/tl/simplified_chinese/DroidSansFallback.ttf
+share/renpy/launcher/game/tl/simplified_chinese/DroidSansFallback.txt
+share/renpy/launcher/game/tl/simplified_chinese/README-cn.txt
+share/renpy/launcher/game/tl/simplified_chinese/README-en.txt
+share/renpy/launcher/game/tl/simplified_chinese/README.txt
+share/renpy/launcher/game/tl/simplified_chinese/about.rpy
+share/renpy/launcher/game/tl/simplified_chinese/add_file.rpy
+share/renpy/launcher/game/tl/simplified_chinese/android.rpy
+share/renpy/launcher/game/tl/simplified_chinese/choose_theme.rpy
+share/renpy/launcher/game/tl/simplified_chinese/common.rpy
+share/renpy/launcher/game/tl/simplified_chinese/distribute.rpy
+share/renpy/launcher/game/tl/simplified_chinese/distribute_gui.rpy
+share/renpy/launcher/game/tl/simplified_chinese/editor.rpy
+share/renpy/launcher/game/tl/simplified_chinese/front_page.rpy
+share/renpy/launcher/game/tl/simplified_chinese/interface.rpy
+share/renpy/launcher/game/tl/simplified_chinese/navigation.rpy
+share/renpy/launcher/game/tl/simplified_chinese/new_project.rpy
+share/renpy/launcher/game/tl/simplified_chinese/preferences.rpy
+share/renpy/launcher/game/tl/simplified_chinese/project.rpy
+share/renpy/launcher/game/tl/simplified_chinese/style.rpy
+share/renpy/launcher/game/tl/simplified_chinese/translations.rpy
+share/renpy/launcher/game/tl/simplified_chinese/updater.rpy
 share/renpy/launcher/game/tl/spanish/about.rpy
-share/renpy/launcher/game/tl/spanish/about.rpyc
 share/renpy/launcher/game/tl/spanish/add_file.rpy
-share/renpy/launcher/game/tl/spanish/add_file.rpyc
 share/renpy/launcher/game/tl/spanish/android.rpy
-share/renpy/launcher/game/tl/spanish/android.rpyc
 share/renpy/launcher/game/tl/spanish/choose_theme.rpy
-share/renpy/launcher/game/tl/spanish/choose_theme.rpyc
 share/renpy/launcher/game/tl/spanish/common.rpy
-share/renpy/launcher/game/tl/spanish/common.rpyc
 share/renpy/launcher/game/tl/spanish/distribute.rpy
-share/renpy/launcher/game/tl/spanish/distribute.rpyc
 share/renpy/launcher/game/tl/spanish/distribute_gui.rpy
-share/renpy/launcher/game/tl/spanish/distribute_gui.rpyc
 share/renpy/launcher/game/tl/spanish/editor.rpy
-share/renpy/launcher/game/tl/spanish/editor.rpyc
 share/renpy/launcher/game/tl/spanish/front_page.rpy
-share/renpy/launcher/game/tl/spanish/front_page.rpyc
 share/renpy/launcher/game/tl/spanish/interface.rpy
-share/renpy/launcher/game/tl/spanish/interface.rpyc
 share/renpy/launcher/game/tl/spanish/navigation.rpy
-share/renpy/launcher/game/tl/spanish/navigation.rpyc
 share/renpy/launcher/game/tl/spanish/new_project.rpy
-share/renpy/launcher/game/tl/spanish/new_project.rpyc
 share/renpy/launcher/game/tl/spanish/preferences.rpy
-share/renpy/launcher/game/tl/spanish/preferences.rpyc
 share/renpy/launcher/game/tl/spanish/project.rpy
-share/renpy/launcher/game/tl/spanish/project.rpyc
 share/renpy/launcher/game/tl/spanish/style.rpy
-share/renpy/launcher/game/tl/spanish/style.rpyc
 share/renpy/launcher/game/tl/spanish/translations.rpy
-share/renpy/launcher/game/tl/spanish/translations.rpyc
 share/renpy/launcher/game/tl/spanish/updater.rpy
-share/renpy/launcher/game/tl/spanish/updater.rpyc
+share/renpy/launcher/game/tl/traditional_chinese/DroidSansFallback-LICENSE
+share/renpy/launcher/game/tl/traditional_chinese/DroidSansFallback.ttf
+share/renpy/launcher/game/tl/traditional_chinese/about.rpy
+share/renpy/launcher/game/tl/traditional_chinese/add_file.rpy
+share/renpy/launcher/game/tl/traditional_chinese/android.rpy
+share/renpy/launcher/game/tl/traditional_chinese/choose_theme.rpy
+share/renpy/launcher/game/tl/traditional_chinese/common.rpy
+share/renpy/launcher/game/tl/traditional_chinese/distribute.rpy
+share/renpy/launcher/game/tl/traditional_chinese/distribute_gui.rpy
+share/renpy/launcher/game/tl/traditional_chinese/editor.rpy
+share/renpy/launcher/game/tl/traditional_chinese/front_page.rpy
+share/renpy/launcher/game/tl/traditional_chinese/interface.rpy
+share/renpy/launcher/game/tl/traditional_chinese/navigation.rpy
+share/renpy/launcher/game/tl/traditional_chinese/new_project.rpy
+share/renpy/launcher/game/tl/traditional_chinese/preferences.rpy
+share/renpy/launcher/game/tl/traditional_chinese/project.rpy
+share/renpy/launcher/game/tl/traditional_chinese/style.rpy
+share/renpy/launcher/game/tl/traditional_chinese/translations.rpy
+share/renpy/launcher/game/tl/traditional_chinese/updater.rpy
 share/renpy/launcher/game/translations.rpy
-share/renpy/launcher/game/translations.rpyc
 share/renpy/launcher/game/updater.rpy
-share/renpy/launcher/game/updater.rpyc
 share/renpy/launcher/game/util.rpy
-share/renpy/launcher/game/util.rpyc
-share/renpy/launcher/game/vscrollbar_center.png
-share/renpy/launcher/game/window.png
 share/renpy/launcher/icon.icns
 share/renpy/launcher/project.json
-share/renpy/launcher/traceback.txt
 share/renpy/renpy.py
 share/renpy/renpy/__init__.py
 share/renpy/renpy/__init__.pyc
@@ -288,132 +382,79 @@ share/renpy/renpy/audio/sound.py
 share/renpy/renpy/bootstrap.py
 share/renpy/renpy/character.py
 share/renpy/renpy/common/000atl.rpy
-share/renpy/renpy/common/000atl.rpyc
 share/renpy/renpy/common/000statements.rpy
-share/renpy/renpy/common/000statements.rpyc
+share/renpy/renpy/common/000window.rpy
 share/renpy/renpy/common/00action_audio.rpy
-share/renpy/renpy/common/00action_audio.rpyc
 share/renpy/renpy/common/00action_control.rpy
-share/renpy/renpy/common/00action_control.rpyc
 share/renpy/renpy/common/00action_data.rpy
-share/renpy/renpy/common/00action_data.rpyc
 share/renpy/renpy/common/00action_file.rpy
-share/renpy/renpy/common/00action_file.rpyc
 share/renpy/renpy/common/00action_menu.rpy
-share/renpy/renpy/common/00action_menu.rpyc
 share/renpy/renpy/common/00action_other.rpy
-share/renpy/renpy/common/00action_other.rpyc
 share/renpy/renpy/common/00barvalues.rpy
-share/renpy/renpy/common/00barvalues.rpyc
 share/renpy/renpy/common/00build.rpy
-share/renpy/renpy/common/00build.rpyc
 share/renpy/renpy/common/00compat.rpy
-share/renpy/renpy/common/00compat.rpyc
 share/renpy/renpy/common/00console.rpy
-share/renpy/renpy/common/00console.rpyc
 share/renpy/renpy/common/00defaults.rpy
-share/renpy/renpy/common/00defaults.rpyc
 share/renpy/renpy/common/00definitions.rpy
-share/renpy/renpy/common/00definitions.rpyc
 share/renpy/renpy/common/00gallery.rpy
-share/renpy/renpy/common/00gallery.rpyc
 share/renpy/renpy/common/00gamemenu.rpy
-share/renpy/renpy/common/00gamemenu.rpyc
 share/renpy/renpy/common/00gltest.rpy
-share/renpy/renpy/common/00gltest.rpyc
+share/renpy/renpy/common/00iap.rpy
 share/renpy/renpy/common/00keymap.rpy
-share/renpy/renpy/common/00keymap.rpyc
 share/renpy/renpy/common/00layout.rpy
-share/renpy/renpy/common/00layout.rpyc
 share/renpy/renpy/common/00library.rpy
-share/renpy/renpy/common/00library.rpyc
 share/renpy/renpy/common/00mixers.rpy
-share/renpy/renpy/common/00mixers.rpyc
 share/renpy/renpy/common/00musicroom.rpy
-share/renpy/renpy/common/00musicroom.rpyc
 share/renpy/renpy/common/00nvl_mode.rpy
-share/renpy/renpy/common/00nvl_mode.rpyc
 share/renpy/renpy/common/00obsolete.rpy
-share/renpy/renpy/common/00obsolete.rpyc
+share/renpy/renpy/common/00placeholder.rpy
 share/renpy/renpy/common/00preferences.rpy
-share/renpy/renpy/common/00preferences.rpyc
 share/renpy/renpy/common/00splines.rpy
-share/renpy/renpy/common/00splines.rpyc
 share/renpy/renpy/common/00start.rpy
-share/renpy/renpy/common/00start.rpyc
 share/renpy/renpy/common/00style.rpy
-share/renpy/renpy/common/00style.rpyc
 share/renpy/renpy/common/00stylepreferences.rpy
-share/renpy/renpy/common/00stylepreferences.rpyc
 share/renpy/renpy/common/00themes.rpy
-share/renpy/renpy/common/00themes.rpyc
 share/renpy/renpy/common/00updater.rpy
-share/renpy/renpy/common/00updater.rpyc
 share/renpy/renpy/common/00voice.rpy
-share/renpy/renpy/common/00voice.rpyc
 share/renpy/renpy/common/DejaVuSans.ttf
 share/renpy/renpy/common/DejaVuSans.txt
 share/renpy/renpy/common/_compat/gamemenu.rpym
-share/renpy/renpy/common/_compat/gamemenu.rpymc
 share/renpy/renpy/common/_compat/library.rpym
-share/renpy/renpy/common/_compat/library.rpymc
 share/renpy/renpy/common/_compat/mainmenu.rpym
-share/renpy/renpy/common/_compat/mainmenu.rpymc
 share/renpy/renpy/common/_compat/preferences.rpym
-share/renpy/renpy/common/_compat/preferences.rpymc
 share/renpy/renpy/common/_compat/styles.rpym
-share/renpy/renpy/common/_compat/styles.rpymc
 share/renpy/renpy/common/_compat/themes.rpym
-share/renpy/renpy/common/_compat/themes.rpymc
-share/renpy/renpy/common/_developer.rpym
-share/renpy/renpy/common/_developer.rpymc
+share/renpy/renpy/common/_developer/developer.rpym
+share/renpy/renpy/common/_developer/inspector.rpym
 share/renpy/renpy/common/_errorhandling.rpym
-share/renpy/renpy/common/_errorhandling.rpymc
 share/renpy/renpy/common/_layout/classic_joystick_preferences.rpym
-share/renpy/renpy/common/_layout/classic_joystick_preferences.rpymc
 share/renpy/renpy/common/_layout/classic_load_save.rpym
-share/renpy/renpy/common/_layout/classic_load_save.rpymc
 share/renpy/renpy/common/_layout/classic_main_menu.rpym
-share/renpy/renpy/common/_layout/classic_main_menu.rpymc
 share/renpy/renpy/common/_layout/classic_navigation.rpym
-share/renpy/renpy/common/_layout/classic_navigation.rpymc
 share/renpy/renpy/common/_layout/classic_preferences.rpym
-share/renpy/renpy/common/_layout/classic_preferences.rpymc
 share/renpy/renpy/common/_layout/classic_preferences_common.rpym
-share/renpy/renpy/common/_layout/classic_preferences_common.rpymc
 share/renpy/renpy/common/_layout/classic_yesno_prompt.rpym
-share/renpy/renpy/common/_layout/classic_yesno_prompt.rpymc
 share/renpy/renpy/common/_layout/grouped_main_menu.rpym
 share/renpy/renpy/common/_layout/grouped_navigation.rpym
 share/renpy/renpy/common/_layout/imagemap_common.rpym
-share/renpy/renpy/common/_layout/imagemap_common.rpymc
 share/renpy/renpy/common/_layout/imagemap_load_save.rpym
-share/renpy/renpy/common/_layout/imagemap_load_save.rpymc
 share/renpy/renpy/common/_layout/imagemap_main_menu.rpym
-share/renpy/renpy/common/_layout/imagemap_main_menu.rpymc
 share/renpy/renpy/common/_layout/imagemap_navigation.rpym
-share/renpy/renpy/common/_layout/imagemap_navigation.rpymc
 share/renpy/renpy/common/_layout/imagemap_preferences.rpym
-share/renpy/renpy/common/_layout/imagemap_preferences.rpymc
 share/renpy/renpy/common/_layout/imagemap_yesno_prompt.rpym
-share/renpy/renpy/common/_layout/imagemap_yesno_prompt.rpymc
 share/renpy/renpy/common/_layout/one_column_preferences.rpym
 share/renpy/renpy/common/_layout/screen_joystick_preferences.rpym
 share/renpy/renpy/common/_layout/screen_load_save.rpym
-share/renpy/renpy/common/_layout/screen_load_save.rpymc
 share/renpy/renpy/common/_layout/screen_main_menu.rpym
-share/renpy/renpy/common/_layout/screen_main_menu.rpymc
 share/renpy/renpy/common/_layout/screen_preferences.rpym
-share/renpy/renpy/common/_layout/screen_preferences.rpymc
 share/renpy/renpy/common/_layout/screen_yesno_prompt.rpym
-share/renpy/renpy/common/_layout/screen_yesno_prompt.rpymc
 share/renpy/renpy/common/_layout/scrolling_load_save.rpym
-share/renpy/renpy/common/_layout/scrolling_load_save.rpymc
 share/renpy/renpy/common/_layout/two_column_preferences.rpym
-share/renpy/renpy/common/_layout/two_column_preferences.rpymc
 share/renpy/renpy/common/_outline/bar.png
 share/renpy/renpy/common/_outline/circle.png
 share/renpy/renpy/common/_outline/vbar.png
+share/renpy/renpy/common/_placeholder/boy.png
+share/renpy/renpy/common/_placeholder/girl.png
 share/renpy/renpy/common/_roundrect/rr12.png
 share/renpy/renpy/common/_roundrect/rr12g.png
 share/renpy/renpy/common/_roundrect/rr6.png
@@ -611,10 +652,12 @@ share/renpy/renpy/display/scale.py
 share/renpy/renpy/display/screen.py
 share/renpy/renpy/display/swdraw.py
 share/renpy/renpy/display/transition.py
+share/renpy/renpy/display/tts.py
 share/renpy/renpy/display/video.py
 share/renpy/renpy/dump.py
 share/renpy/renpy/easy.py
 share/renpy/renpy/editor.py
+share/renpy/renpy/error.py
 share/renpy/renpy/execution.py
 share/renpy/renpy/exports.py
 share/renpy/renpy/game.py
@@ -635,17 +678,25 @@ share/renpy/renpy/loader.py
 share/renpy/renpy/loadsave.py
 share/renpy/renpy/log.py
 share/renpy/renpy/main.py
+share/renpy/renpy/memory.py
 share/renpy/renpy/minstore.py
 share/renpy/renpy/object.py
 share/renpy/renpy/parser.py
 share/renpy/renpy/persistent.py
 share/renpy/renpy/preferences.py
+share/renpy/renpy/pyanalysis.py
 share/renpy/renpy/python.py
 share/renpy/renpy/savelocation.py
 share/renpy/renpy/screenlang.py
 share/renpy/renpy/script.py
+share/renpy/renpy/sl2/__init__.py
+share/renpy/renpy/sl2/slast.py
+share/renpy/renpy/sl2/sldisplayables.py
+share/renpy/renpy/sl2/slparser.py
 share/renpy/renpy/statements.py
-share/renpy/renpy/style.py
+share/renpy/renpy/style.pxd
+share/renpy/renpy/style.pyx
+share/renpy/renpy/styleclass.pyx
 share/renpy/renpy/substitutions.py
 share/renpy/renpy/text/__init__.py
 share/renpy/renpy/text/extras.py
@@ -662,7 +713,6 @@ share/renpy/renpy/vc_version.py
 share/renpy/renpy/vc_version.pyc
 share/renpy/renpy/warp.py
 share/renpy/the_question/README.html
-share/renpy/the_question/game/bytecode.rpyb
 share/renpy/the_question/game/club.jpg
 share/renpy/the_question/game/illurock.ogg
 share/renpy/the_question/game/lecturehall.jpg
@@ -670,9 +720,7 @@ share/renpy/the_question/game/meadow.jpg
 share/renpy/the_question/game/menu.jpg
 share/renpy/the_question/game/menu2.jpg
 share/renpy/the_question/game/options.rpy
-share/renpy/the_question/game/options.rpyc
 share/renpy/the_question/game/script.rpy
-share/renpy/the_question/game/script.rpyc
 share/renpy/the_question/game/sylvie2_giggle.png
 share/renpy/the_question/game/sylvie2_normal.png
 share/renpy/the_question/game/sylvie2_smile.png
@@ -688,7 +736,6 @@ share/renpy/the_question/project.json
 share/renpy/tutorial/README.html
 share/renpy/tutorial/game/arrow.png
 share/renpy/tutorial/game/band.jpg
-share/renpy/tutorial/game/bytecode.rpyb
 share/renpy/tutorial/game/cache/im-97355fbfe11cfbf399bd634f191bba56.png
 share/renpy/tutorial/game/cave.jpg
 share/renpy/tutorial/game/click.wav
@@ -696,40 +743,25 @@ share/renpy/tutorial/game/concert1.jpg
 share/renpy/tutorial/game/concert2.jpg
 share/renpy/tutorial/game/concert3.jpg
 share/renpy/tutorial/game/demo_character.rpy
-share/renpy/tutorial/game/demo_character.rpyc
 share/renpy/tutorial/game/demo_dynamic.rpy
-share/renpy/tutorial/game/demo_dynamic.rpyc
 share/renpy/tutorial/game/demo_imageops.rpy
-share/renpy/tutorial/game/demo_imageops.rpyc
 share/renpy/tutorial/game/demo_layers.rpy
-share/renpy/tutorial/game/demo_layers.rpyc
 share/renpy/tutorial/game/demo_minigame.rpy
-share/renpy/tutorial/game/demo_minigame.rpyc
 share/renpy/tutorial/game/demo_nvlmode.rpy
-share/renpy/tutorial/game/demo_nvlmode.rpyc
 share/renpy/tutorial/game/demo_persistent.rpy
-share/renpy/tutorial/game/demo_persistent.rpyc
 share/renpy/tutorial/game/demo_text.rpy
-share/renpy/tutorial/game/demo_text.rpyc
 share/renpy/tutorial/game/demo_transform.rpy
-share/renpy/tutorial/game/demo_transform.rpyc
 share/renpy/tutorial/game/demo_transitions.rpy
-share/renpy/tutorial/game/demo_transitions.rpyc
 share/renpy/tutorial/game/demo_ui.rpy
-share/renpy/tutorial/game/demo_ui.rpyc
 share/renpy/tutorial/game/demos.rpy
-share/renpy/tutorial/game/demos.rpyc
 share/renpy/tutorial/game/editor.rpy
-share/renpy/tutorial/game/editor.rpyc
 share/renpy/tutorial/game/eileen_concerned.png
 share/renpy/tutorial/game/eileen_happy.png
 share/renpy/tutorial/game/eileen_orb.png
 share/renpy/tutorial/game/eileen_side.png
 share/renpy/tutorial/game/eileen_vhappy.png
 share/renpy/tutorial/game/examples.rpy
-share/renpy/tutorial/game/examples.rpyc
 share/renpy/tutorial/game/exclamation.png
-share/renpy/tutorial/game/happy_alley.ogg
 share/renpy/tutorial/game/id_circleiris.png
 share/renpy/tutorial/game/id_circlewipe.png
 share/renpy/tutorial/game/id_dream.png
@@ -748,7 +780,6 @@ share/renpy/tutorial/game/magic.png
 share/renpy/tutorial/game/mjcprefs.jpg
 share/renpy/tutorial/game/new_sfont.png
 share/renpy/tutorial/game/options.rpy
-share/renpy/tutorial/game/options.rpyc
 share/renpy/tutorial/game/pong.png
 share/renpy/tutorial/game/pong_ball.png
 share/renpy/tutorial/game/pong_beep.wav
@@ -760,69 +791,42 @@ share/renpy/tutorial/game/renpyallstars.ogg
 share/renpy/tutorial/game/sakura.png
 share/renpy/tutorial/game/save.png
 share/renpy/tutorial/game/screens.rpy
-share/renpy/tutorial/game/screens.rpyc
 share/renpy/tutorial/game/script.rpy
-share/renpy/tutorial/game/script.rpyc
 share/renpy/tutorial/game/shuttle.ogv
 share/renpy/tutorial/game/spotlight.png
 share/renpy/tutorial/game/star.png
+share/renpy/tutorial/game/sunflower-slow-drag.ogg
 share/renpy/tutorial/game/target1.png
 share/renpy/tutorial/game/target2.png
 share/renpy/tutorial/game/tl/japanese/MTLc3m-LICENSE
 share/renpy/tutorial/game/tl/japanese/MTLc3m.ttf
 share/renpy/tutorial/game/tl/japanese/common.rpy
-share/renpy/tutorial/game/tl/japanese/common.rpyc
 share/renpy/tutorial/game/tl/japanese/demo_character.rpy
-share/renpy/tutorial/game/tl/japanese/demo_character.rpyc
 share/renpy/tutorial/game/tl/japanese/demo_dynamic.rpy
-share/renpy/tutorial/game/tl/japanese/demo_dynamic.rpyc
 share/renpy/tutorial/game/tl/japanese/demo_imageops.rpy
-share/renpy/tutorial/game/tl/japanese/demo_imageops.rpyc
 share/renpy/tutorial/game/tl/japanese/demo_layers.rpy
-share/renpy/tutorial/game/tl/japanese/demo_layers.rpyc
 share/renpy/tutorial/game/tl/japanese/demo_minigame.rpy
-share/renpy/tutorial/game/tl/japanese/demo_minigame.rpyc
 share/renpy/tutorial/game/tl/japanese/demo_nvlmode.rpy
-share/renpy/tutorial/game/tl/japanese/demo_nvlmode.rpyc
 share/renpy/tutorial/game/tl/japanese/demo_persistent.rpy
-share/renpy/tutorial/game/tl/japanese/demo_persistent.rpyc
 share/renpy/tutorial/game/tl/japanese/demo_text.rpy
-share/renpy/tutorial/game/tl/japanese/demo_text.rpyc
 share/renpy/tutorial/game/tl/japanese/demo_transform.rpy
-share/renpy/tutorial/game/tl/japanese/demo_transform.rpyc
 share/renpy/tutorial/game/tl/japanese/demo_transitions.rpy
-share/renpy/tutorial/game/tl/japanese/demo_transitions.rpyc
 share/renpy/tutorial/game/tl/japanese/demo_ui.rpy
-share/renpy/tutorial/game/tl/japanese/demo_ui.rpyc
 share/renpy/tutorial/game/tl/japanese/screens.rpy
-share/renpy/tutorial/game/tl/japanese/screens.rpyc
 share/renpy/tutorial/game/tl/japanese/script.rpy
-share/renpy/tutorial/game/tl/japanese/script.rpyc
 share/renpy/tutorial/game/tl/japanese/style.rpy
-share/renpy/tutorial/game/tl/japanese/style.rpyc
 share/renpy/tutorial/game/tl/japanese/tutorial_atl.rpy
-share/renpy/tutorial/game/tl/japanese/tutorial_atl.rpyc
 share/renpy/tutorial/game/tl/japanese/tutorial_playing.rpy
-share/renpy/tutorial/game/tl/japanese/tutorial_playing.rpyc
 share/renpy/tutorial/game/tl/japanese/tutorial_quickstart.rpy
-share/renpy/tutorial/game/tl/japanese/tutorial_quickstart.rpyc
 share/renpy/tutorial/game/tl/japanese/tutorial_sprite.rpy
-share/renpy/tutorial/game/tl/japanese/tutorial_sprite.rpyc
 share/renpy/tutorial/game/tl/japanese/tutorial_video.rpy
-share/renpy/tutorial/game/tl/japanese/tutorial_video.rpyc
 share/renpy/tutorial/game/tower_clock.ogg
 share/renpy/tutorial/game/tutorial_atl.rpy
-share/renpy/tutorial/game/tutorial_atl.rpyc
 share/renpy/tutorial/game/tutorial_playing.rpy
-share/renpy/tutorial/game/tutorial_playing.rpyc
 share/renpy/tutorial/game/tutorial_quickstart.rpy
-share/renpy/tutorial/game/tutorial_quickstart.rpyc
 share/renpy/tutorial/game/tutorial_sprite.rpy
-share/renpy/tutorial/game/tutorial_sprite.rpyc
 share/renpy/tutorial/game/tutorial_video.rpy
-share/renpy/tutorial/game/tutorial_video.rpyc
 share/renpy/tutorial/game/washington.jpg
 share/renpy/tutorial/game/whitehouse.jpg
 share/renpy/tutorial/project.json
-share/renpy/tutorial/traceback.txt
 share/renpy/update/current.json
diff --git a/games/py-renpy/distinfo b/games/py-renpy/distinfo
index 47d2d33fa55..d93d29fdba2 100644
--- a/games/py-renpy/distinfo
+++ b/games/py-renpy/distinfo
@@ -1,7 +1,10 @@
-$NetBSD: distinfo,v 1.3 2015/11/03 20:57:02 agc Exp $
+$NetBSD: distinfo,v 1.4 2017/06/24 19:39:47 adam Exp $
 
-SHA1 (renpy-6.16.5-source.tar.bz2) = 0f1c2f78f5d5888adf6a827ca96836035499790c
-RMD160 (renpy-6.16.5-source.tar.bz2) = 601ad49129d7ecb18e31977cf8957a37ac8d2181
-SHA512 (renpy-6.16.5-source.tar.bz2) = 1a718d86a689135e5a280f64cdc3c0340d712b7804af2169ed4cb4a12528e01088c919b87d36176b3fb8a05e8201f226146c46c4f4d5ebf1d89c3cebd1263c4d
-Size (renpy-6.16.5-source.tar.bz2) = 14455622 bytes
-SHA1 (patch-module_setup.py) = 2274903b654b539d7edbd88e465a9a7add60fcb4
+SHA1 (renpy-6.18.3-source.tar.bz2) = 0e15152531f8bed959ba63a2086d6b363739a573
+RMD160 (renpy-6.18.3-source.tar.bz2) = bbd8deb70015ea1d9eb9403db35f7ba5a4c0ebc4
+SHA512 (renpy-6.18.3-source.tar.bz2) = 7ea99adaf1fbea7a499790fb5b37349fc797f383fb633956a43955c80885b259e26570469c430f4c4c103e62444f60082690489ee6400809f5e9024693261e55
+Size (renpy-6.18.3-source.tar.bz2) = 23244450 bytes
+SHA1 (patch-module_core.c) = 333d6e8704098d7f423869e77b1adbcdd4d79c1f
+SHA1 (patch-module_ffdecode.c) = 9a43f5a3ca74cccdba68706540070c3d514d28cd
+SHA1 (patch-module_setup.py) = cb5a6ae303b3323c389cf9e3a2085adc11fdde4f
+SHA1 (patch-module_subpixel.c) = 3dee17b2bb1a8880f57b7cb48f633bfc7d1f3204
diff --git a/games/py-renpy/patches/patch-module_core.c b/games/py-renpy/patches/patch-module_core.c
new file mode 100644
index 00000000000..35d7a8a8d75
--- /dev/null
+++ b/games/py-renpy/patches/patch-module_core.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-module_core.c,v 1.1 2017/06/24 19:39:47 adam Exp $
+
+Fix for duplicate symbol PyGAME_C_API.
+
+--- module/core.c.orig	2017-06-24 17:57:51.000000000 +0000
++++ module/core.c
+@@ -1,6 +1,6 @@
+ #include "renpy.h"
+ #include "IMG_savepng.h"
+-#include <pygame/pygame.h>
++#include <pygame/_pygame.h>
+ #include <stdio.h>
+ #include <math.h>
+ 
diff --git a/games/py-renpy/patches/patch-module_ffdecode.c b/games/py-renpy/patches/patch-module_ffdecode.c
new file mode 100644
index 00000000000..bedbaf862db
--- /dev/null
+++ b/games/py-renpy/patches/patch-module_ffdecode.c
@@ -0,0 +1,24 @@
+$NetBSD: patch-module_ffdecode.c,v 1.1 2017/06/24 19:39:47 adam Exp $
+
+Fix for duplicate symbol PyGAME_C_API.
+Fix for deprecated AVCODEC_MAX_AUDIO_FRAME_SIZE.
+
+--- module/ffdecode.c.orig	2014-07-06 14:22:40.000000000 +0000
++++ module/ffdecode.c
+@@ -19,7 +19,7 @@
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+  */
+ 
+-#include <pygame/pygame.h>
++#include <pygame/_pygame.h>
+ #include <math.h>
+ #include <limits.h>
+ #include <libavutil/avstring.h>
+@@ -101,6 +101,7 @@ typedef struct VideoState {
+        compensation */
+ 
+ #ifndef HAS_RESAMPLE
++#define AVCODEC_MAX_AUDIO_FRAME_SIZE 19200
+     uint8_t audio_buf1[(AVCODEC_MAX_AUDIO_FRAME_SIZE * 3) / 2] __attribute__ ((aligned (16))) ;
+     uint8_t audio_buf2[(AVCODEC_MAX_AUDIO_FRAME_SIZE * 3) / 2] __attribute__ ((aligned (16))) ;
+ #else
diff --git a/games/py-renpy/patches/patch-module_setup.py b/games/py-renpy/patches/patch-module_setup.py
index 9ff851a651f..c6b98708c36 100644
--- a/games/py-renpy/patches/patch-module_setup.py
+++ b/games/py-renpy/patches/patch-module_setup.py
@@ -1,10 +1,10 @@
-$NetBSD: patch-module_setup.py,v 1.1 2013/10/23 11:35:46 ryoon Exp $
+$NetBSD: patch-module_setup.py,v 1.2 2017/06/24 19:39:47 adam Exp $
 
 * png from pkgsrc is libpng16.so
 
---- module/setup.py.orig	2013-06-08 02:38:29.000000000 +0000
+--- module/setup.py.orig	2014-08-05 01:19:58.000000000 +0000
 +++ module/setup.py
-@@ -33,7 +33,7 @@ include("libswscale/swscale.h")
+@@ -75,7 +75,7 @@ include("libswscale/swscale.h")
  include("GL/glew.h")
  
  library("SDL")
diff --git a/games/py-renpy/patches/patch-module_subpixel.c b/games/py-renpy/patches/patch-module_subpixel.c
new file mode 100644
index 00000000000..7afc24a59b5
--- /dev/null
+++ b/games/py-renpy/patches/patch-module_subpixel.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-module_subpixel.c,v 1.1 2017/06/24 19:39:47 adam Exp $
+
+Fix for duplicate symbol PyGAME_C_API.
+
+--- module/subpixel.c.orig	2017-06-24 17:57:56.000000000 +0000
++++ module/subpixel.c
+@@ -7,7 +7,7 @@
+  */
+ 
+ #include "renpy.h"
+-#include <pygame/pygame.h>
++#include <pygame/_pygame.h>
+ #include <stdio.h>
+ #include <math.h>
+