diff -Nur py-game/Makefile py-game.new/Makefile --- py-game/Makefile Tue Jun 14 11:51:29 2005 +++ py-game.new/Makefile Wed Sep 14 08:56:03 2005 @@ -6,13 +6,12 @@ # PORTNAME= py-game -PORTVERSION= 1.6 -PORTREVISION= 2 +PORTVERSION= 1.7.1 CATEGORIES= devel python MASTER_SITES= http://pygame.seul.org/ftp/ -DISTNAME= ${PORTNAME:S/-//}-${PORTVERSION} +DISTNAME= ${PORTNAME:S/-//}-${PORTVERSION}release -MAINTAINER= ports@FreeBSD.org +MAINTAINER= mva@sysfault.org COMMENT= A module designed to write games in Python BUILD_DEPENDS= ${PYNUMERIC} @@ -21,7 +20,8 @@ USE_SDL= ttf image mixer sdl USE_PYTHON= yes -USE_PYDISTUTILS= yes +USE_PYDISTUTILS=yes +USE_XLIB= yes do-configure: @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} config.py diff -Nur py-game/distinfo py-game.new/distinfo --- py-game/distinfo Tue Jun 14 11:51:29 2005 +++ py-game.new/distinfo Tue Sep 13 21:26:54 2005 @@ -1,2 +1,2 @@ -MD5 (pygame-1.6.tar.gz) = ea5db930c0031873a7f5ad1f2f7926db -SIZE (pygame-1.6.tar.gz) = 846095 +MD5 (pygame-1.7.1release.tar.gz) = 05d86d1af446f79411359400951053b7 +SIZE (pygame-1.7.1release.tar.gz) = 1279697 diff -Nur py-game/files/patch-config_unix.py py-game.new/files/patch-config_unix.py --- py-game/files/patch-config_unix.py Tue Jun 14 11:51:29 2005 +++ py-game.new/files/patch-config_unix.py Wed Sep 14 09:12:49 2005 @@ -1,25 +1,39 @@ - -$FreeBSD: ports/devel/py-game/files/patch-config_unix.py,v 1.3 2002/05/28 10:35:21 sobomax Exp $ - ---- config_unix.py.orig Sat Mar 23 10:23:12 2002 -+++ config_unix.py Tue May 28 12:58:39 2002 -@@ -113,7 +113,7 @@ - - sdl_lib_name = 'SDL' - if sys.platform.find('bsd') != -1: -- sdl_lib_name = 'SDL-1.2' -+ sdl_lib_name = 'SDL-1.1' +--- config_unix.py.orig Wed Aug 10 04:45:11 2005 ++++ config_unix.py Wed Sep 14 09:12:44 2005 +@@ -4,7 +4,7 @@ + from glob import glob + from distutils.sysconfig import get_python_inc +-configcommand = os.environ.get('SDL_CONFIG', 'sdl-config',) ++configcommand = os.environ.get('SDL_CONFIG', 'sdl11-config',) + configcommand = configcommand + ' --version --cflags --libs' + localbase = os.environ.get('LOCALBASE', '') +@@ -52,6 +52,9 @@ + self.cflags += f + ' ' + elif f[:3] == '-Wl': + self.cflags += '-Xlinker ' + f + ' ' ++ if self.name == 'SDL': ++ inc = '-I' + os.environ.get ('X11BASE', '') + '/include' ++ self.cflags = inc + ' ' + self.cflags + except: + print 'WARNING: "%s" failed!' % command + self.found = 0 +@@ -137,7 +140,7 @@ def main(): -@@ -132,8 +132,8 @@ - raise SystemExit + print '\nHunting dependencies...' + DEPS = [ +- DependencyProg('SDL', 'SDL_CONFIG', 'sdl-config', '1.2', 'sdl'), ++ DependencyProg('SDL', 'SDL_CONFIG', 'sdl11-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'), +@@ -146,7 +149,7 @@ + ] + if not DEPS[0].found: +- print 'Unable to run "sdl-config". Please make sure a development version of SDL is installed.' ++ print 'Unable to run "sdl11-config". Please make sure a development version of SDL is installed.' + raise SystemExit -- if localbase: #unneeded? -- incdirs = [localbase + '/include/SDL'] -+ if localbase: #unneeded? nah, needed on FreeBSD! -+ incdirs = [localbase + '/include/SDL11', localbase + '/include/smpeg'] - libdirs = [localbase + '/lib'] - else: - incdirs = [] + if localbase: diff -Nur py-game/files/patch-src-draw.c py-game.new/files/patch-src-draw.c --- py-game/files/patch-src-draw.c Tue Jun 14 11:51:29 2005 +++ py-game.new/files/patch-src-draw.c Thu Jan 1 01:00:00 1970 @@ -1,14 +0,0 @@ ---- src/draw.c.orig Thu Oct 16 08:13:22 2003 -+++ src/draw.c Wed Jul 14 14:20:17 2004 -@@ -25,9 +25,9 @@ - */ - #include "pygame.h" - #include -+#include - --#ifdef _MSC_VER --#pragma warning (disable:4244) -+#if __FreeBSD_version < 502119 - - float trunc(float d) - { diff -Nur py-game/pkg-descr py-game.new/pkg-descr --- py-game/pkg-descr Tue Jun 14 11:51:29 2005 +++ py-game.new/pkg-descr Wed Sep 14 09:43:42 2005 @@ -1,4 +1,4 @@ -Pygame is a cross-platfrom library designed to make it easy to write -multimedia software, such as games, in Python. +Pygame is a cross-platfrom library based on top of the SDL and designed +to make it easy to write multimedia software, such as games, in Python. -WWW: http://pygame.seul.org/ +WWW: http://www.pygame.org/ diff -Nur py-game/pkg-plist py-game.new/pkg-plist --- py-game/pkg-plist Tue Jun 14 11:51:29 2005 +++ py-game.new/pkg-plist Wed Sep 14 09:25:39 2005 @@ -1,3 +1,5 @@ +include/%%PYTHON_VERSION%%/pygame/fastevents.h +include/%%PYTHON_VERSION%%/pygame/ffmovie.h include/%%PYTHON_VERSION%%/pygame/font.h include/%%PYTHON_VERSION%%/pygame/mixer.h include/%%PYTHON_VERSION%%/pygame/pygame.h @@ -19,6 +21,7 @@ lib/%%PYTHON_VERSION%%/site-packages/pygame/display.so lib/%%PYTHON_VERSION%%/site-packages/pygame/draw.so lib/%%PYTHON_VERSION%%/site-packages/pygame/event.so +lib/%%PYTHON_VERSION%%/site-packages/pygame/fastevent.so lib/%%PYTHON_VERSION%%/site-packages/pygame/font.so lib/%%PYTHON_VERSION%%/site-packages/pygame/freesansbold.ttf lib/%%PYTHON_VERSION%%/site-packages/pygame/image.so @@ -35,6 +38,10 @@ lib/%%PYTHON_VERSION%%/site-packages/pygame/mixer_music.so lib/%%PYTHON_VERSION%%/site-packages/pygame/mouse.so lib/%%PYTHON_VERSION%%/site-packages/pygame/movie.so +lib/%%PYTHON_VERSION%%/site-packages/pygame/overlay.so +lib/%%PYTHON_VERSION%%/site-packages/pygame/pkgdata.py +lib/%%PYTHON_VERSION%%/site-packages/pygame/pkgdata.pyc +lib/%%PYTHON_VERSION%%/site-packages/pygame/pkgdata.pyo lib/%%PYTHON_VERSION%%/site-packages/pygame/pygame.ico lib/%%PYTHON_VERSION%%/site-packages/pygame/pygame_icon.bmp lib/%%PYTHON_VERSION%%/site-packages/pygame/pygame_icon.icns @@ -57,6 +64,7 @@ lib/%%PYTHON_VERSION%%/site-packages/pygame/version.pyc lib/%%PYTHON_VERSION%%/site-packages/pygame/version.pyo %%PORTDOCS%%%%DOCSDIR%%/LGPL +%%PORTDOCS%%%%DOCSDIR%%/howto_release_pygame.txt %%PORTDOCS%%%%DOCSDIR%%/index.html %%PORTDOCS%%%%DOCSDIR%%/logos.html %%PORTDOCS%%%%DOCSDIR%%/pygame_logo.gif @@ -69,6 +77,7 @@ %%PORTDOCS%%%%DOCSDIR%%/ref/Font.html %%PORTDOCS%%%%DOCSDIR%%/ref/Joystick.html %%PORTDOCS%%%%DOCSDIR%%/ref/Movie.html +%%PORTDOCS%%%%DOCSDIR%%/ref/Overlay.html %%PORTDOCS%%%%DOCSDIR%%/ref/Rect.html %%PORTDOCS%%%%DOCSDIR%%/ref/Sound.html %%PORTDOCS%%%%DOCSDIR%%/ref/Surface.html @@ -76,6 +85,7 @@ %%PORTDOCS%%%%DOCSDIR%%/ref/pygame_cdrom.html %%PORTDOCS%%%%DOCSDIR%%/ref/pygame_color.html %%PORTDOCS%%%%DOCSDIR%%/ref/pygame_constants.html +%%PORTDOCS%%%%DOCSDIR%%/ref/pygame_cursor.html %%PORTDOCS%%%%DOCSDIR%%/ref/pygame_cursors.html %%PORTDOCS%%%%DOCSDIR%%/ref/pygame_display.html %%PORTDOCS%%%%DOCSDIR%%/ref/pygame_draw.html @@ -101,6 +111,10 @@ %%PORTDOCS%%%%DOCSDIR%%/tut/chimp/ChimpLineByLine.html %%PORTDOCS%%%%DOCSDIR%%/tut/chimp/chimp.py.html %%PORTDOCS%%%%DOCSDIR%%/tut/chimp/chimpshot.gif +%%PORTDOCS%%%%DOCSDIR%%/tut/intro/ball.gif +%%PORTDOCS%%%%DOCSDIR%%/tut/intro/blade.jpg +%%PORTDOCS%%%%DOCSDIR%%/tut/intro/freedom.jpg +%%PORTDOCS%%%%DOCSDIR%%/tut/intro/intro.html %%PORTDOCS%%%%DOCSDIR%%/tut/newbieguide.html %%PORTDOCS%%%%DOCSDIR%%/tut/surfarray/SurfarrayIntro.html %%PORTDOCS%%%%DOCSDIR%%/tut/surfarray/allblack.jpg @@ -126,6 +140,7 @@ %%PORTDOCS%%%%DOCSDIR%%/util/listlate.html %%PORTDOCS%%%%DOCSDIR%%/util/makedocs.py %%PORTDOCS%%%%DOCSDIR%%/util/pagelate.html +%%PORTDOCS%%%%EXAMPLESDIR%%/.#stars.py.1.7 %%PORTDOCS%%%%EXAMPLESDIR%%/aliens.py %%PORTDOCS%%%%EXAMPLESDIR%%/arraydemo.py %%PORTDOCS%%%%EXAMPLESDIR%%/chimp.py @@ -135,7 +150,6 @@ %%PORTDOCS%%%%EXAMPLESDIR%%/data/arraydemo.bmp %%PORTDOCS%%%%EXAMPLESDIR%%/data/background.gif %%PORTDOCS%%%%EXAMPLESDIR%%/data/bomb.gif -%%PORTDOCS%%%%EXAMPLESDIR%%/data/bong.wav %%PORTDOCS%%%%EXAMPLESDIR%%/data/boom.wav %%PORTDOCS%%%%EXAMPLESDIR%%/data/car_door.wav %%PORTDOCS%%%%EXAMPLESDIR%%/data/chimp.bmp @@ -150,22 +164,41 @@ %%PORTDOCS%%%%EXAMPLESDIR%%/data/secosmic_lo.wav %%PORTDOCS%%%%EXAMPLESDIR%%/data/shot.gif %%PORTDOCS%%%%EXAMPLESDIR%%/data/whiff.wav +%%PORTDOCS%%%%EXAMPLESDIR%%/data/yuv_1.pgm %%PORTDOCS%%%%EXAMPLESDIR%%/eventlist.py +%%PORTDOCS%%%%EXAMPLESDIR%%/fastevents.py %%PORTDOCS%%%%EXAMPLESDIR%%/fonty.py %%PORTDOCS%%%%EXAMPLESDIR%%/glcube.py %%PORTDOCS%%%%EXAMPLESDIR%%/liquid.py +%%PORTDOCS%%%%EXAMPLESDIR%%/macosx/aliens_app_example/English.lproj/MainMenu.nib/JavaCompiling.plist +%%PORTDOCS%%%%EXAMPLESDIR%%/macosx/aliens_app_example/English.lproj/MainMenu.nib/_MainMenu_EOArchive_English.java +%%PORTDOCS%%%%EXAMPLESDIR%%/macosx/aliens_app_example/English.lproj/MainMenu.nib/classes.nib +%%PORTDOCS%%%%EXAMPLESDIR%%/macosx/aliens_app_example/English.lproj/MainMenu.nib/info.nib +%%PORTDOCS%%%%EXAMPLESDIR%%/macosx/aliens_app_example/English.lproj/MainMenu.nib/keyedobjects.nib +%%PORTDOCS%%%%EXAMPLESDIR%%/macosx/aliens_app_example/English.lproj/aliens.icns +%%PORTDOCS%%%%EXAMPLESDIR%%/macosx/aliens_app_example/README.txt +%%PORTDOCS%%%%EXAMPLESDIR%%/macosx/aliens_app_example/aliens.py +%%PORTDOCS%%%%EXAMPLESDIR%%/macosx/aliens_app_example/aliens_bootstrap.py +%%PORTDOCS%%%%EXAMPLESDIR%%/macosx/aliens_app_example/setup.py +%%PORTDOCS%%%%EXAMPLESDIR%%/macosx/macfont.py %%PORTDOCS%%%%EXAMPLESDIR%%/moveit.py %%PORTDOCS%%%%EXAMPLESDIR%%/oldalien.py +%%PORTDOCS%%%%EXAMPLESDIR%%/overlay.py %%PORTDOCS%%%%EXAMPLESDIR%%/readme.txt %%PORTDOCS%%%%EXAMPLESDIR%%/sound.py +%%PORTDOCS%%%%EXAMPLESDIR%%/sound_array_demos.py %%PORTDOCS%%%%EXAMPLESDIR%%/stars.py -%%PORTDOCS%%%%EXAMPLESDIR%%/uberball.py %%PORTDOCS%%%%EXAMPLESDIR%%/vgrade.py +%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/macosx/aliens_app_example/English.lproj/MainMenu.nib +%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/macosx/aliens_app_example/English.lproj +%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/macosx/aliens_app_example +%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/macosx %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/data %%PORTDOCS%%@dirrm %%EXAMPLESDIR%% %%PORTDOCS%%@dirrm %%DOCSDIR%%/util %%PORTDOCS%%@dirrm %%DOCSDIR%%/tut/tom %%PORTDOCS%%@dirrm %%DOCSDIR%%/tut/surfarray +%%PORTDOCS%%@dirrm %%DOCSDIR%%/tut/intro %%PORTDOCS%%@dirrm %%DOCSDIR%%/tut/chimp %%PORTDOCS%%@dirrm %%DOCSDIR%%/tut %%PORTDOCS%%@dirrm %%DOCSDIR%%/ref