From nobody Thu Feb 10 11:00:42 2022 X-Original-To: dev-commits-ports-main@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 D091C19C1D00; Thu, 10 Feb 2022 11:00:42 +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 4JvYgt5bZKz4dng; Thu, 10 Feb 2022 11:00:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644490842; 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=KrMRgsOBtdNX4crmeA7fE/he/IxvMVMJwv3O4zoOqps=; b=AjJR741Gb8HWqEf2feK/p1lq42HrZE85+ZrYtpxhuhjPC4MW+3RgUesd7bfNYaOZMSuTds AP1PiPdInP43pjlkR/CCTauUiyavmXgME4eiTQYBq88xZFbjkbj6ScRQ0FMiC+gk/ZV4XZ YrBd66rU5qePP8xX0TBnVLOeGXUkK+WCCb/VeQrl5ZGyrIKVzqq+ViJGBbkPpxTYvHH2dU dvCo6SkIfPGNbUlNCZPqO8P+TEm98JVeNTnBW6uVErR3sr8CNwYF4pSqmgAAXCgYnztRQo D8LCPkWpvNl6DlmlzK0cTVZckvJ112lot51Vy86Q81GzNS1tTcOqoxhz2JpMGg== 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 A01431F165; Thu, 10 Feb 2022 11:00:42 +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 21AB0gsw031032; Thu, 10 Feb 2022 11:00:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21AB0gES031031; Thu, 10 Feb 2022 11:00:42 GMT (envelope-from git) Date: Thu, 10 Feb 2022 11:00:42 GMT Message-Id: <202202101100.21AB0gES031031@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Fukang Chen Subject: git: 33e2061728d3 - main - devel/py-amalgamate: Fix data_files install location List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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/main X-Git-Reftype: branch X-Git-Commit: 33e2061728d30f5e43912b604da958ede94ba59f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644490842; 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=KrMRgsOBtdNX4crmeA7fE/he/IxvMVMJwv3O4zoOqps=; b=EMbdjDyTEBu+4ICSWP2IsBzQAIKeLdtX6E1hnzBtWDYeL1op5/JmQ0QHoSGzgHTObFooHa ciJ5KR/ZPleDsDTP9PDAd59/cSKsXrO0b2S40ixuIbtk8lxdFZy4BYHlCQh+11ksRB6Jrc ciSWJJckStUbIvi9JySoYi99/XxPn8C7Rkkm6N0NNxckuVuFESewGt1wuXWhsaDw+igUY0 VJoHDbceDqPaBFD2vjSEYr3d7JRfHA4rrBgh7IKR/U0XLCYhqa5/ZkOvE9aLzBeu5sXhpT FUpQXsDOBLIxDV9hBob4LgDBgUMeiGpfLInRiOpR5NJIFLoGNMR5Ci/rvG/Zpg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644490842; a=rsa-sha256; cv=none; b=XMf/rAJgZBHCKY/e+BXJ6ktc1+9nT5EAuYar1HxKEly9XgiYpyneOyf/ap3qtODB+BGUnH 7JkVUK4AqmPhhmH+VzTigOASbCYxlYbAnAxZ1UWtopUZVR/3IYKYQa0gqKFjmzF2n1B0u2 0laz7xYPpJy/ny2hvpWjt1EzJnHv6yjV/46mWcihH9jlPsHLtJwMSZ0aJAWmTRkhzQ0dpV gahNuLPBZIT+9uK+HbuRDYdD8sbs7e8oVPQKM20K+ihOLJxF8vi8KGYGfDOop5MvMVIDKp Y/+9Yp4O2onPfRrs0DrtN40Bzc+Snzykx3C4nKvBBldni7ic95tKWWwrp134RA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by loader: URL: https://cgit.FreeBSD.org/ports/commit/?id=33e2061728d30f5e43912b604da958ede94ba59f commit 33e2061728d30f5e43912b604da958ede94ba59f Author: Fukang Chen AuthorDate: 2022-01-18 15:26:35 +0000 Commit: Fukang Chen CommitDate: 2022-02-10 10:55:14 +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) --- 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']),], + } + +