--- a/uwsginl-plugin-lang-pypy3/Makefile	Wed Jan 17 00:14:07 2024 +0100
+++ b/uwsginl-plugin-lang-pypy3/Makefile	Wed Jan 17 01:09:07 2024 +0100
@@ -2,7 +2,7 @@
 
 PORTNAME=	${UWSGI_NAME}-plugin-lang-pypy3
 #DISTVERSION=	2.0.20
-PORTVERSION=	2.1.pl6.g${MYGH_TAG_DATE}
+PORTVERSION=	2.1.pl7.g${MYGH_TAG_DATE}
 CATEGORIES=	www python
 # Use GitHub id for now (before official 2.1); see below
 #MASTER_SITES=	https://projects.unbit.it/downloads/
@@ -18,15 +18,15 @@
 LICENSE_FILE=	${WRKSRC}/LICENSE
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-FLAVORS=	pypy3 pypy38 pypy39
-FLAVOR?=	${FLAVORS:[1]}
+FLAVORS=	pypy3 pypy39 pypy310
+FLAVOR?=	pypy310
 
 PKGNAMEPREFIX=	${FLAVOR}-
 
 BUILD_DEPENDS+=	${UWSGI_NAME}==${PORTVERSION}:www/uwsginl
-BUILD_DEPENDS+=	pypy3>=6:lang/pypy3
+BUILD_DEPENDS+=	${PYPY_PACKAGE}>=7:lang/${PYPY_PACKAGE}
 RUN_DEPENDS+=	${UWSGI_NAME}==${PORTVERSION}:www/uwsginl
-RUN_DEPENDS+=	pypy3>=6:lang/pypy3
+RUN_DEPENDS+=	${PYPY_PACKAGE}>=7:lang/${PYPY_PACKAGE}
 
 USES=		cpe gettext-runtime pkgconfig
 CPE_VENDOR=	unbit
@@ -39,16 +39,22 @@
 
 .if ${FLAVOR} == pypy3
 PLUGIN_NAME=	pypy3
-PYPY_LDLIBRARY=	libpypy3-c.so
-PYPY_LIBDIR=	lib_pypy
-.elif ${FLAVOR} == pypy38
-PLUGIN_NAME=	pypy3
-PYPY_LDLIBRARY=	libpypy3-c.so
-PYPY_LIBDIR=	lib/pypy3.8
+PYPY_PACKAGE=	pypy310
+PYPY_EXECUTABLE=	pypy3.10
+PYPY_LDLIBRARY=	libpypy3.10-c.so
+PYPY_LIBDIR=	lib/pypy3.10
 .elif ${FLAVOR} == pypy39
 PLUGIN_NAME=	pypy39
+PYPY_PACKAGE=	pypy39
+PYPY_EXECUTABLE=	pypy3.9
 PYPY_LDLIBRARY=	libpypy3.9-c.so
 PYPY_LIBDIR=	lib/pypy3.9
+.elif ${FLAVOR} == pypy310
+PLUGIN_NAME=	pypy310
+PYPY_PACKAGE=	pypy310
+PYPY_EXECUTABLE=	pypy3.10
+PYPY_LDLIBRARY=	libpypy3.10-c.so
+PYPY_LIBDIR=	lib/pypy3.10
 .endif
 
 CFLAGS+=	-DPYPY_LDLIBRARY="${PYPY_LDLIBRARY}" -DPYPY_LIBDIR="${PYPY_LIBDIR}" -DPYPY_PLUGIN_NAME="${PLUGIN_NAME}"