Index: branches/2016Q1/devel/py-game_sdl2/files/patch-src_pygame__sdl2_event.pyx =================================================================== --- branches/2016Q1/devel/py-game_sdl2/files/patch-src_pygame__sdl2_event.pyx (revision 405594) +++ branches/2016Q1/devel/py-game_sdl2/files/patch-src_pygame__sdl2_event.pyx (nonexistent) @@ -1,33 +0,0 @@ -commit 1359d51 -Author: Tom Rothamel -Date: Tue Nov 3 09:01:52 2015 -0500 - - Allow event types to be longs. - - Fixes renpy/renpy#778. ---- - src/pygame_sdl2/event.pyx | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git src/pygame_sdl2/event.pyx src/pygame_sdl2/event.pyx -index 209fb83..22da508 100644 ---- src/pygame_sdl2/event.pyx -+++ src/pygame_sdl2/event.pyx -@@ -416,7 +416,7 @@ def set_blocked(t=None): - if t == None: - for et in event_names.keys(): - SDL_EventState(et, SDL_ENABLE) -- elif type(t) == int: -+ elif isinstance(t, (int, long)): - SDL_EventState(t, SDL_IGNORE) - else: - for et in t: -@@ -426,7 +426,7 @@ def set_allowed(t=None): - if t == None: - for et in event_names.keys(): - SDL_EventState(et, SDL_IGNORE) -- elif type(t) == int: -+ elif isinstance(t, (int, long)): - SDL_EventState(t, SDL_ENABLE) - else: - for et in t: Property changes on: branches/2016Q1/devel/py-game_sdl2/files/patch-src_pygame__sdl2_event.pyx ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2016Q1/devel/py-game_sdl2/Makefile =================================================================== --- branches/2016Q1/devel/py-game_sdl2/Makefile (revision 405594) +++ branches/2016Q1/devel/py-game_sdl2/Makefile (revision 405595) @@ -1,33 +1,32 @@ # $FreeBSD$ PORTNAME= game_sdl2 -PORTVERSION= 6.99.7 -PORTREVISION= 1 +PORTVERSION= 6.99.8 CATEGORIES= devel python MASTER_SITES= http://www.renpy.org/dl/${PORTVERSION}/ \ GENTOO PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} DISTNAME= py${PORTNAME}-for-renpy-${DISTVERSION} MAINTAINER= jbeich@FreeBSD.org COMMENT= Reimplementation of portions of the pygame API using SDL2 LICENSE= LGPL21 ZLIB LICENSE_COMB= multi BUILD_DEPENDS= cython:${PORTSDIR}/lang/cython LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png # Upstream tends to reroll distfiles before moving under /release/ PORTSCOUT= site:http://www.renpy.org/dl/release/ USES= jpeg python tar:bz2 USE_SDL= image2 mixer2 ttf2 USE_PYTHON= autoplist distutils WRKSRC= ${WRKDIR}/${DISTNAME:S/_/-/} post-install: ${FIND} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} -name \*.so \ -exec ${STRIP_CMD} {} + .include Index: branches/2016Q1/devel/py-game_sdl2/distinfo =================================================================== --- branches/2016Q1/devel/py-game_sdl2/distinfo (revision 405594) +++ branches/2016Q1/devel/py-game_sdl2/distinfo (revision 405595) @@ -1,2 +1,2 @@ -SHA256 (pygame_sdl2-for-renpy-6.99.7.tar.bz2) = 24830ec6942203a3b859efce3f694a09ed0cfa988258a27301ab16d7e45f068d -SIZE (pygame_sdl2-for-renpy-6.99.7.tar.bz2) = 133763 +SHA256 (pygame_sdl2-for-renpy-6.99.8.tar.bz2) = cf6c5acd21af92554c404a24d66af9292f126e10d0d8eea1f7d44432e80b0942 +SIZE (pygame_sdl2-for-renpy-6.99.8.tar.bz2) = 133690 Index: branches/2016Q1/devel/renpy/Makefile =================================================================== --- branches/2016Q1/devel/renpy/Makefile (revision 405594) +++ branches/2016Q1/devel/renpy/Makefile (revision 405595) @@ -1,100 +1,100 @@ # $FreeBSD$ PORTNAME= renpy -PORTVERSION= 6.99.7 +PORTVERSION= 6.99.8 DISTVERSIONSUFFIX=-sdk CATEGORIES= devel games MASTER_SITES= http://www.renpy.org/dl/${PORTVERSION}/ MAINTAINER= jbeich@FreeBSD.org COMMENT= Framework for developing visual-novel type games LICENSE= APACHE20 BSD3CLAUSE DejaVu LGPL21 MIT OFL11 ZLIB LICENSE_COMB= multi 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= ${PYTHON_PKGNAMEPREFIX}game_sdl2>0:${PORTSDIR}/devel/py-game_sdl2 \ cython:${PORTSDIR}/lang/cython LIB_DEPENDS= libfribidi.so:${PORTSDIR}/converters/fribidi \ libpng.so:${PORTSDIR}/graphics/png \ libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \ libfreetype.so:${PORTSDIR}/print/freetype2 RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}game_sdl2>=${PORTVERSION}:${PORTSDIR}/devel/py-game_sdl2 # Upstream tends to reroll distfiles before moving under /release/ PORTSCOUT= site:http://www.renpy.org/dl/release/ USES= python:2.7 shebangfix tar:bz2 USE_GL= glew USE_PYTHON= autoplist distutils USE_SDL= sdl2 EXCLUDE= gen 'module/*.py[co]' 'renpy/*.py[co]' EXTRACT_AFTER_ARGS=${EXCLUDE:S,^,--exclude ,} SHEBANG_FILES= renpy.py launcher/game/tkaskdir.py BUILD_WRKSRC= ${WRKSRC}/module INSTALL_WRKSRC= ${BUILD_WRKSRC} MAKE_ENV+= RENPY_DEPS_INSTALL="${LOCALBASE}" PORTDATA= launcher renpy renpy.py templates PORTDOCS= * PLIST_FILES= bin/${PORTNAME} DESKTOP_ENTRIES="Ren'Py" \ "" \ "${DATADIR}/launcher/game/images/logo32.png" \ "${PORTNAME} %f" \ "Development;Game;AdventureGame;" \ "" OPTIONS_DEFAULT=TKINTER DIST OPTIONS_DEFINE= DOCS DIST EXAMPLES TKINTER DIST_DESC= Distribution runtimes for Windows, OS X, Linux DIST_VARS= LICENSE+="ART20 PSFL" \ PORTDATA+="lib renpy.app renpy.exe renpy.sh" EXAMPLES_VARS= PORTDATA+="the_question tutorial" TKINTER_DESC= Install Tkinter to allow choosing Projects Directory TKINTER_RUN_DEPENDS=${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter . for lic in FREETYPE LIBJPEG LIBPNG MSVCR90 DIST_VARS+= LICENSE+=${lic} LICENSE_NAME_${lic}= ${lic} license LICENSE_FILE_${lic}= ${WRKSRC}/LICENSE.txt LICENSE_PERMS_${lic}= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept . endfor post-patch: @${REINPLACE_CMD} -e 's,/usr/bin/python,${PYTHON_CMD},' \ ${WRKSRC}/launcher/game/choose_directory.rpy # Avoid having to add -I/usr/include -L/usr/lib @${REINPLACE_CMD} '/library("z")/d' ${BUILD_WRKSRC}/${PYSETUP} post-build: @${PYTHON_CMD} -m compileall -d ${DATADIR} ${WRKSRC} @${PYTHON_CMD} -O -m compileall -d ${DATADIR} ${WRKSRC} add-plist-post: add-empty-dirs add-empty-dirs: # Keep images directory in templates, see renpy@d81ea29 ${FIND} ${WRKSRC}/templates -type d ! -name "saves" -empty | \ ${SED} 's,^${WRKSRC},@dir ${DATADIR},' >>${TMPPLIST} post-install: ${FIND} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} -name \*.so \ -exec ${STRIP_CMD} {} + ${LN} -fs ${DATADIR}/renpy.py \ ${STAGEDIR}${PREFIX}/bin/${PORTNAME} (cd ${WRKSRC} && ${COPYTREE_SHARE} \ "${PORTDATA}" ${STAGEDIR}${DATADIR} \ "! -name *.orig ! -name *.bak \ ! -name saves ! -name log.txt") ${CHMOD} +x ${STAGEDIR}${DATADIR}/renpy.py ${CHMOD} -R u+w ${STAGEDIR}${DATADIR}/templates post-install-DOCS-on: (cd ${WRKSRC}/doc && ${COPYTREE_SHARE} \ . ${STAGEDIR}${DOCSDIR} \ "! -name *.orig ! -name *.bak") .include Index: branches/2016Q1/devel/renpy/distinfo =================================================================== --- branches/2016Q1/devel/renpy/distinfo (revision 405594) +++ branches/2016Q1/devel/renpy/distinfo (revision 405595) @@ -1,2 +1,2 @@ -SHA256 (renpy-6.99.7-sdk.tar.bz2) = 0a56745476901b8abec3d9d13bf9ee501c4cae50c2ffdd98a17d55b1d78893f2 -SIZE (renpy-6.99.7-sdk.tar.bz2) = 53029769 +SHA256 (renpy-6.99.8-sdk.tar.bz2) = 5745413ed2308ad73cd787d26ee684f6d214969cd5ff22f4a66d98ec7cad8f94 +SIZE (renpy-6.99.8-sdk.tar.bz2) = 53156812 Index: branches/2016Q1 =================================================================== --- branches/2016Q1 (revision 405594) +++ branches/2016Q1 (revision 405595) Property changes on: branches/2016Q1 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r405497