From nobody Sat Oct 22 09:32:17 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 4Mvbhd5rwmz4gWHZ; Sat, 22 Oct 2022 09:32:17 +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 4Mvbhd5CLGz3PRt; Sat, 22 Oct 2022 09:32:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666431137; 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=+mStls8m0+qqOwEGrmSphIQC+s/s49LURF3b2HaxFhQ=; b=xHT++zAoHiDtNsXBoDJEVBccrLIL6T2qBoxT3NUr1Hu6LKRC1rsefnPRYAdLH4qs7EjFC2 NowbT2pdCoGBB7YrUMCrlY64rtaAxx4Ukgq8INJsHsOQp1mB4Dk94D9Vr3txpz9h/piyTM qYZpyhr//DF1YLRgmGYBfwfO3cWAkAyDhMDZ6NsnglkwDghbh7oi42qqsX7O+mifkn0YXm LPFpvYKDRRqQE5mYUAIjNKxYDG028AyRi2yKCAmvD67QXfASWfZVyCpPkxV6LV1fbDiN7y yjlQSx7LqgsY/Li+59xqimWN21QBD+Ufqkr01OyETiwpVIM/Xv3JbD5a/UdP8A== 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 4Mvbhd4Fr3zWMr; Sat, 22 Oct 2022 09:32:17 +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 29M9WHh1062376; Sat, 22 Oct 2022 09:32:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29M9WHI9062375; Sat, 22 Oct 2022 09:32:17 GMT (envelope-from git) Date: Sat, 22 Oct 2022 09:32:17 GMT Message-Id: <202210220932.29M9WHI9062375@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Kai Knoblich Subject: git: bfff400638f8 - main - devel/py-black: Really fix packaging issues 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: kai X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bfff400638f87b7be4144b56728d54e271048d13 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666431137; 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=+mStls8m0+qqOwEGrmSphIQC+s/s49LURF3b2HaxFhQ=; b=DKFTyp2BDV8kSwsvgw4ksLWBAjBbAP6I3S6kkFcVdK+FHXYlDWC8icjmTr8Jr1PaWHliJz ibSakzSHQNQcuwPHiBEIquA9cCbfhvliZhcs6wQWsGM6onTzvCVnxOf7Fd/89ZKzdyzBuh oaR98bxPyf2C6cC0L6STVpK1WfmpQZGDjbNH/YhffVPTpau2kxbAPQsfpJGytbfAFsgTP1 GqpKj3mTnQcxFWc2LA5k8hy2M5B+sdzDBNsJcrg7cgxigyRquAfoafSeFV7dcGqBUB6cbO Xz61PUW+SkMmXN1T6jGAdFwDAX7vVUs/tHEpFFjD8aMd5P4Va3R0YMoGazq8XA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666431137; a=rsa-sha256; cv=none; b=viKIp4rofpRh4yiayUR1C0Sj1LuLs5HxmH9deBtqHZVdwXzfTKK4s6rGrqW2oL0Vo8FdDm rF+TqJ5rBz79mQL9nyZtD2J5Mosgyc8QKR2nHlDfDpNdGy/uDCZedR020Cp7yaQW9K1oF+ Qlrr/j5Uni/9qcAlpK16L2+2H6Tsic3xnSSgcjuTRa9+mfRfDq1bu/OCpKeWbHs0920Vb7 z0fc40W94akzGBNa+6XtszGYztJcLJ0arI9mAcYNMMUwRCuHEl5DgGGYtRGFs4xXhNGEnH 0tHR+OnY3sBbS/Nx5wX23V9+LbbWsx8UMnZs01Wq95DAIiNgN0bmvSgd34vGnw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kai: URL: https://cgit.FreeBSD.org/ports/commit/?id=bfff400638f87b7be4144b56728d54e271048d13 commit bfff400638f87b7be4144b56728d54e271048d13 Author: Kai Knoblich AuthorDate: 2022-10-22 09:26:51 +0000 Commit: Kai Knoblich CommitDate: 2022-10-22 09:26:51 +0000 devel/py-black: Really fix packaging issues * When the port was updated via dea032cba8b3, it still wouldn't build, which was then fixed with 25b2be6023fe. Although the port can now be built, the content of the generated package is not correct at the moment as every Python module is placed into an additional "src/" directory. There was an attempt to fix the problem via 76670f6a4f84, but the root cause has not yet been eliminated because the Python module is still not usable: $ python3.9 -m black /usr/local/bin/python3.9: No module named black * Remedy these issues by adjusting the backported "setup.py" to generate the correct package content. * Bump PORTREVISION due package change. PR: 267040 [1] Reported by: Martin Birgmeier [1] pkg-fallout (for games/anki which requires py-black) Approved by: portmgr (blanket, fix packaging issues) Fixes: 25b2be6023fe devel/py-black: fix build --- devel/py-black/Makefile | 2 +- devel/py-black/files/setup.py | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/devel/py-black/Makefile b/devel/py-black/Makefile index 39eb1814eb3c..1597cc49b912 100644 --- a/devel/py-black/Makefile +++ b/devel/py-black/Makefile @@ -1,6 +1,6 @@ PORTNAME= black PORTVERSION= 22.10.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-black/files/setup.py b/devel/py-black/files/setup.py index b72ba2fa96e0..cc1917e41656 100644 --- a/devel/py-black/files/setup.py +++ b/devel/py-black/files/setup.py @@ -53,11 +53,6 @@ setup( 'blackd = blackd:patched_main [d]', ], }, - packages=[ - 'scripts', - 'src.black', - 'src.blackd', - 'src.blib2to3', - 'src.blib2to3.pgen2', - ], + package_dir={'': 'src'}, + package_data={'': ['*']}, )