Pygame 1.9.3:

This is a bugfix release which fixes a couple of key issues which came up with 1.9.2. It also adds wheels for Python 3.6 on Linux, Mac and Windows.

9 files changed, 229 insertions, 195 deletions

diff --git a/devel/py-game/Makefile b/devel/py-game/Makefile
index 094159d23a0..f3125e18a67 100644
--- a/devel/py-game/Makefile
+++ b/devel/py-game/Makefile
@@ -1,60 +1,35 @@
-# $NetBSD: Makefile,v 1.34 2015/04/25 14:20:39 tnn Exp $
+# $NetBSD: Makefile,v 1.35 2017/06/20 17:00:07 adam Exp $
 
-DISTNAME=	pygame-1.9.1release
-PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/py//:S/release//}
-PKGREVISION=	2
+DISTNAME=	pygame-1.9.3
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/py//}
 CATEGORIES=	games
-MASTER_SITES=	http://www.pygame.org/ftp/
+MASTER_SITES=	${MASTER_SITE_PYPI:=P/Pygame/}
 
 MAINTAINER=	ryoon@NetBSD.org
 HOMEPAGE=	http://www.pygame.org/
 COMMENT=	Set of Python modules designed for writing games
 LICENSE=	gnu-lgpl-v2.1
 
-.include "../../mk/compiler.mk"
-
-.if !empty(PKGSRC_COMPILER:Mclang)
-CFLAGS+=	-no-integrated-as
-.endif
-
 REPLACE_PYTHON+=	bundle_docs.py
 REPLACE_PYTHON+=	config.py
-REPLACE_PYTHON+=	examples/aacircle.py
-REPLACE_PYTHON+=	examples/aliens.py
-REPLACE_PYTHON+=	examples/arraydemo.py
-REPLACE_PYTHON+=	examples/blend_fill.py
-REPLACE_PYTHON+=	examples/blit_blends.py
-REPLACE_PYTHON+=	examples/camera.py
-REPLACE_PYTHON+=	examples/chimp.py
-REPLACE_PYTHON+=	examples/cursors.py
-REPLACE_PYTHON+=	examples/eventlist.py
-REPLACE_PYTHON+=	examples/fastevents.py
-REPLACE_PYTHON+=	examples/fonty.py
-REPLACE_PYTHON+=	examples/glcube.py
-REPLACE_PYTHON+=	examples/headless_no_windows_needed.py
-REPLACE_PYTHON+=	examples/liquid.py
-REPLACE_PYTHON+=	examples/macosx/aliens_app_example/aliens.py
-REPLACE_PYTHON+=	examples/mask.py
-REPLACE_PYTHON+=	examples/midi.py
-REPLACE_PYTHON+=	examples/moveit.py
-REPLACE_PYTHON+=	examples/movieplayer.py
-REPLACE_PYTHON+=	examples/oldalien.py
-REPLACE_PYTHON+=	examples/overlay.py
-REPLACE_PYTHON+=	examples/pixelarray.py
-REPLACE_PYTHON+=	examples/scaletest.py
-REPLACE_PYTHON+=	examples/scrap_clipboard.py
-REPLACE_PYTHON+=	examples/scroll.py
-REPLACE_PYTHON+=	examples/sound.py
-REPLACE_PYTHON+=	examples/sound_array_demos.py
-REPLACE_PYTHON+=	examples/stars.py
-REPLACE_PYTHON+=	examples/testsprite.py
-REPLACE_PYTHON+=	examples/vgrade.py
+REPLACE_PYTHON+=	examples/*.py
 REPLACE_PYTHON+=	makeref.py
-REPLACE_PYTHON+=	msys_build_deps.py
-REPLACE_PYTHON+=	msys_link_VC_2008_dlls.py
 REPLACE_PYTHON+=	run_tests.py
 REPLACE_PYTHON+=	setup.py
-REPLACE_PYTHON+=	test/test_utils/unittest.py
+
+SUBST_CLASSES+=		fixpath
+SUBST_STAGE.fixpath=	pre-configure
+SUBST_MESSAGE.fixpath=	Fixing paths.
+SUBST_FILES.fixpath=	config_darwin.py config_unix.py
+SUBST_SED.fixpath=	-e 's,/usr/local,${PREFIX},g'
+
+.include "../../mk/bsd.prefs.mk"
+PLIST_VARS+=		darwin
+.if ${OPSYS} != "Darwin"
+.  include "../../x11/libX11/buildlink3.mk"
+.else
+PLIST.darwin=		yes
+.endif
 
 .include "../../audio/SDL_mixer/buildlink3.mk"
 .include "../../devel/SDL/buildlink3.mk"
@@ -62,8 +37,7 @@ REPLACE_PYTHON+=	test/test_utils/unittest.py
 .include "../../graphics/SDL_image/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../lang/python/application.mk"
-.include "../../lang/python/distutils.mk"
-.include "../../mk/jpeg.buildlink3.mk"
+.include "../../lang/python/egg.mk"
 .include "../../multimedia/smpeg/buildlink3.mk"
-.include "../../x11/libX11/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-game/PLIST b/devel/py-game/PLIST
index 4e817c23d9b..fc4e94ae13b 100644
--- a/devel/py-game/PLIST
+++ b/devel/py-game/PLIST
@@ -1,32 +1,39 @@
-@comment $NetBSD: PLIST,v 1.8 2014/01/19 16:26:51 wiz Exp $
+@comment $NetBSD: PLIST,v 1.9 2017/06/20 17:00:07 adam Exp $
+${PYINC}/pygame/_camera.h
+${PYINC}/pygame/_pygame.h
+${PYINC}/pygame/_surface.h
 ${PYINC}/pygame/bitmask.h
 ${PYINC}/pygame/camera.h
 ${PYINC}/pygame/fastevents.h
-${PYINC}/pygame/ffmovie.h
 ${PYINC}/pygame/font.h
+${PYINC}/pygame/freetype.h
 ${PYINC}/pygame/mask.h
 ${PYINC}/pygame/mixer.h
 ${PYINC}/pygame/pgarrinter.h
+${PYINC}/pygame/pgbufferproxy.h
 ${PYINC}/pygame/pgcompat.h
 ${PYINC}/pygame/pgopengl.h
 ${PYINC}/pygame/pygame.h
-${PYINC}/pygame/pygamedocs.h
 ${PYINC}/pygame/scrap.h
 ${PYINC}/pygame/surface.h
-${PYSITELIB}/${EGG_FILE}
+${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/pygame/LGPL
 ${PYSITELIB}/pygame/__init__.py
 ${PYSITELIB}/pygame/__init__.pyc
 ${PYSITELIB}/pygame/__init__.pyo
-${PYSITELIB}/pygame/_arraysurfarray.so
 ${PYSITELIB}/pygame/_camera_opencv_highgui.py
 ${PYSITELIB}/pygame/_camera_opencv_highgui.pyc
 ${PYSITELIB}/pygame/_camera_opencv_highgui.pyo
 ${PYSITELIB}/pygame/_camera_vidcapture.py
 ${PYSITELIB}/pygame/_camera_vidcapture.pyc
 ${PYSITELIB}/pygame/_camera_vidcapture.pyo
-${PLIST.py2x}${PYSITELIB}/pygame/_numericsndarray.so
-${PLIST.py2x}${PYSITELIB}/pygame/_numericsurfarray.so
+${PYSITELIB}/pygame/_dummybackend.py
+${PYSITELIB}/pygame/_dummybackend.pyc
+${PYSITELIB}/pygame/_dummybackend.pyo
+${PYSITELIB}/pygame/_freetype.so
 ${PYSITELIB}/pygame/_numpysndarray.py
 ${PYSITELIB}/pygame/_numpysndarray.pyc
 ${PYSITELIB}/pygame/_numpysndarray.pyo
@@ -57,78 +64,12 @@ ${PYSITELIB}/pygame/docs/__init__.pyo
 ${PYSITELIB}/pygame/docs/__main__.py
 ${PYSITELIB}/pygame/docs/__main__.pyc
 ${PYSITELIB}/pygame/docs/__main__.pyo
-${PYSITELIB}/pygame/docs/index.html
 ${PYSITELIB}/pygame/docs/logos.html
 ${PYSITELIB}/pygame/docs/pygame_logo.gif
 ${PYSITELIB}/pygame/docs/pygame_powered.gif
 ${PYSITELIB}/pygame/docs/pygame_small.gif
 ${PYSITELIB}/pygame/docs/pygame_tiny.gif
-${PYSITELIB}/pygame/docs/ref/camera.html
-${PYSITELIB}/pygame/docs/ref/cdrom.html
-${PYSITELIB}/pygame/docs/ref/color.html
-${PYSITELIB}/pygame/docs/ref/cursors.html
-${PYSITELIB}/pygame/docs/ref/display.html
-${PYSITELIB}/pygame/docs/ref/draw.html
-${PYSITELIB}/pygame/docs/ref/event.html
-${PYSITELIB}/pygame/docs/ref/examples.html
-${PYSITELIB}/pygame/docs/ref/font.html
-${PYSITELIB}/pygame/docs/ref/gfxdraw.html
-${PYSITELIB}/pygame/docs/ref/image.html
-${PYSITELIB}/pygame/docs/ref/index.html
-${PYSITELIB}/pygame/docs/ref/joystick.html
-${PYSITELIB}/pygame/docs/ref/key.html
-${PYSITELIB}/pygame/docs/ref/locals.html
-${PYSITELIB}/pygame/docs/ref/mask.html
-${PYSITELIB}/pygame/docs/ref/midi.html
-${PYSITELIB}/pygame/docs/ref/mixer.html
-${PYSITELIB}/pygame/docs/ref/mouse.html
-${PYSITELIB}/pygame/docs/ref/movie.html
-${PYSITELIB}/pygame/docs/ref/music.html
-${PYSITELIB}/pygame/docs/ref/overlay.html
-${PYSITELIB}/pygame/docs/ref/pixelarray.html
-${PYSITELIB}/pygame/docs/ref/pygame.html
-${PYSITELIB}/pygame/docs/ref/pygame_cursor.html
-${PYSITELIB}/pygame/docs/ref/rect.html
-${PYSITELIB}/pygame/docs/ref/scrap.html
-${PYSITELIB}/pygame/docs/ref/sndarray.html
-${PYSITELIB}/pygame/docs/ref/sprite.html
-${PYSITELIB}/pygame/docs/ref/surface.html
-${PYSITELIB}/pygame/docs/ref/surfarray.html
-${PYSITELIB}/pygame/docs/ref/tests.html
-${PYSITELIB}/pygame/docs/ref/time.html
-${PYSITELIB}/pygame/docs/ref/transform.html
-${PYSITELIB}/pygame/docs/tut/DisplayModes.html
-${PYSITELIB}/pygame/docs/tut/ImportInit.html
-${PYSITELIB}/pygame/docs/tut/MoveIt.html
-${PYSITELIB}/pygame/docs/tut/SpriteIntro.html
-${PYSITELIB}/pygame/docs/tut/chimp/ChimpLineByLine.html
-${PYSITELIB}/pygame/docs/tut/chimp/chimp.py.html
-${PYSITELIB}/pygame/docs/tut/chimp/chimpshot.gif
-${PYSITELIB}/pygame/docs/tut/intro/ball.gif
-${PYSITELIB}/pygame/docs/tut/intro/blade.jpg
-${PYSITELIB}/pygame/docs/tut/intro/freedom.jpg
-${PYSITELIB}/pygame/docs/tut/intro/intro.html
-${PYSITELIB}/pygame/docs/tut/newbieguide.html
-${PYSITELIB}/pygame/docs/tut/surfarray/SurfarrayIntro.html
-${PYSITELIB}/pygame/docs/tut/surfarray/allblack.jpg
-${PYSITELIB}/pygame/docs/tut/surfarray/flipped.jpg
-${PYSITELIB}/pygame/docs/tut/surfarray/imgarray.jpg
-${PYSITELIB}/pygame/docs/tut/surfarray/redimg.jpg
-${PYSITELIB}/pygame/docs/tut/surfarray/scaledown.jpg
-${PYSITELIB}/pygame/docs/tut/surfarray/scaleup.jpg
-${PYSITELIB}/pygame/docs/tut/surfarray/soften.jpg
-${PYSITELIB}/pygame/docs/tut/surfarray/striped.jpg
-${PYSITELIB}/pygame/docs/tut/surfarray/xfade.jpg
-${PYSITELIB}/pygame/docs/tut/tom/MakeGames.html
-${PYSITELIB}/pygame/docs/tut/tom/basic.png
-${PYSITELIB}/pygame/docs/tut/tom/event-flowchart.png
-${PYSITELIB}/pygame/docs/tut/tom/formulae.png
-${PYSITELIB}/pygame/docs/tut/tom/games2.html
-${PYSITELIB}/pygame/docs/tut/tom/games3.html
-${PYSITELIB}/pygame/docs/tut/tom/games4.html
-${PYSITELIB}/pygame/docs/tut/tom/games5.html
-${PYSITELIB}/pygame/docs/tut/tom/games6.html
-${PYSITELIB}/pygame/docs/tut/tom/radians.png
+${PYSITELIB}/pygame/docs/ref/docscomments.json
 ${PYSITELIB}/pygame/draw.so
 ${PYSITELIB}/pygame/event.so
 ${PYSITELIB}/pygame/examples/__init__.py
@@ -171,8 +112,10 @@ ${PYSITELIB}/pygame/examples/data/background.gif
 ${PYSITELIB}/pygame/examples/data/blue.mpg
 ${PYSITELIB}/pygame/examples/data/bomb.gif
 ${PYSITELIB}/pygame/examples/data/boom.wav
+${PYSITELIB}/pygame/examples/data/brick.png
 ${PYSITELIB}/pygame/examples/data/car_door.wav
 ${PYSITELIB}/pygame/examples/data/chimp.bmp
+${PYSITELIB}/pygame/examples/data/city.png
 ${PYSITELIB}/pygame/examples/data/danger.gif
 ${PYSITELIB}/pygame/examples/data/explosion1.gif
 ${PYSITELIB}/pygame/examples/data/fist.bmp
@@ -184,6 +127,7 @@ ${PYSITELIB}/pygame/examples/data/midikeys.png
 ${PYSITELIB}/pygame/examples/data/oldplayer.gif
 ${PYSITELIB}/pygame/examples/data/player1.gif
 ${PYSITELIB}/pygame/examples/data/punch.wav
+${PYSITELIB}/pygame/examples/data/sans.ttf
 ${PYSITELIB}/pygame/examples/data/secosmic_lo.wav
 ${PYSITELIB}/pygame/examples/data/shot.gif
 ${PYSITELIB}/pygame/examples/data/static.png
@@ -198,6 +142,9 @@ ${PYSITELIB}/pygame/examples/fastevents.pyo
 ${PYSITELIB}/pygame/examples/fonty.py
 ${PYSITELIB}/pygame/examples/fonty.pyc
 ${PYSITELIB}/pygame/examples/fonty.pyo
+${PYSITELIB}/pygame/examples/freetype_misc.py
+${PYSITELIB}/pygame/examples/freetype_misc.pyc
+${PYSITELIB}/pygame/examples/freetype_misc.pyo
 ${PYSITELIB}/pygame/examples/glcube.py
 ${PYSITELIB}/pygame/examples/glcube.pyc
 ${PYSITELIB}/pygame/examples/glcube.pyo
@@ -226,9 +173,6 @@ ${PYSITELIB}/pygame/examples/midi.pyo
 ${PYSITELIB}/pygame/examples/moveit.py
 ${PYSITELIB}/pygame/examples/moveit.pyc
 ${PYSITELIB}/pygame/examples/moveit.pyo
-${PYSITELIB}/pygame/examples/movieplayer.py
-${PYSITELIB}/pygame/examples/movieplayer.pyc
-${PYSITELIB}/pygame/examples/movieplayer.pyo
 ${PYSITELIB}/pygame/examples/oldalien.py
 ${PYSITELIB}/pygame/examples/oldalien.pyc
 ${PYSITELIB}/pygame/examples/oldalien.pyo
@@ -238,7 +182,12 @@ ${PYSITELIB}/pygame/examples/overlay.pyo
 ${PYSITELIB}/pygame/examples/pixelarray.py
 ${PYSITELIB}/pygame/examples/pixelarray.pyc
 ${PYSITELIB}/pygame/examples/pixelarray.pyo
-${PYSITELIB}/pygame/examples/readme.txt
+${PYSITELIB}/pygame/examples/playmus.py
+${PYSITELIB}/pygame/examples/playmus.pyc
+${PYSITELIB}/pygame/examples/playmus.pyo
+${PYSITELIB}/pygame/examples/prevent_display_stretching.py
+${PYSITELIB}/pygame/examples/prevent_display_stretching.pyc
+${PYSITELIB}/pygame/examples/prevent_display_stretching.pyo
 ${PYSITELIB}/pygame/examples/scaletest.py
 ${PYSITELIB}/pygame/examples/scaletest.pyc
 ${PYSITELIB}/pygame/examples/scaletest.pyo
@@ -266,6 +215,12 @@ ${PYSITELIB}/pygame/examples/vgrade.pyo
 ${PYSITELIB}/pygame/fastevent.so
 ${PYSITELIB}/pygame/font.so
 ${PYSITELIB}/pygame/freesansbold.ttf
+${PYSITELIB}/pygame/freetype.py
+${PYSITELIB}/pygame/freetype.pyc
+${PYSITELIB}/pygame/freetype.pyo
+${PYSITELIB}/pygame/ftfont.py
+${PYSITELIB}/pygame/ftfont.pyc
+${PYSITELIB}/pygame/ftfont.pyo
 ${PYSITELIB}/pygame/gfxdraw.so
 ${PYSITELIB}/pygame/gp2x/__init__.py
 ${PYSITELIB}/pygame/gp2x/__init__.pyc
@@ -284,22 +239,21 @@ ${PYSITELIB}/pygame/key.so
 ${PYSITELIB}/pygame/locals.py
 ${PYSITELIB}/pygame/locals.pyc
 ${PYSITELIB}/pygame/locals.pyo
-${PYSITELIB}/pygame/mac_scrap.py
-${PYSITELIB}/pygame/mac_scrap.pyc
-${PYSITELIB}/pygame/mac_scrap.pyo
 ${PYSITELIB}/pygame/macosx.py
 ${PYSITELIB}/pygame/macosx.pyc
 ${PYSITELIB}/pygame/macosx.pyo
 ${PYSITELIB}/pygame/mask.so
+${PYSITELIB}/pygame/math.so
 ${PYSITELIB}/pygame/midi.py
 ${PYSITELIB}/pygame/midi.pyc
 ${PYSITELIB}/pygame/midi.pyo
 ${PYSITELIB}/pygame/mixer.so
 ${PYSITELIB}/pygame/mixer_music.so
 ${PYSITELIB}/pygame/mouse.so
-${PYSITELIB}/pygame/movie.so
+${PYSITELIB}/pygame/newbuffer.so
 ${PYSITELIB}/pygame/overlay.so
 ${PYSITELIB}/pygame/pixelarray.so
+${PYSITELIB}/pygame/pixelcopy.so
 ${PYSITELIB}/pygame/pkgdata.py
 ${PYSITELIB}/pygame/pkgdata.pyc
 ${PYSITELIB}/pygame/pkgdata.pyo
@@ -311,7 +265,8 @@ ${PYSITELIB}/pygame/pygame_icon.tiff
 ${PYSITELIB}/pygame/readme.html
 ${PYSITELIB}/pygame/rect.so
 ${PYSITELIB}/pygame/rwobject.so
-${PLIST.py2x}${PYSITELIB}/pygame/scrap.so
+${PYSITELIB}/pygame/scrap.so
+${PLIST.darwin}${PYSITELIB}/pygame/sdlmain_osx.so
 ${PYSITELIB}/pygame/sndarray.py
 ${PYSITELIB}/pygame/sndarray.pyc
 ${PYSITELIB}/pygame/sndarray.pyo
@@ -341,6 +296,9 @@ ${PYSITELIB}/pygame/tests/blit_test.pyo
 ${PYSITELIB}/pygame/tests/bufferproxy_test.py
 ${PYSITELIB}/pygame/tests/bufferproxy_test.pyc
 ${PYSITELIB}/pygame/tests/bufferproxy_test.pyo
+${PYSITELIB}/pygame/tests/camera_test.py
+${PYSITELIB}/pygame/tests/camera_test.pyc
+${PYSITELIB}/pygame/tests/camera_test.pyo
 ${PYSITELIB}/pygame/tests/cdrom_tags.py
 ${PYSITELIB}/pygame/tests/cdrom_tags.pyc
 ${PYSITELIB}/pygame/tests/cdrom_tags.pyo
@@ -350,6 +308,9 @@ ${PYSITELIB}/pygame/tests/cdrom_test.pyo
 ${PYSITELIB}/pygame/tests/color_test.py
 ${PYSITELIB}/pygame/tests/color_test.pyc
 ${PYSITELIB}/pygame/tests/color_test.pyo
+${PYSITELIB}/pygame/tests/compat_test.py
+${PYSITELIB}/pygame/tests/compat_test.pyc
+${PYSITELIB}/pygame/tests/compat_test.pyo
 ${PYSITELIB}/pygame/tests/cursors_test.py
 ${PYSITELIB}/pygame/tests/cursors_test.pyc
 ${PYSITELIB}/pygame/tests/cursors_test.pyo
@@ -365,20 +326,52 @@ ${PYSITELIB}/pygame/tests/event_test.pyo
 ${PYSITELIB}/pygame/tests/fastevent_test.py
 ${PYSITELIB}/pygame/tests/fastevent_test.pyc
 ${PYSITELIB}/pygame/tests/fastevent_test.pyo
+${PYSITELIB}/pygame/tests/fixtures/fonts/A_PyGameMono-8.png
+${PYSITELIB}/pygame/tests/fixtures/fonts/PyGameMono-18-100dpi.bdf
+${PYSITELIB}/pygame/tests/fixtures/fonts/PyGameMono-18-75dpi.bdf
+${PYSITELIB}/pygame/tests/fixtures/fonts/PyGameMono-8.bdf
+${PYSITELIB}/pygame/tests/fixtures/fonts/PyGameMono.otf
+${PYSITELIB}/pygame/tests/fixtures/fonts/test_fixed.otf
+${PYSITELIB}/pygame/tests/fixtures/fonts/test_sans.ttf
+${PYSITELIB}/pygame/tests/fixtures/fonts/u13079_PyGameMono-8.png
 ${PYSITELIB}/pygame/tests/fixtures/xbm_cursors/white_sizing.xbm
 ${PYSITELIB}/pygame/tests/fixtures/xbm_cursors/white_sizing_mask.xbm
+${PYSITELIB}/pygame/tests/font_tags.py
+${PYSITELIB}/pygame/tests/font_tags.pyc
+${PYSITELIB}/pygame/tests/font_tags.pyo
 ${PYSITELIB}/pygame/tests/font_test.py
 ${PYSITELIB}/pygame/tests/font_test.pyc
 ${PYSITELIB}/pygame/tests/font_test.pyo
+${PYSITELIB}/pygame/tests/freetype_tags.py
+${PYSITELIB}/pygame/tests/freetype_tags.pyc
+${PYSITELIB}/pygame/tests/freetype_tags.pyo
+${PYSITELIB}/pygame/tests/freetype_test.py
+${PYSITELIB}/pygame/tests/freetype_test.pyc
+${PYSITELIB}/pygame/tests/freetype_test.pyo
+${PYSITELIB}/pygame/tests/ftfont_tags.py
+${PYSITELIB}/pygame/tests/ftfont_tags.pyc
+${PYSITELIB}/pygame/tests/ftfont_tags.pyo
+${PYSITELIB}/pygame/tests/ftfont_test.py
+${PYSITELIB}/pygame/tests/ftfont_test.pyc
+${PYSITELIB}/pygame/tests/ftfont_test.pyo
 ${PYSITELIB}/pygame/tests/gfxdraw_test.py
 ${PYSITELIB}/pygame/tests/gfxdraw_test.pyc
 ${PYSITELIB}/pygame/tests/gfxdraw_test.pyo
 ${PYSITELIB}/pygame/tests/image__save_gl_surface_test.py
 ${PYSITELIB}/pygame/tests/image__save_gl_surface_test.pyc
 ${PYSITELIB}/pygame/tests/image__save_gl_surface_test.pyo
+${PYSITELIB}/pygame/tests/image_tags.py
+${PYSITELIB}/pygame/tests/image_tags.pyc
+${PYSITELIB}/pygame/tests/image_tags.pyo
 ${PYSITELIB}/pygame/tests/image_test.py
 ${PYSITELIB}/pygame/tests/image_test.pyc
 ${PYSITELIB}/pygame/tests/image_test.pyo
+${PYSITELIB}/pygame/tests/imageext_tags.py
+${PYSITELIB}/pygame/tests/imageext_tags.pyc
+${PYSITELIB}/pygame/tests/imageext_tags.pyo
+${PYSITELIB}/pygame/tests/imageext_test.py
+${PYSITELIB}/pygame/tests/imageext_test.pyc
+${PYSITELIB}/pygame/tests/imageext_test.pyo
 ${PYSITELIB}/pygame/tests/joystick_test.py
 ${PYSITELIB}/pygame/tests/joystick_test.pyc
 ${PYSITELIB}/pygame/tests/joystick_test.pyo
@@ -388,30 +381,39 @@ ${PYSITELIB}/pygame/tests/key_test.pyo
 ${PYSITELIB}/pygame/tests/mask_test.py
 ${PYSITELIB}/pygame/tests/mask_test.pyc
 ${PYSITELIB}/pygame/tests/mask_test.pyo
+${PYSITELIB}/pygame/tests/math_test.py
+${PYSITELIB}/pygame/tests/math_test.pyc
+${PYSITELIB}/pygame/tests/math_test.pyo
+${PYSITELIB}/pygame/tests/midi_tags.py
+${PYSITELIB}/pygame/tests/midi_tags.pyc
+${PYSITELIB}/pygame/tests/midi_tags.pyo
 ${PYSITELIB}/pygame/tests/midi_test.py
 ${PYSITELIB}/pygame/tests/midi_test.pyc
 ${PYSITELIB}/pygame/tests/midi_test.pyo
+${PYSITELIB}/pygame/tests/mixer_music_tags.py
+${PYSITELIB}/pygame/tests/mixer_music_tags.pyc
+${PYSITELIB}/pygame/tests/mixer_music_tags.pyo
 ${PYSITELIB}/pygame/tests/mixer_music_test.py
 ${PYSITELIB}/pygame/tests/mixer_music_test.pyc
 ${PYSITELIB}/pygame/tests/mixer_music_test.pyo
+${PYSITELIB}/pygame/tests/mixer_tags.py
+${PYSITELIB}/pygame/tests/mixer_tags.pyc
+${PYSITELIB}/pygame/tests/mixer_tags.pyo
 ${PYSITELIB}/pygame/tests/mixer_test.py
 ${PYSITELIB}/pygame/tests/mixer_test.pyc
 ${PYSITELIB}/pygame/tests/mixer_test.pyo
 ${PYSITELIB}/pygame/tests/mouse_test.py
 ${PYSITELIB}/pygame/tests/mouse_test.pyc
 ${PYSITELIB}/pygame/tests/mouse_test.pyo
-${PYSITELIB}/pygame/tests/movie_tags.py
-${PYSITELIB}/pygame/tests/movie_tags.pyc
-${PYSITELIB}/pygame/tests/movie_tags.pyo
-${PYSITELIB}/pygame/tests/movie_test.py
-${PYSITELIB}/pygame/tests/movie_test.pyc
-${PYSITELIB}/pygame/tests/movie_test.pyo
 ${PYSITELIB}/pygame/tests/overlay_test.py
 ${PYSITELIB}/pygame/tests/overlay_test.pyc
 ${PYSITELIB}/pygame/tests/overlay_test.pyo
 ${PYSITELIB}/pygame/tests/pixelarray_test.py
 ${PYSITELIB}/pygame/tests/pixelarray_test.pyc
 ${PYSITELIB}/pygame/tests/pixelarray_test.pyo
+${PYSITELIB}/pygame/tests/pixelcopy_test.py
+${PYSITELIB}/pygame/tests/pixelcopy_test.pyc
+${PYSITELIB}/pygame/tests/pixelcopy_test.pyo
 ${PYSITELIB}/pygame/tests/rect_test.py
 ${PYSITELIB}/pygame/tests/rect_test.pyc
 ${PYSITELIB}/pygame/tests/rect_test.pyo
@@ -544,6 +546,9 @@ ${PYSITELIB}/pygame/tests/run_tests__tests/timeout/fake_2_test.pyo
 ${PYSITELIB}/pygame/tests/run_tests__tests/timeout/sleep_test.py
 ${PYSITELIB}/pygame/tests/run_tests__tests/timeout/sleep_test.pyc
 ${PYSITELIB}/pygame/tests/run_tests__tests/timeout/sleep_test.pyo
+${PYSITELIB}/pygame/tests/rwobject_test.py
+${PYSITELIB}/pygame/tests/rwobject_test.pyc
+${PYSITELIB}/pygame/tests/rwobject_test.pyo
 ${PYSITELIB}/pygame/tests/scrap_tags.py
 ${PYSITELIB}/pygame/tests/scrap_tags.pyc
 ${PYSITELIB}/pygame/tests/scrap_tags.pyo
@@ -580,24 +585,30 @@ ${PYSITELIB}/pygame/tests/test_test_.pyo
 ${PYSITELIB}/pygame/tests/test_utils/__init__.py
 ${PYSITELIB}/pygame/tests/test_utils/__init__.pyc
 ${PYSITELIB}/pygame/tests/test_utils/__init__.pyo
+${PYSITELIB}/pygame/tests/test_utils/arrinter.py
+${PYSITELIB}/pygame/tests/test_utils/arrinter.pyc
+${PYSITELIB}/pygame/tests/test_utils/arrinter.pyo
 ${PYSITELIB}/pygame/tests/test_utils/async_sub.py
 ${PYSITELIB}/pygame/tests/test_utils/async_sub.pyc
 ${PYSITELIB}/pygame/tests/test_utils/async_sub.pyo
+${PYSITELIB}/pygame/tests/test_utils/buftools.py
+${PYSITELIB}/pygame/tests/test_utils/buftools.pyc
+${PYSITELIB}/pygame/tests/test_utils/buftools.pyo
+${PYSITELIB}/pygame/tests/test_utils/endian.py
+${PYSITELIB}/pygame/tests/test_utils/endian.pyc
+${PYSITELIB}/pygame/tests/test_utils/endian.pyo
+${PYSITELIB}/pygame/tests/test_utils/png.py
+${PYSITELIB}/pygame/tests/test_utils/png.pyc
+${PYSITELIB}/pygame/tests/test_utils/png.pyo
 ${PYSITELIB}/pygame/tests/test_utils/run_tests.py
 ${PYSITELIB}/pygame/tests/test_utils/run_tests.pyc
 ${PYSITELIB}/pygame/tests/test_utils/run_tests.pyo
+${PYSITELIB}/pygame/tests/test_utils/test_machinery.py
+${PYSITELIB}/pygame/tests/test_utils/test_machinery.pyc
+${PYSITELIB}/pygame/tests/test_utils/test_machinery.pyo
 ${PYSITELIB}/pygame/tests/test_utils/test_runner.py
 ${PYSITELIB}/pygame/tests/test_utils/test_runner.pyc
 ${PYSITELIB}/pygame/tests/test_utils/test_runner.pyo
-${PYSITELIB}/pygame/tests/test_utils/unittest.py
-${PYSITELIB}/pygame/tests/test_utils/unittest.pyc
-${PYSITELIB}/pygame/tests/test_utils/unittest.pyo
-${PYSITELIB}/pygame/tests/test_utils/unittest_patch.py
-${PYSITELIB}/pygame/tests/test_utils/unittest_patch.pyc
-${PYSITELIB}/pygame/tests/test_utils/unittest_patch.pyo
-${PYSITELIB}/pygame/tests/threads_tags.py
-${PYSITELIB}/pygame/tests/threads_tags.pyc
-${PYSITELIB}/pygame/tests/threads_tags.pyo
 ${PYSITELIB}/pygame/tests/threads_test.py
 ${PYSITELIB}/pygame/tests/threads_test.pyc
 ${PYSITELIB}/pygame/tests/threads_test.pyo
diff --git a/devel/py-game/buildlink3.mk b/devel/py-game/buildlink3.mk
index 29aa96008a3..258d207b6f2 100644
--- a/devel/py-game/buildlink3.mk
+++ b/devel/py-game/buildlink3.mk
@@ -1,15 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.28 2015/04/25 14:20:39 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.29 2017/06/20 17:00:07 adam Exp $
 
-BUILDLINK_TREE+=	${PYPKGPREFIX}-game
+BUILDLINK_TREE+=	py-game
 
 .if !defined(PY_GAME_BUILDLINK3_MK)
 PY_GAME_BUILDLINK3_MK:=
 
 .include "../../lang/python/pyversion.mk"
 
-BUILDLINK_API_DEPENDS.${PYPKGPREFIX}-game+=	${PYPKGPREFIX}-game>=1.9.1
-BUILDLINK_ABI_DEPENDS.${PYPKGPREFIX}-game+=	${PYPKGPREFIX}-game>=1.9.1nb2
-BUILDLINK_PKGSRCDIR.${PYPKGPREFIX}-game?=	../../devel/py-game
+BUILDLINK_API_DEPENDS.py-game+=		py-game>=1.9.1
+BUILDLINK_ABI_DEPENDS.py-game+=		py-game>=1.9.1nb2
+BUILDLINK_PKGSRCDIR.py-game?=		../../devel/py-game
 
 .include "../../audio/SDL_mixer/buildlink3.mk"
 .include "../../devel/SDL/buildlink3.mk"
@@ -17,7 +17,9 @@ BUILDLINK_PKGSRCDIR.${PYPKGPREFIX}-game?=	../../devel/py-game
 .include "../../graphics/SDL_image/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../multimedia/smpeg/buildlink3.mk"
-.include "../../x11/libX11/buildlink3.mk"
+.if ${OPSYS} != "Darwin"
+.  include "../../x11/libX11/buildlink3.mk"
+.endif
 .endif # PY_GAME_BUILDLINK3_MK
 
-BUILDLINK_TREE+=	-${PYPKGPREFIX}-game
+BUILDLINK_TREE+=	-py-game
diff --git a/devel/py-game/distinfo b/devel/py-game/distinfo
index f8c78f6d73f..c0448040b77 100644
--- a/devel/py-game/distinfo
+++ b/devel/py-game/distinfo
@@ -1,8 +1,10 @@
-$NetBSD: distinfo,v 1.6 2015/11/03 03:29:08 agc Exp $
+$NetBSD: distinfo,v 1.7 2017/06/20 17:00:07 adam Exp $
 
-SHA1 (pygame-1.9.1release.tar.gz) = a45aeb0623e36ae7a1707b5f41ee6274f72ca4fa
-RMD160 (pygame-1.9.1release.tar.gz) = 352d74d6cb025e7489e1123a7a25d1695beabafb
-SHA512 (pygame-1.9.1release.tar.gz) = 485f02c4f3113a9de5e731c089de8a9bdcc639152de162f20eb8b50659a42e24f53d0685346dc46f390439be5a5c001dcce7cb866b180948c0f1441d01a7d6c2
-Size (pygame-1.9.1release.tar.gz) = 2134254 bytes
-SHA1 (patch-Setup.in) = f85ced0514b9badcef87ead2546037e2cedbb09e
-SHA1 (patch-aa) = 89e7b1cf5a82136f95b03dbea35bdd5a9d569745
+SHA1 (pygame-1.9.3.tar.gz) = b3ef126f0baea3bd0986fddebba82b6b13f6f282
+RMD160 (pygame-1.9.3.tar.gz) = ac95b8c2afa5076746227a6d1ae9c200d14d5757
+SHA512 (pygame-1.9.3.tar.gz) = 8920c598a97b4ff8602391517f070b67263bacb6330e13ea5d7d5432ee592a7c984fe986837b90a032da3d4e717f9df0cc99f0fb39f1cbde1b4f6a4c132feffe
+Size (pygame-1.9.3.tar.gz) = 2974541 bytes
+SHA1 (patch-Setup.in) = 71659c0150ec53b063cd47531b8b0a93ea671ceb
+SHA1 (patch-Setup__Unix.in) = 03fb45137f018761e6b9f19de056c0fdff5d153d
+SHA1 (patch-config__darwin.py) = c39c00b3252195dcf4476574e9b8439acf66c0ab
+SHA1 (patch-config__unix.py) = b02951432fb41d1e9cffd6d85de877b710e39b28
diff --git a/devel/py-game/patches/patch-Setup.in b/devel/py-game/patches/patch-Setup.in
index 3d1b64c66cf..6cf890db350 100644
--- a/devel/py-game/patches/patch-Setup.in
+++ b/devel/py-game/patches/patch-Setup.in
@@ -1,17 +1,28 @@
-$NetBSD: patch-Setup.in,v 1.1 2013/10/24 12:08:22 ryoon Exp $
+$NetBSD: patch-Setup.in,v 1.2 2017/06/20 17:00:07 adam Exp $
 
-* Disable video4linux
+Use correct lib for PNG.
+Disable portmidi/porttime.
 
---- Setup.in.orig	2009-07-02 04:41:56.000000000 +0000
+--- Setup.in.orig	2016-05-06 15:05:22.000000000 +0000
 +++ Setup.in
-@@ -34,8 +34,8 @@ _numericsurfarray src/_numericsurfarray.
- _numericsndarray src/_numericsndarray.c $(SDL) $(MIXER) $(DEBUG)
- movie src/movie.c $(SDL) $(SMPEG) $(DEBUG)
+@@ -11,11 +11,9 @@ SDL = -I/usr/include/SDL -D_REENTRANT -l
+ FONT = -lSDL_ttf
+ IMAGE = -lSDL_image
+ MIXER = -lSDL_mixer
+-PNG = -lpng
++PNG = -lpng16
+ JPEG = -ljpeg
+ SCRAP = -lX11
+-PORTMIDI = -lportmidi
+-PORTTIME = -lporttime
+ FREETYPE = -lfreetype
+ #--EndConfig
+ 
+@@ -30,7 +28,6 @@ font src/font.c $(SDL) $(FONT) $(DEBUG)
+ mixer src/mixer.c $(SDL) $(MIXER) $(DEBUG)
+ mixer_music src/music.c $(SDL) $(MIXER) $(DEBUG)
  scrap src/scrap.c $(SDL) $(SCRAP) $(DEBUG)
--_camera src/_camera.c src/camera_v4l2.c src/camera_v4l.c $(SDL) $(DEBUG)
 -pypm src/pypm.c $(SDL) $(PORTMIDI) $(PORTTIME) $(DEBUG)
-+#_camera src/_camera.c src/camera_v4l2.c src/camera_v4l.c $(SDL) $(DEBUG)
-+#pypm src/pypm.c $(SDL) $(PORTMIDI) $(PORTTIME) $(DEBUG)
  
  GFX = src/SDL_gfx/SDL_gfxPrimitives.c 
  #GFX = src/SDL_gfx/SDL_gfxBlitFunc.c src/SDL_gfx/SDL_gfxPrimitives.c 
diff --git a/devel/py-game/patches/patch-Setup__Unix.in b/devel/py-game/patches/patch-Setup__Unix.in
new file mode 100644
index 00000000000..4506ce36ae5
--- /dev/null
+++ b/devel/py-game/patches/patch-Setup__Unix.in
@@ -0,0 +1,10 @@
+$NetBSD: patch-Setup__Unix.in,v 1.1 2017/06/20 17:00:07 adam Exp $
+
+Disable video4linux.
+
+--- Setup_Unix.in.orig	2017-06-20 16:07:34.000000000 +0000
++++ Setup_Unix.in
+@@ -1,2 +1,2 @@
+ #This file defines platform specific modules for linux
+-_camera src/_camera.c src/camera_v4l2.c $(SDL) $(DEBUG)
++#_camera src/_camera.c src/camera_v4l2.c $(SDL) $(DEBUG)
diff --git a/devel/py-game/patches/patch-aa b/devel/py-game/patches/patch-aa
deleted file mode 100644
index 772ab230f18..00000000000
--- a/devel/py-game/patches/patch-aa
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2013/10/24 12:08:22 ryoon Exp $
-
-* Detect /usr/X11R7
-* Disable portmidi and porttime, porttime is a part of portmidi
-
---- config_unix.py.orig	2009-05-26 21:15:24.000000000 +0000
-+++ config_unix.py
-@@ -17,7 +17,7 @@ localbase = os.environ.get('LOCALBASE', 
- #these get prefixes with '/usr' and '/usr/local' or the $LOCALBASE
- origincdirs = ['/include', '/include/SDL', '/include/SDL',
-                '/include/smpeg' ]
--origlibdirs = ['/lib','/lib64','/X11R6/lib']
-+origlibdirs = ['/lib','/lib64','/X11R6/lib','/X11R7/lib']
- 
- def confirm(message):
-     "ask a yes/no question, return result"
-@@ -145,8 +145,8 @@ def main():
-         Dependency('PNG', 'png.h', 'libpng', ['png']),
-         Dependency('JPEG', 'jpeglib.h', 'libjpeg', ['jpeg']),
-         Dependency('SCRAP', '', 'libX11', ['X11']),
--        Dependency('PORTMIDI', 'portmidi.h', 'libportmidi.so', ['portmidi']),
--        Dependency('PORTTIME', 'porttime.h', 'libporttime.so', ['porttime']),
-+        #Dependency('PORTMIDI', 'portmidi.h', 'libportmidi.so', ['portmidi']),
-+        #Dependency('PORTTIME', 'porttime.h', 'libporttime.so', ['porttime']),
-         #Dependency('GFX', 'SDL_gfxPrimitives.h', 'libSDL_gfx.so', ['SDL_gfx']),
-     ]
-     if not DEPS[0].found:
diff --git a/devel/py-game/patches/patch-config__darwin.py b/devel/py-game/patches/patch-config__darwin.py
new file mode 100644
index 00000000000..e4ab27acbee
--- /dev/null
+++ b/devel/py-game/patches/patch-config__darwin.py
@@ -0,0 +1,15 @@
+$NetBSD: patch-config__darwin.py,v 1.1 2017/06/20 17:00:07 adam Exp $
+
+Use correct lib for PNG.
+
+--- config_darwin.py.orig	2017-06-20 16:20:16.000000000 +0000
++++ config_darwin.py
+@@ -109,7 +109,7 @@ DEPS = [
+          FrameworkDependency('MIXER', 'SDL_mixer.h', 'libSDL_mixer', 'SDL_mixer')],
+     FrameworkDependency('PORTTIME', 'CoreMidi.h', 'CoreMidi', 'CoreMIDI'),
+     FrameworkDependency('QUICKTIME', 'QuickTime.h', 'QuickTime', 'QuickTime'),
+-    Dependency('PNG', 'png.h', 'libpng', ['png']),
++    Dependency('PNG', 'png.h', 'libpng16', ['png']),
+     Dependency('JPEG', 'jpeglib.h', 'libjpeg', ['jpeg']),
+     Dependency('PORTMIDI', 'portmidi.h', 'libportmidi', ['portmidi']),
+     #DependencyProg('FREETYPE', 'FREETYPE_CONFIG', '/usr/X11R6/bin/freetype-config', '2.0',
diff --git a/devel/py-game/patches/patch-config__unix.py b/devel/py-game/patches/patch-config__unix.py
new file mode 100644
index 00000000000..2353f78c7c5
--- /dev/null
+++ b/devel/py-game/patches/patch-config__unix.py
@@ -0,0 +1,36 @@
+$NetBSD: patch-config__unix.py,v 1.1 2017/06/20 17:00:07 adam Exp $
+
+Detect X11R7
+Disable portmidi and porttime; porttime is a part of portmidi
+
+--- config_unix.py.orig	2016-08-20 20:28:55.000000000 +0000
++++ config_unix.py
+@@ -16,7 +16,7 @@ localbase = os.environ.get('LOCALBASE', 
+ 
+ #these get prefixes with '/usr' and '/usr/local' or the $LOCALBASE
+ origincdirs = ['/include', '/include/SDL', '/include/SDL']
+-origlibdirs = ['/lib','/lib64','/X11R6/lib']
++origlibdirs = ['/lib','/lib64','/X11R6/lib','/X11R7/lib']
+ if 'ORIGLIBDIRS' in os.environ and os.environ['ORIGLIBDIRS'] != "":
+     origlibdirs = os.environ['ORIGLIBDIRS'].split(":")
+ 
+@@ -169,18 +169,15 @@ def main():
+         else:
+             return Dependency('PORTTIME', 'porttime.h', 'libporttime.so', ['porttime'])
+ 
+-    porttime_dep = get_porttime_dep()
+ 
+     DEPS = [
+         DependencyProg('SDL', 'SDL_CONFIG', 'sdl-config', '1.2', ['sdl']),
+         Dependency('FONT', 'SDL_ttf.h', 'libSDL_ttf.so', ['SDL_ttf']),
+         Dependency('IMAGE', 'SDL_image.h', 'libSDL_image.so', ['SDL_image']),
+         Dependency('MIXER', 'SDL_mixer.h', 'libSDL_mixer.so', ['SDL_mixer']),
+-        Dependency('PNG', 'png.h', 'libpng', ['png']),
++        Dependency('PNG', 'png.h', 'libpng16', ['png']),
+         Dependency('JPEG', 'jpeglib.h', 'libjpeg', ['jpeg']),
+         Dependency('SCRAP', '', 'libX11', ['X11']),
+-        Dependency('PORTMIDI', 'portmidi.h', 'libportmidi.so', ['portmidi']),
+-        porttime_dep,
+         DependencyProg('FREETYPE', 'FREETYPE_CONFIG', 'freetype-config', '2.0',
+                        ['freetype'], '--ftversion'),
+         #Dependency('GFX', 'SDL_gfxPrimitives.h', 'libSDL_gfx.so', ['SDL_gfx']),