changeset 206:7f8d6a19c404

Rename port options regarding translation: they now have all a TRANS_ prefix. This is to remove possible clashes with other PYTHON-related port options and variables.
author Franz Glasner <fzglas.hg@dom66.de>
date Fri, 14 Mar 2025 01:16:50 +0100
parents 31261c452c90
children fccf5077df78
files lang/pypy2/Makefile lang/pypy310/Makefile lang/pypy311/Makefile
diffstat 3 files changed, 55 insertions(+), 55 deletions(-) [+]
line wrap: on
line diff
--- a/lang/pypy2/Makefile	Thu Mar 13 21:06:09 2025 +0100
+++ b/lang/pypy2/Makefile	Fri Mar 14 01:16:50 2025 +0100
@@ -30,24 +30,24 @@
 USES=		compiler:c11 gettext-runtime gmake shebangfix ssl tar:bzip2
 USE_LDCONFIG=	${PREFIX}/${PYPY_DIR}/bin
 
-OPTIONS_DEFINE=	BYTECOMPILE
-OPTIONS_DEFAULT=	BYTECOMPILE PYTHON
-OPTIONS_SINGLE=	TRANS
-OPTIONS_SINGLE_TRANS=	PYTHON PYPY PYPY_MINMEM
-OPTIONS_SUB=	yes
+OPTIONS_DEFINE=		BYTECOMPILE
+OPTIONS_DEFAULT=	BYTECOMPILE TRANS_PYTHON
+OPTIONS_SINGLE=		TRANS
+OPTIONS_SINGLE_TRANS=	TRANS_PYTHON TRANS_PYPY TRANS_PYPY_MINMEM
+OPTIONS_SUB=		yes
 
 BYTECOMPILE_DESC=	Enable to build byte-compiled Python files
-TRANS_DESC=	Translation method
-PYTHON_DESC=	Use Python-2.7 to translate (slowest)
-PYPY_DESC=	Use PyPy to translate (fastest, highest memory usage)
-PYPY_MINMEM_DESC=	Use PyPy to translate (lowest memory usage)
+TRANS_DESC=		Translation method
+TRANS_PYTHON_DESC=	Use Python-2.7 to translate (slowest)
+TRANS_PYPY_DESC=	Use PyPy to translate (fastest, highest memory usage)
+TRANS_PYPY_MINMEM_DESC=	Use PyPy to translate (lowest memory usage)
 
-PYTHON_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycparser>=2.10:devel/py-pycparser@${PY_FLAVOR}
-PYTHON_USES=	python:2.7,build
-PYPY_BUILD_DEPENDS=	pypy2:lang/pypy2
-PYPY_VARS=	PYTHON_CMD=${LOCALBASE}/bin/pypy
-PYPY_MINMEM_BUILD_DEPENDS=	pypy2:lang/pypy2
-PYPY_MINMEM_VARS=	PYTHON_CMD="${SETENV} PYPY_GC_MAX_DELTA=200MB ${LOCALBASE}/bin/pypy --jit loop_longevity=300"
+TRANS_PYTHON_USES=		python:2.7,build
+TRANS_PYTHON_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycparser>=2.10:devel/py-pycparser@${PY_FLAVOR}
+TRANS_PYPY_BUILD_DEPENDS=	pypy2:lang/pypy2
+TRANS_PYPY_VARS=		PYTHON_CMD=${LOCALBASE}/bin/pypy
+TRANS_PYPY_MINMEM_BUILD_DEPENDS=	pypy2:lang/pypy2
+TRANS_PYPY_MINMEM_VARS=			PYTHON_CMD="${SETENV} PYPY_GC_MAX_DELTA=200MB ${LOCALBASE}/bin/pypy --jit loop_longevity=300"
 
 PYPY_TAG=	pypy
 PYPY_DIR=	${PYPY_TAG}-${DISTVERSION:C|([0-9]+)\.([0-9]+).*|\1.\2|}
--- a/lang/pypy310/Makefile	Thu Mar 13 21:06:09 2025 +0100
+++ b/lang/pypy310/Makefile	Fri Mar 14 01:16:50 2025 +0100
@@ -34,34 +34,34 @@
 USES=		compiler:c11 gettext-runtime gmake shebangfix ssl tar:bzip2
 USE_LDCONFIG=	${PREFIX}/${PYPY_DIR}/bin
 
-OPTIONS_DEFINE=	BYTECOMPILE
-OPTIONS_DEFAULT=	BYTECOMPILE PYTHON BCUNCHECKEDHASH
-OPTIONS_SINGLE=	TRANS BCSTYLE
-OPTIONS_SINGLE_TRANS=	PYTHON PYPY PYPY_MINMEM
+OPTIONS_DEFINE=		BYTECOMPILE
+OPTIONS_DEFAULT=	BYTECOMPILE TRANS_PYTHON BCUNCHECKEDHASH
+OPTIONS_SINGLE=		TRANS BCSTYLE
+OPTIONS_SINGLE_TRANS=	TRANS_PYTHON TRANS_PYPY TRANS_PYPY_MINMEM
 OPTIONS_SINGLE_BCSTYLE=	BCTIMESTAMP BCCHECKEDHASH BCUNCHECKEDHASH
-OPTIONS_SUB=	yes
+OPTIONS_SUB=		yes
 
 BYTECOMPILE_DESC=	Enable to build byte-compiled Python files
-TRANS_DESC=	Translation method
-BCSTYLE_DESC=	PEP-552 .pyc-File Invalidation Modes
-PYTHON_DESC=	Use Python-2.7 to translate (slowest)
-PYPY_DESC=	Use PyPy to translate (fastest, highest memory usage)
-PYPY_MINMEM_DESC=	Use PyPy to translate (lowest memory usage)
+TRANS_DESC=		Translation method
+BCSTYLE_DESC=		PEP-552 .pyc-File Invalidation Modes
+TRANS_PYTHON_DESC=	Use Python-2.7 to translate (slowest)
+TRANS_PYPY_DESC=	Use PyPy to translate (fastest, highest memory usage)
+TRANS_PYPY_MINMEM_DESC=	Use PyPy to translate (lowest memory usage)
 BCTIMESTAMP_DESC=	Traditional timestamp based .pyc file invalidataion
 BCCHECKEDHASH_DESC=	Use checked hash based .pyc file invalidataion
 BCUNCHECKEDHASH_DESC=	Use unchecked hash based .pyc file invalidataion
 
-PYTHON_USES=		python:2.7,build,test
-PYTHON_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycparser>=2.10:devel/py-pycparser@${PY_FLAVOR}
-PYTHON_VARS=		TESTRUNNER_PYTHON_CMD=${LOCALBASE}/bin/python2.7
-PYPY_USES=		python:2.7,test
-PYPY_BUILD_DEPENDS=	pypy2:lang/pypy2
-PYPY_VARS=		PYTHON_CMD=${LOCALBASE}/bin/pypy \
-			TESTRUNNER_PYTHON_CMD=${LOCALBASE}/bin/python2.7
-PYPY_MINMEM_USES=		python:2.7,test
-PYPY_MINMEM_BUILD_DEPENDS=	pypy2:lang/pypy2
-PYPY_MINMEM_VARS=		PYTHON_CMD="${SETENV} PYPY_GC_MAX_DELTA=200MB ${LOCALBASE}/bin/pypy --jit loop_longevity=300" \
+TRANS_PYTHON_USES=		python:2.7,build,test
+TRANS_PYTHON_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycparser>=2.10:devel/py-pycparser@${PY_FLAVOR}
+TRANS_PYTHON_VARS=		TESTRUNNER_PYTHON_CMD=${LOCALBASE}/bin/python2.7
+TRANS_PYPY_USES=		python:2.7,test
+TRANS_PYPY_BUILD_DEPENDS=	pypy2:lang/pypy2
+TRANS_PYPY_VARS=		PYTHON_CMD=${LOCALBASE}/bin/pypy \
 				TESTRUNNER_PYTHON_CMD=${LOCALBASE}/bin/python2.7
+TRANS_PYPY_MINMEM_USES=			python:2.7,test
+TRANS_PYPY_MINMEM_BUILD_DEPENDS=	pypy2:lang/pypy2
+TRANS_PYPY_MINMEM_VARS=			PYTHON_CMD="${SETENV} PYPY_GC_MAX_DELTA=200MB ${LOCALBASE}/bin/pypy --jit loop_longevity=300" \
+					TESTRUNNER_PYTHON_CMD=${LOCALBASE}/bin/python2.7
 BCTIMESTAMP_VARS=	COMPILEALL_INVALIDATIONMODE=timestamp
 BCCHECKEDHASH_VARS=	COMPILEALL_INVALIDATIONMODE=checked-hash
 BCUNCHECKEDHASH_VARS=	COMPILEALL_INVALIDATIONMODE=unchecked-hash
--- a/lang/pypy311/Makefile	Thu Mar 13 21:06:09 2025 +0100
+++ b/lang/pypy311/Makefile	Fri Mar 14 01:16:50 2025 +0100
@@ -34,34 +34,34 @@
 USES=		compiler:c11 gettext-runtime gmake shebangfix ssl tar:bzip2
 USE_LDCONFIG=	${PREFIX}/${PYPY_DIR}/bin
 
-OPTIONS_DEFINE=	BYTECOMPILE
-OPTIONS_DEFAULT=	BYTECOMPILE PYTHON BCUNCHECKEDHASH
-OPTIONS_SINGLE=	TRANS BCSTYLE
-OPTIONS_SINGLE_TRANS=	PYTHON PYPY PYPY_MINMEM
+OPTIONS_DEFINE=		BYTECOMPILE
+OPTIONS_DEFAULT=	BYTECOMPILE TRANS_PYTHON BCUNCHECKEDHASH
+OPTIONS_SINGLE=		TRANS BCSTYLE
+OPTIONS_SINGLE_TRANS=	TRANS_PYTHON TRANS_PYPY TRANS_PYPY_MINMEM
 OPTIONS_SINGLE_BCSTYLE=	BCTIMESTAMP BCCHECKEDHASH BCUNCHECKEDHASH
-OPTIONS_SUB=	yes
+OPTIONS_SUB=		yes
 
 BYTECOMPILE_DESC=	Enable to build byte-compiled Python files
-TRANS_DESC=	Translation method
-BCSTYLE_DESC=	PEP-552 .pyc-File Invalidation Modes
-PYTHON_DESC=	Use Python-2.7 to translate (slowest)
-PYPY_DESC=	Use PyPy to translate (fastest, highest memory usage)
-PYPY_MINMEM_DESC=	Use PyPy to translate (lowest memory usage)
+TRANS_DESC=		Translation method
+BCSTYLE_DESC=		PEP-552 .pyc-File Invalidation Modes
+TRANS_PYTHON_DESC=	Use Python-2.7 to translate (slowest)
+TRANS_PYPY_DESC=	Use PyPy to translate (fastest, highest memory usage)
+TRANS_PYPY_MINMEM_DESC=	Use PyPy to translate (lowest memory usage)
 BCTIMESTAMP_DESC=	Traditional timestamp based .pyc file invalidataion
 BCCHECKEDHASH_DESC=	Use checked hash based .pyc file invalidataion
 BCUNCHECKEDHASH_DESC=	Use unchecked hash based .pyc file invalidataion
 
-PYTHON_USES=		python:2.7,build,test
-PYTHON_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycparser>=2.10:devel/py-pycparser@${PY_FLAVOR}
-PYTHON_VARS=		TESTRUNNER_PYTHON_CMD=${LOCALBASE}/bin/python2.7
-PYPY_USES=		python:2.7,test
-PYPY_BUILD_DEPENDS=	pypy2:lang/pypy2
-PYPY_VARS=		PYTHON_CMD=${LOCALBASE}/bin/pypy \
-			TESTRUNNER_PYTHON_CMD=${LOCALBASE}/bin/python2.7
-PYPY_MINMEM_USES=		python:2.7,test
-PYPY_MINMEM_BUILD_DEPENDS=	pypy2:lang/pypy2
-PYPY_MINMEM_VARS=		PYTHON_CMD="${SETENV} PYPY_GC_MAX_DELTA=200MB ${LOCALBASE}/bin/pypy --jit loop_longevity=300" \
+TRANS_PYTHON_USES=		python:2.7,build,test
+TRANS_PYTHON_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycparser>=2.10:devel/py-pycparser@${PY_FLAVOR}
+TRANS_PYTHON_VARS=		TESTRUNNER_PYTHON_CMD=${LOCALBASE}/bin/python2.7
+TRANS_PYPY_USES=		python:2.7,test
+TRANS_PYPY_BUILD_DEPENDS=	pypy2:lang/pypy2
+TRANS_PYPY_VARS=		PYTHON_CMD=${LOCALBASE}/bin/pypy \
 				TESTRUNNER_PYTHON_CMD=${LOCALBASE}/bin/python2.7
+TRANS_PYPY_MINMEM_USES=			python:2.7,test
+TRANS_PYPY_MINMEM_BUILD_DEPENDS=	pypy2:lang/pypy2
+TRANS_PYPY_MINMEM_VARS=			PYTHON_CMD="${SETENV} PYPY_GC_MAX_DELTA=200MB ${LOCALBASE}/bin/pypy --jit loop_longevity=300" \
+					TESTRUNNER_PYTHON_CMD=${LOCALBASE}/bin/python2.7
 BCTIMESTAMP_VARS=	COMPILEALL_INVALIDATIONMODE=timestamp
 BCCHECKEDHASH_VARS=	COMPILEALL_INVALIDATIONMODE=checked-hash
 BCUNCHECKEDHASH_VARS=	COMPILEALL_INVALIDATIONMODE=unchecked-hash