[pkgsrc/trunk]: pkgsrc Use Pillow as versioned dependency

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc Use Pillow as versioned dependency
From: adam <adam%pkgsrc.org@localhost>
Date: Wed, 10 Mar 2021 20:11:46 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/d6d23f399695
branches:  trunk
changeset: 448590:d6d23f399695
user:      adam <adam%pkgsrc.org@localhost>
date:      Wed Mar 10 18:49:06 2021 +0000

description:
Use Pillow as versioned dependency

diffstat:

 chat/matrix-synapse/Makefile    |  6 ++++--
 games/pysolfc/Makefile          |  6 ++++--
 games/unknown-horizons/Makefile |  6 ++++--
 graphics/py-Willow/Makefile     |  6 ++++--
 graphics/py-aafigure/Makefile   |  6 ++++--
 graphics/py-blurhash/Makefile   |  5 ++---
 graphics/py-qrcode/Makefile     |  6 ++++--
 graphics/py-strich/Makefile     |  6 ++----
 8 files changed, 28 insertions(+), 19 deletions(-)

diffs (207 lines):

diff -r 68fda0da9d78 -r d6d23f399695 chat/matrix-synapse/Makefile
--- a/chat/matrix-synapse/Makefile      Wed Mar 10 18:44:02 2021 +0000
+++ b/chat/matrix-synapse/Makefile      Wed Mar 10 18:49:06 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2021/03/06 19:00:43 js Exp $
+# $NetBSD: Makefile,v 1.18 2021/03/10 18:49:06 adam Exp $
 
 DISTNAME=      matrix-synapse-1.28.0
 CATEGORIES=    chat
@@ -29,7 +29,6 @@
 DEPENDS+=      ${PYPKGPREFIX}-asn1-modules>=0.0.7:../../security/py-asn1-modules
 DEPENDS+=      ${PYPKGPREFIX}-daemonize>=2.3.1:../../devel/py-daemonize
 DEPENDS+=      ${PYPKGPREFIX}-bcrypt>=3.1.0:../../security/py-bcrypt
-DEPENDS+=      ${PYPKGPREFIX}-Pillow>=4.3.0:../../graphics/py-Pillow
 DEPENDS+=      ${PYPKGPREFIX}-sortedcontainers>=1.4.4:../../devel/py-sortedcontainers
 DEPENDS+=      ${PYPKGPREFIX}-macaroons>=0.13.0:../../devel/py-macaroons
 DEPENDS+=      ${PYPKGPREFIX}-msgpack>=0.5.2:../../devel/py-msgpack
@@ -44,6 +43,8 @@
 DEPENDS+=      ${PYPKGPREFIX}-psycopg2>=2.7:../../databases/py-psycopg2
 DEPENDS+=      ${PYPKGPREFIX}-lxml>=3.5.0:../../textproc/py-lxml
 
+PYTHON_VERSIONED_DEPENDENCIES= Pillow
+
 USE_LANGUAGES= # none
 USE_TOOLS+=    perl:run
 REPLACE_PERL+= scripts/sync_room_to_group.pl
@@ -71,4 +72,5 @@
 MESSAGE_SUBST+=        SYNAPSE_DATA=${SYNAPSE_DATA:Q}
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 68fda0da9d78 -r d6d23f399695 games/pysolfc/Makefile
--- a/games/pysolfc/Makefile    Wed Mar 10 18:44:02 2021 +0000
+++ b/games/pysolfc/Makefile    Wed Mar 10 18:49:06 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2021/01/07 21:58:08 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2021/03/10 18:49:07 adam Exp $
 
 DISTNAME=      PySolFC-2.6.4
 PKGNAME=       ${DISTNAME:tl}
@@ -17,9 +17,10 @@
 DISTFILES+=    ${CARDSETS_NAME}.tar.bz2
 
 DEPENDS+=      ${PYPKGPREFIX}-Tk-[0-9]*:../../x11/py-Tk
-DEPENDS+=      ${PYPKGPREFIX}-Pillow-[0-9]*:../../graphics/py-Pillow
 DEPENDS+=      ${PYPKGPREFIX}-game-[0-9]*:../../devel/py-game
 
+PYTHON_VERSIONED_DEPENDENCIES= Pillow
+
 USE_TOOLS+=    pax
 
 SUBST_CLASSES+=                datadir
@@ -46,4 +47,5 @@
 
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../lang/python/distutils.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 68fda0da9d78 -r d6d23f399695 games/unknown-horizons/Makefile
--- a/games/unknown-horizons/Makefile   Wed Mar 10 18:44:02 2021 +0000
+++ b/games/unknown-horizons/Makefile   Wed Mar 10 18:49:06 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2020/12/04 20:45:20 nia Exp $
+# $NetBSD: Makefile,v 1.5 2021/03/10 18:49:06 adam Exp $
 
 DISTNAME=      unknown-horizons-2019.1
 PKGREVISION=   1
@@ -15,10 +15,11 @@
 DEPENDS+=      ${PYPKGPREFIX}-future-[0-9]*:../../devel/py-future
 DEPENDS+=      ${PYPKGPREFIX}-future-[0-9]*:../../devel/py-future
 DEPENDS+=      ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
-DEPENDS+=      ${PYPKGPREFIX}-Pillow-[0-9]*:../../graphics/py-Pillow
 DEPENDS+=      ${PYPKGPREFIX}-yaml-[0-9]*:../../textproc/py-yaml
 DEPENDS+=      fifengine-[0-9]*:../../devel/fifengine
 
+PYTHON_VERSIONED_DEPENDENCIES= Pillow
+
 REPLACE_PYTHON+=       run_server.py
 REPLACE_PYTHON+=       run_uh.py
 
@@ -34,4 +35,5 @@
 
 .include "../../lang/python/application.mk"
 .include "../../lang/python/distutils.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 68fda0da9d78 -r d6d23f399695 graphics/py-Willow/Makefile
--- a/graphics/py-Willow/Makefile       Wed Mar 10 18:44:02 2021 +0000
+++ b/graphics/py-Willow/Makefile       Wed Mar 10 18:49:06 2021 +0000
@@ -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 @@
 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 -r 68fda0da9d78 -r d6d23f399695 graphics/py-aafigure/Makefile
--- a/graphics/py-aafigure/Makefile     Wed Mar 10 18:44:02 2021 +0000
+++ b/graphics/py-aafigure/Makefile     Wed Mar 10 18:49:06 2021 +0000
@@ -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 @@
 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 -r 68fda0da9d78 -r d6d23f399695 graphics/py-blurhash/Makefile
--- a/graphics/py-blurhash/Makefile     Wed Mar 10 18:44:02 2021 +0000
+++ b/graphics/py-blurhash/Makefile     Wed Mar 10 18:49:06 2021 +0000
@@ -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 @@
 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 -r 68fda0da9d78 -r d6d23f399695 graphics/py-qrcode/Makefile
--- a/graphics/py-qrcode/Makefile       Wed Mar 10 18:44:02 2021 +0000
+++ b/graphics/py-qrcode/Makefile       Wed Mar 10 18:49:06 2021 +0000
@@ -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 @@
 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 @@
 
 .include "../../lang/python/application.mk"
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 68fda0da9d78 -r d6d23f399695 graphics/py-strich/Makefile
--- a/graphics/py-strich/Makefile       Wed Mar 10 18:44:02 2021 +0000
+++ b/graphics/py-strich/Makefile       Wed Mar 10 18:49:06 2021 +0000
@@ -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 @@
 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
Prev by Date: [pkgsrc/trunk]: pkgsrc/lang/python Added py-Pillow to versioned dependencies
Next by Date: [pkgsrc/trunk]: pkgsrc/www Add monolith
Previous by Thread: [pkgsrc/trunk]: pkgsrc/lang/python Added py-Pillow to versioned dependencies
Next by Thread: [pkgsrc/trunk]: pkgsrc/www Add monolith
Indexes:
Home | Main Index | Thread Index | Old Index