diff --git a/devel/py-flufl.lock/Makefile b/devel/py-flufl.lock/Makefile
index 7b025a52d8ed..0d0c19300db2 100644
--- a/devel/py-flufl.lock/Makefile
+++ b/devel/py-flufl.lock/Makefile
@@ -1,20 +1,25 @@
 PORTNAME=	flufl.lock
-PORTVERSION=	7.1
+DISTVERSION=	9.0.0
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+DISTNAME=	${PORTNAME:tl:C|[-_.]+|_|g}-${DISTVERSION}
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	NFS-safe file locking with timeouts for POSIX systems
 WWW=		https://flufllock.readthedocs.io
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pdm-pep517>0:devel/py-pdm-pep517@${PY_FLAVOR}
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}hatchling>=0:devel/py-hatchling@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}atpublic>=0:devel/py-atpublic@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psutil>=0:sysutils/py-psutil@${PY_FLAVOR}
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}diff-cover>=0:devel/py-diff-cover@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}sybil>=0:devel/py-sybil@${PY_FLAVOR}
 
 USES=		python
-USE_PYTHON=	autoplist pep517
+USE_PYTHON=	autoplist pep517 pytest
+
+NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-flufl.lock/distinfo b/devel/py-flufl.lock/distinfo
index 4f7bd2d85a2a..3acc3d4e6927 100644
--- a/devel/py-flufl.lock/distinfo
+++ b/devel/py-flufl.lock/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1734813227
-SHA256 (flufl.lock-7.1.tar.gz) = 431b7fe8f661299200ff67a538bac937172181c1ed3a6efa6d28934b48b8a12c
-SIZE (flufl.lock-7.1.tar.gz) = 33315
+TIMESTAMP = 1773343904
+SHA256 (flufl_lock-9.0.0.tar.gz) = 270a46e754af3937735cdd4f8a8f43a2dc4e5c40a24fdf972f5dc6db0862e8bb
+SIZE (flufl_lock-9.0.0.tar.gz) = 34151
diff --git a/devel/py-flufl.lock/files/patch-pyproject.toml b/devel/py-flufl.lock/files/patch-pyproject.toml
new file mode 100644
index 000000000000..ecaa5f9267a7
--- /dev/null
+++ b/devel/py-flufl.lock/files/patch-pyproject.toml
@@ -0,0 +1,14 @@
+remove after setuptools/python.mk update incorporating the period (.) portion of name normalisation
+
+https://packaging.python.org/en/latest/specifications/name-normalization/
+https://packaging.python.org/en/latest/specifications/binary-distribution-format/#escaping-and-unicode
+
+--- pyproject.toml.orig	2020-02-02 00:00:00 UTC
++++ pyproject.toml
+@@ -1,5 +1,5 @@
+ [project]
+-name = 'flufl.lock'
++name = 'flufl-lock'
+ authors = [
+     {name = 'Barry Warsaw', email = 'barry@python.org'},
+ ]