git: a51421303ac5 - main - cad/py-amaranth: Correct build to be able to determine version w/out patches

From: Yuri Victorovich <yuri_at_FreeBSD.org>
Date: Thu, 11 Jan 2024 09:12:53 UTC
The branch main has been updated by yuri:

URL: https://cgit.FreeBSD.org/ports/commit/?id=a51421303ac551c8f5a86204f1408111838697e5

commit a51421303ac551c8f5a86204f1408111838697e5
Author:     Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2024-01-11 09:11:59 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2024-01-11 09:12:46 +0000

    cad/py-amaranth: Correct build to be able to determine version w/out patches
---
 cad/py-amaranth/Makefile                   |  6 +-----
 cad/py-amaranth/files/patch-pyproject.toml | 17 -----------------
 2 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/cad/py-amaranth/Makefile b/cad/py-amaranth/Makefile
index e8f694c65e8d..e6379b6192eb 100644
--- a/cad/py-amaranth/Makefile
+++ b/cad/py-amaranth/Makefile
@@ -25,13 +25,9 @@ GH_ACCOUNT=	amaranth-lang
 
 NO_ARCH=	yes
 
+MAKE_ENV=	PDM_BUILD_SCM_VERSION=${DISTVERSION} # this allows to build from a tarball (otherwise PDM wouldn't be able to determine the version)
 TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 
-post-patch:
-	@${REINPLACE_CMD} \
-		-e 's|%%VERSION%%|${DISTVERSION}|' \
-		${WRKSRC}/pyproject.toml
-
 do-install: # workaround for https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=272771
 	@${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 	@cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${PEP517_INSTALL_CMD}
diff --git a/cad/py-amaranth/files/patch-pyproject.toml b/cad/py-amaranth/files/patch-pyproject.toml
deleted file mode 100644
index e19d759d8171..000000000000
--- a/cad/py-amaranth/files/patch-pyproject.toml
+++ /dev/null
@@ -1,17 +0,0 @@
---- pyproject.toml.orig	2023-12-13 09:29:50 UTC
-+++ pyproject.toml
-@@ -4,12 +4,13 @@ source = "scm"
- source = "scm"
- 
- [project]
--dynamic = ["version"]
-+dynamic = []
- 
- name = "amaranth"
- description = "Amaranth hardware definition language"
- authors = [{name = "Amaranth HDL contributors"}]
- license = {file = "LICENSE.txt"}
-+version = "%%VERSION%%"
- 
- requires-python = "~=3.8"
- dependencies = [