# HG changeset patch
# User Franz Glasner <fzglas.hg@dom66.de>
# Date 1705732623 -3600
# Node ID c43bcad6c935cd9e6bd38d992020994beadc906f
# Parent  def4f59a53893b1f0247afc5e9d4ceea7914c24f
Prepare some preconditions for runnings tests for pypy310 and pypy39.

BUGS: Tests to not run yet.

diff -r def4f59a5389 -r c43bcad6c935 lang/pypy310/Makefile
--- a/lang/pypy310/Makefile	Fri Jan 19 01:54:42 2024 +0100
+++ b/lang/pypy310/Makefile	Sat Jan 20 07:37:03 2024 +0100
@@ -27,9 +27,9 @@
 LIB_DEPENDS+=	libgdbm.so:databases/gdbm
 # We also need for dbm.ndbm the BerkeleyDB in version 5
 LIB_DEPENDS+=	libdb-5.so:databases/db5
-TEST_DEPENDS=	${LOCALBASE}/${PYPY_DIR}/lib_pypy/_gdbm_cffi.${PYPY_CFFI_VER}.so:databases/pypy-gdbm \
-		${LOCALBASE}/${PYPY_DIR}/lib_pypy/_sqlite3_cffi.${PYPY_CFFI_VER}.so:databases/pypy-sqlite3 \
-		${LOCALBASE}/${PYPY_DIR}/lib_pypy/_tkinter/tklib_cffi.${PYPY_CFFI_VER}.so:x11-toolkits/pypy-tkinter
+TEST_DEPENDS=	${LOCALBASE}/${PYPY_DIR}/lib/pypy${PYPY_PYTHON_IMPL_VER}/_gdbm_cffi.${PYPY_CFFI_VER}.so:databases/pypy3-gdbm@pypy310 \
+		${LOCALBASE}/${PYPY_DIR}/lib/pypy${PYPY_PYTHON_IMPL_VER}/_sqlite3_cffi.${PYPY_CFFI_VER}.so:databases/pypy3-sqlite3@pypy310 \
+		${LOCALBASE}/${PYPY_DIR}/lib/pypy${PYPY_PYTHON_IMPL_VER}/_tkinter/tklib_cffi.${PYPY_CFFI_VER}.so:x11-toolkits/pypy3-tkinter@pypy310
 
 USES=		compiler:c11 gettext-runtime gmake shebangfix ssl tar:bzip2
 USE_LDCONFIG=	${PREFIX}/${PYPY_DIR}/bin
@@ -188,18 +188,18 @@
 	# add_translated_tests()
 	(cd ${WRKSRC}; \
 		${SETENV} ${MAKE_ENV} TMPDIR=${WRKDIR}/build PYTHONPATH=${WRKSRC} \
-		${WRKSRC}/pypy/goal/pypy-c testrunner/runner.py --root pypy --logfile=pytest-A.log \
+		${WRKSRC}/pypy/goal/${PYPY_EXECUTABLE} testrunner/runner.py --root pypy --logfile=pytest-A.log \
 			--parallel-runs ${MAKE_JOBS_NUMBER} \
 			--config pypy/pytest-A.cfg --config pypy/pytest-A.py)
 .for dir in lib-python pypy/module/pypyjit/test
 	(cd ${WRKSRC}; \
 		${SETENV} ${MAKE_ENV} TMPDIR=${WRKDIR}/build PYTHONPATH=${WRKSRC} \
-		${WRKSRC}/pypy/goal/pypy-c pypy/test_all.py --basetemp ${WRKDIR}/build --pypy pypy/goal/pypy-c \
+		${WRKSRC}/pypy/goal/${PYPY_EXECUTABLE} pypy/test_all.py --basetemp ${WRKDIR}/build --pypy pypy/goal/${PYPY_EXECUTABLE} \
 			${dir} )
 .endfor
 	(cd ${WRKSRC}/lib-python/2.7/test; \
 		${SETENV} ${MAKE_ENV} TMPDIR=${WRKDIR}/build PYTHONPATH=${WRKSRC} \
-		${WRKSRC}/pypy/goal/pypy-c regrtest.py -vvu all)
+		${WRKSRC}/pypy/goal/${PYPY_EXECUTABLE} regrtest.py -vvu all)
 
 pkg-plist: stage
 	${TAR} -tf ${WRKDIR}/build/${PYPY_DIR}.tar.bz2 > ${WRKDIR}/.plist-files-gen
diff -r def4f59a5389 -r c43bcad6c935 lang/pypy39/Makefile
--- a/lang/pypy39/Makefile	Fri Jan 19 01:54:42 2024 +0100
+++ b/lang/pypy39/Makefile	Sat Jan 20 07:37:03 2024 +0100
@@ -27,9 +27,9 @@
 LIB_DEPENDS+=	libgdbm.so:databases/gdbm
 # We also need for dbm.ndbm the BerkeleyDB in version 5
 LIB_DEPENDS+=	libdb-5.so:databases/db5
-TEST_DEPENDS=	${LOCALBASE}/${PYPY_DIR}/lib_pypy/_gdbm_cffi.${PYPY_CFFI_VER}.so:databases/pypy-gdbm \
-		${LOCALBASE}/${PYPY_DIR}/lib_pypy/_sqlite3_cffi.${PYPY_CFFI_VER}.so:databases/pypy-sqlite3 \
-		${LOCALBASE}/${PYPY_DIR}/lib_pypy/_tkinter/tklib_cffi.${PYPY_CFFI_VER}.so:x11-toolkits/pypy-tkinter
+TEST_DEPENDS=	${LOCALBASE}/${PYPY_DIR}/lib/pypy${PYPY_PYTHON_IMPL_VER}/_gdbm_cffi.${PYPY_CFFI_VER}.so:databases/pypy3-gdbm@pypy39 \
+		${LOCALBASE}/${PYPY_DIR}/lib/pypy${PYPY_PYTHON_IMPL_VER}/_sqlite3_cffi.${PYPY_CFFI_VER}.so:databases/pypy3-sqlite3@pypy39 \
+		${LOCALBASE}/${PYPY_DIR}/lib/pypy${PYPY_PYTHON_IMPL_VER}/_tkinter/tklib_cffi.${PYPY_CFFI_VER}.so:x11-toolkits/pypy3-tkinter@pypy39
 
 USES=		compiler:c11 gettext-runtime gmake shebangfix ssl tar:bzip2
 USE_LDCONFIG=	${PREFIX}/${PYPY_DIR}/bin
@@ -189,18 +189,18 @@
 	# add_translated_tests()
 	(cd ${WRKSRC}; \
 		${SETENV} ${MAKE_ENV} TMPDIR=${WRKDIR}/build PYTHONPATH=${WRKSRC} \
-		${WRKSRC}/pypy/goal/pypy-c testrunner/runner.py --root pypy --logfile=pytest-A.log \
+		${WRKSRC}/pypy/goal/${PYPY_EXECUTABLE} testrunner/runner.py --root pypy --logfile=pytest-A.log \
 			--parallel-runs ${MAKE_JOBS_NUMBER} \
 			--config pypy/pytest-A.cfg --config pypy/pytest-A.py)
 .for dir in lib-python pypy/module/pypyjit/test
 	(cd ${WRKSRC}; \
 		${SETENV} ${MAKE_ENV} TMPDIR=${WRKDIR}/build PYTHONPATH=${WRKSRC} \
-		${WRKSRC}/pypy/goal/pypy-c pypy/test_all.py --basetemp ${WRKDIR}/build --pypy pypy/goal/pypy-c \
+		${WRKSRC}/pypy/goal/${PYPY_EXECUTABLE} pypy/test_all.py --basetemp ${WRKDIR}/build --pypy pypy/goal/${PYPY_EXECUTABLE} \
 			${dir} )
 .endfor
 	(cd ${WRKSRC}/lib-python/2.7/test; \
 		${SETENV} ${MAKE_ENV} TMPDIR=${WRKDIR}/build PYTHONPATH=${WRKSRC} \
-		${WRKSRC}/pypy/goal/pypy-c regrtest.py -vvu all)
+		${WRKSRC}/pypy/goal/${PYPY_EXECUTABLE} regrtest.py -vvu all)
 
 pkg-plist: stage
 	${TAR} -tf ${WRKDIR}/build/${PYPY_DIR}.tar.bz2 > ${WRKDIR}/.plist-files-gen