git: bfff400638f8 - main - devel/py-black: Really fix packaging issues

From: Kai Knoblich <kai_at_FreeBSD.org>
Date: Sat, 22 Oct 2022 09:32:17 UTC
The branch main has been updated by kai:

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

commit bfff400638f87b7be4144b56728d54e271048d13
Author:     Kai Knoblich <kai@FreeBSD.org>
AuthorDate: 2022-10-22 09:26:51 +0000
Commit:     Kai Knoblich <kai@FreeBSD.org>
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={'': ['*']},
 )