From: Stuart Henderson <stu@spacehopper.org>
Subject: Re: 回复: shall we create new port lang/cython3 ?
To: Daniel Dickman <didickman@gmail.com>, "ports@openbsd.org" <ports@openbsd.org>
Cc: pea@openbsd.org, bket@openbsd.org, martin@catai.org, bcallah@openbsd.org, marc.espie.openbsd@gmail.com, paul@irofti.net
Date: Thu, 4 Jul 2024 15:54:08 +0100

On 2024/06/30 14:53, Stuart Henderson wrote:
> On 2024/06/28 18:44, Daniel Dickman wrote:
> > > These use python 2 and fail with cython 3:
> > >
> > > games/pygame_sdl2
> > > games/renpy
> > 
> > please mark these as BROKEN
> > 
> > > The following ports didn't build and I don't have diffs to fix/update
> > > them. If anyone wants to push this forward then figuring out how to patch
> > > or update these would be helpful:
> > >
> > > math/mlpack                     ?
> > > math/py-h5py,python3            3.11.0 supports newer cython, but needs newer numpy
> > > math/py-pandas,python3          ?
> > > math/py-scikit-image,python3    0.22.0/newer, need newer numpy (0.22.0: 1.23.3, 0.23.x: 2.x)
> > > math/py-scipy,python3           ?
> > 
> > please mark the above as BROKEN for now.
> > 
> > I use scipy and pandas so will be motivated to fix once we have Cython
> > 3 in the tree.

Here's the diff that I have doing the above, maintainers of touched ports CC'd.
Alternatively for mlpack, there's an update which works with new cython at
https://junkpile.org/mlpack-4.4.0.diff but I have no idea how to test it.

 games/pygame_sdl2/Makefile    |    7 ++
 games/renpy/Makefile          |    2 
 geo/py-fiona/Makefile         |    8 +--
 geo/py-fiona/distinfo         |    4 -
 geo/py-fiona/pkg/PLIST        |   20 ++-----
 geo/py-proj/Makefile          |    3 -
 geo/py-proj/distinfo          |    4 -
 geo/py-rasterio/Makefile      |    3 -
 geo/py-rasterio/distinfo      |    4 -
 geo/py-rasterio/pkg/PLIST     |    3 -
 lang/cython/Makefile          |    3 -
 lang/cython/distinfo          |    4 -
 lang/cython/pkg/PLIST         |  111 +++++++++++++++++++++++++-----------------
 math/mlpack/Makefile          |    2 
 math/py-h5py/Makefile         |    2 
 math/py-pandas/Makefile       |    2 
 math/py-scikit-image/Makefile |    2 
 math/py-scipy/Makefile        |    2 
 net/py-msgpack/Makefile       |    3 -
 net/py-msgpack/distinfo       |    4 -
 textproc/py-yaml/Makefile     |   16 ++----
 textproc/py-yaml/distinfo     |    4 -
 22 files changed, 119 insertions(+), 94 deletions(-)

Index: lang/cython/Makefile
===================================================================
RCS file: /cvs/ports/lang/cython/Makefile,v
diff -u -p -r1.66 Makefile
--- lang/cython/Makefile	6 May 2024 12:23:44 -0000	1.66
+++ lang/cython/Makefile	3 Jul 2024 21:41:24 -0000
@@ -1,10 +1,9 @@
 COMMENT =		optimising static compiler for Python and Cython
 
-MODPY_EGG_VERSION =	0.29.36
+MODPY_EGG_VERSION =	3.0.10
 DISTNAME =		Cython-${MODPY_EGG_VERSION}
 PKGNAME =		py-cython-${MODPY_EGG_VERSION}
 CATEGORIES =		lang
-REVISION =		0
 
 EPOCH =			0
 
Index: lang/cython/distinfo
===================================================================
RCS file: /cvs/ports/lang/cython/distinfo,v
diff -u -p -r1.38 distinfo
--- lang/cython/distinfo	10 Feb 2024 18:16:41 -0000	1.38
+++ lang/cython/distinfo	3 Jul 2024 21:41:24 -0000
@@ -1,2 +1,2 @@
-SHA256 (Cython-0.29.36.tar.gz) = QcDP0tdU44PJ7rle/8mqSrhH0Ml0cHfd18Dctow7wB8=
-SIZE (Cython-0.29.36.tar.gz) = 2097760
+SHA256 (Cython-3.0.10.tar.gz) = 3MlnOTMfuFTc9QP5RgdXbP6EiAZsYcpQ39VYNvEy3pk=
+SIZE (Cython-3.0.10.tar.gz) = 2751764
Index: lang/cython/pkg/PLIST
===================================================================
RCS file: /cvs/ports/lang/cython/pkg/PLIST,v
diff -u -p -r1.23 PLIST
--- lang/cython/pkg/PLIST	17 Dec 2023 11:55:38 -0000	1.23
+++ lang/cython/pkg/PLIST	3 Jul 2024 21:41:24 -0000
@@ -22,17 +22,26 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/Cython/Build/IpythonMagic.py
 lib/python${MODPY_VERSION}/site-packages/Cython/Build/Tests/
 lib/python${MODPY_VERSION}/site-packages/Cython/Build/Tests/TestCyCache.py
+lib/python${MODPY_VERSION}/site-packages/Cython/Build/Tests/TestCythonizeArgsParser.py
+lib/python${MODPY_VERSION}/site-packages/Cython/Build/Tests/TestDependencies.py
 lib/python${MODPY_VERSION}/site-packages/Cython/Build/Tests/TestInline.py
 lib/python${MODPY_VERSION}/site-packages/Cython/Build/Tests/TestIpythonMagic.py
+lib/python${MODPY_VERSION}/site-packages/Cython/Build/Tests/TestRecythonize.py
 lib/python${MODPY_VERSION}/site-packages/Cython/Build/Tests/TestStripLiterals.py
 lib/python${MODPY_VERSION}/site-packages/Cython/Build/Tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/Cython/Build/Tests/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/Cython/Build/Tests/${MODPY_PYCACHE}TestCyCache.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/Cython/Build/Tests/${MODPY_PYCACHE}TestCyCache.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/Cython/Build/Tests/${MODPY_PYCACHE}TestCythonizeArgsParser.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/Cython/Build/Tests/${MODPY_PYCACHE}TestCythonizeArgsParser.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/Cython/Build/Tests/${MODPY_PYCACHE}TestDependencies.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/Cython/Build/Tests/${MODPY_PYCACHE}TestDependencies.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/Cython/Build/Tests/${MODPY_PYCACHE}TestInline.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/Cython/Build/Tests/${MODPY_PYCACHE}TestInline.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/Cython/Build/Tests/${MODPY_PYCACHE}TestIpythonMagic.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/Cython/Build/Tests/${MODPY_PYCACHE}TestIpythonMagic.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/Cython/Build/Tests/${MODPY_PYCACHE}TestRecythonize.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/Cython/Build/Tests/${MODPY_PYCACHE}TestRecythonize.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/Cython/Build/Tests/${MODPY_PYCACHE}TestStripLiterals.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/Cython/Build/Tests/${MODPY_PYCACHE}TestStripLiterals.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/Cython/Build/Tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -61,10 +70,12 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Buffer.py
 lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Builtin.py
 lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/CmdLine.py
+@so lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Code.${MODPY_PYC_MAGIC_TAG}so
 lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Code.pxd
 lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Code.py
 lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/CodeGeneration.py
 lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/CythonScope.py
+lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Dataclass.py
 lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/DebugFlags.py
 lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Errors.py
 lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/ExprNodes.py
@@ -85,6 +96,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Options.py
 lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/ParseTreeTransforms.pxd
 lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/ParseTreeTransforms.py
+@so lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Parsing.${MODPY_PYC_MAGIC_TAG}so
 lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Parsing.pxd
 lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Parsing.py
 lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Pipeline.py
@@ -102,6 +114,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Tests/TestGrammar.py
 lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Tests/TestMemView.py
 lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Tests/TestParseTreeTransforms.py
+lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Tests/TestScanning.py
 lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Tests/TestSignatureMatching.py
 lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Tests/TestStringEncoding.py
 lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Tests/TestTreeFragment.py
@@ -109,6 +122,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Tests/TestTypes.py
 lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Tests/TestUtilityLoad.py
 lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Tests/TestVisitor.py
+lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Tests/Utils.py
 lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Tests/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Tests/${MODPY_PYCACHE}TestBuffer.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -123,6 +137,8 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Tests/${MODPY_PYCACHE}TestMemView.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Tests/${MODPY_PYCACHE}TestParseTreeTransforms.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Tests/${MODPY_PYCACHE}TestParseTreeTransforms.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Tests/${MODPY_PYCACHE}TestScanning.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Tests/${MODPY_PYCACHE}TestScanning.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Tests/${MODPY_PYCACHE}TestSignatureMatching.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Tests/${MODPY_PYCACHE}TestSignatureMatching.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Tests/${MODPY_PYCACHE}TestStringEncoding.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -137,12 +153,15 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Tests/${MODPY_PYCACHE}TestUtilityLoad.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Tests/${MODPY_PYCACHE}TestVisitor.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Tests/${MODPY_PYCACHE}TestVisitor.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Tests/${MODPY_PYCACHE}Utils.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Tests/${MODPY_PYCACHE}Utils.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/TreeFragment.py
 lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/TreePath.py
 lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/TypeInference.py
 lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/TypeSlots.py
+lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/UFuncs.py
 lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/UtilNodes.py
 lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/UtilityCode.py
 lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Version.py
@@ -169,6 +188,8 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/${MODPY_PYCACHE}CodeGeneration.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/${MODPY_PYCACHE}CythonScope.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/${MODPY_PYCACHE}CythonScope.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/${MODPY_PYCACHE}Dataclass.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/${MODPY_PYCACHE}Dataclass.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/${MODPY_PYCACHE}DebugFlags.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/${MODPY_PYCACHE}DebugFlags.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/${MODPY_PYCACHE}Errors.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -223,6 +244,8 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/${MODPY_PYCACHE}TypeInference.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/${MODPY_PYCACHE}TypeSlots.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/${MODPY_PYCACHE}TypeSlots.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/${MODPY_PYCACHE}UFuncs.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/${MODPY_PYCACHE}UFuncs.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/${MODPY_PYCACHE}UtilNodes.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/${MODPY_PYCACHE}UtilNodes.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/${MODPY_PYCACHE}UtilityCode.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -283,43 +306,6 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/Cython/Distutils/extension.py
 lib/python${MODPY_VERSION}/site-packages/Cython/Distutils/old_build_ext.py
 lib/python${MODPY_VERSION}/site-packages/Cython/Includes/
-lib/python${MODPY_VERSION}/site-packages/Cython/Includes/Deprecated/
-lib/python${MODPY_VERSION}/site-packages/Cython/Includes/Deprecated/python.pxd
-lib/python${MODPY_VERSION}/site-packages/Cython/Includes/Deprecated/python_bool.pxd
-lib/python${MODPY_VERSION}/site-packages/Cython/Includes/Deprecated/python_buffer.pxd
-lib/python${MODPY_VERSION}/site-packages/Cython/Includes/Deprecated/python_bytes.pxd
-lib/python${MODPY_VERSION}/site-packages/Cython/Includes/Deprecated/python_cobject.pxd
-lib/python${MODPY_VERSION}/site-packages/Cython/Includes/Deprecated/python_complex.pxd
-lib/python${MODPY_VERSION}/site-packages/Cython/Includes/Deprecated/python_dict.pxd
-lib/python${MODPY_VERSION}/site-packages/Cython/Includes/Deprecated/python_exc.pxd
-lib/python${MODPY_VERSION}/site-packages/Cython/Includes/Deprecated/python_float.pxd
-lib/python${MODPY_VERSION}/site-packages/Cython/Includes/Deprecated/python_function.pxd
-lib/python${MODPY_VERSION}/site-packages/Cython/Includes/Deprecated/python_getargs.pxd
-lib/python${MODPY_VERSION}/site-packages/Cython/Includes/Deprecated/python_instance.pxd
-lib/python${MODPY_VERSION}/site-packages/Cython/Includes/Deprecated/python_int.pxd
-lib/python${MODPY_VERSION}/site-packages/Cython/Includes/Deprecated/python_iterator.pxd
-lib/python${MODPY_VERSION}/site-packages/Cython/Includes/Deprecated/python_list.pxd
-lib/python${MODPY_VERSION}/site-packages/Cython/Includes/Deprecated/python_long.pxd
-lib/python${MODPY_VERSION}/site-packages/Cython/Includes/Deprecated/python_mapping.pxd
-lib/python${MODPY_VERSION}/site-packages/Cython/Includes/Deprecated/python_mem.pxd
-lib/python${MODPY_VERSION}/site-packages/Cython/Includes/Deprecated/python_method.pxd
-lib/python${MODPY_VERSION}/site-packages/Cython/Includes/Deprecated/python_module.pxd
-lib/python${MODPY_VERSION}/site-packages/Cython/Includes/Deprecated/python_number.pxd
-lib/python${MODPY_VERSION}/site-packages/Cython/Includes/Deprecated/python_object.pxd
-lib/python${MODPY_VERSION}/site-packages/Cython/Includes/Deprecated/python_oldbuffer.pxd
-lib/python${MODPY_VERSION}/site-packages/Cython/Includes/Deprecated/python_pycapsule.pxd
-lib/python${MODPY_VERSION}/site-packages/Cython/Includes/Deprecated/python_ref.pxd
-lib/python${MODPY_VERSION}/site-packages/Cython/Includes/Deprecated/python_sequence.pxd
-lib/python${MODPY_VERSION}/site-packages/Cython/Includes/Deprecated/python_set.pxd
-lib/python${MODPY_VERSION}/site-packages/Cython/Includes/Deprecated/python_string.pxd
-lib/python${MODPY_VERSION}/site-packages/Cython/Includes/Deprecated/python_tuple.pxd
-lib/python${MODPY_VERSION}/site-packages/Cython/Includes/Deprecated/python_type.pxd
-lib/python${MODPY_VERSION}/site-packages/Cython/Includes/Deprecated/python_unicode.pxd
-lib/python${MODPY_VERSION}/site-packages/Cython/Includes/Deprecated/python_version.pxd
-lib/python${MODPY_VERSION}/site-packages/Cython/Includes/Deprecated/python_weakref.pxd
-lib/python${MODPY_VERSION}/site-packages/Cython/Includes/Deprecated/stdio.pxd
-lib/python${MODPY_VERSION}/site-packages/Cython/Includes/Deprecated/stdlib.pxd
-lib/python${MODPY_VERSION}/site-packages/Cython/Includes/Deprecated/stl.pxd
 lib/python${MODPY_VERSION}/site-packages/Cython/Includes/cpython/
 lib/python${MODPY_VERSION}/site-packages/Cython/Includes/cpython/__init__.pxd
 lib/python${MODPY_VERSION}/site-packages/Cython/Includes/cpython/array.pxd
@@ -332,10 +318,13 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/Cython/Includes/cpython/cobject.pxd
 lib/python${MODPY_VERSION}/site-packages/Cython/Includes/cpython/codecs.pxd
 lib/python${MODPY_VERSION}/site-packages/Cython/Includes/cpython/complex.pxd
+lib/python${MODPY_VERSION}/site-packages/Cython/Includes/cpython/contextvars.pxd
 lib/python${MODPY_VERSION}/site-packages/Cython/Includes/cpython/conversion.pxd
 lib/python${MODPY_VERSION}/site-packages/Cython/Includes/cpython/datetime.pxd
+lib/python${MODPY_VERSION}/site-packages/Cython/Includes/cpython/descr.pxd
 lib/python${MODPY_VERSION}/site-packages/Cython/Includes/cpython/dict.pxd
 lib/python${MODPY_VERSION}/site-packages/Cython/Includes/cpython/exc.pxd
+lib/python${MODPY_VERSION}/site-packages/Cython/Includes/cpython/fileobject.pxd
 lib/python${MODPY_VERSION}/site-packages/Cython/Includes/cpython/float.pxd
 lib/python${MODPY_VERSION}/site-packages/Cython/Includes/cpython/function.pxd
 lib/python${MODPY_VERSION}/site-packages/Cython/Includes/cpython/genobject.pxd
@@ -348,6 +337,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/Cython/Includes/cpython/long.pxd
 lib/python${MODPY_VERSION}/site-packages/Cython/Includes/cpython/longintrepr.pxd
 lib/python${MODPY_VERSION}/site-packages/Cython/Includes/cpython/mapping.pxd
+lib/python${MODPY_VERSION}/site-packages/Cython/Includes/cpython/marshal.pxd
 lib/python${MODPY_VERSION}/site-packages/Cython/Includes/cpython/mem.pxd
 lib/python${MODPY_VERSION}/site-packages/Cython/Includes/cpython/memoryview.pxd
 lib/python${MODPY_VERSION}/site-packages/Cython/Includes/cpython/method.pxd
@@ -357,6 +347,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/Cython/Includes/cpython/oldbuffer.pxd
 lib/python${MODPY_VERSION}/site-packages/Cython/Includes/cpython/pycapsule.pxd
 lib/python${MODPY_VERSION}/site-packages/Cython/Includes/cpython/pylifecycle.pxd
+lib/python${MODPY_VERSION}/site-packages/Cython/Includes/cpython/pyport.pxd
 lib/python${MODPY_VERSION}/site-packages/Cython/Includes/cpython/pystate.pxd
 lib/python${MODPY_VERSION}/site-packages/Cython/Includes/cpython/pythread.pxd
 lib/python${MODPY_VERSION}/site-packages/Cython/Includes/cpython/ref.pxd
@@ -364,6 +355,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/Cython/Includes/cpython/set.pxd
 lib/python${MODPY_VERSION}/site-packages/Cython/Includes/cpython/slice.pxd
 lib/python${MODPY_VERSION}/site-packages/Cython/Includes/cpython/string.pxd
+lib/python${MODPY_VERSION}/site-packages/Cython/Includes/cpython/time.pxd
 lib/python${MODPY_VERSION}/site-packages/Cython/Includes/cpython/tuple.pxd
 lib/python${MODPY_VERSION}/site-packages/Cython/Includes/cpython/type.pxd
 lib/python${MODPY_VERSION}/site-packages/Cython/Includes/cpython/unicode.pxd
@@ -371,6 +363,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/Cython/Includes/cpython/weakref.pxd
 lib/python${MODPY_VERSION}/site-packages/Cython/Includes/libc/
 lib/python${MODPY_VERSION}/site-packages/Cython/Includes/libc/__init__.pxd
+lib/python${MODPY_VERSION}/site-packages/Cython/Includes/libc/complex.pxd
 lib/python${MODPY_VERSION}/site-packages/Cython/Includes/libc/errno.pxd
 lib/python${MODPY_VERSION}/site-packages/Cython/Includes/libc/float.pxd
 lib/python${MODPY_VERSION}/site-packages/Cython/Includes/libc/limits.pxd
@@ -387,9 +380,14 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/Cython/Includes/libcpp/
 lib/python${MODPY_VERSION}/site-packages/Cython/Includes/libcpp/__init__.pxd
 lib/python${MODPY_VERSION}/site-packages/Cython/Includes/libcpp/algorithm.pxd
+lib/python${MODPY_VERSION}/site-packages/Cython/Includes/libcpp/any.pxd
+lib/python${MODPY_VERSION}/site-packages/Cython/Includes/libcpp/atomic.pxd
+lib/python${MODPY_VERSION}/site-packages/Cython/Includes/libcpp/bit.pxd
 lib/python${MODPY_VERSION}/site-packages/Cython/Includes/libcpp/cast.pxd
+lib/python${MODPY_VERSION}/site-packages/Cython/Includes/libcpp/cmath.pxd
 lib/python${MODPY_VERSION}/site-packages/Cython/Includes/libcpp/complex.pxd
 lib/python${MODPY_VERSION}/site-packages/Cython/Includes/libcpp/deque.pxd
+lib/python${MODPY_VERSION}/site-packages/Cython/Includes/libcpp/execution.pxd
 lib/python${MODPY_VERSION}/site-packages/Cython/Includes/libcpp/forward_list.pxd
 lib/python${MODPY_VERSION}/site-packages/Cython/Includes/libcpp/functional.pxd
 lib/python${MODPY_VERSION}/site-packages/Cython/Includes/libcpp/iterator.pxd
@@ -397,8 +395,12 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/Cython/Includes/libcpp/list.pxd
 lib/python${MODPY_VERSION}/site-packages/Cython/Includes/libcpp/map.pxd
 lib/python${MODPY_VERSION}/site-packages/Cython/Includes/libcpp/memory.pxd
+lib/python${MODPY_VERSION}/site-packages/Cython/Includes/libcpp/numbers.pxd
+lib/python${MODPY_VERSION}/site-packages/Cython/Includes/libcpp/numeric.pxd
+lib/python${MODPY_VERSION}/site-packages/Cython/Includes/libcpp/optional.pxd
 lib/python${MODPY_VERSION}/site-packages/Cython/Includes/libcpp/pair.pxd
 lib/python${MODPY_VERSION}/site-packages/Cython/Includes/libcpp/queue.pxd
+lib/python${MODPY_VERSION}/site-packages/Cython/Includes/libcpp/random.pxd
 lib/python${MODPY_VERSION}/site-packages/Cython/Includes/libcpp/set.pxd
 lib/python${MODPY_VERSION}/site-packages/Cython/Includes/libcpp/stack.pxd
 lib/python${MODPY_VERSION}/site-packages/Cython/Includes/libcpp/string.pxd
@@ -427,22 +429,27 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/Cython/Includes/posix/strings.pxd
 lib/python${MODPY_VERSION}/site-packages/Cython/Includes/posix/time.pxd
 lib/python${MODPY_VERSION}/site-packages/Cython/Includes/posix/types.pxd
+lib/python${MODPY_VERSION}/site-packages/Cython/Includes/posix/uio.pxd
 lib/python${MODPY_VERSION}/site-packages/Cython/Includes/posix/unistd.pxd
 lib/python${MODPY_VERSION}/site-packages/Cython/Includes/posix/wait.pxd
 lib/python${MODPY_VERSION}/site-packages/Cython/Plex/
 @so lib/python${MODPY_VERSION}/site-packages/Cython/Plex/Actions.${MODPY_PYC_MAGIC_TAG}so
 lib/python${MODPY_VERSION}/site-packages/Cython/Plex/Actions.pxd
 lib/python${MODPY_VERSION}/site-packages/Cython/Plex/Actions.py
+@so lib/python${MODPY_VERSION}/site-packages/Cython/Plex/DFA.${MODPY_PYC_MAGIC_TAG}so
+lib/python${MODPY_VERSION}/site-packages/Cython/Plex/DFA.pxd
 lib/python${MODPY_VERSION}/site-packages/Cython/Plex/DFA.py
 lib/python${MODPY_VERSION}/site-packages/Cython/Plex/Errors.py
 lib/python${MODPY_VERSION}/site-packages/Cython/Plex/Lexicons.py
+@so lib/python${MODPY_VERSION}/site-packages/Cython/Plex/Machines.${MODPY_PYC_MAGIC_TAG}so
+lib/python${MODPY_VERSION}/site-packages/Cython/Plex/Machines.pxd
 lib/python${MODPY_VERSION}/site-packages/Cython/Plex/Machines.py
 lib/python${MODPY_VERSION}/site-packages/Cython/Plex/Regexps.py
 @so lib/python${MODPY_VERSION}/site-packages/Cython/Plex/Scanners.${MODPY_PYC_MAGIC_TAG}so
 lib/python${MODPY_VERSION}/site-packages/Cython/Plex/Scanners.pxd
 lib/python${MODPY_VERSION}/site-packages/Cython/Plex/Scanners.py
-lib/python${MODPY_VERSION}/site-packages/Cython/Plex/Timing.py
-lib/python${MODPY_VERSION}/site-packages/Cython/Plex/Traditional.py
+@so lib/python${MODPY_VERSION}/site-packages/Cython/Plex/Transitions.${MODPY_PYC_MAGIC_TAG}so
+lib/python${MODPY_VERSION}/site-packages/Cython/Plex/Transitions.pxd
 lib/python${MODPY_VERSION}/site-packages/Cython/Plex/Transitions.py
 lib/python${MODPY_VERSION}/site-packages/Cython/Plex/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/Cython/Plex/${MODPY_PYCACHE}/
@@ -460,10 +467,6 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/Cython/Plex/${MODPY_PYCACHE}Regexps.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/Cython/Plex/${MODPY_PYCACHE}Scanners.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/Cython/Plex/${MODPY_PYCACHE}Scanners.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/Cython/Plex/${MODPY_PYCACHE}Timing.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/Cython/Plex/${MODPY_PYCACHE}Timing.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/Cython/Plex/${MODPY_PYCACHE}Traditional.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/Cython/Plex/${MODPY_PYCACHE}Traditional.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/Cython/Plex/${MODPY_PYCACHE}Transitions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/Cython/Plex/${MODPY_PYCACHE}Transitions.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/Cython/Plex/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -476,6 +479,7 @@ lib/python${MODPY_VERSION}/site-packages
 @so lib/python${MODPY_VERSION}/site-packages/Cython/Runtime/refnanny.${MODPY_PYC_MAGIC_TAG}so
 lib/python${MODPY_VERSION}/site-packages/Cython/Runtime/refnanny.pyx
 lib/python${MODPY_VERSION}/site-packages/Cython/Shadow.py
+@so lib/python${MODPY_VERSION}/site-packages/Cython/StringIOTree.${MODPY_PYC_MAGIC_TAG}so
 lib/python${MODPY_VERSION}/site-packages/Cython/StringIOTree.py
 lib/python${MODPY_VERSION}/site-packages/Cython/Tempita/
 lib/python${MODPY_VERSION}/site-packages/Cython/Tempita/__init__.py
@@ -497,7 +501,9 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/Cython/Tests/TestCodeWriter.py
 lib/python${MODPY_VERSION}/site-packages/Cython/Tests/TestCythonUtils.py
 lib/python${MODPY_VERSION}/site-packages/Cython/Tests/TestJediTyper.py
+lib/python${MODPY_VERSION}/site-packages/Cython/Tests/TestShadow.py
 lib/python${MODPY_VERSION}/site-packages/Cython/Tests/TestStringIOTree.py
+lib/python${MODPY_VERSION}/site-packages/Cython/Tests/TestTestUtils.py
 lib/python${MODPY_VERSION}/site-packages/Cython/Tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/Cython/Tests/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/Cython/Tests/${MODPY_PYCACHE}TestCodeWriter.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -506,8 +512,12 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/Cython/Tests/${MODPY_PYCACHE}TestCythonUtils.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/Cython/Tests/${MODPY_PYCACHE}TestJediTyper.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/Cython/Tests/${MODPY_PYCACHE}TestJediTyper.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/Cython/Tests/${MODPY_PYCACHE}TestShadow.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/Cython/Tests/${MODPY_PYCACHE}TestShadow.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/Cython/Tests/${MODPY_PYCACHE}TestStringIOTree.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/Cython/Tests/${MODPY_PYCACHE}TestStringIOTree.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/Cython/Tests/${MODPY_PYCACHE}TestTestUtils.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/Cython/Tests/${MODPY_PYCACHE}TestTestUtils.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/Cython/Tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/Cython/Tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/Cython/Tests/${MODPY_PYCACHE}xmlrunner.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -519,7 +529,6 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/Cython/Utility/Builtins.c
 lib/python${MODPY_VERSION}/site-packages/Cython/Utility/CConvert.pyx
 lib/python${MODPY_VERSION}/site-packages/Cython/Utility/CMath.c
-lib/python${MODPY_VERSION}/site-packages/Cython/Utility/Capsule.c
 lib/python${MODPY_VERSION}/site-packages/Cython/Utility/CommonStructures.c
 lib/python${MODPY_VERSION}/site-packages/Cython/Utility/Complex.c
 lib/python${MODPY_VERSION}/site-packages/Cython/Utility/Coroutine.c
@@ -527,6 +536,8 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/Cython/Utility/CppConvert.pyx
 lib/python${MODPY_VERSION}/site-packages/Cython/Utility/CppSupport.cpp
 lib/python${MODPY_VERSION}/site-packages/Cython/Utility/CythonFunction.c
+lib/python${MODPY_VERSION}/site-packages/Cython/Utility/Dataclasses.c
+lib/python${MODPY_VERSION}/site-packages/Cython/Utility/Dataclasses.py
 lib/python${MODPY_VERSION}/site-packages/Cython/Utility/Embed.c
 lib/python${MODPY_VERSION}/site-packages/Cython/Utility/Exceptions.c
 lib/python${MODPY_VERSION}/site-packages/Cython/Utility/ExtensionTypes.c
@@ -535,6 +546,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/Cython/Utility/MemoryView.pyx
 lib/python${MODPY_VERSION}/site-packages/Cython/Utility/MemoryView_C.c
 lib/python${MODPY_VERSION}/site-packages/Cython/Utility/ModuleSetupCode.c
+lib/python${MODPY_VERSION}/site-packages/Cython/Utility/NumpyImportArray.c
 lib/python${MODPY_VERSION}/site-packages/Cython/Utility/ObjectHandling.c
 lib/python${MODPY_VERSION}/site-packages/Cython/Utility/Optimize.c
 lib/python${MODPY_VERSION}/site-packages/Cython/Utility/Overflow.c
@@ -545,11 +557,16 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/Cython/Utility/TestCythonScope.pyx
 lib/python${MODPY_VERSION}/site-packages/Cython/Utility/TestUtilityLoader.c
 lib/python${MODPY_VERSION}/site-packages/Cython/Utility/TypeConversion.c
+lib/python${MODPY_VERSION}/site-packages/Cython/Utility/UFuncs.pyx
+lib/python${MODPY_VERSION}/site-packages/Cython/Utility/UFuncs_C.c
 lib/python${MODPY_VERSION}/site-packages/Cython/Utility/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/Cython/Utility/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/Cython/Utility/${MODPY_PYCACHE}Dataclasses.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/Cython/Utility/${MODPY_PYCACHE}Dataclasses.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/Cython/Utility/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/Cython/Utility/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/Cython/Utility/arrayarray.h
+@so lib/python${MODPY_VERSION}/site-packages/Cython/Utils.${MODPY_PYC_MAGIC_TAG}so
 lib/python${MODPY_VERSION}/site-packages/Cython/Utils.py
 lib/python${MODPY_VERSION}/site-packages/Cython/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/Cython/${MODPY_PYCACHE}/
@@ -578,9 +595,15 @@ lib/python${MODPY_VERSION}/site-packages
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pyximport/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/pyximport/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pyximport/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pyximport/${MODPY_PYCACHE}_pyximport2.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/pyximport/${MODPY_PYCACHE}_pyximport2.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pyximport/${MODPY_PYCACHE}_pyximport3.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/pyximport/${MODPY_PYCACHE}_pyximport3.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pyximport/${MODPY_PYCACHE}pyxbuild.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pyximport/${MODPY_PYCACHE}pyxbuild.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pyximport/${MODPY_PYCACHE}pyximport.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pyximport/${MODPY_PYCACHE}pyximport.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pyximport/_pyximport2.py
+lib/python${MODPY_VERSION}/site-packages/pyximport/_pyximport3.py
 lib/python${MODPY_VERSION}/site-packages/pyximport/pyxbuild.py
 lib/python${MODPY_VERSION}/site-packages/pyximport/pyximport.py
Index: textproc/py-yaml/Makefile
===================================================================
RCS file: /cvs/ports/textproc/py-yaml/Makefile,v
diff -u -p -r1.33 Makefile
--- textproc/py-yaml/Makefile	6 May 2024 12:24:10 -0000	1.33
+++ textproc/py-yaml/Makefile	3 Jul 2024 21:40:58 -0000
@@ -1,9 +1,12 @@
 COMMENT=	YAML parser and emitter in Python
 
-MODPY_EGG_VERSION=6.0.1
+GH_ACCOUNT=	yaml
+GH_PROJECT=	pyyaml
+GH_TAGNAME=	6.0.2rc1
+
+MODPY_EGG_VERSION=6.0.2rc1
 DISTNAME=	PyYAML-${MODPY_EGG_VERSION}
 PKGNAME=	py-yaml-${MODPY_EGG_VERSION}
-REVISION=	0
 
 CATEGORIES=	textproc
 
@@ -21,16 +24,11 @@ MODULES=	lang/python
 FLAVORS=	python3
 FLAVOR=		python3
 
-MODPY_PI=	Yes
+#MODPY_PI=	Yes
 MODPY_PYBUILD=	setuptools
 
 CFLAGS+=	-I${LOCALBASE}/include
 LIB_DEPENDS=	devel/libyaml
-BUILD_DEPENDS=	lang/cython${MODPY_FLAVOR}<3v0
-
-# https://github.com/yaml/pyyaml/issues/640
-MODPY_PYTEST=	No
-do-test:
-	cd ${WRKSRC}; ${MODPY_BIN} setup.py test
+BUILD_DEPENDS=	lang/cython${MODPY_FLAVOR}
 
 .include <bsd.port.mk>
Index: textproc/py-yaml/distinfo
===================================================================
RCS file: /cvs/ports/textproc/py-yaml/distinfo,v
diff -u -p -r1.10 distinfo
--- textproc/py-yaml/distinfo	14 Apr 2024 15:22:34 -0000	1.10
+++ textproc/py-yaml/distinfo	3 Jul 2024 21:40:58 -0000
@@ -1,2 +1,2 @@
-SHA256 (PyYAML-6.0.1.tar.gz) = v99GCxc2x3Xyup9qkryjC8IJUGe4qdd4dtH61sw7SkM=
-SIZE (PyYAML-6.0.1.tar.gz) = 125201
+SHA256 (PyYAML-6.0.2rc1.tar.gz) = CsMIRrklrWTB3y/00mgyd/I/3owkgghJZzWyYyuUa3s=
+SIZE (PyYAML-6.0.2rc1.tar.gz) = 123879
Index: net/py-msgpack/Makefile
===================================================================
RCS file: /cvs/ports/net/py-msgpack/Makefile,v
diff -u -p -r1.38 Makefile
--- net/py-msgpack/Makefile	6 May 2024 12:23:47 -0000	1.38
+++ net/py-msgpack/Makefile	3 Jul 2024 21:40:58 -0000
@@ -1,10 +1,9 @@
 COMMENT =		messagepack (de)serializer
 
-MODPY_EGG_VERSION =	1.0.5
+MODPY_EGG_VERSION =	1.0.8
 EPOCH =			0
 DISTNAME =		msgpack-${MODPY_EGG_VERSION}
 PKGNAME =		py-msgpack-${MODPY_EGG_VERSION}
-REVISION =		0
 
 CATEGORIES =		net textproc
 
Index: net/py-msgpack/distinfo
===================================================================
RCS file: /cvs/ports/net/py-msgpack/distinfo,v
diff -u -p -r1.14 distinfo
--- net/py-msgpack/distinfo	15 Jun 2023 11:27:58 -0000	1.14
+++ net/py-msgpack/distinfo	3 Jul 2024 21:40:58 -0000
@@ -1,2 +1,2 @@
-SHA256 (msgpack-1.0.5.tar.gz) = wHVUQoTq3Fzdxw9HVzMdmdy8FrK71ISdFfiq5M820xw=
-SIZE (msgpack-1.0.5.tar.gz) = 127834
+SHA256 (msgpack-1.0.8.tar.gz) = lcArDifnBuSNDlQm0XEMp44PBijW6J1bWluRpfEidPM=
+SIZE (msgpack-1.0.8.tar.gz) = 167014
Index: geo/py-fiona/Makefile
===================================================================
RCS file: /cvs/ports/geo/py-fiona/Makefile,v
diff -u -p -r1.35 Makefile
--- geo/py-fiona/Makefile	6 May 2024 12:23:34 -0000	1.35
+++ geo/py-fiona/Makefile	3 Jul 2024 21:40:58 -0000
@@ -1,9 +1,8 @@
 COMMENT =	high-level API and CLI on top of OGR
 
-MODPY_EGG_VERSION =	1.9.4.post1
-DISTNAME =	Fiona-${MODPY_EGG_VERSION}
+MODPY_EGG_VERSION =	1.9.6
+DISTNAME =	fiona-${MODPY_EGG_VERSION}
 PKGNAME =	${MODPY_PY_PREFIX}${DISTNAME:L:S/.post/pl/}
-REVISION =	0
 
 CATEGORIES =	geo
 
@@ -36,8 +35,7 @@ RUN_DEPENDS =	geo/py-cligj${MODPY_FLAVOR
 		devel/py-munch${MODPY_FLAVOR} \
 		devel/py-six${MODPY_FLAVOR}
 
-TEST_DEPENDS =	devel/py-nose${MODPY_FLAVOR} \
-		devel/py-tz${MODPY_FLAVOR} \
+TEST_DEPENDS =	devel/py-tz${MODPY_FLAVOR} \
 		net/py-boto3${MODPY_FLAVOR}
 
 WANTLIB += ${COMPILER_LIBCXX} gdal m
Index: geo/py-fiona/distinfo
===================================================================
RCS file: /cvs/ports/geo/py-fiona/distinfo,v
diff -u -p -r1.14 distinfo
--- geo/py-fiona/distinfo	28 Jul 2023 12:34:00 -0000	1.14
+++ geo/py-fiona/distinfo	3 Jul 2024 21:40:58 -0000
@@ -1,2 +1,2 @@
-SHA256 (Fiona-1.9.4.post1.tar.gz) = VnnT9+DVEwNety5ZUnu5BIaFmvRAV1XfxzkThjMQYSA=
-SIZE (Fiona-1.9.4.post1.tar.gz) = 924293
+SHA256 (fiona-1.9.6.tar.gz) = eRs0lPiyGMBupW+JK9a6iT36I1JTR3YdBm+3c4rNo7E=
+SIZE (fiona-1.9.6.tar.gz) = 411019
Index: geo/py-fiona/pkg/PLIST
===================================================================
RCS file: /cvs/ports/geo/py-fiona/pkg/PLIST,v
diff -u -p -r1.11 PLIST
--- geo/py-fiona/pkg/PLIST	28 Jul 2023 12:34:00 -0000	1.11
+++ geo/py-fiona/pkg/PLIST	3 Jul 2024 21:40:58 -0000
@@ -2,14 +2,14 @@
 @conflict py-fiona-*
 @pkgpath geo/py-fiona
 bin/fio
-lib/python${MODPY_VERSION}/site-packages/Fiona-${MODPY_EGG_VERSION}.dist-info/
-lib/python${MODPY_VERSION}/site-packages/Fiona-${MODPY_EGG_VERSION}.dist-info/LICENSE.txt
-lib/python${MODPY_VERSION}/site-packages/Fiona-${MODPY_EGG_VERSION}.dist-info/METADATA
-lib/python${MODPY_VERSION}/site-packages/Fiona-${MODPY_EGG_VERSION}.dist-info/RECORD
-lib/python${MODPY_VERSION}/site-packages/Fiona-${MODPY_EGG_VERSION}.dist-info/WHEEL
-lib/python${MODPY_VERSION}/site-packages/Fiona-${MODPY_EGG_VERSION}.dist-info/entry_points.txt
-lib/python${MODPY_VERSION}/site-packages/Fiona-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/fiona/
+lib/python${MODPY_VERSION}/site-packages/fiona-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/fiona-${MODPY_EGG_VERSION}.dist-info/LICENSE.txt
+lib/python${MODPY_VERSION}/site-packages/fiona-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/fiona-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/fiona-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/fiona-${MODPY_EGG_VERSION}.dist-info/entry_points.txt
+lib/python${MODPY_VERSION}/site-packages/fiona-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/fiona/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/fiona/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/fiona/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -58,14 +58,9 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/fiona/_err.pxd
 @so lib/python${MODPY_VERSION}/site-packages/fiona/_geometry.${MODPY_PYC_MAGIC_TAG}so
 lib/python${MODPY_VERSION}/site-packages/fiona/_geometry.pxd
-lib/python${MODPY_VERSION}/site-packages/fiona/_shim.pxd
 lib/python${MODPY_VERSION}/site-packages/fiona/_show_versions.py
 @so lib/python${MODPY_VERSION}/site-packages/fiona/_transform.${MODPY_PYC_MAGIC_TAG}so
 lib/python${MODPY_VERSION}/site-packages/fiona/_vendor/
-lib/python${MODPY_VERSION}/site-packages/fiona/_vendor/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/fiona/_vendor/${MODPY_PYCACHE}/
-lib/python${MODPY_VERSION}/site-packages/fiona/_vendor/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/fiona/_vendor/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/fiona/_vendor/munch/
 lib/python${MODPY_VERSION}/site-packages/fiona/_vendor/munch/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/fiona/_vendor/munch/${MODPY_PYCACHE}/
@@ -136,7 +131,6 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/fiona/fio/main.py
 lib/python${MODPY_VERSION}/site-packages/fiona/fio/options.py
 lib/python${MODPY_VERSION}/site-packages/fiona/fio/rm.py
-lib/python${MODPY_VERSION}/site-packages/fiona/gdal.pxd
 lib/python${MODPY_VERSION}/site-packages/fiona/gdal.pxi
 lib/python${MODPY_VERSION}/site-packages/fiona/inspector.py
 lib/python${MODPY_VERSION}/site-packages/fiona/io.py
Index: geo/py-proj/Makefile
===================================================================
RCS file: /cvs/ports/geo/py-proj/Makefile,v
diff -u -p -r1.38 Makefile
--- geo/py-proj/Makefile	6 May 2024 12:23:34 -0000	1.38
+++ geo/py-proj/Makefile	3 Jul 2024 21:40:58 -0000
@@ -1,9 +1,8 @@
 COMMENT =		Pyrex generated python interface to PROJ.4 library
 
-MODPY_EGG_VERSION =	3.6.0
+MODPY_EGG_VERSION =	3.6.1
 DISTNAME =		pyproj-${MODPY_EGG_VERSION}
 PKGNAME =		${DISTNAME:S/py/py-/:S/.post/pl/}
-REVISION =		0
 
 CATEGORIES =		geo
 
Index: geo/py-proj/distinfo
===================================================================
RCS file: /cvs/ports/geo/py-proj/distinfo,v
diff -u -p -r1.17 distinfo
--- geo/py-proj/distinfo	5 Mar 2024 12:10:06 -0000	1.17
+++ geo/py-proj/distinfo	3 Jul 2024 21:40:58 -0000
@@ -1,2 +1,2 @@
-SHA256 (pyproj-3.6.0.tar.gz) = pbERhls/D4t3s5g/L75N1iSPwJ03MClZSZd8jc2YgGI=
-SIZE (pyproj-3.6.0.tar.gz) = 224432
+SHA256 (pyproj-3.6.1.tar.gz) = RKp8cEwrfY+z1IO791r2yyNQ0wpjsUQnmgm3X+rVAb8=
+SIZE (pyproj-3.6.1.tar.gz) = 225131
Index: geo/py-rasterio/Makefile
===================================================================
RCS file: /cvs/ports/geo/py-rasterio/Makefile,v
diff -u -p -r1.30 Makefile
--- geo/py-rasterio/Makefile	6 May 2024 12:23:34 -0000	1.30
+++ geo/py-rasterio/Makefile	3 Jul 2024 21:40:58 -0000
@@ -1,9 +1,8 @@
 COMMENT =	geospatial raster data API and CLI
 
-MODPY_EGG_VERSION =	1.3.2
+MODPY_EGG_VERSION =	1.3.9
 DISTNAME =	rasterio-${MODPY_EGG_VERSION}
 PKGNAME =	py-${DISTNAME}
-REVISION =	2
 
 CATEGORIES =	geo
 
Index: geo/py-rasterio/distinfo
===================================================================
RCS file: /cvs/ports/geo/py-rasterio/distinfo,v
diff -u -p -r1.16 distinfo
--- geo/py-rasterio/distinfo	14 Oct 2022 10:36:52 -0000	1.16
+++ geo/py-rasterio/distinfo	3 Jul 2024 21:40:58 -0000
@@ -1,2 +1,2 @@
-SHA256 (rasterio-1.3.2.tar.gz) = qRsy9km8WqMlmQk0kljreZm36DA3X2PNN63iCCBm7Bw=
-SIZE (rasterio-1.3.2.tar.gz) = 404915
+SHA256 (rasterio-1.3.9.tar.gz) = /G0NKQSS+hpQaHEc/rshzJNpaIkbftnaBpDIpziIhcU=
+SIZE (rasterio-1.3.9.tar.gz) = 411741
Index: geo/py-rasterio/pkg/PLIST
===================================================================
RCS file: /cvs/ports/geo/py-rasterio/pkg/PLIST,v
diff -u -p -r1.9 PLIST
--- geo/py-rasterio/pkg/PLIST	25 Nov 2022 21:11:35 -0000	1.9
+++ geo/py-rasterio/pkg/PLIST	3 Jul 2024 21:40:58 -0000
@@ -14,8 +14,6 @@ lib/python${MODPY_VERSION}/site-packages
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/rasterio/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/rasterio/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/rasterio/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/rasterio/${MODPY_PYCACHE}_loading.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/rasterio/${MODPY_PYCACHE}_loading.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/rasterio/${MODPY_PYCACHE}_path.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/rasterio/${MODPY_PYCACHE}_path.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/rasterio/${MODPY_PYCACHE}_show_versions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -74,7 +72,6 @@ lib/python${MODPY_VERSION}/site-packages
 @so lib/python${MODPY_VERSION}/site-packages/rasterio/_filepath.${MODPY_PYC_MAGIC_TAG}so
 @so lib/python${MODPY_VERSION}/site-packages/rasterio/_fill.${MODPY_PYC_MAGIC_TAG}so
 @so lib/python${MODPY_VERSION}/site-packages/rasterio/_io.${MODPY_PYC_MAGIC_TAG}so
-lib/python${MODPY_VERSION}/site-packages/rasterio/_loading.py
 lib/python${MODPY_VERSION}/site-packages/rasterio/_path.py
 lib/python${MODPY_VERSION}/site-packages/rasterio/_show_versions.py
 @so lib/python${MODPY_VERSION}/site-packages/rasterio/_transform.${MODPY_PYC_MAGIC_TAG}so
Index: games/pygame_sdl2/Makefile
===================================================================
RCS file: /cvs/ports/games/pygame_sdl2/Makefile,v
diff -u -p -r1.6 Makefile
--- games/pygame_sdl2/Makefile	11 Mar 2022 19:04:50 -0000	1.6
+++ games/pygame_sdl2/Makefile	3 Jul 2024 21:40:58 -0000
@@ -1,3 +1,5 @@
+BROKEN =	needs update for cython 3.x - current upstream version works with py 3.x
+
 # Keep in sync with games/renpy!!!
 V =		7.3.5.606
 COMMENT =	Ren'Py fork of pygame
@@ -17,6 +19,11 @@ PERMIT_PACKAGE =	Yes
 # Not yet. We need to wait for Ren'Py to make the switch.
 #FLAVORS =	python3
 #FLAVOR ?=
+
+# N.B. there's no py- prefix for this port; suggest normalising by using
+# PKGNAME=py-pygame_sdl2-${V} when switching to python 3, the python module
+# will take care of changing this to py3-pygame_sdl2. The move will need
+# a "quirks rename" (pygame_sdl2 -> py3-pygame_sdl2) and @pkgpath marker. -sthen
 
 WANTLIB += SDL2 SDL2_image SDL2_mixer SDL2_ttf jpeg png pthread
 WANTLIB += ${MODPY_WANTLIB}
Index: games/renpy/Makefile
===================================================================
RCS file: /cvs/ports/games/renpy/Makefile,v
diff -u -p -r1.21 Makefile
--- games/renpy/Makefile	26 Sep 2023 09:41:40 -0000	1.21
+++ games/renpy/Makefile	3 Jul 2024 21:40:58 -0000
@@ -1,3 +1,5 @@
+BROKEN =		needs update for cython 3.x - current upstream version works with py 3.x
+
 COMMENT =		visual novel engine
 
 V =			7.3.5
Index: math/mlpack/Makefile
===================================================================
RCS file: /cvs/ports/math/mlpack/Makefile,v
diff -u -p -r1.29 Makefile
--- math/mlpack/Makefile	6 May 2024 12:23:45 -0000	1.29
+++ math/mlpack/Makefile	3 Jul 2024 21:40:58 -0000
@@ -1,3 +1,5 @@
+BROKEN =	needs adjusting for cython 3
+
 BROKEN-arm =	llvm out of memory
 BROKEN-powerpc = virtual memory exhausted, even with -O1
 BROKEN-sparc64 = Exhausts virtual memory
Index: math/py-h5py/Makefile
===================================================================
RCS file: /cvs/ports/math/py-h5py/Makefile,v
diff -u -p -r1.19 Makefile
--- math/py-h5py/Makefile	6 May 2024 12:23:45 -0000	1.19
+++ math/py-h5py/Makefile	3 Jul 2024 21:40:58 -0000
@@ -1,3 +1,5 @@
+BROKEN =	needs adjusting for cython 3
+
 COMMENT =	pythonic interface to the HDF5 binary data format
 
 MODPY_EGG_VERSION =	3.10.0
Index: math/py-pandas/Makefile
===================================================================
RCS file: /cvs/ports/math/py-pandas/Makefile,v
diff -u -p -r1.31 Makefile
--- math/py-pandas/Makefile	3 Jul 2024 21:26:45 -0000	1.31
+++ math/py-pandas/Makefile	3 Jul 2024 21:40:58 -0000
@@ -1,3 +1,5 @@
+BROKEN =	needs adjusting for cython 3
+
 COMMENT =		data analysis and manipulation library
 
 MODPY_EGG_VERSION =	1.5.3
Index: math/py-scikit-image/Makefile
===================================================================
RCS file: /cvs/ports/math/py-scikit-image/Makefile,v
diff -u -p -r1.12 Makefile
--- math/py-scikit-image/Makefile	6 May 2024 12:23:45 -0000	1.12
+++ math/py-scikit-image/Makefile	3 Jul 2024 21:40:58 -0000
@@ -1,3 +1,5 @@
+BROKEN =	needs adjusting for cython 3
+
 COMMENT =		image processing routines for SciPy
 
 MODPY_EGG_VERSION =	0.19.3
Index: math/py-scipy/Makefile
===================================================================
RCS file: /cvs/ports/math/py-scipy/Makefile,v
diff -u -p -r1.59 Makefile
--- math/py-scipy/Makefile	29 May 2024 10:36:06 -0000	1.59
+++ math/py-scipy/Makefile	3 Jul 2024 21:40:58 -0000
@@ -1,3 +1,5 @@
+BROKEN =	needs adjusting for cython 3
+
 COMMENT=		maths, science and engineering modules for Python
 
 MODPY_EGG_VERSION=	1.10.1