Update to 6.99.1

Changes:	http://www.renpy.org/doc/html/changelog.html

devel/renpy/Makefile

@@ -1,9 +1,8 @@
 # $FreeBSD$
 
 PORTNAME=	renpy
-PORTVERSION=	6.18.3
+PORTVERSION=	6.99.1
 DISTVERSIONSUFFIX=-source
-PORTREVISION=	3
 CATEGORIES=	devel games
 MASTER_SITES=	http://www.renpy.org/dl/${PORTVERSION}/ \
 		GENTOO/distfiles
@@ -17,20 +16,18 @@ LICENSE_NAME_DejaVu=	Bitstream Vera and Arev fonts license
 LICENSE_FILE_DejaVu=	${WRKSRC}/renpy/common/DejaVuSans.txt
 LICENSE_PERMS_DejaVu=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-BUILD_DEPENDS=	${PYGAME} \
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}game_sdl2>0:${PORTSDIR}/devel/py-game_sdl2 \
 		cython:${PORTSDIR}/lang/cython
 LIB_DEPENDS=	libfribidi.so:${PORTSDIR}/converters/fribidi \
 		libGLEW.so:${PORTSDIR}/graphics/glew \
 		libpng.so:${PORTSDIR}/graphics/png \
 		libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \
 		libfreetype.so:${PORTSDIR}/print/freetype2
-RUN_DEPENDS=	${PYGAME}
-
-PORTSCOUT=	skipv:6.99.0 # prerelease, missing style_common.pxi
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}game_sdl2>0:${PORTSDIR}/devel/py-game_sdl2
 
 USES=		python:2.7 shebangfix tar:bz2
 USE_PYTHON=	autoplist distutils
-USE_SDL=	sdl
+USE_SDL=	sdl2
 EXTRACT_AFTER_ARGS=--exclude gen
 SHEBANG_FILES=	renpy.py launcher/game/tkaskdir.py
 python_OLD_CMD=	/usr/bin/env python
@@ -62,6 +59,10 @@ TKINTER_RUN_DEPENDS=${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py
 PORTDATA+=	the_question tutorial
 .endif
 
+post-extract:
+# https://github.com/renpy/renpy/issues/594
+	${CP} -n ${FILESDIR}/style_common.pxi ${BUILD_WRKSRC}/include
+
 post-patch:
 	@${REINPLACE_CMD} -e 's,/usr/bin/python,${PYTHON_CMD},' \
 		${WRKSRC}/launcher/game/project.rpy

devel/renpy/distinfo

@@ -1,2 +1,2 @@
-SHA256 (renpy-6.18.3-source.tar.bz2) = c0c6af79ceb529e69cebfdb0e9849e50dc27e424dc2fd2b322c13d6ec938cba6
-SIZE (renpy-6.18.3-source.tar.bz2) = 23244450
+SHA256 (renpy-6.99.1-source.tar.bz2) = 8c34634b98a2bb0937c9582d98105d975e7157cc76f59bb9df2465e279d462fd
+SIZE (renpy-6.99.1-source.tar.bz2) = 23435755

devel/renpy/files/patch-module_ffdecode.c

@@ -1,12 +0,0 @@
-diff --git module/ffdecode.c module/ffdecode.c
-index e9e0db7..c32a788 100644
---- module/ffdecode.c
-+++ module/ffdecode.c
-@@ -22,6 +22,7 @@
- #include <math.h>
- #include <limits.h>
- #include <libavutil/avstring.h>
-+#include <libavutil/time.h>
- #include <libavformat/avformat.h>
- #include <libavcodec/avcodec.h>
- #include <libswscale/swscale.h>

devel/renpy/files/style_common.pxi

@@ -0,0 +1,39 @@
+# Copyright 2004-2014 Tom Rothamel <pytom@bishoujo.us>
+#
+# Permission is hereby granted, free of charge, to any person
+# obtaining a copy of this software and associated documentation files
+# (the "Software"), to deal in the Software without restriction,
+# including without limitation the rights to use, copy, modify, merge,
+# publish, distribute, sublicense, and/or sell copies of the Software,
+# and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+import renpy
+
+from renpy.style cimport register_property_function, assign
+from cpython.ref cimport PyObject
+
+from renpy.styledata.styleutil import none_is_null, expand_focus_mask, expand_outlines, expand_anchor
+
+cdef inline object index_0(object v):
+    return v[0]
+
+cdef inline object index_1(object v):
+    return v[1]
+
+cdef inline object index_2(object v):
+    return v[2]
+
+cdef inline object index_3(object v):
+    return v[3]