Use Pillow as versioned dependency

5 files changed, 16 insertions, 13 deletions

diff --git a/graphics/py-Willow/Makefile b/graphics/py-Willow/Makefile
index 30ef2d1e34a..9181cf97e9c 100644
--- a/graphics/py-Willow/Makefile
+++ b/graphics/py-Willow/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2020/08/03 23:49:52 joerg Exp $
+# $NetBSD: Makefile,v 1.2 2021/03/10 18:49:07 adam Exp $
 
 DISTNAME=	Willow-1.4
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -13,10 +13,12 @@ LICENSE=	modified-bsd
 GITHUB_PROJECT=	Willow
 GITHUB_TAG=	v${PKGVERSION_NOREV}
 
-DEPENDS+=	${PYPKGPREFIX}-Pillow-[0-9]*:../../graphics/py-Pillow
 DEPENDS+=	${PYPKGPREFIX}-wand-[0-9]*:../../graphics/py-wand
 TEST_DEPENDS+=	${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
 
+PYTHON_VERSIONED_DEPENDENCIES=	Pillow
+
 .include "../../graphics/opencv/buildlink3.mk"
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/py-aafigure/Makefile b/graphics/py-aafigure/Makefile
index f8676e32ee1..a5ea68dfb40 100644
--- a/graphics/py-aafigure/Makefile
+++ b/graphics/py-aafigure/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2018/01/04 21:07:12 adam Exp $
+# $NetBSD: Makefile,v 1.16 2021/03/10 18:49:07 adam Exp $
 
 DISTNAME=	aafigure-0.6
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -10,13 +10,15 @@ HOMEPAGE=	https://launchpad.net/aafigure
 COMMENT=	ASCII art to image converter
 LICENSE=	modified-bsd
 
-DEPENDS+=	${PYPKGPREFIX}-Pillow-[0-9]*:../../graphics/py-Pillow
 DEPENDS+=	${PYPKGPREFIX}-reportlab-[0-9]*:../../print/py-reportlab
 
+PYTHON_VERSIONED_DEPENDENCIES=	Pillow
+
 USE_LANGUAGES=	# none
 
 post-install:
 	cd ${DESTDIR}${PREFIX}/bin && ${MV} aafigure aafigure${PYVERSSUFFIX} || ${TRUE}
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/py-blurhash/Makefile b/graphics/py-blurhash/Makefile
index cc7ee6da93a..e5f51c15c93 100644
--- a/graphics/py-blurhash/Makefile
+++ b/graphics/py-blurhash/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2020/05/16 17:42:42 adam Exp $
+# $NetBSD: Makefile,v 1.3 2021/03/10 18:49:07 adam Exp $
 
 DISTNAME=	blurhash-1.1.4
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -10,12 +10,11 @@ HOMEPAGE=	https://github.com/halcy/blurhash-python
 COMMENT=	Implementation of the blurhash algorithm in pure python
 LICENSE=	mit
 
-TEST_DEPENDS+=	${PYPKGPREFIX}-Pillow-[0-9]*:../../graphics/py-Pillow
 TEST_DEPENDS+=	${PYPKGPREFIX}-numpy-[0-9]*:../../math/py-numpy
 
 USE_LANGUAGES=	# none
 
-PYTHON_VERSIONED_DEPENDENCIES=	test:test
+PYTHON_VERSIONED_DEPENDENCIES=	Pillow test:test
 
 .include "../../lang/python/egg.mk"
 .include "../../lang/python/versioned_dependencies.mk"
diff --git a/graphics/py-qrcode/Makefile b/graphics/py-qrcode/Makefile
index 4251c761db7..7fe6ce57cba 100644
--- a/graphics/py-qrcode/Makefile
+++ b/graphics/py-qrcode/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2019/01/21 10:03:47 adam Exp $
+# $NetBSD: Makefile,v 1.15 2021/03/10 18:49:06 adam Exp $
 
 DISTNAME=	qrcode-6.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -10,10 +10,11 @@ HOMEPAGE=	https://pypi.python.org/pypi/qrcode
 COMMENT=	Python QR Code image generator
 LICENSE=	modified-bsd
 
-DEPENDS+=	${PYPKGPREFIX}-Pillow-[0-9]*:../../graphics/py-Pillow
 DEPENDS+=	${PYPKGPREFIX}-lxml-[0-9]*:../../textproc/py-lxml
 DEPENDS+=	${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
 
+PYTHON_VERSIONED_DEPENDENCIES=	Pillow
+
 USE_LANGUAGES=	# none
 
 REPLACE_PYTHON+=	qrcode/console_scripts.py
@@ -32,4 +33,5 @@ post-install:
 
 .include "../../lang/python/application.mk"
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/py-strich/Makefile b/graphics/py-strich/Makefile
index 2597286120c..d27f4af1395 100644
--- a/graphics/py-strich/Makefile
+++ b/graphics/py-strich/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2020/05/18 10:30:16 adam Exp $
+# $NetBSD: Makefile,v 1.4 2021/03/10 18:49:06 adam Exp $
 
 DISTNAME=	pyStrich-0.8
 PKGNAME=	${PYPKGPREFIX}-strich-0.8
@@ -10,9 +10,7 @@ HOMEPAGE=	https://github.com/mmulqueen/pyStrich
 COMMENT=	1D and 2D barcode generator
 LICENSE=	2-clause-bsd AND apache-2.0
 
-DEPENDS+=	${PYPKGPREFIX}-Pillow-[0-9]*:../../graphics/py-Pillow
-
-PYTHON_VERSIONED_DEPENDENCIES=	test:test
+PYTHON_VERSIONED_DEPENDENCIES=	Pillow test:test
 
 do-test:
 	${MKDIR} ${WRKSRC}/pystrich/code128/test_img ${WRKSRC}/pystrich/ean13/test_img