git: 0d8c0a97d5a3 - main - devel/py-flufl.lock: fix stage
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 17 Mar 2026 06:45:34 UTC
The branch main has been updated by vishwin:
URL: https://cgit.FreeBSD.org/ports/commit/?id=0d8c0a97d5a3752bb38e7e56aa0312278117f513
commit 0d8c0a97d5a3752bb38e7e56aa0312278117f513
Author: Charlie Li <vishwin@FreeBSD.org>
AuthorDate: 2026-03-17 06:35:23 +0000
Commit: Charlie Li <vishwin@FreeBSD.org>
CommitDate: 2026-03-17 06:35:23 +0000
devel/py-flufl.lock: fix stage
staging still breaks because PEP517_INSTALL_CMD and USE_PYTHON=autoplist
do not handle the period (.) name normalisation bit that hatchling
implements properly. For now, use a hack that allows correct packaging
until PR 270358/review D46236 is committed, at which point the hack
becomes a no-op.
Pointy-hat to: vishwin
With hat: python
PR: 293772
---
devel/py-flufl.lock/Makefile | 15 +++++++++++++++
devel/py-flufl.lock/files/patch-pyproject.toml | 14 --------------
2 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/devel/py-flufl.lock/Makefile b/devel/py-flufl.lock/Makefile
index 0d0c19300db2..3678b8061484 100644
--- a/devel/py-flufl.lock/Makefile
+++ b/devel/py-flufl.lock/Makefile
@@ -22,4 +22,19 @@ USE_PYTHON= autoplist pep517 pytest
NO_ARCH= yes
+# remove the following blocks 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
+PEP517_INSTALL_CMD= ${PYTHON_CMD} -m installer --destdir ${STAGEDIR} --prefix ${PREFIX} \
+ ${BUILD_WRKSRC}/dist/${PORTNAME:tl:C|[-_.]+|_|g}-${DISTVERSION}*.whl && \
+ ${CP} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/flufl_lock-${DISTVERSION}.dist-info/RECORD \
+ ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/flufl.lock-${DISTVERSION}.dist-info/RECORD
+
+pre-install:
+ ${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/flufl.lock-${DISTVERSION}.dist-info
+
+post-install:
+ ${RM} -r ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/flufl.lock-${DISTVERSION}.dist-info
+
.include <bsd.port.mk>
diff --git a/devel/py-flufl.lock/files/patch-pyproject.toml b/devel/py-flufl.lock/files/patch-pyproject.toml
deleted file mode 100644
index ecaa5f9267a7..000000000000
--- a/devel/py-flufl.lock/files/patch-pyproject.toml
+++ /dev/null
@@ -1,14 +0,0 @@
-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'},
- ]