diff --git a/math/py-cypari2/Makefile b/math/py-cypari2/Makefile
index 7e41abe4b0b8..215c1fdc9623 100644
--- a/math/py-cypari2/Makefile
+++ b/math/py-cypari2/Makefile
@@ -1,36 +1,38 @@
 PORTNAME=	cypari2
-PORTVERSION=	2.1.5
-PORTREVISION=	1
+PORTVERSION=	2.2.1
 CATEGORIES=	math python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Python interface to the number theory library PARI/GP
 WWW=		https://github.com/sagemath/cypari2
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cysignals>0:devel/py-cysignals@${PY_FLAVOR}
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cython3>0:lang/cython3@${PY_FLAVOR}	\
+		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}	\
+		${PYTHON_PKGNAMEPREFIX}cysignals>0:devel/py-cysignals@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR}
 LIB_DEPENDS=	libgmp.so:math/gmp	\
 		libpari.so:math/pari
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cysignals>0:devel/py-cysignals@${PY_FLAVOR}
 TEST_DEPENDS=	py.test:devel/py-pytest@${PY_FLAVOR}	\
 		${PYTHON_PKGNAMEPREFIX}flaky>=3.8.1:devel/py-flaky@${PY_FLAVOR}
 
 #USE_GITHUB=	yes
 #GH_ACCOUNT=	sagemath
 
 USES=		compiler:c11 python
-USE_PYTHON=	cython distutils
+USE_PYTHON=	pep517
 
 .if !defined(WITH_DEBUG)
 LDFLAGS+=	-s
 .endif
 
 PLIST_SUB+=	VER=${DISTVERSION}
 
 do-test: install
 	(cd ${WRKSRC} && py.test)
 
 .include <bsd.port.mk>
diff --git a/math/py-cypari2/distinfo b/math/py-cypari2/distinfo
index d0973b8bc918..462a75a19fe4 100644
--- a/math/py-cypari2/distinfo
+++ b/math/py-cypari2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1714919603
-SHA256 (cypari2-2.1.5.tar.gz) = 1a25865c34f20b1dc95830798e34ab6436e278b8e0c80dc7bf0ab34c5db03ab8
-SIZE (cypari2-2.1.5.tar.gz) = 127119
+TIMESTAMP = 1737838943
+SHA256 (cypari2-2.2.1.tar.gz) = aaa017a6a280581902f73cf5ce1695712b6598a032be14cfab81f97c475f83b8
+SIZE (cypari2-2.2.1.tar.gz) = 127323
diff --git a/math/py-cypari2/files/patch-setup.py b/math/py-cypari2/files/patch-setup.py
deleted file mode 100644
index b7461a85af6a..000000000000
--- a/math/py-cypari2/files/patch-setup.py
+++ /dev/null
@@ -1,10 +0,0 @@
---- setup.py.orig	2024-03-24 18:42:39 UTC
-+++ setup.py
-@@ -36,7 +36,6 @@ class build_ext(_build_ext):
-             "binding": True,
-             "cdivision": True,
-             "language_level": 2,
--            "legacy_implicit_noexcept": True,
-             "c_api_binop_methods": True,
-         }
- 
diff --git a/math/py-cypari2/pkg-descr b/math/py-cypari2/pkg-descr
index 5b4957f64c38..f8b9d1c9f59a 100644
--- a/math/py-cypari2/pkg-descr
+++ b/math/py-cypari2/pkg-descr
@@ -1 +1,3 @@
 A Python interface to the number theory library PARI/GP.
+
+The interface as been kept as close as possible from PARI/GP.
diff --git a/math/py-cypari2/pkg-plist b/math/py-cypari2/pkg-plist
index 6610e3a4f72c..1b4c67db9b58 100644
--- a/math/py-cypari2/pkg-plist
+++ b/math/py-cypari2/pkg-plist
@@ -1,31 +1,38 @@
+%%PYTHON_SITELIBDIR%%/cypari2-%%VER%%.dist-info/LICENSE
+%%PYTHON_SITELIBDIR%%/cypari2-%%VER%%.dist-info/METADATA
+%%PYTHON_SITELIBDIR%%/cypari2-%%VER%%.dist-info/RECORD
+%%PYTHON_SITELIBDIR%%/cypari2-%%VER%%.dist-info/WHEEL
+%%PYTHON_SITELIBDIR%%/cypari2-%%VER%%.dist-info/top_level.txt
 %%PYTHON_SITELIBDIR%%/cypari2/__init__.py
 %%PYTHON_SITELIBDIR%%/cypari2/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/cypari2/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/cypari2/auto_paridecl.pxd
 %%PYTHON_SITELIBDIR%%/cypari2/closure%%PYTHON_EXT_SUFFIX%%.so
 %%PYTHON_SITELIBDIR%%/cypari2/closure.pxd
 %%PYTHON_SITELIBDIR%%/cypari2/closure.pyx
 %%PYTHON_SITELIBDIR%%/cypari2/convert%%PYTHON_EXT_SUFFIX%%.so
 %%PYTHON_SITELIBDIR%%/cypari2/convert.pxd
 %%PYTHON_SITELIBDIR%%/cypari2/convert.pyx
+%%PYTHON_SITELIBDIR%%/cypari2/custom_block%%PYTHON_EXT_SUFFIX%%.so
+%%PYTHON_SITELIBDIR%%/cypari2/custom_block.pyx
 %%PYTHON_SITELIBDIR%%/cypari2/cypari.h
 %%PYTHON_SITELIBDIR%%/cypari2/gen%%PYTHON_EXT_SUFFIX%%.so
 %%PYTHON_SITELIBDIR%%/cypari2/gen.pxd
 %%PYTHON_SITELIBDIR%%/cypari2/gen.pyx
 %%PYTHON_SITELIBDIR%%/cypari2/handle_error%%PYTHON_EXT_SUFFIX%%.so
 %%PYTHON_SITELIBDIR%%/cypari2/handle_error.pxd
 %%PYTHON_SITELIBDIR%%/cypari2/handle_error.pyx
 %%PYTHON_SITELIBDIR%%/cypari2/pari_instance%%PYTHON_EXT_SUFFIX%%.so
 %%PYTHON_SITELIBDIR%%/cypari2/pari_instance.pxd
 %%PYTHON_SITELIBDIR%%/cypari2/pari_instance.pyx
 %%PYTHON_SITELIBDIR%%/cypari2/paridecl.pxd
 %%PYTHON_SITELIBDIR%%/cypari2/paripriv.pxd
 %%PYTHON_SITELIBDIR%%/cypari2/pycore_long.h
 %%PYTHON_SITELIBDIR%%/cypari2/pycore_long.pxd
 %%PYTHON_SITELIBDIR%%/cypari2/stack%%PYTHON_EXT_SUFFIX%%.so
 %%PYTHON_SITELIBDIR%%/cypari2/stack.pxd
 %%PYTHON_SITELIBDIR%%/cypari2/stack.pyx
 %%PYTHON_SITELIBDIR%%/cypari2/string_utils%%PYTHON_EXT_SUFFIX%%.so
 %%PYTHON_SITELIBDIR%%/cypari2/string_utils.pxd
 %%PYTHON_SITELIBDIR%%/cypari2/string_utils.pyx
 %%PYTHON_SITELIBDIR%%/cypari2/types.pxd