--- a/lang/pypy2/Makefile.cffi.inc	Mon Jan 15 00:06:31 2024 +0100
+++ b/lang/pypy2/Makefile.cffi.inc	Mon Jan 15 09:12:00 2024 +0100
@@ -1,54 +1,40 @@
-# NOTE: Also includes bsd.pypy.mk and (indirectly) bsd.port.pre.mk
+# -*- mode: makefile -*-
+# NOTE: Also includes bsd.port.pre.mk
 
-PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+PKGNAMEPREFIX=	${FLAVOR}-
 DISTFILES=
 
-BUILD_DEPENDS+=	${PYTHON_IMPL}:lang/${PYTHON_IMPL}
-RUN_DEPENDS+=	${PYTHON_IMPL}:lang/${PYTHON_IMPL}
+.if !defined(LICENSE)
+LICENSE=	MIT PSFL
+LICENSE_COMB=	multi
+.endif
+
+PYPY_DEFAULT_DISTVERSION?=	7.3.14
+
+BUILD_DEPENDS+=	${PYPY_PYTHON_IMPL}:lang/${FLAVOR}
+RUN_DEPENDS+=	${PYPY_PYTHON_IMPL}:lang/${FLAVOR}
 
 CFFI_MODULE?=	_${PORTNAME}
 
-FLAVORS=	pypy pypy3
-FLAVOR?=	${FLAVORS:[1]}
+FLAVORS=	pypy2
+FLAVOR=		${FLAVORS:[1]}
 
-PYTHON_IMPL=	${FLAVOR}
-PYTHON_PORTVERSION=	${DISTVERSION}
-PYTHON_PKGNAMEPREFIX=	${PYTHON_IMPL}-
-PYTHON_CMD=	${LOCALBASE}/bin/${PYTHON_IMPL}
-
-.include "${.CURDIR}/../../lang/pypy/bsd.pypy.mk"
+PYPY_PYTHON_IMPL=	pypy2.7
+PYPY_PORTVERSION=	${DISTVERSION}
+PYPY_CMD=	${LOCALBASE}/bin/${PYPY_PYTHON_IMPL}
 
-#
-# Check that this port's build selected option FORPYIMPL39 or FORPYIMPL310
-# is compatible to the corresponding build option of the installed pypy3.
-#
-.if ${FLAVOR} == pypy3 && exists(${LOCALBASE}/bin/pypy3)
-_PYPY_SC_PLATSTDLIB=	${:!${LOCALBASE}/bin/pypy3 -c 'import sysconfig; print(sysconfig.get_path("platstdlib"))'!}
-.  if ${_PYPY_SC_PLATSTDLIB:T} != ${PYTHON_IMPL_MINOR}
-IGNORE=		Port option mismatch: must match FORPYIMPLxx of the installed lang/pypy3
-.  endif
-.endif
+PYPY_DIR=	pypy-${DISTVERSION:C|([0-9]+)\.([0-9]+).*|\1.\2|}
+PYPY_CFFI_VER=	pypy-73
 
-.if ${FLAVOR} == pypy
-PLIST_FILES=	${PYPY_DIR}/lib_pypy/${CFFI_MODULE}_cffi.${PYPY_CFFI_VER}.so
-.else  # pypy3
-PLIST_FILES=	${PYPY_DIR}/lib/${PYTHON_IMPL_MINOR}/${CFFI_MODULE}_cffi.${PYPY_CFFI_VER}.so
-.endif
+PLIST_FILES+=	${PYPY_DIR}/lib_pypy/${CFFI_MODULE}_cffi.${PYPY_CFFI_VER}.so
+
+.include <bsd.port.pre.mk>
 
 do-build:
-.if ${FLAVOR} == pypy
 	${CP} ${LOCALBASE}/${PYPY_DIR}/lib_pypy/${CFFI_MODULE}_build.py ${WRKDIR}/${PORTNAME}.py
-.else     # newer pypy3
-	${CP} ${LOCALBASE}/${PYPY_DIR}/lib/${PYTHON_IMPL_MINOR}/${CFFI_MODULE}_build.py ${WRKDIR}/${PORTNAME}.py
-.endif
 	(cd ${WRKDIR}; \
-		${PYTHON_CMD} -c "from ${PORTNAME} import ${CFFI_NAME} as ffi; ffi.compile('${WRKDIR}');")
+		${PYPY_CMD} -c "from ${PORTNAME} import ${FFI_MODULE_NAME} as ffi; ffi.compile('${WRKDIR}');")
 
 do-install:
-.if ${FLAVOR} == pypy
 	${MKDIR} ${STAGEDIR}${PREFIX}/${PYPY_DIR}/lib_pypy/`dirname ${CFFI_MODULE}`/
 	${INSTALL_LIB} ${WRKDIR}/${CFFI_MODULE}_cffi.${PYPY_CFFI_VER}.so ${STAGEDIR}${PREFIX}/${PYPY_DIR}/lib_pypy/`dirname ${CFFI_MODULE}`/
-.else  # newer pypy3
-	${MKDIR} ${STAGEDIR}${PREFIX}/${PYPY_DIR}/lib/${PYTHON_IMPL_MINOR}/`dirname ${CFFI_MODULE}`/
-	${INSTALL_LIB} ${WRKDIR}/${CFFI_MODULE}_cffi.${PYPY_CFFI_VER}.so ${STAGEDIR}${PREFIX}/${PYPY_DIR}/lib/${PYTHON_IMPL_MINOR}/`dirname ${CFFI_MODULE}`/
-.endif