From nobody Thu Feb 10 11:13:34 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id EE07519C6E24; Thu, 10 Feb 2022 11:13:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JvYyk5mznz4hjD; Thu, 10 Feb 2022 11:13:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644491614; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qt6DxCrdE0ebMSpF61hjhAmgRoMnRh5SLr+h20QZDp4=; b=ga599eklW07jYNlPDW43wHb6J8QWi7gMfS91Y2x51Bs3F/n/U/OT0BPIU3sO5svJRwMHU6 hcFEb9Ga1GHNq8Pi5UbatpVxFd4qhF8En91h+Ubn6kAWN1WYqbsNlkBH1OzSo6oxi624Lu XWFt3wpfWLlU0yYrfyx/qSMmnXZMafmdbqtsCpNKOeaWi3MHyL378gA5pb/8Sp/gXaTY2e 0BMEf+xYvFdmDQtnqPQ0XPRszT7JsmeJwXmdJHDLQR1r7SuJ/muFKHHx0ovGOad3OFVGVa pdaKatuhZyaWINCnQ533d7R3H8sSL7JBlincNEUm6rwUch1rf6e/eNP6EvxjTg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A76141F6B6; Thu, 10 Feb 2022 11:13:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 21ABDYxJ048809; Thu, 10 Feb 2022 11:13:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21ABDY4Q048808; Thu, 10 Feb 2022 11:13:34 GMT (envelope-from git) Date: Thu, 10 Feb 2022 11:13:34 GMT Message-Id: <202202101113.21ABDY4Q048808@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Fukang Chen Subject: git: b19f93882a7c - 2022Q1 - devel/py-amalgamate: Fix data_files install location List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: loader X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q1 X-Git-Reftype: branch X-Git-Commit: b19f93882a7c53f2da0f0b8c2850f61128c6d3f4 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644491614; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qt6DxCrdE0ebMSpF61hjhAmgRoMnRh5SLr+h20QZDp4=; b=Bf6zPkB72vA4M/XcFAd9MEvhPE5GmHTvD3R0Kd3kHiVTlrqt5ZkPgOpESxchkWFaBkbq6V WnJEpED0Jh6uOoLNOyR8DQ3+x6MdsoCNEux9EPqFO4nGO45mkVh7+Ndwn2SOz5QMht8s5b 3tmcHceWVP1HQpzr5wizMiwke3YKPnXt1B7ATpyFxRXTPNZPgP7sB+j22+zN56m3C3+Gwf 9BHiovIozKLGyGDroyfFhvUkkFL04LcWNELqSEi8YUPrL5Xk2CKOTeT0u0AlZw1hO+toN1 YIj+DrZ02Vhs1gU+vMU31qflahm41cNpic/Il8f2MEgUgb/7jqPnkFk52+Lmmg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644491614; a=rsa-sha256; cv=none; b=SiDUEvEoBa3ThrChnZR12CCCUhMS1TEE/ixNa7YIUZwc5onYpj0316DUoLgtX0auLKp++9 hCCbGnMe43WJpLWLE12M1GVCs+Pm0kePW3D1Pjo8Gz+GXCRHTK84ype2bplSDCP9ikD34v sTq+XA4ynL0dE3UED+4JcZg4Um8eASfHZFZuxQoy9ug+rFsl7DNx7wqB7+BvKgRSFX3snP UepKlzGW1U7KdvXJkrIf9NVLSR69oz3LnSo3wZlGnamDQyzYHUPrS/H1LdkBpPup4d97Me ufS9mo5RhcI7GaGL7Ntww4z3R9eCx6/GS31rBsxkhr6hNtULJWUj8cZKf250Lg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q1 has been updated by loader: URL: https://cgit.FreeBSD.org/ports/commit/?id=b19f93882a7c53f2da0f0b8c2850f61128c6d3f4 commit b19f93882a7c53f2da0f0b8c2850f61128c6d3f4 Author: Fukang Chen AuthorDate: 2022-01-18 15:26:35 +0000 Commit: Fukang Chen 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 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']),], + } + +