- Update to 1.8.0

- Fixed EXAMPLESDIR and DOCDIR to include PYTHONPREFIX

PR:		122231
Submitted by:	Marcus von Appen <mva@sysfault.org> (maintainer)

5 files changed, 84 insertions, 55 deletions

diff --git a/devel/py-game/Makefile b/devel/py-game/Makefile
index ba3099c8d0da..06b3834e0727 100644
--- a/devel/py-game/Makefile
+++ b/devel/py-game/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	game
-PORTVERSION=	1.7.1
-PORTREVISION=	4
+PORTVERSION=	1.8.0
 CATEGORIES=	devel python
 MASTER_SITES=	http://pygame.seul.org/ftp/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -16,16 +15,17 @@ DISTNAME=	py${PORTNAME}-${PORTVERSION}release
 MAINTAINER=	mva@sysfault.org
 COMMENT=	A module designed to write games in Python
 
-BUILD_DEPENDS=	${PYNUMERIC}
 LIB_DEPENDS=	smpeg.1:${PORTSDIR}/multimedia/smpeg
-RUN_DEPENDS=	${PYNUMERIC}
 
 USE_SDL=	ttf image mixer sdl
 USE_PYTHON=	yes
 USE_PYDISTUTILS=yes
 
 PYDISTUTILS_PKGNAME=	pygame
-PYDISTUTILS_PKGVERSION=	1.7.1release
+PYDISTUTILS_PKGVERSION=	1.8.0release
+
+DOCSDIR=	${PREFIX}/share/doc/py-${PORTNAME}
+EXAMPLESDIR=	${PREFIX}/share/examples/py-${PORTNAME}
 
 do-configure:
 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} config.py
diff --git a/devel/py-game/distinfo b/devel/py-game/distinfo
index 14f3b2c64f7f..38445fcbfb8c 100644
--- a/devel/py-game/distinfo
+++ b/devel/py-game/distinfo
@@ -1,3 +1,3 @@
-MD5 (pygame-1.7.1release.tar.gz) = 05d86d1af446f79411359400951053b7
-SHA256 (pygame-1.7.1release.tar.gz) = 11dfa923f5f831d2bedf476978e004efcac4cfa7d1f315dd094262265fcd8042
-SIZE (pygame-1.7.1release.tar.gz) = 1279697
+MD5 (pygame-1.8.0release.tar.gz) = 8d9cca47d356db2ada07865aa066dceb
+SHA256 (pygame-1.8.0release.tar.gz) = ee7748e2689f41b54544e9997c42abd568b8c2d85292c4e6c0146c48b464ba82
+SIZE (pygame-1.8.0release.tar.gz) = 1473603
diff --git a/devel/py-game/files/patch-config_unix.py b/devel/py-game/files/patch-config_unix.py
deleted file mode 100644
index 2bf13082c5fd..000000000000
--- a/devel/py-game/files/patch-config_unix.py
+++ /dev/null
@@ -1,12 +0,0 @@
---- config_unix.py.orig	Wed Aug 10 04:45:11 2005
-+++ config_unix.py	Wed Sep 14 09:12:44 2005
-@@ -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
diff --git a/devel/py-game/pkg-descr b/devel/py-game/pkg-descr
index 72415e260ec2..0fa6da10a2da 100644
--- a/devel/py-game/pkg-descr
+++ b/devel/py-game/pkg-descr
@@ -1,4 +1,4 @@
 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://www.pygame.org/news.html
+WWW: http://www.pygame.org/
diff --git a/devel/py-game/pkg-plist b/devel/py-game/pkg-plist
index 785049635fd1..2e861744e1df 100644
--- a/devel/py-game/pkg-plist
+++ b/devel/py-game/pkg-plist
@@ -1,12 +1,34 @@
+include/%%PYTHON_VERSION%%/pygame/bitmask.h
 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
+include/%%PYTHON_VERSION%%/pygame/pygamedocs.h
+include/%%PYTHON_VERSION%%/pygame/scrap.h
+include/%%PYTHON_VERSION%%/pygame/surface.h
+%%PYTHON_SITELIBDIR%%/pygame/gp2x/__init__.py
+%%PYTHON_SITELIBDIR%%/pygame/gp2x/__init__.pyc
+%%PYTHON_SITELIBDIR%%/pygame/gp2x/__init__.pyo
+%%PYTHON_SITELIBDIR%%/pygame/gp2x/constants.py
+%%PYTHON_SITELIBDIR%%/pygame/gp2x/constants.pyc
+%%PYTHON_SITELIBDIR%%/pygame/gp2x/constants.pyo
+%%PYTHON_SITELIBDIR%%/pygame/gp2x/locals.py
+%%PYTHON_SITELIBDIR%%/pygame/gp2x/locals.pyc
+%%PYTHON_SITELIBDIR%%/pygame/gp2x/locals.pyo
 %%PYTHON_SITELIBDIR%%/pygame/__init__.py
 %%PYTHON_SITELIBDIR%%/pygame/__init__.pyc
 %%PYTHON_SITELIBDIR%%/pygame/__init__.pyo
+%%PYTHON_SITELIBDIR%%/pygame/_numericsndarray.so
+%%PYTHON_SITELIBDIR%%/pygame/_numericsurfarray.so
+%%PYTHON_SITELIBDIR%%/pygame/_numpysurfarray.py
+%%PYTHON_SITELIBDIR%%/pygame/_numpysurfarray.pyc
+%%PYTHON_SITELIBDIR%%/pygame/_numpysurfarray.pyo
+%%PYTHON_SITELIBDIR%%/pygame/_numpysndarray.py
+%%PYTHON_SITELIBDIR%%/pygame/_numpysndarray.pyc
+%%PYTHON_SITELIBDIR%%/pygame/_numpysndarray.pyo
 %%PYTHON_SITELIBDIR%%/pygame/base.so
+%%PYTHON_SITELIBDIR%%/pygame/bufferproxy.so
 %%PYTHON_SITELIBDIR%%/pygame/cdrom.so
 %%PYTHON_SITELIBDIR%%/pygame/color.py
 %%PYTHON_SITELIBDIR%%/pygame/color.pyc
@@ -31,14 +53,19 @@ include/%%PYTHON_VERSION%%/pygame/pygame.h
 %%PYTHON_SITELIBDIR%%/pygame/locals.py
 %%PYTHON_SITELIBDIR%%/pygame/locals.pyc
 %%PYTHON_SITELIBDIR%%/pygame/locals.pyo
+%%PYTHON_SITELIBDIR%%/pygame/mac_scrap.py
+%%PYTHON_SITELIBDIR%%/pygame/mac_scrap.pyc
+%%PYTHON_SITELIBDIR%%/pygame/mac_scrap.pyo
 %%PYTHON_SITELIBDIR%%/pygame/macosx.py
 %%PYTHON_SITELIBDIR%%/pygame/macosx.pyc
 %%PYTHON_SITELIBDIR%%/pygame/macosx.pyo
+%%PYTHON_SITELIBDIR%%/pygame/mask.so
 %%PYTHON_SITELIBDIR%%/pygame/mixer.so
 %%PYTHON_SITELIBDIR%%/pygame/mixer_music.so
 %%PYTHON_SITELIBDIR%%/pygame/mouse.so
 %%PYTHON_SITELIBDIR%%/pygame/movie.so
 %%PYTHON_SITELIBDIR%%/pygame/overlay.so
+%%PYTHON_SITELIBDIR%%/pygame/pixelarray.so
 %%PYTHON_SITELIBDIR%%/pygame/pkgdata.py
 %%PYTHON_SITELIBDIR%%/pygame/pkgdata.pyc
 %%PYTHON_SITELIBDIR%%/pygame/pkgdata.pyo
@@ -48,12 +75,17 @@ include/%%PYTHON_VERSION%%/pygame/pygame.h
 %%PYTHON_SITELIBDIR%%/pygame/pygame_icon.tiff
 %%PYTHON_SITELIBDIR%%/pygame/rect.so
 %%PYTHON_SITELIBDIR%%/pygame/rwobject.so
-%%PYTHON_SITELIBDIR%%/pygame/sndarray.so
+%%PYTHON_SITELIBDIR%%/pygame/scrap.so
+%%PYTHON_SITELIBDIR%%/pygame/sndarray.py
+%%PYTHON_SITELIBDIR%%/pygame/sndarray.pyc
+%%PYTHON_SITELIBDIR%%/pygame/sndarray.pyo
 %%PYTHON_SITELIBDIR%%/pygame/sprite.py
 %%PYTHON_SITELIBDIR%%/pygame/sprite.pyc
 %%PYTHON_SITELIBDIR%%/pygame/sprite.pyo
 %%PYTHON_SITELIBDIR%%/pygame/surface.so
-%%PYTHON_SITELIBDIR%%/pygame/surfarray.so
+%%PYTHON_SITELIBDIR%%/pygame/surfarray.py
+%%PYTHON_SITELIBDIR%%/pygame/surfarray.pyc
+%%PYTHON_SITELIBDIR%%/pygame/surfarray.pyo
 %%PYTHON_SITELIBDIR%%/pygame/surflock.so
 %%PYTHON_SITELIBDIR%%/pygame/sysfont.py
 %%PYTHON_SITELIBDIR%%/pygame/sysfont.pyc
@@ -71,40 +103,34 @@ include/%%PYTHON_VERSION%%/pygame/pygame.h
 %%PORTDOCS%%%%DOCSDIR%%/pygame_powered.gif
 %%PORTDOCS%%%%DOCSDIR%%/pygame_small.gif
 %%PORTDOCS%%%%DOCSDIR%%/pygame_tiny.gif
-%%PORTDOCS%%%%DOCSDIR%%/ref/CD.html
-%%PORTDOCS%%%%DOCSDIR%%/ref/Channel.html
-%%PORTDOCS%%%%DOCSDIR%%/ref/Clock.html
-%%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
+%%PORTDOCS%%%%DOCSDIR%%/ref/cdrom.html
+%%PORTDOCS%%%%DOCSDIR%%/ref/cursors.html
+%%PORTDOCS%%%%DOCSDIR%%/ref/display.html
+%%PORTDOCS%%%%DOCSDIR%%/ref/draw.html
+%%PORTDOCS%%%%DOCSDIR%%/ref/event.html
+%%PORTDOCS%%%%DOCSDIR%%/ref/font.html
+%%PORTDOCS%%%%DOCSDIR%%/ref/image.html
+%%PORTDOCS%%%%DOCSDIR%%/ref/index.html
+%%PORTDOCS%%%%DOCSDIR%%/ref/joystick.html
+%%PORTDOCS%%%%DOCSDIR%%/ref/key.html
+%%PORTDOCS%%%%DOCSDIR%%/ref/mask.html
+%%PORTDOCS%%%%DOCSDIR%%/ref/mixer.html
+%%PORTDOCS%%%%DOCSDIR%%/ref/mouse.html
+%%PORTDOCS%%%%DOCSDIR%%/ref/movie.html
+%%PORTDOCS%%%%DOCSDIR%%/ref/music.html
+%%PORTDOCS%%%%DOCSDIR%%/ref/overlay.html
+%%PORTDOCS%%%%DOCSDIR%%/ref/pixelarray.html
 %%PORTDOCS%%%%DOCSDIR%%/ref/pygame.html
-%%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
-%%PORTDOCS%%%%DOCSDIR%%/ref/pygame_event.html
-%%PORTDOCS%%%%DOCSDIR%%/ref/pygame_font.html
-%%PORTDOCS%%%%DOCSDIR%%/ref/pygame_image.html
-%%PORTDOCS%%%%DOCSDIR%%/ref/pygame_joystick.html
-%%PORTDOCS%%%%DOCSDIR%%/ref/pygame_key.html
-%%PORTDOCS%%%%DOCSDIR%%/ref/pygame_mixer.html
-%%PORTDOCS%%%%DOCSDIR%%/ref/pygame_mixer_music.html
-%%PORTDOCS%%%%DOCSDIR%%/ref/pygame_mouse.html
-%%PORTDOCS%%%%DOCSDIR%%/ref/pygame_movie.html
-%%PORTDOCS%%%%DOCSDIR%%/ref/pygame_sndarray.html
-%%PORTDOCS%%%%DOCSDIR%%/ref/pygame_sprite.html
-%%PORTDOCS%%%%DOCSDIR%%/ref/pygame_surfarray.html
-%%PORTDOCS%%%%DOCSDIR%%/ref/pygame_time.html
-%%PORTDOCS%%%%DOCSDIR%%/ref/pygame_transform.html
+%%PORTDOCS%%%%DOCSDIR%%/ref/rect.html
+%%PORTDOCS%%%%DOCSDIR%%/ref/scrap.html
+%%PORTDOCS%%%%DOCSDIR%%/ref/sndarray.html
+%%PORTDOCS%%%%DOCSDIR%%/ref/sprite.html
+%%PORTDOCS%%%%DOCSDIR%%/ref/surface.html
+%%PORTDOCS%%%%DOCSDIR%%/ref/surfarray.html
+%%PORTDOCS%%%%DOCSDIR%%/ref/time.html
+%%PORTDOCS%%%%DOCSDIR%%/ref/transform.html
 %%PORTDOCS%%%%DOCSDIR%%/tut/DisplayModes.html
-%%PORTDOCS%%%%DOCSDIR%%/tut/Executable.html
 %%PORTDOCS%%%%DOCSDIR%%/tut/ImportInit.html
 %%PORTDOCS%%%%DOCSDIR%%/tut/MoveIt.html
 %%PORTDOCS%%%%DOCSDIR%%/tut/SpriteIntro.html
@@ -140,14 +166,21 @@ include/%%PYTHON_VERSION%%/pygame/pygame.h
 %%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%%/blend_fill.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/blit_blends.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/chimp.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/cursors.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/data/alien1.gif
+%%PORTDOCS%%%%EXAMPLESDIR%%/data/alien1.jpg
+%%PORTDOCS%%%%EXAMPLESDIR%%/data/alien1.png
 %%PORTDOCS%%%%EXAMPLESDIR%%/data/alien2.gif
+%%PORTDOCS%%%%EXAMPLESDIR%%/data/alien2.png
 %%PORTDOCS%%%%EXAMPLESDIR%%/data/alien3.gif
+%%PORTDOCS%%%%EXAMPLESDIR%%/data/alien3.png
 %%PORTDOCS%%%%EXAMPLESDIR%%/data/arraydemo.bmp
+%%PORTDOCS%%%%EXAMPLESDIR%%/data/asprite.bmp
 %%PORTDOCS%%%%EXAMPLESDIR%%/data/background.gif
 %%PORTDOCS%%%%EXAMPLESDIR%%/data/bomb.gif
 %%PORTDOCS%%%%EXAMPLESDIR%%/data/boom.wav
@@ -163,10 +196,12 @@ include/%%PYTHON_VERSION%%/pygame/pygame.h
 %%PORTDOCS%%%%EXAMPLESDIR%%/data/punch.wav
 %%PORTDOCS%%%%EXAMPLESDIR%%/data/secosmic_lo.wav
 %%PORTDOCS%%%%EXAMPLESDIR%%/data/shot.gif
+%%PORTDOCS%%%%EXAMPLESDIR%%/data/static.png
 %%PORTDOCS%%%%EXAMPLESDIR%%/data/whiff.wav
 %%PORTDOCS%%%%EXAMPLESDIR%%/data/yuv_1.pgm
 %%PORTDOCS%%%%EXAMPLESDIR%%/eventlist.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/fastevents.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/headless_no_windows_needed.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/fonty.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/glcube.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/liquid.py
@@ -181,13 +216,18 @@ include/%%PYTHON_VERSION%%/pygame/pygame.h
 %%PORTDOCS%%%%EXAMPLESDIR%%/macosx/aliens_app_example/aliens_bootstrap.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/macosx/aliens_app_example/setup.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/macosx/macfont.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/mask.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/moveit.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/oldalien.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/overlay.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/pixelarray.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/readme.txt
+%%PORTDOCS%%%%EXAMPLESDIR%%/scaletest.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/scrap_clipboard.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/sound.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/sound_array_demos.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/stars.py
+%%PORTDOCS%%%%EXAMPLESDIR%%/testsprite.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
@@ -203,5 +243,6 @@ include/%%PYTHON_VERSION%%/pygame/pygame.h
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/tut
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/ref
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm %%PYTHON_SITELIBDIR%%/pygame/gp2x
 @dirrm %%PYTHON_SITELIBDIR%%/pygame
 @dirrm include/%%PYTHON_VERSION%%/pygame