# HG changeset patch
# User Franz Glasner <f.glasner@feldmann-mg.com>
# Date 1664894060 -7200
# Node ID 27f6cd24b808795e6b5930627bfbb3e0430b7902
# Parent  246c2f3282318fee161d3ea76d63932d3d78f84a
More centralized Python version management

diff -r 246c2f328231 -r 27f6cd24b808 Makefile
--- a/Makefile	Tue Oct 04 09:45:03 2022 +0200
+++ b/Makefile	Tue Oct 04 16:34:20 2022 +0200
@@ -3,7 +3,7 @@
 PORTNAME?=	pypy
 CATEGORIES=	lang python
 MASTER_SITES=	https://downloads.python.org/pypy/
-DISTNAME?=	${PORTNAME}2.7-v${DISTVERSION}-src
+DISTNAME?=	${PYTHON_IMPL_MINOR}-v${DISTVERSION}-src
 
 MAINTAINER=	python@FreeBSD.org
 COMMENT=	Fast, compliant implementation of the Python language
diff -r 246c2f328231 -r 27f6cd24b808 bsd.pypy.mk
--- a/bsd.pypy.mk	Tue Oct 04 09:45:03 2022 +0200
+++ b/bsd.pypy.mk	Tue Oct 04 16:34:20 2022 +0200
@@ -13,12 +13,17 @@
 
 .if ${PYTHON_IMPL} == pypy
 DISTVERSION=	7.3.9
+PY_VERSION_SHORT=	2.7
 PYPY_CFFI_VER=	${PYTHON_IMPL}-73
 .else # ${PYTHON_IMPL} == pypy3
 DISTVERSION=	7.3.9
-PYPY_CFFI_VER=	${PYTHON_IMPL}8-pp${DISTVERSION:S|.||:C|\..*||}-${OPSYS:tl}${OSREL:C|\..*||}
-PYTHON_IMPL_MINOR=	${PYTHON_IMPL}.8
+PY_VERSION_SHORT=	3.8
+PYPY_CFFI_VER=	${PYTHON_IMPL_NODOT}-pp${DISTVERSION:S|.||:C|\..*||}-${OPSYS:tl}${OSREL:C|\..*||}
 PLIST_SUB+=	PYTHON_IMPL_MINOR=${PYTHON_IMPL_MINOR}
 .endif
 
+PY_VERSION_NODOT=       ${PY_VERSION_SHORT:S/.//}
+PYTHON_IMPL_MINOR=	pypy${PY_VERSION_SHORT}
+PYTHON_IMPL_NODOT=	pypy${PY_VERSION_NODOT}
+
 .include <bsd.port.pre.mk>