git: ee6e804f71e5 - main - devel/py-black: Fix dea032cba8b338a23c5bfdcc51327e2dce5855a3

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Po-Chuan Hsieh <sunpoet_at_FreeBSD.org>
Date: Sat, 19 Nov 2022 08:17:11 UTC
The branch main has been updated by sunpoet:

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

commit ee6e804f71e58d287e359739fca08c219113f014
Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2022-11-19 08:11:56 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2022-11-19 08:11:56 +0000

    devel/py-black: Fix dea032cba8b338a23c5bfdcc51327e2dce5855a3
    
    - Revert 25b2be6023fea32fa22fc78775375fe2c3d07dcd: pyproject.toml removal is enough
---
 devel/py-black/Makefile       | 4 +---
 devel/py-black/distinfo       | 2 --
 devel/py-black/files/setup.py | 8 ++++++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/devel/py-black/Makefile b/devel/py-black/Makefile
index 1597cc49b912..a600c3c25b61 100644
--- a/devel/py-black/Makefile
+++ b/devel/py-black/Makefile
@@ -5,9 +5,6 @@ CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-PATCH_SITES=	https://github.com/psf/black/commit/
-PATCHFILES=	d923945513d8f679f43aec44aa8b777e5f9aab14.diff:-p1
-
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Uncompromising code formatter
 WWW=		https://github.com/psf/black
@@ -62,6 +59,7 @@ RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}tomli>=1.1.0:textproc/py-tomli@${PY_FLAVOR}
 .endif
 
 post-patch:
+	@${RM} ${WRKSRC}/pyproject.toml
 	@${SED} -e 's|%%PORTVERSION%%|${PORTVERSION}|' ${FILESDIR}/setup.py > ${WRKSRC}/setup.py
 
 .include <bsd.port.post.mk>
diff --git a/devel/py-black/distinfo b/devel/py-black/distinfo
index 5121e0738b91..df9a51f47f96 100644
--- a/devel/py-black/distinfo
+++ b/devel/py-black/distinfo
@@ -1,5 +1,3 @@
 TIMESTAMP = 1665755641
 SHA256 (black-22.10.0.tar.gz) = f513588da599943e0cde4e32cc9879e825d58720d6557062d1098c5ad80080e1
 SIZE (black-22.10.0.tar.gz) = 547735
-SHA256 (d923945513d8f679f43aec44aa8b777e5f9aab14.diff) = e3d8b3d72adb21ba52fb528a25b34e359557c0b14187b4c81d077b154067ec92
-SIZE (d923945513d8f679f43aec44aa8b777e5f9aab14.diff) = 845
diff --git a/devel/py-black/files/setup.py b/devel/py-black/files/setup.py
index cc1917e41656..5dc76298ce68 100644
--- a/devel/py-black/files/setup.py
+++ b/devel/py-black/files/setup.py
@@ -53,6 +53,10 @@ setup(
             'blackd = blackd:patched_main [d]',
         ],
     },
-    package_dir={'': 'src'},
-    package_data={'': ['*']},
+    package_dir={
+        '': 'src',
+    },
+    package_data={
+        '': ['*'],
+    },
 )