Hi.
This diff update pygame to version 1.8.1.
Slightly tested.
Please, test/comment/ok.
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/pygame/Makefile,v
retrieving revision 1.19
diff -u -r1.19 Makefile
--- Makefile 11 Mar 2009 21:16:06 -0000 1.19
+++ Makefile 6 Apr 2009 18:25:26 -0000
@@ -4,8 +4,8 @@
COMMENT= set of Python modules designed for writing games
-DISTNAME= pygame-1.7.1release
-PKGNAME= ${DISTNAME:S/release//}p2
+DISTNAME= pygame-1.8.1release
+PKGNAME= ${DISTNAME:S/release//}
CATEGORIES= devel games
HOMEPAGE= http://www.pygame.org/
@@ -14,7 +14,8 @@
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
-WANTLIB= SDL X11 Xext m smpeg usbhid
+
+WANTLIB += SDL X11 jpeg png smpeg
MASTER_SITES= ${HOMEPAGE}ftp/
@@ -34,10 +35,14 @@
EXAMPLESDIR= ${PREFIX}/share/examples/pygame
DOCDIR= ${PREFIX}/share/doc/pygame
DOCSUBDIRS= ref tut tut/chimp tut/surfarray \
- tut/tom util
+ tut/tom
+
+# This regression test wants an X11 display
+REGRESS_IS_INTERACTIVE= Yes
+REGRESS_FLAGS= DISPLAY=${DISPLAY} XAUTHORITY=${XAUTHORITY}
do-configure:
- @perl -pi -e "s,!!X11BASE!!,${X11BASE},g" ${WRKSRC}/Setup.in
+ ${SUBST_CMD} ${WRKSRC}/Setup.in
@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MODPY_BIN} config.py
post-install:
@@ -47,7 +52,7 @@
${INSTALL_DATA_DIR} ${EXAMPLESDIR}/data
${INSTALL_SCRIPT} ${WRKSRC}/examples/data/* ${EXAMPLESDIR}/data
${INSTALL_DATA_DIR} ${DOCDIR}
- ${INSTALL_DATA} ${WRKSRC}/readme.* ${DOCDIR}
+ ${INSTALL_DATA} ${WRKSRC}/README.txt ${DOCDIR}
${INSTALL_DATA} ${WRKSRC}/docs/*.{gif,html} ${DOCDIR}
.for i in ${DOCSUBDIRS}
${INSTALL_DATA_DIR} ${DOCDIR}/$i
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/pygame/distinfo,v
retrieving revision 1.5
diff -u -r1.5 distinfo
--- distinfo 5 Apr 2007 15:38:06 -0000 1.5
+++ distinfo 6 Apr 2009 18:25:26 -0000
@@ -1,5 +1,5 @@
-MD5 (pygame-1.7.1release.tar.gz) = BdhtGvRG95QRNZQAlRBTtw==
-RMD160 (pygame-1.7.1release.tar.gz) = LLemDz9XRolY1FL42vTPgQY+GVU=
-SHA1 (pygame-1.7.1release.tar.gz) = z2lA4+xPSJMO+ORgDG3s+hPru+o=
-SHA256 (pygame-1.7.1release.tar.gz) =
Ed+pI/X4MdK+30dpeOAE78rEz6fR8xXdCUJiJl/NgEI=
-SIZE (pygame-1.7.1release.tar.gz) = 1279697
+MD5 (pygame-1.8.1release.tar.gz) = PnLxHZnBpG7WnrlDyd4gpQ==
+RMD160 (pygame-1.8.1release.tar.gz) = 3DN04hhaP7w2zHSsOwUOflfwpM4=
+SHA1 (pygame-1.8.1release.tar.gz) = YtKtRSoMwUhvh31aKuc2tnA1SMw=
+SHA256 (pygame-1.8.1release.tar.gz) =
fhhB2BK56zn9ScKXzmw62DvaVr94pmbpQm0/bszpKnU=
+SIZE (pygame-1.8.1release.tar.gz) = 1705162
Index: patches/patch-Setup_in
===================================================================
RCS file: /cvs/ports/devel/pygame/patches/patch-Setup_in,v
retrieving revision 1.1
diff -u -r1.1 patch-Setup_in
--- patches/patch-Setup_in 17 Oct 2006 23:31:12 -0000 1.1
+++ patches/patch-Setup_in 6 Apr 2009 18:25:26 -0000
@@ -1,12 +1,11 @@
$OpenBSD: patch-Setup_in,v 1.1 2006/10/17 23:31:12 alek Exp $
---- Setup.in.orig Mon Apr 18 07:46:23 2005
-+++ Setup.in Tue Oct 17 19:00:17 2006
-@@ -41,7 +41,7 @@ movie src/movie.c $(SDL) $(SMPEG)
- base src/base.c $(SDL)
- cdrom src/cdrom.c $(SDL)
- constants src/constants.c $(SDL)
--display src/display.c $(SDL)
-+display src/display.c $(SDL) -I!!X11BASE!!/include
- event src/event.c $(SDL)
- fastevent src/fastevent.c src/fastevents.c $(SDL)
- key src/key.c $(SDL)
+--- Setup.in.orig Mon Apr 6 20:06:31 2009
++++ Setup.in Mon Apr 6 20:07:24 2009
+@@ -58,6 +58,7 @@ cdrom src/cdrom.c $(SDL) $(DEBUG)
+ color src/color.c $(SDL) $(DEBUG)
+ constants src/constants.c $(SDL) $(DEBUG)
+ display src/display.c $(SDL) $(DEBUG)
++display src/display.c $(SDL) $(DEBUG) -I${X11BASE}/include
+ event src/event.c $(SDL) $(DEBUG)
+ fastevent src/fastevent.c src/fastevents.c $(SDL) $(DEBUG)
+ key src/key.c $(SDL) $(DEBUG)
Index: patches/patch-config_unix_py
===================================================================
RCS file: patches/patch-config_unix_py
diff -N patches/patch-config_unix_py
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-config_unix_py 6 Apr 2009 18:25:26 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- config_unix.py.orig Mon Apr 6 20:14:17 2009
++++ config_unix.py Mon Apr 6 20:14:56 2009
+@@ -9,7 +9,7 @@ configcommand = configcommand + ' --version --cflags -
+ localbase = os.environ.get('LOCALBASE', '')
+
+ #these get prefixes with '/usr' and '/usr/local' or the $LOCALBASE
+-origincdirs = ['/include', '/include/SDL', '/include/SDL',
++origincdirs = ['/include', '/include/SDL', '/include/libpng',
+ '/include/smpeg' ]
+ origlibdirs = ['/lib','/lib64','/X11R6/lib']
+
Index: patches/patch-examples_eventlist_py
===================================================================
RCS file: /cvs/ports/devel/pygame/patches/patch-examples_eventlist_py,v
retrieving revision 1.1
diff -u -r1.1 patch-examples_eventlist_py
--- patches/patch-examples_eventlist_py 17 Oct 2006 23:31:12 -0000 1.1
+++ patches/patch-examples_eventlist_py 6 Apr 2009 18:25:26 -0000
@@ -1,7 +1,8 @@
$OpenBSD: patch-examples_eventlist_py,v 1.1 2006/10/17 23:31:12 alek Exp $
---- examples/eventlist.py.orig Tue Oct 17 19:07:46 2006
-+++ examples/eventlist.py Tue Oct 17 19:07:52 2006
-@@ -1,4 +1,4 @@
+--- examples/eventlist.py.orig Mon Jul 7 07:58:40 2008
++++ examples/eventlist.py Mon Apr 6 20:08:49 2009
+@@ -1,5 +1,5 @@
+ #!/usr/bin/env python
-
+#!/usr/bin/env python
"""Eventlist is a sloppy style of pygame, but is a handy
Index: patches/patch-examples_fastevents_py
===================================================================
RCS file: /cvs/ports/devel/pygame/patches/patch-examples_fastevents_py,v
retrieving revision 1.1
diff -u -r1.1 patch-examples_fastevents_py
--- patches/patch-examples_fastevents_py 17 Oct 2006 23:31:12 -0000
1.1
+++ patches/patch-examples_fastevents_py 6 Apr 2009 18:25:26 -0000
@@ -1,7 +1,8 @@
$OpenBSD: patch-examples_fastevents_py,v 1.1 2006/10/17 23:31:12 alek Exp $
---- examples/fastevents.py.orig Wed Oct 18 01:04:26 2006
-+++ examples/fastevents.py Wed Oct 18 01:04:33 2006
-@@ -1,3 +1,4 @@
+--- examples/fastevents.py.orig Mon Jul 7 07:58:40 2008
++++ examples/fastevents.py Mon Apr 6 20:08:49 2009
+@@ -1,4 +1,5 @@
+ #!/usr/bin/env python
+#!/usr/bin/env python
""" This is a stress test for the fastevents module.
Index: patches/patch-examples_overlay_py
===================================================================
RCS file: patches/patch-examples_overlay_py
diff -N patches/patch-examples_overlay_py
--- patches/patch-examples_overlay_py 17 Oct 2006 23:31:12 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,9 +0,0 @@
-$OpenBSD: patch-examples_overlay_py,v 1.1 2006/10/17 23:31:12 alek Exp $
---- examples/overlay.py.orig Tue Oct 17 19:09:01 2006
-+++ examples/overlay.py Tue Oct 17 19:09:10 2006
-@@ -1,4 +1,4 @@
--#! /bin/env python
-+#!/usr/bin/env python
-
- import sys
- import pygame
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/pygame/pkg/PLIST,v
retrieving revision 1.4
diff -u -r1.4 PLIST
--- pkg/PLIST 17 Oct 2006 23:31:12 -0000 1.4
+++ pkg/PLIST 6 Apr 2009 18:25:26 -0000
@@ -1,17 +1,29 @@
@comment $OpenBSD: PLIST,v 1.4 2006/10/17 23:31:12 alek Exp $
include/python${MODPY_VERSION}/pygame/
+include/python${MODPY_VERSION}/pygame/bitmask.h
include/python${MODPY_VERSION}/pygame/fastevents.h
include/python${MODPY_VERSION}/pygame/ffmovie.h
include/python${MODPY_VERSION}/pygame/font.h
include/python${MODPY_VERSION}/pygame/mixer.h
+include/python${MODPY_VERSION}/pygame/pgopengl.h
include/python${MODPY_VERSION}/pygame/pygame.h
+include/python${MODPY_VERSION}/pygame/pygamedocs.h
+include/python${MODPY_VERSION}/pygame/scrap.h
+include/python${MODPY_VERSION}/pygame/surface.h
lib/python${MODPY_VERSION}/site-packages/pygame/
+lib/python${MODPY_VERSION}/site-packages/pygame-1.8.1release-py${MODPY_VERSION}.egg-info
lib/python${MODPY_VERSION}/site-packages/pygame/__init__.py
lib/python${MODPY_VERSION}/site-packages/pygame/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/pygame/_numericsndarray.so
+lib/python${MODPY_VERSION}/site-packages/pygame/_numericsurfarray.so
+lib/python${MODPY_VERSION}/site-packages/pygame/_numpysndarray.py
+lib/python${MODPY_VERSION}/site-packages/pygame/_numpysndarray.pyc
+lib/python${MODPY_VERSION}/site-packages/pygame/_numpysurfarray.py
+lib/python${MODPY_VERSION}/site-packages/pygame/_numpysurfarray.pyc
lib/python${MODPY_VERSION}/site-packages/pygame/base.so
+lib/python${MODPY_VERSION}/site-packages/pygame/bufferproxy.so
lib/python${MODPY_VERSION}/site-packages/pygame/cdrom.so
-lib/python${MODPY_VERSION}/site-packages/pygame/color.py
-lib/python${MODPY_VERSION}/site-packages/pygame/color.pyc
+lib/python${MODPY_VERSION}/site-packages/pygame/color.so
lib/python${MODPY_VERSION}/site-packages/pygame/colordict.py
lib/python${MODPY_VERSION}/site-packages/pygame/colordict.pyc
lib/python${MODPY_VERSION}/site-packages/pygame/constants.so
@@ -23,19 +35,30 @@
lib/python${MODPY_VERSION}/site-packages/pygame/fastevent.so
lib/python${MODPY_VERSION}/site-packages/pygame/font.so
lib/python${MODPY_VERSION}/site-packages/pygame/freesansbold.ttf
+lib/python${MODPY_VERSION}/site-packages/pygame/gp2x/
+lib/python${MODPY_VERSION}/site-packages/pygame/gp2x/__init__.py
+lib/python${MODPY_VERSION}/site-packages/pygame/gp2x/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/pygame/gp2x/constants.py
+lib/python${MODPY_VERSION}/site-packages/pygame/gp2x/constants.pyc
+lib/python${MODPY_VERSION}/site-packages/pygame/gp2x/locals.py
+lib/python${MODPY_VERSION}/site-packages/pygame/gp2x/locals.pyc
lib/python${MODPY_VERSION}/site-packages/pygame/image.so
lib/python${MODPY_VERSION}/site-packages/pygame/imageext.so
lib/python${MODPY_VERSION}/site-packages/pygame/joystick.so
lib/python${MODPY_VERSION}/site-packages/pygame/key.so
lib/python${MODPY_VERSION}/site-packages/pygame/locals.py
lib/python${MODPY_VERSION}/site-packages/pygame/locals.pyc
+lib/python${MODPY_VERSION}/site-packages/pygame/mac_scrap.py
+lib/python${MODPY_VERSION}/site-packages/pygame/mac_scrap.pyc
lib/python${MODPY_VERSION}/site-packages/pygame/macosx.py
lib/python${MODPY_VERSION}/site-packages/pygame/macosx.pyc
+lib/python${MODPY_VERSION}/site-packages/pygame/mask.so
lib/python${MODPY_VERSION}/site-packages/pygame/mixer.so
lib/python${MODPY_VERSION}/site-packages/pygame/mixer_music.so
lib/python${MODPY_VERSION}/site-packages/pygame/mouse.so
lib/python${MODPY_VERSION}/site-packages/pygame/movie.so
lib/python${MODPY_VERSION}/site-packages/pygame/overlay.so
+lib/python${MODPY_VERSION}/site-packages/pygame/pixelarray.so
lib/python${MODPY_VERSION}/site-packages/pygame/pkgdata.py
lib/python${MODPY_VERSION}/site-packages/pygame/pkgdata.pyc
lib/python${MODPY_VERSION}/site-packages/pygame/pygame.ico
@@ -44,62 +67,65 @@
lib/python${MODPY_VERSION}/site-packages/pygame/pygame_icon.tiff
lib/python${MODPY_VERSION}/site-packages/pygame/rect.so
lib/python${MODPY_VERSION}/site-packages/pygame/rwobject.so
-lib/python${MODPY_VERSION}/site-packages/pygame/sndarray.so
+lib/python${MODPY_VERSION}/site-packages/pygame/scrap.so
+lib/python${MODPY_VERSION}/site-packages/pygame/sndarray.py
+lib/python${MODPY_VERSION}/site-packages/pygame/sndarray.pyc
lib/python${MODPY_VERSION}/site-packages/pygame/sprite.py
lib/python${MODPY_VERSION}/site-packages/pygame/sprite.pyc
lib/python${MODPY_VERSION}/site-packages/pygame/surface.so
-lib/python${MODPY_VERSION}/site-packages/pygame/surfarray.so
+lib/python${MODPY_VERSION}/site-packages/pygame/surfarray.py
+lib/python${MODPY_VERSION}/site-packages/pygame/surfarray.pyc
lib/python${MODPY_VERSION}/site-packages/pygame/surflock.so
lib/python${MODPY_VERSION}/site-packages/pygame/sysfont.py
lib/python${MODPY_VERSION}/site-packages/pygame/sysfont.pyc
+lib/python${MODPY_VERSION}/site-packages/pygame/threads/
+lib/python${MODPY_VERSION}/site-packages/pygame/threads/Py25Queue.py
+lib/python${MODPY_VERSION}/site-packages/pygame/threads/Py25Queue.pyc
+lib/python${MODPY_VERSION}/site-packages/pygame/threads/__init__.py
+lib/python${MODPY_VERSION}/site-packages/pygame/threads/__init__.pyc
lib/python${MODPY_VERSION}/site-packages/pygame/time.so
lib/python${MODPY_VERSION}/site-packages/pygame/transform.so
lib/python${MODPY_VERSION}/site-packages/pygame/version.py
lib/python${MODPY_VERSION}/site-packages/pygame/version.pyc
share/doc/pygame/
+share/doc/pygame/README.txt
share/doc/pygame/index.html
share/doc/pygame/logos.html
share/doc/pygame/pygame_logo.gif
share/doc/pygame/pygame_powered.gif
share/doc/pygame/pygame_small.gif
share/doc/pygame/pygame_tiny.gif
-share/doc/pygame/readme.txt
share/doc/pygame/ref/
-share/doc/pygame/ref/CD.html
-share/doc/pygame/ref/Channel.html
-share/doc/pygame/ref/Clock.html
-share/doc/pygame/ref/Font.html
-share/doc/pygame/ref/Joystick.html
-share/doc/pygame/ref/Movie.html
-share/doc/pygame/ref/Overlay.html
-share/doc/pygame/ref/Rect.html
-share/doc/pygame/ref/Sound.html
-share/doc/pygame/ref/Surface.html
+share/doc/pygame/ref/cdrom.html
+share/doc/pygame/ref/color.html
+share/doc/pygame/ref/cursors.html
+share/doc/pygame/ref/display.html
+share/doc/pygame/ref/draw.html
+share/doc/pygame/ref/event.html
+share/doc/pygame/ref/font.html
+share/doc/pygame/ref/image.html
+share/doc/pygame/ref/index.html
+share/doc/pygame/ref/joystick.html
+share/doc/pygame/ref/key.html
+share/doc/pygame/ref/mask.html
+share/doc/pygame/ref/mixer.html
+share/doc/pygame/ref/mouse.html
+share/doc/pygame/ref/movie.html
+share/doc/pygame/ref/music.html
+share/doc/pygame/ref/overlay.html
+share/doc/pygame/ref/pixelarray.html
share/doc/pygame/ref/pygame.html
-share/doc/pygame/ref/pygame_cdrom.html
-share/doc/pygame/ref/pygame_color.html
-share/doc/pygame/ref/pygame_constants.html
share/doc/pygame/ref/pygame_cursor.html
-share/doc/pygame/ref/pygame_cursors.html
-share/doc/pygame/ref/pygame_display.html
-share/doc/pygame/ref/pygame_draw.html
-share/doc/pygame/ref/pygame_event.html
-share/doc/pygame/ref/pygame_font.html
-share/doc/pygame/ref/pygame_image.html
-share/doc/pygame/ref/pygame_joystick.html
-share/doc/pygame/ref/pygame_key.html
-share/doc/pygame/ref/pygame_mixer.html
-share/doc/pygame/ref/pygame_mixer_music.html
-share/doc/pygame/ref/pygame_mouse.html
-share/doc/pygame/ref/pygame_movie.html
-share/doc/pygame/ref/pygame_sndarray.html
-share/doc/pygame/ref/pygame_sprite.html
-share/doc/pygame/ref/pygame_surfarray.html
-share/doc/pygame/ref/pygame_time.html
-share/doc/pygame/ref/pygame_transform.html
+share/doc/pygame/ref/rect.html
+share/doc/pygame/ref/scrap.html
+share/doc/pygame/ref/sndarray.html
+share/doc/pygame/ref/sprite.html
+share/doc/pygame/ref/surface.html
+share/doc/pygame/ref/surfarray.html
+share/doc/pygame/ref/time.html
+share/doc/pygame/ref/transform.html
share/doc/pygame/tut/
share/doc/pygame/tut/DisplayModes.html
-share/doc/pygame/tut/Executable.html
share/doc/pygame/tut/ImportInit.html
share/doc/pygame/tut/MoveIt.html
share/doc/pygame/tut/SpriteIntro.html
@@ -131,20 +157,25 @@
share/doc/pygame/tut/tom/games6.html
share/doc/pygame/tut/tom/radians.png
share/doc/pygame/util/
-share/doc/pygame/util/doclate.html
-share/doc/pygame/util/listlate.html
-share/doc/pygame/util/makedocs.py
-share/doc/pygame/util/pagelate.html
share/examples/pygame/
share/examples/pygame/aliens.py
share/examples/pygame/arraydemo.py
+share/examples/pygame/blend_fill.py
+share/examples/pygame/blit_blends.py
share/examples/pygame/chimp.py
+share/examples/pygame/cursors.py
share/examples/pygame/data/
share/examples/pygame/data/alien1.gif
+share/examples/pygame/data/alien1.jpg
+share/examples/pygame/data/alien1.png
share/examples/pygame/data/alien2.gif
+share/examples/pygame/data/alien2.png
share/examples/pygame/data/alien3.gif
+share/examples/pygame/data/alien3.png
share/examples/pygame/data/arraydemo.bmp
+share/examples/pygame/data/asprite.bmp
share/examples/pygame/data/background.gif
+share/examples/pygame/data/blue.mpg
share/examples/pygame/data/bomb.gif
share/examples/pygame/data/boom.wav
share/examples/pygame/data/car_door.wav
@@ -152,6 +183,8 @@
share/examples/pygame/data/danger.gif
share/examples/pygame/data/explosion1.gif
share/examples/pygame/data/fist.bmp
+share/examples/pygame/data/house_lo.mp3
+share/examples/pygame/data/house_lo.ogg
share/examples/pygame/data/house_lo.wav
share/examples/pygame/data/liquid.bmp
share/examples/pygame/data/oldplayer.gif
@@ -159,18 +192,25 @@
share/examples/pygame/data/punch.wav
share/examples/pygame/data/secosmic_lo.wav
share/examples/pygame/data/shot.gif
+share/examples/pygame/data/static.png
share/examples/pygame/data/whiff.wav
share/examples/pygame/data/yuv_1.pgm
share/examples/pygame/eventlist.py
share/examples/pygame/fastevents.py
share/examples/pygame/fonty.py
@comment share/examples/pygame/glcube.py
+share/examples/pygame/headless_no_windows_needed.py
share/examples/pygame/liquid.py
+share/examples/pygame/mask.py
share/examples/pygame/moveit.py
share/examples/pygame/oldalien.py
share/examples/pygame/overlay.py
+share/examples/pygame/pixelarray.py
share/examples/pygame/readme.txt
+share/examples/pygame/scaletest.py
+share/examples/pygame/scrap_clipboard.py
share/examples/pygame/sound.py
share/examples/pygame/sound_array_demos.py
share/examples/pygame/stars.py
+share/examples/pygame/testsprite.py
share/examples/pygame/vgrade.py
--
Antoine
