Date: Thu, 10 Feb 2022 11:13:34 GMT From: Fukang Chen <loader@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: b19f93882a7c - 2022Q1 - devel/py-amalgamate: Fix data_files install location Message-ID: <202202101113.21ABDY4Q048808@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2022Q1 has been updated by loader: URL: https://cgit.FreeBSD.org/ports/commit/?id=b19f93882a7c53f2da0f0b8c2850f61128c6d3f4 commit b19f93882a7c53f2da0f0b8c2850f61128c6d3f4 Author: Fukang Chen <loader@FreeBSD.org> AuthorDate: 2022-01-18 15:26:35 +0000 Commit: Fukang Chen <loader@FreeBSD.org> CommitDate: 2022-02-10 11:12:25 +0000 devel/py-amalgamate: Fix data_files install location - Install data_files into ${DOCSDIR} instead of ${PREFIX} - Allow concurrent installation for bin/amalgamate.py and ${DOCSDIR} PR: 261159 Approved by: lwhsu (python) MFH: 2022Q1 (ports compliance) (cherry picked from commit 33e2061728d30f5e43912b604da958ede94ba59f) --- devel/py-amalgamate/Makefile | 6 +++++- devel/py-amalgamate/files/patch-setup.py | 11 +++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/devel/py-amalgamate/Makefile b/devel/py-amalgamate/Makefile index c8694a38686c..03d0facfd95b 100644 --- a/devel/py-amalgamate/Makefile +++ b/devel/py-amalgamate/Makefile @@ -1,5 +1,6 @@ PORTNAME= amalgamate PORTVERSION= 0.1.3 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -11,8 +12,11 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE USES= python:3.4+ -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils concurrent NO_ARCH= yes +post-patch: + @${REINPLACE_CMD} -e 's|%%DOCSDIR%%|${DOCSDIR}|' ${WRKSRC}/setup.py + .include <bsd.port.mk> diff --git a/devel/py-amalgamate/files/patch-setup.py b/devel/py-amalgamate/files/patch-setup.py new file mode 100644 index 000000000000..c716bf4acc5b --- /dev/null +++ b/devel/py-amalgamate/files/patch-setup.py @@ -0,0 +1,11 @@ +--- setup.py.orig 2022-01-18 11:48:00 UTC ++++ setup.py +@@ -26,7 +26,7 @@ setup_kwargs = { + ], + "zip_safe": False, + "scripts": ['amalgamate.py'], +- "data_files": [("", ['LICENSE', 'README.rst']),], ++ "data_files": [("%%DOCSDIR%%", ['LICENSE', 'README.rst']),], + } + +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202202101113.21ABDY4Q048808>