python: egg.mk: add USE_PKG_RESOURCES flag

This flag should be set for packages that import pkg_resources
and thus need setuptools after the build step.

Set this flag for packages that need it and bump PKGREVISION.

11 files changed, 44 insertions, 24 deletions

diff --git a/graphics/py-actdiag/Makefile b/graphics/py-actdiag/Makefile
index e478a40dbd3..a1837d9913d 100644
--- a/graphics/py-actdiag/Makefile
+++ b/graphics/py-actdiag/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2022/01/04 20:54:04 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2022/01/05 15:41:11 wiz Exp $
 
 DISTNAME=	actdiag-2.0.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	graphics python
 MASTER_SITES=	${MASTER_SITE_PYPI:=a/actdiag/}
 
@@ -19,6 +19,8 @@ INSTALLATION_DIRS+=	${PKGMANDIR}/man1
 
 PYTHON_VERSIONS_INCOMPATIBLE=	27
 
+USE_PKG_RESOURCES=	yes
+
 post-install:
 	cd ${DESTDIR}${PREFIX}/bin && \
 	${MV} actdiag actdiag-${PYVERSSUFFIX} || ${TRUE}
diff --git a/graphics/py-blockdiag/Makefile b/graphics/py-blockdiag/Makefile
index bb8ba861aa5..cbca6767776 100644
--- a/graphics/py-blockdiag/Makefile
+++ b/graphics/py-blockdiag/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.28 2022/01/04 20:54:04 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2022/01/05 15:41:11 wiz Exp $
 
 DISTNAME=	blockdiag-2.0.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	graphics python
 MASTER_SITES=	${MASTER_SITE_PYPI:=b/blockdiag/}
 
@@ -24,7 +24,8 @@ USE_LANGUAGES=	# none
 INSTALLATION_DIRS+=	${PKGMANDIR}/man1
 
 PYTHON_VERSIONS_INCOMPATIBLE=	27
-PYTHON_VERSIONED_DEPENDENCIES+=	setuptools
+
+USE_PKG_RESOURCES=	yes
 
 post-install:
 	cd ${DESTDIR}${PREFIX}/bin && \
@@ -33,5 +34,4 @@ post-install:
 		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/blockdiag-${PYVERSSUFFIX}.1
 
 .include "../../lang/python/egg.mk"
-.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/py-fits/Makefile b/graphics/py-fits/Makefile
index cbbf27955a7..5840e71a133 100644
--- a/graphics/py-fits/Makefile
+++ b/graphics/py-fits/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2022/01/04 20:54:05 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2022/01/05 15:41:11 wiz Exp $
 
 DISTNAME=	pyfits-3.5
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/py//}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	graphics python
 MASTER_SITES=	${MASTER_SITE_PYPI:=p/pyfits/}
 
@@ -14,6 +14,8 @@ LICENSE=	modified-bsd
 BUILD_DEPENDS+=	${PYPKGPREFIX}-d2to1>=0.2.12:../../devel/py-d2to1
 BUILD_DEPENDS+=	${PYPKGPREFIX}-stsci.distutils>=0.3:../../devel/py-stsci.distutils
 
+USE_PKG_RESOURCES=	yes
+
 post-install:
 	cd ${DESTDIR}${PREFIX}/bin && \
 		${MV} fitscheck fitscheck-${PYVERSSUFFIX} && \
diff --git a/graphics/py-imageio/Makefile b/graphics/py-imageio/Makefile
index 7a50725a511..6f8a552d66c 100644
--- a/graphics/py-imageio/Makefile
+++ b/graphics/py-imageio/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2022/01/04 20:54:05 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2022/01/05 15:41:11 wiz Exp $
 
 DISTNAME=	imageio-2.10.5
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	graphics python
 MASTER_SITES=	${MASTER_SITE_PYPI:=i/imageio/}
 
@@ -18,6 +18,8 @@ TEST_DEPENDS+=	${PYPKGPREFIX}-tifffile-[0-9]*:../../graphics/py-tifffile
 
 PYTHON_VERSIONS_INCOMPATIBLE=	27 # py-numpy
 
+USE_PKG_RESOURCES=	yes
+
 USE_LANGUAGES=	# none
 
 post-extract:
diff --git a/graphics/py-nwdiag/Makefile b/graphics/py-nwdiag/Makefile
index 3a167bb2a98..1df85d76c84 100644
--- a/graphics/py-nwdiag/Makefile
+++ b/graphics/py-nwdiag/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2022/01/04 20:54:06 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2022/01/05 15:41:11 wiz Exp $
 
 DISTNAME=	nwdiag-2.0.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	graphics python
 MASTER_SITES=	${MASTER_SITE_PYPI:=n/nwdiag/}
 
@@ -15,6 +15,8 @@ DEPENDS+=	${PYPKGPREFIX}-blockdiag>=1.5.0:../../graphics/py-blockdiag
 
 USE_LANGUAGES=	# none
 
+USE_PKG_RESOURCES=	yes
+
 INSTALLATION_DIRS+=	${PKGMANDIR}/man1
 
 PYTHON_VERSIONS_INCOMPATIBLE=	27
diff --git a/graphics/py-pycha/Makefile b/graphics/py-pycha/Makefile
index 3fa1a2d77f4..c85f2f16189 100644
--- a/graphics/py-pycha/Makefile
+++ b/graphics/py-pycha/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2022/01/04 20:54:06 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2022/01/05 15:41:11 wiz Exp $
 
 DISTNAME=	pycha-0.8.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	graphics python
 MASTER_SITES=	${MASTER_SITE_PYPI:=p/pycha/}
 
@@ -16,6 +16,8 @@ DEPENDS+=	${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
 
 USE_LANGUAGES=	#none
 
+USE_PKG_RESOURCES=	yes
+
 post-install:
 	${MV} ${DESTDIR}${PREFIX}/bin/chavier ${DESTDIR}${PREFIX}/bin/chavier-${PYVERSSUFFIX} || ${TRUE}
 
diff --git a/graphics/py-pygal/Makefile b/graphics/py-pygal/Makefile
index cd9d9d80f94..8a05722a71e 100644
--- a/graphics/py-pygal/Makefile
+++ b/graphics/py-pygal/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2022/01/04 20:54:06 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2022/01/05 15:41:11 wiz Exp $
 
 DISTNAME=	pygal-2.4.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	graphics python
 MASTER_SITES=	${MASTER_SITE_PYPI:=p/pygal/}
 
@@ -23,6 +23,8 @@ USE_LANGUAGES=	# none
 
 PYTHON_VERSIONS_INCOMPATIBLE=	27 # py-pyquery
 
+USE_PKG_RESOURCES=	yes
+
 post-install:
 	cd ${DESTDIR}${PREFIX}/bin && ${MV} pygal_gen.py pygal_gen${PYVERSSUFFIX}.py || ${TRUE}
 
diff --git a/graphics/py-qrcode/Makefile b/graphics/py-qrcode/Makefile
index 801a10de282..3c6ec49de50 100644
--- a/graphics/py-qrcode/Makefile
+++ b/graphics/py-qrcode/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2022/01/04 20:54:07 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2022/01/05 15:41:12 wiz Exp $
 
 DISTNAME=	qrcode-6.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	graphics python
 MASTER_SITES=	${MASTER_SITE_PYPI:=q/qrcode/}
 
@@ -16,6 +16,8 @@ DEPENDS+=	${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
 
 PYTHON_VERSIONED_DEPENDENCIES=	Pillow
 
+USE_PKG_RESOURCES=	yes
+
 USE_LANGUAGES=	# none
 
 REPLACE_PYTHON+=	qrcode/console_scripts.py
diff --git a/graphics/py-scour/Makefile b/graphics/py-scour/Makefile
index 1d93394a490..3efb174243d 100644
--- a/graphics/py-scour/Makefile
+++ b/graphics/py-scour/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2022/01/04 20:54:07 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2022/01/05 15:41:12 wiz Exp $
 
 DISTNAME=	scour-0.38.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	graphics python
 MASTER_SITES=	${MASTER_SITE_PYPI:=s/scour/}
 
@@ -13,6 +13,8 @@ LICENSE=	apache-2.0
 
 DEPENDS+=	${PYPKGPREFIX}-six>=1.15.0:../../lang/py-six
 
+USE_PKG_RESOURCES=	yes
+
 USE_LANGUAGES=	# none
 
 .include "../../lang/python/egg.mk"
diff --git a/graphics/py-seqdiag/Makefile b/graphics/py-seqdiag/Makefile
index fd87da53ac6..6f13ecf505e 100644
--- a/graphics/py-seqdiag/Makefile
+++ b/graphics/py-seqdiag/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2022/01/04 20:54:07 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2022/01/05 15:41:12 wiz Exp $
 
 DISTNAME=	seqdiag-2.0.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	graphics python
 MASTER_SITES=	${MASTER_SITE_PYPI:=s/seqdiag/}
 
@@ -19,6 +19,8 @@ INSTALLATION_DIRS+=	${PKGMANDIR}/man1
 
 PYTHON_VERSIONS_INCOMPATIBLE=	27
 
+USE_PKG_RESOURCES=	yes
+
 post-install:
 	cd ${DESTDIR}${PREFIX}/bin && \
 	${MV} seqdiag seqdiag-${PYVERSSUFFIX} || ${TRUE}
diff --git a/graphics/py-tifffile/Makefile b/graphics/py-tifffile/Makefile
index cb5ea338e2b..5778837476f 100644
--- a/graphics/py-tifffile/Makefile
+++ b/graphics/py-tifffile/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2022/01/04 20:54:07 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2022/01/05 15:41:12 wiz Exp $
 
 DISTNAME=	tifffile-2021.11.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	graphics python
 MASTER_SITES=	${MASTER_SITE_PYPI:=t/tifffile/}
 
@@ -15,6 +15,8 @@ USE_LANGUAGES=	# none
 
 PYTHON_VERSIONS_INCOMPATIBLE=	27
 
+USE_PKG_RESOURCES=	yes
+
 post-install:
 .for bin in lsm2bin tiff2fsspec tiffcomment tifffile
 	cd ${DESTDIR}${PREFIX}/bin && \