--- a/Makefile	Sat Oct 01 14:21:56 2022 +0200
+++ b/Makefile	Mon Oct 03 11:38:58 2022 +0200
@@ -2,11 +2,14 @@
 # $FreeBSD: head/lang/pypy3/Makefile 559974 2021-01-02 21:48:19Z rene $
 
 PORTNAME=	pypy3
-DISTNAME=	${PORTNAME}.6-v${DISTVERSION}-src
+DISTNAME=	${PORTNAME}.8-v${DISTVERSION}-src
 
 MASTERDIR=	${.CURDIR}/../pypy
 
-WRKSRC=		${WRKDIR}/${PORTNAME}.6-v${DISTVERSION:C/-.*//}-src
+WRKSRC=		${WRKDIR}/${PORTNAME}.8-v${DISTVERSION:C/-.*//}-src
+
+# Without gdbm is not supported on v7.3.9 any more: no extra package needed
+LIB_DEPENDS+=	libgdbm.so:databases/gdbm
 
 SHEBANG_FILES=	\
 		lib-python/3/base64.py \
@@ -29,12 +32,15 @@
 		lib-python/3/symbol.py \
 		lib-python/3/tabnanny.py \
 		lib-python/3/tarfile.py \
-		lib-python/3/test/bisect.py \
+		lib-python/3/test/bisect_cmd.py \
 		lib-python/3/test/crashers/recursive_call.py \
 		lib-python/3/test/curses_tests.py \
 		lib-python/3/test/pystone.py \
 		lib-python/3/test/re_tests.py \
 		lib-python/3/test/regrtest.py \
+		lib-python/3/test/ziptestdata/header.sh \
+		lib-python/3/test/ziptestdata/exe_with_z64 \
+		lib-python/3/test/ziptestdata/exe_with_zip \
 		lib-python/3/timeit.py \
 		lib-python/3/trace.py \
 		lib-python/3/turtledemo/bytedesign.py \
@@ -53,9 +59,9 @@
 		lib-python/3/webbrowser.py \
 		lib_pypy/_cffi_ssl/tools/make_ssl_data.py
 
-PACKAGE_ARGS=	--without-gdbm --without-sqlite3 --without-tk
+PACKAGE_ARGS=	--without-sqlite3 --without-_tkinter
 
-PYPY_CFFI_VER=	${PORTNAME}6-pp${DISTVERSION:C/.[^.]+$//:S/.//}-${ARCH}-${OPSYS:tl}${OSREL:C/\..*//}
+PYPY_CFFI_VER=	${PORTNAME}8-pp${DISTVERSION:C/.[^.]+$//:S/.//}-${ARCH}-${OPSYS:tl}${OSREL:C/\..*//}
 
 pre-install:
 	${FIND} ${WRKSRC} -name '*.pyc' -delete