From cbfdd53518d177921c67ee5ef66bd227975b4746 Mon Sep 17 00:00:00 2001 From: xsa Date: Sat, 10 Apr 2004 23:08:11 +0000 Subject: [PATCH] update to 1.6; requested/tested/ok jolan@. --- devel/pygame/Makefile | 10 ++++++---- devel/pygame/distinfo | 6 +++--- devel/pygame/patches/patch-examples_chimp_py | 6 +++--- devel/pygame/patches/patch-examples_uberball_py | 6 +++--- devel/pygame/pkg/PLIST | 7 ++++--- 5 files changed, 19 insertions(+), 16 deletions(-) diff --git a/devel/pygame/Makefile b/devel/pygame/Makefile index 238702f3895..b7458444ceb 100644 --- a/devel/pygame/Makefile +++ b/devel/pygame/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.3 2004/01/30 08:39:48 xsa Exp $ +# $OpenBSD: Makefile,v 1.4 2004/04/10 23:08:11 xsa Exp $ NOT_FOR_ARCHS= ${NO_SHARED_ARCHS} COMMENT= "set of Python modules designed for writing games" -DISTNAME= pygame-1.5.6 +DISTNAME= pygame-1.6 CATEGORIES= devel games HOMEPAGE= http://www.pygame.org/ @@ -57,7 +57,9 @@ post-install: ${DOCDIR}/$i .endfor -do-regress: - @cd ${WRKSRC} && ${MODPY_BIN} ./run_tests.py +do-regress: fake + @cd ${WRKSRC} && ${MAKE_ENV} \ + PYTHONPATH=${WRKINST}${MODPY_SITEPKG} \ + ${MODPY_BIN} ./run_tests.py .include diff --git a/devel/pygame/distinfo b/devel/pygame/distinfo index 1fe899194de..f480bcbd4b5 100644 --- a/devel/pygame/distinfo +++ b/devel/pygame/distinfo @@ -1,3 +1,3 @@ -MD5 (pygame-1.5.6.tar.gz) = d5ed5a18f463d898d590b77ea4ea9e00 -RMD160 (pygame-1.5.6.tar.gz) = d7926fad0d65ac70981fd94d4d3680e8f4fc0afe -SHA1 (pygame-1.5.6.tar.gz) = 5213a71d5641713f89e617c0c7008bb18aaf176e +MD5 (pygame-1.6.tar.gz) = ea5db930c0031873a7f5ad1f2f7926db +RMD160 (pygame-1.6.tar.gz) = a3f5369a523708cb4581a230a65f6085cb6e9982 +SHA1 (pygame-1.6.tar.gz) = 5b99ca0c923917da9fd0ba1b9ead9175b4a7d970 diff --git a/devel/pygame/patches/patch-examples_chimp_py b/devel/pygame/patches/patch-examples_chimp_py index 7e7f855b739..4694e13fd89 100644 --- a/devel/pygame/patches/patch-examples_chimp_py +++ b/devel/pygame/patches/patch-examples_chimp_py @@ -1,9 +1,9 @@ -$OpenBSD: patch-examples_chimp_py,v 1.1.1.1 2003/08/08 21:48:58 jolan Exp $ +$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-08-08 21:18:17.000000000 +0200 ++++ examples/chimp.py 2003-12-26 00:56:18.000000000 +0100 @@ -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 that comes with pygame. It is based on a 'popular' web banner. diff --git a/devel/pygame/patches/patch-examples_uberball_py b/devel/pygame/patches/patch-examples_uberball_py index 11bfa2d765a..b14acd8f8b6 100644 --- a/devel/pygame/patches/patch-examples_uberball_py +++ b/devel/pygame/patches/patch-examples_uberball_py @@ -1,9 +1,9 @@ -$OpenBSD: patch-examples_uberball_py,v 1.1.1.1 2003/08/08 21:48:58 jolan Exp $ +$OpenBSD: patch-examples_uberball_py,v 1.2 2004/04/10 23:08:11 xsa Exp $ --- examples/uberball.py.orig 2002-05-29 02:03:40.000000000 +0200 -+++ examples/uberball.py 2003-08-08 21:19:54.000000000 +0200 ++++ examples/uberball.py 2003-12-26 00:56:41.000000000 +0100 @@ -1,4 +1,4 @@ -#/usr/bin/env python -+#!/usr/bin/env python ++#!/usr/bin/env %%PYTHON%% """ ÜberBall python source by Geoff Howland. 04-28-02 diff --git a/devel/pygame/pkg/PLIST b/devel/pygame/pkg/PLIST index ede9461cca1..edf0895611f 100644 --- a/devel/pygame/pkg/PLIST +++ b/devel/pygame/pkg/PLIST @@ -1,9 +1,7 @@ -@comment $OpenBSD: PLIST,v 1.1.1.1 2003/08/08 21:48:58 jolan Exp $ -include/python${MODPY_VERSION}/pygame/CPS.h +@comment $OpenBSD: PLIST,v 1.2 2004/04/10 23:08:11 xsa Exp $ include/python${MODPY_VERSION}/pygame/font.h include/python${MODPY_VERSION}/pygame/mixer.h include/python${MODPY_VERSION}/pygame/pygame.h -include/python${MODPY_VERSION}/pygame/setproctitle.h 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/base.so @@ -26,6 +24,8 @@ 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/macosx.py +lib/python${MODPY_VERSION}/site-packages/pygame/macosx.pyc 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 @@ -143,6 +143,7 @@ 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/eventlist.py share/examples/pygame/fonty.py @comment share/examples/pygame/glcube.py share/examples/pygame/liquid.py