update pygame

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

update pygame

Damien Miller
Hi,

This updates pygame to 1.7.1. Please test.

-d

Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/pygame/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- Makefile 3 Jun 2006 09:37:09 -0000 1.11
+++ Makefile 14 Jun 2006 12:05:58 -0000
@@ -7,8 +7,8 @@ BROKEN= "smpeg"
 
 COMMENT= "set of Python modules designed for writing games"
 
-DISTNAME= pygame-1.6
-PKGNAME= ${DISTNAME}p2
+DISTNAME= pygame-1.7.1release
+PKGNAME= ${DISTNAME:S/release$//}
 CATEGORIES= devel games
 HOMEPAGE= http://www.pygame.org/
 
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/pygame/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo 5 Jan 2005 16:22:42 -0000 1.3
+++ distinfo 14 Jun 2006 12:05:58 -0000
@@ -1,4 +1,4 @@
-MD5 (pygame-1.6.tar.gz) = ea5db930c0031873a7f5ad1f2f7926db
-RMD160 (pygame-1.6.tar.gz) = a3f5369a523708cb4581a230a65f6085cb6e9982
-SHA1 (pygame-1.6.tar.gz) = 5b99ca0c923917da9fd0ba1b9ead9175b4a7d970
-SIZE (pygame-1.6.tar.gz) = 846095
+MD5 (pygame-1.7.1release.tar.gz) = 05d86d1af446f79411359400951053b7
+RMD160 (pygame-1.7.1release.tar.gz) = 2cb7a60f3f57468958d452f8daf4cf81063e1955
+SHA1 (pygame-1.7.1release.tar.gz) = cf6940e3ec4f48930ef8e4600c6decfa13ebbbea
+SIZE (pygame-1.7.1release.tar.gz) = 1279697
Index: patches/patch-config_unix_py
===================================================================
RCS file: /cvs/ports/devel/pygame/patches/patch-config_unix_py,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-config_unix_py
--- patches/patch-config_unix_py 8 Aug 2003 21:48:58 -0000 1.1.1.1
+++ patches/patch-config_unix_py 14 Jun 2006 12:05:58 -0000
@@ -1,12 +1,20 @@
-$OpenBSD: patch-config_unix_py,v 1.1.1.1 2003/08/08 21:48:58 jolan Exp $
---- config_unix.py.orig Mon Feb  3 17:31:01 2003
-+++ config_unix.py Fri Jul 25 10:59:52 2003
-@@ -82,7 +82,7 @@ class Dependency:
-         for dir in libdirs:
-             for name in libnames:
-                 path = os.path.join(dir, name)
--                if os.path.isfile(path):
-+                if filter(os.path.isfile, glob(path+'*')):
-                     self.lib_dir = dir
-                
-         if self.lib_dir and self.inc_dir:
+$OpenBSD$
+--- config_unix.py.orig Wed Aug 10 12:45:11 2005
++++ config_unix.py Sun May 21 17:14:23 2006
+@@ -33,7 +33,7 @@ class DependencyProg:
+         self.lib_dir = ''
+         self.inc_dir = ''
+         self.lib = ''
+-        self.cflags = ''
++        self.cflags = '-I/usr/X11R6/include '
+         try:
+             config = os.popen(command + ' --version --cflags --libs').readlines()
+             flags = string.split(string.join(config[1:], ' '))
+@@ -42,7 +42,6 @@ class DependencyProg:
+                 err= 'WARNING: requires %s version %s (%s found)' % (self.name, self.ver, minver)
+                 raise ValueError, err
+             self.found = 1
+-            self.cflags = ''
+             for f in flags:
+                 #if f[:2] == '-L':
+                 #    self.lib_dir += f[2:] + ' '
Index: patches/patch-config_unix_py.orig
===================================================================
RCS file: patches/patch-config_unix_py.orig
diff -N patches/patch-config_unix_py.orig
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-config_unix_py.orig 14 Jun 2006 12:05:58 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- config_unix.py.orig Wed Aug 10 12:45:11 2005
++++ config_unix.py Sun May 21 17:11:43 2006
+@@ -33,7 +33,7 @@ class DependencyProg:
+         self.lib_dir = ''
+         self.inc_dir = ''
+         self.lib = ''
+-        self.cflags = ''
++        self.cflags = '-I/usr/X11R6/include'
+         try:
+             config = os.popen(command + ' --version --cflags --libs').readlines()
+             flags = string.split(string.join(config[1:], ' '))
Index: patches/patch-examples_aliens_py
===================================================================
RCS file: patches/patch-examples_aliens_py
diff -N patches/patch-examples_aliens_py
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-examples_aliens_py 14 Jun 2006 12:05:58 -0000
@@ -0,0 +1,9 @@
+$OpenBSD$
+--- examples/aliens.py.orig Sun May 21 16:56:11 2006
++++ examples/aliens.py Sun May 21 16:57:20 2006
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#!/usr/bin/env %%PYTHON%%
+
+ import random, os.path
+
Index: patches/patch-examples_arraydemo_py
===================================================================
RCS file: /cvs/ports/devel/pygame/patches/patch-examples_arraydemo_py,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-examples_arraydemo_py
--- patches/patch-examples_arraydemo_py 8 Aug 2003 21:48:58 -0000 1.1.1.1
+++ patches/patch-examples_arraydemo_py 14 Jun 2006 12:05:58 -0000
@@ -1,9 +1,9 @@
 $OpenBSD: patch-examples_arraydemo_py,v 1.1.1.1 2003/08/08 21:48:58 jolan Exp $
---- examples/arraydemo.py.orig 2002-02-19 23:48:44.000000000 +0100
-+++ examples/arraydemo.py 2003-08-08 21:17:52.000000000 +0200
-@@ -1,3 +1,5 @@
+--- examples/arraydemo.py.orig Sat Dec 27 06:01:39 2003
++++ examples/arraydemo.py Sun May 21 16:57:18 2006
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
 +#!/usr/bin/env %%PYTHON%%
-+
+
  import os
  try:
-     import pygame
Index: patches/patch-examples_chimp_py
===================================================================
RCS file: /cvs/ports/devel/pygame/patches/patch-examples_chimp_py,v
retrieving revision 1.2
diff -u -p -r1.2 patch-examples_chimp_py
--- patches/patch-examples_chimp_py 10 Apr 2004 23:08:11 -0000 1.2
+++ patches/patch-examples_chimp_py 14 Jun 2006 12:05:58 -0000
@@ -1,8 +1,8 @@
 $OpenBSD: patch-examples_chimp_py,v 1.2 2004/04/10 23:08:11 xsa Exp $
---- examples/chimp.py.orig 2002-07-22 21:21:08.000000000 +0200
-+++ examples/chimp.py 2003-12-26 00:56:18.000000000 +0100
+--- examples/chimp.py.orig Tue May  3 19:19:34 2005
++++ examples/chimp.py Sun May 21 16:55:37 2006
 @@ -1,4 +1,4 @@
--#/usr/bin/env python
+-#!/usr/bin/env python
 +#!/usr/bin/env %%PYTHON%%
  """
  This simple example is used for the line-by-line tutorial
Index: patches/patch-examples_eventlist_py
===================================================================
RCS file: patches/patch-examples_eventlist_py
diff -N patches/patch-examples_eventlist_py
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-examples_eventlist_py 14 Jun 2006 12:05:58 -0000
@@ -0,0 +1,8 @@
+$OpenBSD$
+--- examples/eventlist.py.orig Sun May 21 16:56:11 2006
++++ examples/eventlist.py Sun May 21 16:57:06 2006
+@@ -1,3 +1,4 @@
++#!/usr/bin/env %%PYTHON%%
+
+ """Eventlist is a sloppy style of pygame, but is a handy
+ tool for learning about pygame events and input. At the
Index: patches/patch-examples_fastevents_py
===================================================================
RCS file: patches/patch-examples_fastevents_py
diff -N patches/patch-examples_fastevents_py
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-examples_fastevents_py 14 Jun 2006 12:05:58 -0000
@@ -0,0 +1,8 @@
+$OpenBSD$
+--- examples/fastevents.py.orig Sun May 21 16:56:11 2006
++++ examples/fastevents.py Sun May 21 16:57:13 2006
+@@ -1,3 +1,4 @@
++#!/usr/bin/env %%PYTHON%%
+ """  This is a stress test for the fastevents module.
+
+ *Fast events does not appear faster!*
Index: patches/patch-examples_fonty_py
===================================================================
RCS file: /cvs/ports/devel/pygame/patches/patch-examples_fonty_py,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-examples_fonty_py
--- patches/patch-examples_fonty_py 8 Aug 2003 21:48:58 -0000 1.1.1.1
+++ patches/patch-examples_fonty_py 14 Jun 2006 12:05:58 -0000
@@ -1,15 +1,9 @@
 $OpenBSD: patch-examples_fonty_py,v 1.1.1.1 2003/08/08 21:48:58 jolan Exp $
---- examples/fonty.py.orig 2002-01-05 10:17:53.000000000 +0100
-+++ examples/fonty.py 2003-08-08 21:18:45.000000000 +0200
-@@ -1,3 +1,4 @@
+--- examples/fonty.py.orig Sat Dec 27 06:01:39 2003
++++ examples/fonty.py Sun May 21 16:56:37 2006
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
 +#!/usr/bin/env %%PYTHON%%
 
  """Here we load a .TTF font file, and display it in
  a basic pygame window. It demonstrates several of the
-@@ -65,4 +66,4 @@ def main():
-
-
- if __name__ == '__main__': main()
--    
-\ No newline at end of file
-+    
Index: patches/patch-examples_glcube_py
===================================================================
RCS file: patches/patch-examples_glcube_py
diff -N patches/patch-examples_glcube_py
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-examples_glcube_py 14 Jun 2006 12:05:58 -0000
@@ -0,0 +1,9 @@
+$OpenBSD$
+--- examples/glcube.py.orig Sun May 21 16:56:11 2006
++++ examples/glcube.py Sun May 21 16:56:40 2006
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env %%PYTHON%%
+
+ """Draw a cube on the screen. every frame we orbit
+ the camera around by a small amount and it appears
Index: patches/patch-examples_liquid_py
===================================================================
RCS file: /cvs/ports/devel/pygame/patches/patch-examples_liquid_py,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-examples_liquid_py
--- patches/patch-examples_liquid_py 8 Aug 2003 21:48:58 -0000 1.1.1.1
+++ patches/patch-examples_liquid_py 14 Jun 2006 12:05:58 -0000
@@ -1,7 +1,8 @@
 $OpenBSD: patch-examples_liquid_py,v 1.1.1.1 2003/08/08 21:48:58 jolan Exp $
---- examples/liquid.py.orig 2002-01-05 10:17:53.000000000 +0100
-+++ examples/liquid.py 2003-08-08 21:19:13.000000000 +0200
-@@ -1,3 +1,4 @@
+--- examples/liquid.py.orig Wed Mar 31 17:58:56 2004
++++ examples/liquid.py Sun May 21 16:56:23 2006
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
 +#!/usr/bin/env %%PYTHON%%
 
  """This examples demonstrates a simplish water effect of an
Index: patches/patch-examples_moveit_py
===================================================================
RCS file: patches/patch-examples_moveit_py
diff -N patches/patch-examples_moveit_py
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-examples_moveit_py 14 Jun 2006 12:05:58 -0000
@@ -0,0 +1,9 @@
+$OpenBSD$
+--- examples/moveit.py.orig Sun May 21 16:56:11 2006
++++ examples/moveit.py Sun May 21 16:56:42 2006
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env %%PYTHON%%
+
+ """
+ This is the full and final example from the Pygame Tutorial,
Index: patches/patch-examples_oldalien_py
===================================================================
RCS file: patches/patch-examples_oldalien_py
diff -N patches/patch-examples_oldalien_py
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-examples_oldalien_py 14 Jun 2006 12:05:58 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+--- examples/oldalien.py.orig Sat Jan  5 20:17:53 2002
++++ examples/oldalien.py Sun May 21 17:06:17 2006
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#!/usr/bin/env %%PYTHON%%
+
+ """This is a much simpler version of the aliens.py
+ example. It makes a good place for beginners to get
+@@ -233,4 +233,4 @@ def main():
+ #if python says run, let's run!
+ if __name__ == '__main__':
+     main()
+-    
+\ No newline at end of file
++    
Index: patches/patch-examples_overlay_py
===================================================================
RCS file: patches/patch-examples_overlay_py
diff -N patches/patch-examples_overlay_py
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-examples_overlay_py 14 Jun 2006 12:05:58 -0000
@@ -0,0 +1,9 @@
+$OpenBSD$
+--- examples/overlay.py.orig Sun May 21 16:56:11 2006
++++ examples/overlay.py Sun May 21 16:56:45 2006
+@@ -1,4 +1,4 @@
+-#! /bin/env python
++#!/usr/bin/env %%PYTHON%%
+
+ import sys
+ import pygame
Index: patches/patch-examples_sound_array_demos_py
===================================================================
RCS file: patches/patch-examples_sound_array_demos_py
diff -N patches/patch-examples_sound_array_demos_py
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-examples_sound_array_demos_py 14 Jun 2006 12:05:58 -0000
@@ -0,0 +1,9 @@
+$OpenBSD$
+--- examples/sound_array_demos.py.orig Sun May 21 16:56:11 2006
++++ examples/sound_array_demos.py Sun May 21 16:56:49 2006
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env %%PYTHON%%
+ """
+ Creates an echo effect an any Sound object.
+
Index: patches/patch-examples_sound_py
===================================================================
RCS file: patches/patch-examples_sound_py
diff -N patches/patch-examples_sound_py
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-examples_sound_py 14 Jun 2006 12:05:58 -0000
@@ -0,0 +1,9 @@
+$OpenBSD$
+--- examples/sound.py.orig Sun May 21 16:56:11 2006
++++ examples/sound.py Sun May 21 16:56:47 2006
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env %%PYTHON%%
+
+ """extremely simple demonstration playing a soundfile
+ and waiting for it to finish. you'll need the pygame.mixer
Index: patches/patch-examples_stars_py
===================================================================
RCS file: patches/patch-examples_stars_py
diff -N patches/patch-examples_stars_py
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-examples_stars_py 14 Jun 2006 12:05:58 -0000
@@ -0,0 +1,9 @@
+$OpenBSD$
+--- examples/stars.py.orig Sun May 21 16:56:11 2006
++++ examples/stars.py Sun May 21 16:56:51 2006
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env %%PYTHON%%
+
+ """A simple starfield example. Note you can move the 'center' of
+ the starfield by leftclicking in the window. This example show
Index: patches/patch-examples_vgrade_py
===================================================================
RCS file: patches/patch-examples_vgrade_py
diff -N patches/patch-examples_vgrade_py
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-examples_vgrade_py 14 Jun 2006 12:05:58 -0000
@@ -0,0 +1,9 @@
+$OpenBSD$
+--- examples/vgrade.py.orig Sun May 21 16:56:11 2006
++++ examples/vgrade.py Sun May 21 16:56:52 2006
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env %%PYTHON%%
+
+ """This example demonstrates creating an image with Numeric
+ python, and displaying that through SDL. You can look at the
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/pygame/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST 14 Sep 2004 23:44:01 -0000 1.3
+++ pkg/PLIST 14 Jun 2006 12:05:58 -0000
@@ -1,8 +1,13 @@
-@comment $OpenBSD: PLIST,v 1.3 2004/09/14 23:44:01 espie Exp $
+@comment $OpenBSD$
+include/python${MODPY_VERSION}/
 include/python${MODPY_VERSION}/pygame/
+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/pygame.h
+lib/python${MODPY_VERSION}/
+lib/python${MODPY_VERSION}/site-packages/
 lib/python${MODPY_VERSION}/site-packages/pygame/
 lib/python${MODPY_VERSION}/site-packages/pygame/__init__.py
 lib/python${MODPY_VERSION}/site-packages/pygame/__init__.pyc
@@ -18,6 +23,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/pygame/display.so
 lib/python${MODPY_VERSION}/site-packages/pygame/draw.so
 lib/python${MODPY_VERSION}/site-packages/pygame/event.so
+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/image.so
@@ -32,6 +38,9 @@ lib/python${MODPY_VERSION}/site-packages
 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/pkgdata.py
+lib/python${MODPY_VERSION}/site-packages/pygame/pkgdata.pyc
 lib/python${MODPY_VERSION}/site-packages/pygame/pygame.ico
 lib/python${MODPY_VERSION}/site-packages/pygame/pygame_icon.bmp
 lib/python${MODPY_VERSION}/site-packages/pygame/pygame_icon.icns
@@ -57,7 +66,6 @@ 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.html
 share/doc/pygame/readme.txt
 share/doc/pygame/ref/
 share/doc/pygame/ref/CD.html
@@ -66,6 +74,7 @@ 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
@@ -73,6 +82,7 @@ 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
@@ -139,7 +149,6 @@ share/examples/pygame/data/alien3.gif
 share/examples/pygame/data/arraydemo.bmp
 share/examples/pygame/data/background.gif
 share/examples/pygame/data/bomb.gif
-share/examples/pygame/data/bong.wav
 share/examples/pygame/data/boom.wav
 share/examples/pygame/data/car_door.wav
 share/examples/pygame/data/chimp.bmp
@@ -154,14 +163,17 @@ share/examples/pygame/data/punch.wav
 share/examples/pygame/data/secosmic_lo.wav
 share/examples/pygame/data/shot.gif
 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/liquid.py
 share/examples/pygame/moveit.py
 share/examples/pygame/oldalien.py
+share/examples/pygame/overlay.py
 share/examples/pygame/readme.txt
 share/examples/pygame/sound.py
+share/examples/pygame/sound_array_demos.py
 share/examples/pygame/stars.py
-share/examples/pygame/uberball.py
 share/examples/pygame/vgrade.py