On Sat, Oct 17, 2020 at 01:36:46AM -0400, Daniel Dickman wrote:
> As noted in WHATSNEW, pygame removed support for py-Numeric back in 2016.
> Diff below removes py-Numeric from the BUILD_DEPENDS.
> While here:
> - re-enable pypi as a download source
> - regenerate PLIST
> ok?
ok kmos
--Kurt
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/devel/pygame/Makefile,v
> retrieving revision 1.37
> diff -u -p -u -r1.37 Makefile
> --- Makefile 3 Jul 2020 21:12:53 -0000 1.37
> +++ Makefile 17 Oct 2020 05:27:08 -0000
> @@ -6,7 +6,7 @@ MODPY_EGG_VERSION = 1.9.3
> DISTNAME= pygame-${MODPY_EGG_VERSION}
> PKGNAME = py-game-${MODPY_EGG_VERSION}
> CATEGORIES= devel games
> -REVISION = 2
> +REVISION = 3
>
> HOMEPAGE= https://www.pygame.org/
>
> @@ -17,15 +17,12 @@ WANTLIB += SDL SDL_image SDL_mixer SDL_t
> WANTLIB += freetype z ${MODPY_WANTLIB}
>
> MODULES= lang/python
> -#MODPY_PI = Yes
> -# 1.9.3 was pulled out of the main pypi
> -MASTER_SITES =
> https://files.pythonhosted.org/packages/61/06/3c25051549c252cc6fde01c8aeae90b96831370884504fe428a623316def/
> +MODPY_PI = Yes
> +
> MODPY_SETUPTOOLS = Yes
> SUBST_VARS += MODPY_LIB_SUFFIX
> FLAVORS = python3
> FLAVOR ?=
> -
> -BUILD_DEPENDS+= math/py-Numeric
>
> LIB_DEPENDS= devel/sdl-ttf \
> devel/sdl-image \
> Index: patches/patch-config_unix_py
> ===================================================================
> RCS file: /cvs/ports/devel/pygame/patches/patch-config_unix_py,v
> retrieving revision 1.6
> diff -u -p -u -r1.6 patch-config_unix_py
> --- patches/patch-config_unix_py 1 Apr 2018 09:27:43 -0000 1.6
> +++ patches/patch-config_unix_py 17 Oct 2020 05:27:08 -0000
> @@ -3,7 +3,7 @@ $OpenBSD: patch-config_unix_py,v 1.6 201
> Index: config_unix.py
> --- config_unix.py.orig
> +++ config_unix.py
> -@@ -206,15 +206,6 @@ def main():
> +@@ -231,15 +231,6 @@ def main():
> for d in DEPS:
> d.configure(incdirs, libdirs)
>
> Index: patches/patch-src_camera_h
> ===================================================================
> RCS file: /cvs/ports/devel/pygame/patches/patch-src_camera_h,v
> retrieving revision 1.2
> diff -u -p -u -r1.2 patch-src_camera_h
> --- patches/patch-src_camera_h 1 Apr 2018 09:27:43 -0000 1.2
> +++ patches/patch-src_camera_h 17 Oct 2020 05:27:08 -0000
> @@ -16,7 +16,7 @@ Index: src/camera.h
> #elif defined(__APPLE__)
> #include <AvailabilityMacros.h>
> /* We support OSX 10.6 and below. */
> -@@ -163,7 +166,11 @@ char** v4l2_list_cameras (int* num_devices);
> +@@ -165,7 +168,11 @@ char** v4l2_list_cameras (int* num_devices);
> int v4l2_get_control (int fd, int id, int *value);
> int v4l2_set_control (int fd, int id, int value);
> PyObject* v4l2_read_raw (PyCameraObject* self);
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/devel/pygame/pkg/PLIST,v
> retrieving revision 1.8
> diff -u -p -u -r1.8 PLIST
> --- pkg/PLIST 1 Apr 2018 09:27:43 -0000 1.8
> +++ pkg/PLIST 17 Oct 2020 05:27:08 -0000
> @@ -48,23 +48,23 @@ lib/python${MODPY_VERSION}/site-packages
>
> lib/python${MODPY_VERSION}/site-packages/pygame/${MODPY_PYCACHE}surfarray.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/pygame/${MODPY_PYCACHE}sysfont.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/pygame/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/pygame/_camera.so
> +@so lib/python${MODPY_VERSION}/site-packages/pygame/_camera.so
> lib/python${MODPY_VERSION}/site-packages/pygame/_camera_opencv_highgui.py
> lib/python${MODPY_VERSION}/site-packages/pygame/_camera_vidcapture.py
> lib/python${MODPY_VERSION}/site-packages/pygame/_dummybackend.py
> -lib/python${MODPY_VERSION}/site-packages/pygame/_freetype.so
> +@so lib/python${MODPY_VERSION}/site-packages/pygame/_freetype.so
> lib/python${MODPY_VERSION}/site-packages/pygame/_numpysndarray.py
> lib/python${MODPY_VERSION}/site-packages/pygame/_numpysurfarray.py
> -lib/python${MODPY_VERSION}/site-packages/pygame/base.so
> -lib/python${MODPY_VERSION}/site-packages/pygame/bufferproxy.so
> +@so lib/python${MODPY_VERSION}/site-packages/pygame/base.so
> +@so lib/python${MODPY_VERSION}/site-packages/pygame/bufferproxy.so
> lib/python${MODPY_VERSION}/site-packages/pygame/camera.py
> -lib/python${MODPY_VERSION}/site-packages/pygame/cdrom.so
> -lib/python${MODPY_VERSION}/site-packages/pygame/color.so
> +@so lib/python${MODPY_VERSION}/site-packages/pygame/cdrom.so
> +@so 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/compat.py
> -lib/python${MODPY_VERSION}/site-packages/pygame/constants.so
> +@so lib/python${MODPY_VERSION}/site-packages/pygame/constants.so
> lib/python${MODPY_VERSION}/site-packages/pygame/cursors.py
> -lib/python${MODPY_VERSION}/site-packages/pygame/display.so
> +@so lib/python${MODPY_VERSION}/site-packages/pygame/display.so
> lib/python${MODPY_VERSION}/site-packages/pygame/docs/
> lib/python${MODPY_VERSION}/site-packages/pygame/docs/__init__.py
> lib/python${MODPY_VERSION}/site-packages/pygame/docs/__main__.py
> @@ -78,8 +78,8 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/pygame/docs/pygame_tiny.gif
> lib/python${MODPY_VERSION}/site-packages/pygame/docs/ref/
> lib/python${MODPY_VERSION}/site-packages/pygame/docs/ref/docscomments.json
> -lib/python${MODPY_VERSION}/site-packages/pygame/draw.so
> -lib/python${MODPY_VERSION}/site-packages/pygame/event.so
> +@so lib/python${MODPY_VERSION}/site-packages/pygame/draw.so
> +@so lib/python${MODPY_VERSION}/site-packages/pygame/event.so
> lib/python${MODPY_VERSION}/site-packages/pygame/examples/
> lib/python${MODPY_VERSION}/site-packages/pygame/examples/__init__.py
>
> ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pygame/examples/${MODPY_PYCACHE}/
> @@ -195,12 +195,12 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/pygame/examples/stars.py
> lib/python${MODPY_VERSION}/site-packages/pygame/examples/testsprite.py
> lib/python${MODPY_VERSION}/site-packages/pygame/examples/vgrade.py
> -lib/python${MODPY_VERSION}/site-packages/pygame/fastevent.so
> -lib/python${MODPY_VERSION}/site-packages/pygame/font.so
> +@so lib/python${MODPY_VERSION}/site-packages/pygame/fastevent.so
> +@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/freetype.py
> lib/python${MODPY_VERSION}/site-packages/pygame/ftfont.py
> -lib/python${MODPY_VERSION}/site-packages/pygame/gfxdraw.so
> +@so lib/python${MODPY_VERSION}/site-packages/pygame/gfxdraw.so
> lib/python${MODPY_VERSION}/site-packages/pygame/gp2x/
> lib/python${MODPY_VERSION}/site-packages/pygame/gp2x/__init__.py
>
> ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pygame/gp2x/${MODPY_PYCACHE}/
> @@ -209,23 +209,23 @@ lib/python${MODPY_VERSION}/site-packages
>
> lib/python${MODPY_VERSION}/site-packages/pygame/gp2x/${MODPY_PYCACHE}locals.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/pygame/gp2x/constants.py
> lib/python${MODPY_VERSION}/site-packages/pygame/gp2x/locals.py
> -lib/python${MODPY_VERSION}/site-packages/pygame/image.so
> -lib/python${MODPY_VERSION}/site-packages/pygame/imageext.so
> +@so lib/python${MODPY_VERSION}/site-packages/pygame/image.so
> +@so lib/python${MODPY_VERSION}/site-packages/pygame/imageext.so
> lib/python${MODPY_VERSION}/site-packages/pygame/install.html
> -lib/python${MODPY_VERSION}/site-packages/pygame/joystick.so
> -lib/python${MODPY_VERSION}/site-packages/pygame/key.so
> +@so lib/python${MODPY_VERSION}/site-packages/pygame/joystick.so
> +@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/macosx.py
> -lib/python${MODPY_VERSION}/site-packages/pygame/mask.so
> -lib/python${MODPY_VERSION}/site-packages/pygame/math.so
> +@so lib/python${MODPY_VERSION}/site-packages/pygame/mask.so
> +@so lib/python${MODPY_VERSION}/site-packages/pygame/math.so
> lib/python${MODPY_VERSION}/site-packages/pygame/midi.py
> -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/newbuffer.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/pixelcopy.so
> +@so lib/python${MODPY_VERSION}/site-packages/pygame/mixer.so
> +@so lib/python${MODPY_VERSION}/site-packages/pygame/mixer_music.so
> +@so lib/python${MODPY_VERSION}/site-packages/pygame/mouse.so
> +@so lib/python${MODPY_VERSION}/site-packages/pygame/newbuffer.so
> +@so lib/python${MODPY_VERSION}/site-packages/pygame/overlay.so
> +@so lib/python${MODPY_VERSION}/site-packages/pygame/pixelarray.so
> +@so lib/python${MODPY_VERSION}/site-packages/pygame/pixelcopy.so
> lib/python${MODPY_VERSION}/site-packages/pygame/pkgdata.py
> lib/python${MODPY_VERSION}/site-packages/pygame/pygame.ico
> lib/python${MODPY_VERSION}/site-packages/pygame/pygame_icon.bmp
> @@ -233,14 +233,14 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/pygame/pygame_icon.svg
> lib/python${MODPY_VERSION}/site-packages/pygame/pygame_icon.tiff
> lib/python${MODPY_VERSION}/site-packages/pygame/readme.html
> -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/scrap.so
> +@so lib/python${MODPY_VERSION}/site-packages/pygame/rect.so
> +@so lib/python${MODPY_VERSION}/site-packages/pygame/rwobject.so
> +@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/sprite.py
> -lib/python${MODPY_VERSION}/site-packages/pygame/surface.so
> +@so lib/python${MODPY_VERSION}/site-packages/pygame/surface.so
> lib/python${MODPY_VERSION}/site-packages/pygame/surfarray.py
> -lib/python${MODPY_VERSION}/site-packages/pygame/surflock.so
> +@so 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/tests/
> lib/python${MODPY_VERSION}/site-packages/pygame/tests/__init__.py
> @@ -505,8 +505,8 @@ lib/python${MODPY_VERSION}/site-packages
>
> ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pygame/threads/${MODPY_PYCACHE}/
>
> lib/python${MODPY_VERSION}/site-packages/pygame/threads/${MODPY_PYCACHE}Py25Queue.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/pygame/threads/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/pygame/time.so
> -lib/python${MODPY_VERSION}/site-packages/pygame/transform.so
> +@so lib/python${MODPY_VERSION}/site-packages/pygame/time.so
> +@so lib/python${MODPY_VERSION}/site-packages/pygame/transform.so
> lib/python${MODPY_VERSION}/site-packages/pygame/version.py
> share/doc/pygame${MODPY_BIN_SUFFIX}/
> share/doc/pygame${MODPY_BIN_SUFFIX}/logos.html
>
