From f119a3deb967ba422b8b7c39ac5d80d74fd476d1 Mon Sep 17 00:00:00 2001 From: Yasuhiro Kimura Date: Mon, 4 Jan 2021 03:23:23 +0900 Subject: [PATCH] Mk/Uses/python.mk: Chase removal of graphics/py-pillow6 Chase removal of graphics/py-pillow6. * Remove PY_PILLOW from Mk/Uses/python.mk. * Replace '${PY_PILLOW}' in denendency of each port with direct one to graphics/py-pillow. --- Mk/Uses/python.mk | 1 - audio/lollypop/Makefile | 2 +- cad/k40-whisperer/Makefile | 2 +- comms/apitran/Makefile | 2 +- deskutils/calibre/Makefile | 4 ++-- deskutils/griffith/Makefile | 2 +- devel/py-asciimatics/Makefile | 2 +- devel/py-factory-boy/Makefile | 2 +- devel/py-trimesh/Makefile | 2 +- finance/odoo/Makefile | 2 +- games/fretsonfire/Makefile | 2 +- games/hypatia_engine/Makefile | 2 +- games/openage/Makefile | 4 ++-- games/py-mnemosyne/Makefile | 2 +- games/pysolfc/Makefile | 2 +- games/unknown-horizons/Makefile | 2 +- graphics/impressive/Makefile | 2 +- graphics/py-PyOpenGL/Makefile | 4 ++-- graphics/py-blockdiag/Makefile | 2 +- graphics/py-django-easy-thumbnails/Makefile | 4 ++-- graphics/py-face_recognition/Makefile | 2 +- graphics/py-img2pdf/Makefile | 2 +- graphics/py-photocollage/Makefile | 2 +- graphics/py-pyinsane2/Makefile | 2 +- graphics/py-pyocr/Makefile | 2 +- graphics/py-pypillowfight/Makefile | 2 +- graphics/py-scikit-image/Makefile | 2 +- graphics/py-sorl-thumbnail/Makefile | 2 +- graphics/py-ueberzug/Makefile | 2 +- graphics/qgis-ltr/Makefile | 2 +- graphics/qgis/Makefile | 2 +- graphics/variety/Makefile | 2 +- lang/mono/Makefile | 2 +- lang/mono5.10/Makefile | 2 +- math/asymptote/Makefile | 2 +- math/sage/Makefile | 4 ++-- misc/cs/Makefile | 2 +- misc/ironscanner/Makefile | 2 +- misc/mmdnn/Makefile | 2 +- misc/py-gluoncv/Makefile | 2 +- misc/py-tflearn/Makefile | 2 +- multimedia/photofilmstrip/Makefile | 2 +- net-im/py-matrix-synapse/Makefile | 2 +- net-mgmt/netbox/Makefile | 2 +- net-p2p/deluge-cli/Makefile | 2 +- print/hplip/Makefile | 2 +- print/py-reportlab/Makefile | 2 +- science/gramps/Makefile | 2 +- science/rdkit/Makefile | 2 +- security/vinetto/Makefile | 2 +- textproc/py-ocrmypdf/Makefile | 2 +- textproc/py-pikepdf/Makefile | 4 ++-- textproc/py-qrcode/Makefile | 2 +- textproc/py-wordcloud/Makefile | 4 ++-- www/py-bokeh/Makefile | 2 +- www/py-django-filer/Makefile | 2 +- www/py-django-markdownx/Makefile | 2 +- www/py-django-photologue/Makefile | 2 +- www/py-django-simple-captcha/Makefile | 2 +- www/py-pywikibot/Makefile | 2 +- www/py-weboob/Makefile | 2 +- www/seahub/Makefile | 2 +- www/twms/Makefile | 2 +- www/xist/Makefile | 2 +- x11-toolkits/py-easygui/Makefile | 2 +- x11/cinnamon/Makefile | 2 +- x11/py-pyscreenshot/Makefile | 2 +- x11/py-pyvirtualdisplay/Makefile | 2 +- x11/xpra/Makefile | 2 +- 69 files changed, 75 insertions(+), 76 deletions(-) diff --git a/Mk/Uses/python.mk b/Mk/Uses/python.mk index 70ff43985dcc..1856531987c1 100644 --- a/Mk/Uses/python.mk +++ b/Mk/Uses/python.mk @@ -641,7 +641,6 @@ PYNUMPY= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16,1<1.20,1:math/py-numpy@${PY_FLAVOR} .if ${PYTHON_REL} < 3500 PY_PYGMENTS= ${PYTHON_PKGNAMEPREFIX}pygments-25>=2.5.1<3:textproc/py-pygments-25@${PY_FLAVOR} .else -PY_PILLOW= ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} PY_PYGMENTS= ${PYTHON_PKGNAMEPREFIX}pygments>=2.5.1<3:textproc/py-pygments@${PY_FLAVOR} .endif diff --git a/audio/lollypop/Makefile b/audio/lollypop/Makefile index 22149425691d..7b2fad2b4ba1 100644 --- a/audio/lollypop/Makefile +++ b/audio/lollypop/Makefile @@ -22,7 +22,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7.8:databases/py-sqlite3@${PY_FLA ${PYTHON_PKGNAMEPREFIX}dbus>=1.1.1:devel/py-dbus@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}gstreamer1>=1.4.0:multimedia/py-gstreamer1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pylast>=1.4.0:audio/py-pylast@${PY_FLAVOR} \ - ${PY_PILLOW} + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} USES= python:3.6+ pkgconfig gnome gettext meson shebangfix sqlite desktop-file-utils USE_GITLAB= yes diff --git a/cad/k40-whisperer/Makefile b/cad/k40-whisperer/Makefile index 68d58925cfb5..cce569e9f3dd 100644 --- a/cad/k40-whisperer/Makefile +++ b/cad/k40-whisperer/Makefile @@ -12,7 +12,7 @@ LICENSE_FILE= ${WRKSRC}/gpl-3.0.txt RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyusb>0:devel/py-pyusb@${PY_FLAVOR} \ - ${PY_PILLOW} + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} USES= python:run,3.6+ shebangfix zip SHEBANG_FILES= *.py diff --git a/comms/apitran/Makefile b/comms/apitran/Makefile index 5d978d5dc239..a6f0575cfebe 100644 --- a/comms/apitran/Makefile +++ b/comms/apitran/Makefile @@ -13,7 +13,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \ ${PYNUMPY} \ - ${PY_PILLOW} \ + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \ sox:audio/sox \ display:graphics/ImageMagick6 diff --git a/deskutils/calibre/Makefile b/deskutils/calibre/Makefile index 8025cf70e48a..f170c37c3796 100644 --- a/deskutils/calibre/Makefile +++ b/deskutils/calibre/Makefile @@ -31,7 +31,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVO ${PYTHON_PKGNAMEPREFIX}msgpack>=0.3:devel/py-msgpack@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}regex>=0:textproc/py-regex@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}html5-parser>=0.4.3:www/py-html5-parser@${PY_FLAVOR} \ - ${PY_PILLOW} \ + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}zeroconf>0:net/py-zeroconf RUN_DEPENDS= xdg-open:devel/xdg-utils \ ${PYTHON_PKGNAMEPREFIX}css-parser>=1.0.4:www/py-css-parser@${PY_FLAVOR} \ @@ -50,7 +50,7 @@ RUN_DEPENDS= xdg-open:devel/xdg-utils \ ${PYTHON_PKGNAMEPREFIX}markdown>=0:textproc/py-markdown@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}chardet>=0:textproc/py-chardet@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}html5-parser>=0.4.3:www/py-html5-parser@${PY_FLAVOR} \ - ${PY_PILLOW} \ + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \ pdftohtml:graphics/poppler-utils \ ${PYTHON_PKGNAMEPREFIX}zeroconf>0:net/py-zeroconf diff --git a/deskutils/griffith/Makefile b/deskutils/griffith/Makefile index 05c1ff95a1fc..5fb749946df1 100644 --- a/deskutils/griffith/Makefile +++ b/deskutils/griffith/Makefile @@ -12,7 +12,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sqlalchemy12>=1.1:databases/py-sqlalchemy12@${PY_FLAVOR} \ - ${PY_PILLOW} \ + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}reportlab>=3.4:print/py-reportlab@${PY_FLAVOR} USES= gettext-runtime gmake gnome python:3.4+ shebangfix diff --git a/devel/py-asciimatics/Makefile b/devel/py-asciimatics/Makefile index 5157974f3806..b1b79ade5d37 100644 --- a/devel/py-asciimatics/Makefile +++ b/devel/py-asciimatics/Makefile @@ -12,7 +12,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}future>0:devel/py-future@${PY_FLAVOR} \ - ${PY_PILLOW} \ + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyfiglet>=0.7.2:misc/py-pyfiglet@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wcwidth>0:devel/py-wcwidth@${PY_FLAVOR} diff --git a/devel/py-factory-boy/Makefile b/devel/py-factory-boy/Makefile index 4d9ddbcbbff7..d5babf174962 100644 --- a/devel/py-factory-boy/Makefile +++ b/devel/py-factory-boy/Makefile @@ -24,7 +24,7 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage>=0:devel/py-coverage@${PY_FLAVOR} ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}tox>=0:devel/py-tox@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}text-unidecode>=0:converters/py-text-unidecode@${PY_FLAVOR} \ - ${PY_PILLOW} + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils diff --git a/devel/py-trimesh/Makefile b/devel/py-trimesh/Makefile index 7620697fab55..46d59cfbbbb0 100644 --- a/devel/py-trimesh/Makefile +++ b/devel/py-trimesh/Makefile @@ -20,7 +20,7 @@ NEEDED_DEPENDS= ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}svg_path>0:graphics/py-svg.path@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sympy>0:math/py-sympy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}msgpack>0:devel/py-msgpack@${PY_FLAVOR} \ - ${PY_PILLOW} \ + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}xxhash>0:devel/py-xxhash@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pycollada>0:graphics/py-pycollada@${PY_FLAVOR} \ diff --git a/finance/odoo/Makefile b/finance/odoo/Makefile index 707558e69405..e65850cd6c9d 100644 --- a/finance/odoo/Makefile +++ b/finance/odoo/Makefile @@ -34,7 +34,7 @@ RUN_DEPENDS= wkhtmltopdf>0:converters/wkhtmltopdf \ ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyusb>=0:devel/py-pyusb@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}vatnumber>=0:finance/py-vatnumber@${PY_FLAVOR} \ - ${PY_PILLOW} \ + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pydot>=0:graphics/py-pydot@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}ldap>=0:net/py-ldap@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}zeep>=0:net/py-zeep@${PY_FLAVOR} \ diff --git a/games/fretsonfire/Makefile b/games/fretsonfire/Makefile index 1f84f07e0e60..d956770d2a31 100644 --- a/games/fretsonfire/Makefile +++ b/games/fretsonfire/Makefile @@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/copying.txt RUN_DEPENDS= ${PYNUMPY} \ ${PYGAME} \ - ${PY_PILLOW} \ + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}PyOpenGL>=0:graphics/py-PyOpenGL@${PY_FLAVOR} \ ${LOCALBASE}/share/${PORTNAME}/default.ttf:games/fretsonfire-data diff --git a/games/hypatia_engine/Makefile b/games/hypatia_engine/Makefile index f59284cb3cf6..d98d0d9e7d04 100644 --- a/games/hypatia_engine/Makefile +++ b/games/hypatia_engine/Makefile @@ -12,7 +12,7 @@ LICENSE= MIT RUN_DEPENDS= ${PYGAME} \ ${PYTHON_PKGNAMEPREFIX}pyganim>0:graphics/py-pyganim@${PY_FLAVOR} \ - ${PY_PILLOW} + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils diff --git a/games/openage/Makefile b/games/openage/Makefile index cba6d7033142..001e6196df8f 100644 --- a/games/openage/Makefile +++ b/games/openage/Makefile @@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/legal/GPLv3 BUILD_DEPENDS= ${PYNUMPY} \ ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \ - ${PY_PILLOW} \ + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments@${PY_FLAVOR} LIB_DEPENDS= libepoxy.so:graphics/libepoxy \ libfontconfig.so:x11-fonts/fontconfig \ @@ -29,7 +29,7 @@ LIB_DEPENDS= libepoxy.so:graphics/libepoxy \ libnyan.so:lang/nyan RUN_DEPENDS= ${PYNUMPY} \ ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \ - ${PY_PILLOW} \ + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments@${PY_FLAVOR} USES= cmake compiler:c++17-lang gl python:3.4+ qt:5 sdl shebangfix diff --git a/games/py-mnemosyne/Makefile b/games/py-mnemosyne/Makefile index 6cccc68ed206..9f16ba53cb2b 100644 --- a/games/py-mnemosyne/Makefile +++ b/games/py-mnemosyne/Makefile @@ -19,7 +19,7 @@ EXPIRATION_DATE=2021-06-23 RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}PyOpenGL>=0:graphics/py-PyOpenGL@${PY_FLAVOR} \ - ${PY_PILLOW} \ + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>=0:math/py-matplotlib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}webob>=1.4:www/py-webob@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}cheroot>=0:www/py-cheroot@${PY_FLAVOR} \ diff --git a/games/pysolfc/Makefile b/games/pysolfc/Makefile index 2e8449a17ead..80bb36e78b0c 100644 --- a/games/pysolfc/Makefile +++ b/games/pysolfc/Makefile @@ -17,7 +17,7 @@ LICENSE_COMB= multi RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}random2>=0:math/py-random2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${PY_FLAVOR} \ - ${PY_PILLOW} + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} LICENSE_FILE_GPLv3+ = ${WRKSRC}/COPYING LICENSE_DISTFILES_GPLv3+ = ${PYSOLFCDIST} diff --git a/games/unknown-horizons/Makefile b/games/unknown-horizons/Makefile index 9ddeefb3845e..a5784fdd6b0a 100644 --- a/games/unknown-horizons/Makefile +++ b/games/unknown-horizons/Makefile @@ -10,7 +10,7 @@ COMMENT= Real time simulation game LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/doc/licenses/GPL -BUILD_DEPENDS= ${PY_PILLOW} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fife>0:games/py-fife@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \ diff --git a/graphics/impressive/Makefile b/graphics/impressive/Makefile index 7497f10710c2..aa5d71142102 100644 --- a/graphics/impressive/Makefile +++ b/graphics/impressive/Makefile @@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/license.txt RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}PyOpenGL>=0:graphics/py-PyOpenGL@${PY_FLAVOR} \ ${PYGAME} \ - ${PY_PILLOW} + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} USES= python:3.5+ sdl shebangfix USE_SDL= sdl diff --git a/graphics/py-PyOpenGL/Makefile b/graphics/py-PyOpenGL/Makefile index ee9de3d77eaf..e66e286ce61a 100644 --- a/graphics/py-PyOpenGL/Makefile +++ b/graphics/py-PyOpenGL/Makefile @@ -11,9 +11,9 @@ MAINTAINER= python@FreeBSD.org COMMENT= OpenGL (and related library) interface for Python BUILD_DEPENDS= ${PYNUMPY} \ - ${PY_PILLOW} + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} RUN_DEPENDS= ${PYNUMPY} \ - ${PY_PILLOW} + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} OPTIONS_DEFINE= TKINTER OPTIONS_DEFAULT= TKINTER diff --git a/graphics/py-blockdiag/Makefile b/graphics/py-blockdiag/Makefile index 9c7aa1dc2b8c..39ac1dda19ba 100644 --- a/graphics/py-blockdiag/Makefile +++ b/graphics/py-blockdiag/Makefile @@ -12,7 +12,7 @@ COMMENT= Simple block-diagram image generator LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PY_PILLOW} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}funcparserlib>=0.3.6:devel/py-funcparserlib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}webcolors>=0:graphics/py-webcolors@${PY_FLAVOR} diff --git a/graphics/py-django-easy-thumbnails/Makefile b/graphics/py-django-easy-thumbnails/Makefile index 0177f8220a54..a17c85191794 100644 --- a/graphics/py-django-easy-thumbnails/Makefile +++ b/graphics/py-django-easy-thumbnails/Makefile @@ -14,7 +14,7 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django22>=1.8:www/py-django22@${PY_FLAVOR} \ - ${PY_PILLOW} + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} USES= python:3.5+ USE_PYTHON= autoplist concurrent distutils @@ -26,7 +26,7 @@ PORTDOCS= * OPTIONS_DEFINE= DOCS DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django22>=1.8:www/py-django22@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR} \ - ${PY_PILLOW} + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} DOCS_VARS= PYDISTUTILS_BUILD_TARGET+="build_sphinx -a -E" post-patch-DOCS-on: diff --git a/graphics/py-face_recognition/Makefile b/graphics/py-face_recognition/Makefile index 2718f0fbec1d..ec79ada58059 100644 --- a/graphics/py-face_recognition/Makefile +++ b/graphics/py-face_recognition/Makefile @@ -17,7 +17,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>=6.0:devel/py-click@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}face_recognition_models>0:graphics/py-face_recognition_models@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dlib>=19.7:science/py-dlib@${PY_FLAVOR} \ - ${PY_PILLOW} + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils diff --git a/graphics/py-img2pdf/Makefile b/graphics/py-img2pdf/Makefile index 6381a9691fe8..bfd792958458 100644 --- a/graphics/py-img2pdf/Makefile +++ b/graphics/py-img2pdf/Makefile @@ -10,7 +10,7 @@ COMMENT= Convert images to PDF via direct JPEG inclusion LICENSE= LGPL3+ LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PY_PILLOW} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pdfrw>0:textproc/py-pdfrw@${PY_FLAVOR} USES= python:3.5+ diff --git a/graphics/py-photocollage/Makefile b/graphics/py-photocollage/Makefile index d74e146fdfb9..38d4857453c5 100644 --- a/graphics/py-photocollage/Makefile +++ b/graphics/py-photocollage/Makefile @@ -13,7 +13,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cairo>0:graphics/py-cairo@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>:devel/py-six@${PY_FLAVOR} \ - ${PY_PILLOW} + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} USES= gettext-tools python:3.6+ USE_PYTHON= autoplist concurrent distutils diff --git a/graphics/py-pyinsane2/Makefile b/graphics/py-pyinsane2/Makefile index 565591792c41..5c245ec139c4 100644 --- a/graphics/py-pyinsane2/Makefile +++ b/graphics/py-pyinsane2/Makefile @@ -12,7 +12,7 @@ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=1.0:devel/py-nose@${PY_FLAVOR} -RUN_DEPENDS= ${PY_PILLOW} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} USES= gmake python:3.6+ USE_PYTHON= distutils autoplist diff --git a/graphics/py-pyocr/Makefile b/graphics/py-pyocr/Makefile index 7e62c98dee6b..0ae5f97a2c8b 100644 --- a/graphics/py-pyocr/Makefile +++ b/graphics/py-pyocr/Makefile @@ -11,7 +11,7 @@ LICENSE= GPLv3 BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}setuptools_scm_git_archive>0:devel/py-setuptools_scm_git_archive@${PY_FLAVOR} -RUN_DEPENDS= ${PY_PILLOW} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} USES= gmake python:3.4+ USE_PYTHON= distutils autoplist diff --git a/graphics/py-pypillowfight/Makefile b/graphics/py-pypillowfight/Makefile index 7e5246131dcf..b5a00d7ef7f4 100644 --- a/graphics/py-pypillowfight/Makefile +++ b/graphics/py-pypillowfight/Makefile @@ -12,7 +12,7 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=1.0:devel/py-nose@${PY_FLAVOR} -RUN_DEPENDS= ${PY_PILLOW} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} USES= python:3.6+ USE_PYTHON= distutils autoplist diff --git a/graphics/py-scikit-image/Makefile b/graphics/py-scikit-image/Makefile index 2c15d6b7fb42..57d7ce92f81a 100644 --- a/graphics/py-scikit-image/Makefile +++ b/graphics/py-scikit-image/Makefile @@ -12,7 +12,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt BUILD_DEPENDS= ${PYNUMPY} RUN_DEPENDS= ${PYNUMPY} \ - ${PY_PILLOW} \ + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}imageio>0:graphics/py-imageio@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}tifffile>0:graphics/py-tifffile@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>=0.9:science/py-scipy@${PY_FLAVOR} \ diff --git a/graphics/py-sorl-thumbnail/Makefile b/graphics/py-sorl-thumbnail/Makefile index 8dd61f6edfd2..581102849bc4 100644 --- a/graphics/py-sorl-thumbnail/Makefile +++ b/graphics/py-sorl-thumbnail/Makefile @@ -34,7 +34,7 @@ DOCS_VARS= PYDISTUTILS_BUILD_TARGET+="build_sphinx -a -E" GRAPHICSMAGICK_RUN_DEPENDS= ${LOCALBASE}/bin/gm:graphics/GraphicsMagick IMAGEMAGICK_RUN_DEPENDS= ${LOCALBASE}/bin/convert:graphics/ImageMagick6 -PILLOW_RUN_DEPENDS= ${PY_PILLOW} +PILLOW_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} REDIS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}redis>0:databases/py-redis@${PY_FLAVOR} WAND_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Wand>0:graphics/py-wand@${PY_FLAVOR} diff --git a/graphics/py-ueberzug/Makefile b/graphics/py-ueberzug/Makefile index 055ab013e976..3f46efaac7e6 100644 --- a/graphics/py-ueberzug/Makefile +++ b/graphics/py-ueberzug/Makefile @@ -9,7 +9,7 @@ COMMENT= Draw images on terminals with X11 child windows LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PY_PILLOW} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}attrs>=18.2.0:devel/py-attrs@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}docopt>=0:devel/py-docopt@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}psutil>=0:sysutils/py-psutil@${PY_FLAVOR} \ diff --git a/graphics/qgis-ltr/Makefile b/graphics/qgis-ltr/Makefile index c57bee8bc308..14b2cf5a7f4f 100644 --- a/graphics/qgis-ltr/Makefile +++ b/graphics/qgis-ltr/Makefile @@ -81,7 +81,7 @@ RUN_DEPENDS= astyle:devel/astyle \ ${PYTHON_PKGNAMEPREFIX}OWSLib>=0.18.0:graphics/py-OWSLib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pandas>=0.24.2:math/py-pandas@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pbr>=3.1.1:devel/py-pbr@${PY_FLAVOR} \ - ${PY_PILLOW} \ + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pip>=19.1.1:devel/py-pip@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}plotly>=3.0.2:graphics/py-plotly@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}psutil>=5.7.0:sysutils/py-psutil@${PY_FLAVOR} \ diff --git a/graphics/qgis/Makefile b/graphics/qgis/Makefile index bc5c2dabda5e..7e4cb32c7c6f 100644 --- a/graphics/qgis/Makefile +++ b/graphics/qgis/Makefile @@ -81,7 +81,7 @@ RUN_DEPENDS= astyle:devel/astyle \ ${PYTHON_PKGNAMEPREFIX}OWSLib>=0.18.0:graphics/py-OWSLib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pandas>=0.24.2:math/py-pandas@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pbr>=3.1.1:devel/py-pbr@${PY_FLAVOR} \ - ${PY_PILLOW} \ + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pip>=19.1.1:devel/py-pip@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}plotly>=3.0.2:graphics/py-plotly@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}psutil>=5.7.0:sysutils/py-psutil@${PY_FLAVOR} \ diff --git a/graphics/variety/Makefile b/graphics/variety/Makefile index e0c914fa8acf..3d9c9ffe2318 100644 --- a/graphics/variety/Makefile +++ b/graphics/variety/Makefile @@ -13,7 +13,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}python-distutils-extra>=2.38:devel/py-python-distutils-extra@${PY_FLAVOR} LIB_DEPENDS= libgexiv2.so:graphics/gexiv2 \ libnotify.so:devel/libnotify -RUN_DEPENDS= ${PY_PILLOW} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.3.2:www/py-beautifulsoup@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}cairo>=1.10.0:graphics/py-cairo@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}configobj>=5.0.6:devel/py-configobj@${PY_FLAVOR} \ diff --git a/lang/mono/Makefile b/lang/mono/Makefile index e8094d46e013..fe1dab4e4d4b 100644 --- a/lang/mono/Makefile +++ b/lang/mono/Makefile @@ -19,7 +19,7 @@ BUILD_DEPENDS= p5-XML-Parser>=0:textproc/p5-XML-Parser \ bash:shells/bash \ cmake>0:devel/cmake LIB_DEPENDS= libinotify.so:devel/libinotify -RUN_DEPENDS= ${PY_PILLOW} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \ ca_root_nss>=0:security/ca_root_nss CONFLICTS_INSTALL= czmq-3* diff --git a/lang/mono5.10/Makefile b/lang/mono5.10/Makefile index 3dd66c7a518c..eea44b6ace2d 100644 --- a/lang/mono5.10/Makefile +++ b/lang/mono5.10/Makefile @@ -20,7 +20,7 @@ BUILD_DEPENDS= p5-XML-Parser>=0:textproc/p5-XML-Parser \ bash:shells/bash \ cmake>0:devel/cmake LIB_DEPENDS= libinotify.so:devel/libinotify -RUN_DEPENDS= ${PY_PILLOW} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \ ca_root_nss>=0:security/ca_root_nss CONFLICTS_INSTALL= czmq-3* mono5.20 mono6.8 diff --git a/math/asymptote/Makefile b/math/asymptote/Makefile index 274d61913e5d..fa51c956f594 100644 --- a/math/asymptote/Makefile +++ b/math/asymptote/Makefile @@ -18,7 +18,7 @@ ONLY_FOR_ARCHS= amd64 i386 LIB_DEPENDS= libcurl.so:ftp/curl \ libsigsegv.so:devel/libsigsegv RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cson>=0.8:devel/py-cson@${PY_FLAVOR} \ - ${PY_PILLOW} + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} USES= compiler:c++14-lang gettext-runtime ghostscript gl gmake gnome ncurses perl5 python:3.6+ \ pyqt:5 shebangfix tar:tgz diff --git a/math/sage/Makefile b/math/sage/Makefile index 35b1253e5192..6dd5bce3c390 100644 --- a/math/sage/Makefile +++ b/math/sage/Makefile @@ -73,7 +73,7 @@ BUILD_DEPENDS= bash:shells/bash \ ${PYTHON_PKGNAMEPREFIX}path.py>0:devel/py-path.py@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}pexpect>0:misc/py-pexpect@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}pickleshare>0:databases/py-pickleshare@${PY_FLAVOR}\ - ${PY_PILLOW} \ + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pkgconfig>0:devel/py-pkgconfig@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}pplpy>0:math/py-pplpy@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}prometheus-client>0:net-mgmt/py-prometheus-client@${PY_FLAVOR}\ @@ -270,7 +270,7 @@ RUN_DEPENDS= bash:shells/bash \ ${PYTHON_PKGNAMEPREFIX}path.py>0:devel/py-path.py@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}pexpect>0:misc/py-pexpect@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}pickleshare>0:databases/py-pickleshare@${PY_FLAVOR}\ - ${PY_PILLOW} \ + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pkgconfig>0:devel/py-pkgconfig@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}pplpy>0:math/py-pplpy@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}prometheus-client>0:net-mgmt/py-prometheus-client@${PY_FLAVOR}\ diff --git a/misc/cs/Makefile b/misc/cs/Makefile index 0eec40e31536..46a0ec097eed 100644 --- a/misc/cs/Makefile +++ b/misc/cs/Makefile @@ -11,7 +11,7 @@ COMMENT= Cross Stitch software LICENSE= GPLv2+ -RUN_DEPENDS= ${PY_PILLOW} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} NO_BUILD= yes diff --git a/misc/ironscanner/Makefile b/misc/ironscanner/Makefile index 1659c8763744..46ebb02de2fd 100644 --- a/misc/ironscanner/Makefile +++ b/misc/ironscanner/Makefile @@ -8,7 +8,7 @@ COMMENT= Collect as much information as possible on image scanners LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PY_PILLOW} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyinsane2>0:graphics/py-pyinsane2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR} diff --git a/misc/mmdnn/Makefile b/misc/mmdnn/Makefile index a7ac2ab0b1ed..fd79b15a0371 100644 --- a/misc/mmdnn/Makefile +++ b/misc/mmdnn/Makefile @@ -9,7 +9,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYNUMPY} \ - ${PY_PILLOW} \ + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}protobuf>=3.6.0:devel/py-protobuf@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} diff --git a/misc/py-gluoncv/Makefile b/misc/py-gluoncv/Makefile index 1da8748de8e3..b657842c8a2e 100644 --- a/misc/py-gluoncv/Makefile +++ b/misc/py-gluoncv/Makefile @@ -11,7 +11,7 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE PY_DEPENDS= ${PYNUMPY} \ - ${PY_PILLOW} \ + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mxnet>0:misc/py-mxnet@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}portalocker>0:devel/py-portalocker@${PY_FLAVOR} \ diff --git a/misc/py-tflearn/Makefile b/misc/py-tflearn/Makefile index 3d129665f3ee..48979030a94b 100644 --- a/misc/py-tflearn/Makefile +++ b/misc/py-tflearn/Makefile @@ -11,7 +11,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYNUMPY} \ - ${PY_PILLOW} \ + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}tensorflow>0:science/py-tensorflow@${PY_FLAVOR} diff --git a/multimedia/photofilmstrip/Makefile b/multimedia/photofilmstrip/Makefile index 54060a7f6153..f10ccf88ca83 100644 --- a/multimedia/photofilmstrip/Makefile +++ b/multimedia/photofilmstrip/Makefile @@ -14,7 +14,7 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \ - ${PY_PILLOW} + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} RUN_DEPENDS= mencoder:multimedia/mencoder \ mplayer:multimedia/mplayer diff --git a/net-im/py-matrix-synapse/Makefile b/net-im/py-matrix-synapse/Makefile index eafea654f28d..ad2d32a068e2 100644 --- a/net-im/py-matrix-synapse/Makefile +++ b/net-im/py-matrix-synapse/Makefile @@ -28,7 +28,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}jsonschema>=2.5.1:devel/py-jsonschema@${PY_F ${PYTHON_PKGNAMEPREFIX}pyasn1>=0.1.9:devel/py-pyasn1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyasn1-modules>=0.0.7:devel/py-pyasn1-modules@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}bcrypt>=3.1.0:security/py-bcrypt@${PY_FLAVOR} \ - ${PY_PILLOW} \ + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sortedcontainers>=1.4.4:devel/py-sortedcontainers@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pysaml2>=4.5.2:security/py-pysaml2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pymacaroons>=0.13.0:security/py-pymacaroons@${PY_FLAVOR} \ diff --git a/net-mgmt/netbox/Makefile b/net-mgmt/netbox/Makefile index 9ba3d9b4ed1d..7ce178366ea0 100644 --- a/net-mgmt/netbox/Makefile +++ b/net-mgmt/netbox/Makefile @@ -40,7 +40,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django31>=3.1.7<3.2:www/py-django31@${PY_FLA ${PYTHON_PKGNAMEPREFIX}markdown>=2.6.11<3.5:textproc/py-markdown@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}netaddr>=0.8.0<1:net/py-netaddr@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pycryptodome>=3.10.1<4:security/py-pycryptodome@${PY_FLAVOR} \ - ${PY_PILLOW} \ + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}psycopg2>=2.8.6<3:databases/py-psycopg2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}svgwrite>=1.4.1<2:graphics/py-svgwrite@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}yaml>=5.3.1<6:devel/py-yaml@${PY_FLAVOR} \ diff --git a/net-p2p/deluge-cli/Makefile b/net-p2p/deluge-cli/Makefile index 25ad30f4d064..fadec746fee6 100644 --- a/net-p2p/deluge-cli/Makefile +++ b/net-p2p/deluge-cli/Makefile @@ -21,7 +21,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xdg>=0.18:devel/py-xdg@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mako>=0.2.5:textproc/py-mako@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}service_identity>=0:security/py-service_identity@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${PY_FLAVOR} \ - ${PY_PILLOW} \ + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}rencode>0:converters/py-rencode@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${PY_FLAVOR} \ diff --git a/print/hplip/Makefile b/print/hplip/Makefile index c73aa794ad8b..6bfb5fa4753e 100644 --- a/print/hplip/Makefile +++ b/print/hplip/Makefile @@ -51,7 +51,7 @@ FAX_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}reportlab>=0:print/py-reportlab@${PY_FLA FAX_CONFIGURE_ENABLE= fax-build SCAN_DESC= Scanning support -SCAN_RUN_DEPENDS= ${PY_PILLOW} +SCAN_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} SCAN_LIB_DEPENDS= libsane.so:graphics/sane-backends SCAN_CONFIGURE_ENABLE= scan-build diff --git a/print/py-reportlab/Makefile b/print/py-reportlab/Makefile index 0d491554d261..1f5b6c012fbd 100644 --- a/print/py-reportlab/Makefile +++ b/print/py-reportlab/Makefile @@ -15,7 +15,7 @@ COMMENT= Library to create PDF documents using the Python language LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PY_PILLOW} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} USES= python:3.6+ USE_PYTHON= distutils autoplist diff --git a/science/gramps/Makefile b/science/gramps/Makefile index f81d2bfb9ae7..dd142d98f167 100644 --- a/science/gramps/Makefile +++ b/science/gramps/Makefile @@ -41,7 +41,7 @@ TTFFREEFONT_DESC= More font support in reports GEXIV_LIB_DEPENDS= libgexiv2.so:graphics/gexiv2 GTKSPELL_LIB_DEPENDS= libgtkspell3-3.so:textproc/gtkspell3 -PIL_RUN_DEPENDS= ${PY_PILLOW} +PIL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} RCS_RUN_DEPENDS= rcsdiff:devel/rcs TTFFREEFONT_RUN_DEPENDS=${LOCALBASE}/share/fonts/freefont-ttf/FreeMono.ttf:x11-fonts/freefont-ttf diff --git a/science/rdkit/Makefile b/science/rdkit/Makefile index 48d07c89b420..451fdc0450fb 100644 --- a/science/rdkit/Makefile +++ b/science/rdkit/Makefile @@ -49,7 +49,7 @@ PYTHON_CMAKE_BOOL= RDK_BUILD_PYTHON_WRAPPERS PYTHON_BUILD_DEPENDS= ${PYNUMPY} PYTHON_LIB_DEPENDS= ${PY_BOOST} PYTHON_RUN_DEPENDS= ${PYNUMPY} \ - ${PY_PILLOW} \ + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}reportlab>0:print/py-reportlab@${PY_FLAVOR} diff --git a/security/vinetto/Makefile b/security/vinetto/Makefile index 972df51339ce..92c285cd88db 100644 --- a/security/vinetto/Makefile +++ b/security/vinetto/Makefile @@ -13,7 +13,7 @@ COMMENT= Forensics tool to examine Thumbs.db files LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS= ${PY_PILLOW} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} USES= python:3.6+ USE_PYTHON= autoplist distutils concurrent optsuffix diff --git a/textproc/py-ocrmypdf/Makefile b/textproc/py-ocrmypdf/Makefile index 657f338332e1..9b8cb93b34a6 100644 --- a/textproc/py-ocrmypdf/Makefile +++ b/textproc/py-ocrmypdf/Makefile @@ -17,7 +17,7 @@ LIB_DEPENDS= liblept.so:graphics/leptonica RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=1.9.1:devel/py-cffi@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}coloredlogs>=14.0:devel/py-coloredlogs@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}img2pdf>=0.3.0<0.5:graphics/py-img2pdf@${PY_FLAVOR} \ - ${PY_PILLOW} \ + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}tqdm>=4:misc/py-tqdm@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}reportlab>=3.3.0:print/py-reportlab@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pdfminer.six>=20191110<20201019:textproc/py-pdfminer.six@${PY_FLAVOR} \ diff --git a/textproc/py-pikepdf/Makefile b/textproc/py-pikepdf/Makefile index ef091293f26c..1a39ad3b5e1a 100644 --- a/textproc/py-pikepdf/Makefile +++ b/textproc/py-pikepdf/Makefile @@ -16,7 +16,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pybind11>=2.6.0<3:devel/py-pybind11@${PY_F ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} LIB_DEPENDS= libqpdf.so:print/qpdf RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=4.0:devel/py-lxml@${PY_FLAVOR} \ - ${PY_PILLOW} + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}attrs>=20.2.0:devel/py-attrs@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dateutil>=2.8.0:devel/py-dateutil@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}hypothesis>=5<6:devel/py-hypothesis@${PY_FLAVOR} \ @@ -26,7 +26,7 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}attrs>=20.2.0:devel/py-attrs@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest-helpers-namespace>=2019.1.8:devel/py-pytest-helpers-namespace@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest-timeout>=1.3.3:devel/py-pytest-timeout@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest-xdist>=1.28<3:devel/py-pytest-xdist@${PY_FLAVOR} \ - ${PY_PILLOW} \ + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}python-xmp-toolkit>=2.0.1:textproc/py-python-xmp-toolkit@${PY_FLAVOR} USES= compiler:c++14-lang python:3.6+ diff --git a/textproc/py-qrcode/Makefile b/textproc/py-qrcode/Makefile index f59fac7fc26d..31c15e895a39 100644 --- a/textproc/py-qrcode/Makefile +++ b/textproc/py-qrcode/Makefile @@ -13,7 +13,7 @@ COMMENT= QR Code image generator LICENSE= BSD3CLAUSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.8:devel/py-six@${PY_FLAVOR} \ - ${PY_PILLOW} + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils diff --git a/textproc/py-wordcloud/Makefile b/textproc/py-wordcloud/Makefile index d1fb24b26ac2..e37732b0e9b1 100644 --- a/textproc/py-wordcloud/Makefile +++ b/textproc/py-wordcloud/Makefile @@ -12,9 +12,9 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYNUMPY} \ - ${PY_PILLOW} + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} RUN_DEPENDS= ${PYNUMPY} \ - ${PY_PILLOW} \ + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pluggy>0:devel/py-pluggy@${PY_FLAVOR} \ diff --git a/www/py-bokeh/Makefile b/www/py-bokeh/Makefile index d0e12171de6c..a316c4b4685b 100644 --- a/www/py-bokeh/Makefile +++ b/www/py-bokeh/Makefile @@ -16,7 +16,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.7:devel/py-Jinja2@${PY_FLAVOR} \ ${PYNUMPY} \ ${PYTHON_PKGNAMEPREFIX}packaging>=16.8:devel/py-packaging@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dateutil>=2.1:devel/py-dateutil@${PY_FLAVOR} \ - ${PY_PILLOW} \ + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}yaml>=3.10:devel/py-yaml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>=1.5.2:devel/py-six@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}tornado>=5:www/py-tornado@${PY_FLAVOR} \ diff --git a/www/py-django-filer/Makefile b/www/py-django-filer/Makefile index b5ea0e7b9c1c..73f92f218f7c 100644 --- a/www/py-django-filer/Makefile +++ b/www/py-django-filer/Makefile @@ -18,7 +18,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django22>=1.11<4.0:www/py-django22@${PY_FLAV ${PYTHON_PKGNAMEPREFIX}django-polymorphic>=0.7<2.2:www/py-django-polymorphic@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}unidecode>=0.04<1.2:converters/py-unidecode@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \ - ${PY_PILLOW} + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} USES= python:3.5+ USE_PYTHON= autoplist distutils diff --git a/www/py-django-markdownx/Makefile b/www/py-django-markdownx/Makefile index 157e4ce4c38a..90e00d092beb 100644 --- a/www/py-django-markdownx/Makefile +++ b/www/py-django-markdownx/Makefile @@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django22>0:www/py-django22@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}markdown>0:textproc/py-markdown@${PY_FLAVOR} \ - ${PY_PILLOW} + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} USES= python:3.5+ USE_PYTHON= autoplist distutils diff --git a/www/py-django-photologue/Makefile b/www/py-django-photologue/Makefile index cad05e1fcd95..89f5339fc614 100644 --- a/www/py-django-photologue/Makefile +++ b/www/py-django-photologue/Makefile @@ -14,7 +14,7 @@ LICENSE= BSD3CLAUSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django22>=1.11:www/py-django22@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}django-sortedm2m>=3.0.0:www/py-django-sortedm2m@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}ExifRead>=2.1.2:graphics/py-exifread@${PY_FLAVOR} \ - ${PY_PILLOW} + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} USES= python:3.6+ # Required as www/py-django-sortedm2m needs Python 3.6+ USE_PYTHON= autoplist distutils diff --git a/www/py-django-simple-captcha/Makefile b/www/py-django-simple-captcha/Makefile index de97da85147d..50f4074adcf5 100644 --- a/www/py-django-simple-captcha/Makefile +++ b/www/py-django-simple-captcha/Makefile @@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django22>=1.7.0:www/py-django22@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}django-ranged-response>=0.2.0:www/py-django-ranged-response@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>=1.2.0:devel/py-six@${PY_FLAVOR} \ - ${PY_PILLOW} + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} USES= python:3.6+ zip USE_PYTHON= autoplist concurrent distutils diff --git a/www/py-pywikibot/Makefile b/www/py-pywikibot/Makefile index 136181da7ca4..7269a66e3686 100644 --- a/www/py-pywikibot/Makefile +++ b/www/py-pywikibot/Makefile @@ -36,7 +36,7 @@ PYDOT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pydot>0:graphics/py-pydot@${PY_FLAVOR GOOGLE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}google>0:www/py-google@${PY_FLAVOR} IRC_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}irc>0:irc/py-irc@${PY_FLAVOR} MWPARSE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mwparserfromhell>0:textproc/py-mwparserfromhell@${PY_FLAVOR} -PILLOW_RUN_DEPENDS= ${PY_PILLOW} +PILLOW_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} MWOAUTH_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mwoauth>0:www/py-mwoauth@${PY_FLAVOR} HTML_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beautifulsoup>0:www/py-beautifulsoup@${PY_FLAVOR} diff --git a/www/py-weboob/Makefile b/www/py-weboob/Makefile index e7a0a4d5e65c..ee7d0c16cf36 100644 --- a/www/py-weboob/Makefile +++ b/www/py-weboob/Makefile @@ -14,7 +14,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${PY_FLAVOR} ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \ - ${PY_PILLOW} \ + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}html2text>=3.200:textproc/py-html2text@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}cssselect>0:www/py-cssselect@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=2.0.0:www/py-requests@${PY_FLAVOR} diff --git a/www/seahub/Makefile b/www/seahub/Makefile index e26abc59b86c..d35f8eff932e 100644 --- a/www/seahub/Makefile +++ b/www/seahub/Makefile @@ -29,7 +29,7 @@ RUN_DEPENDS= bash:shells/bash \ ${PYTHON_PKGNAMEPREFIX}djangorestframework>=0:www/py-djangorestframework@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \ - ${PY_PILLOW} \ + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyjwt>=0:www/py-pyjwt@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pycryptodome>=0:security/py-pycryptodome@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests-oauthlib>=0:www/py-requests-oauthlib@${PY_FLAVOR} diff --git a/www/twms/Makefile b/www/twms/Makefile index ef76f54bc4a6..7f1230b64a56 100644 --- a/www/twms/Makefile +++ b/www/twms/Makefile @@ -11,7 +11,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyproj>0:graphics/py-pyproj@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}webpy>0:www/webpy@${PY_FLAVOR} \ - ${PY_PILLOW} \ + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}cairo>0:graphics/py-cairo@${PY_FLAVOR} \ ${FREESANS}:x11-fonts/freefont-ttf diff --git a/www/xist/Makefile b/www/xist/Makefile index cd355a4fc6cd..0cce86cadfc5 100644 --- a/www/xist/Makefile +++ b/www/xist/Makefile @@ -15,7 +15,7 @@ LICENSE= MIT RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cssutils>=1.0,1:www/py-cssutils@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}lxml>=3.4:devel/py-lxml@${PY_FLAVOR} \ - ${PY_PILLOW} + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} USES= python:3.6+ tar:bzip2 USE_PYTHON= autoplist distutils diff --git a/x11-toolkits/py-easygui/Makefile b/x11-toolkits/py-easygui/Makefile index 25072e98360d..2292ead70e35 100644 --- a/x11-toolkits/py-easygui/Makefile +++ b/x11-toolkits/py-easygui/Makefile @@ -11,7 +11,7 @@ COMMENT= Easy GUI programming in python LICENSE= BSD3CLAUSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${PY_FLAVOR} \ - ${PY_PILLOW} + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} USES= python:3.6+ USE_PYTHON= distutils autoplist diff --git a/x11/cinnamon/Makefile b/x11/cinnamon/Makefile index 242d60003c7c..7b9f85309cb2 100644 --- a/x11/cinnamon/Makefile +++ b/x11/cinnamon/Makefile @@ -27,7 +27,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus@${PY_FLAVOR} \ cinnamon-control-center:sysutils/cinnamon-control-center \ cinnamon-screensaver:x11/cinnamon-screensaver \ nemo:x11-fm/nemo \ - ${PY_PILLOW} \ + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyinotify>0:devel/py-pyinotify@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pexpect>0:misc/py-pexpect@${PY_FLAVOR} \ diff --git a/x11/py-pyscreenshot/Makefile b/x11/py-pyscreenshot/Makefile index 778655964b40..b00b02a85ef7 100644 --- a/x11/py-pyscreenshot/Makefile +++ b/x11/py-pyscreenshot/Makefile @@ -13,7 +13,7 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}easyprocess>0:devel/py-easyprocess@${PY_FLAVOR} \ - ${PY_PILLOW} \ + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \ import:graphics/ImageMagick6 USES= python:3.6+ diff --git a/x11/py-pyvirtualdisplay/Makefile b/x11/py-pyvirtualdisplay/Makefile index ab9ef53e3451..8801b96c446a 100644 --- a/x11/py-pyvirtualdisplay/Makefile +++ b/x11/py-pyvirtualdisplay/Makefile @@ -17,7 +17,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cog>=2.3:devel/py-cog@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}paver>0:devel/py-paver@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyscreenshot>0:x11/py-pyscreenshot@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR} \ - ${PY_PILLOW} \ + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \ xauth>0:x11/xauth USES= python:3.6+ diff --git a/x11/xpra/Makefile b/x11/xpra/Makefile index 9d9eb5653fa2..cbfbf0f279d1 100644 --- a/x11/xpra/Makefile +++ b/x11/xpra/Makefile @@ -11,7 +11,7 @@ LICENSE= GPLv2 BUILD_DEPENDS= brotli:archivers/brotli \ pandoc:textproc/hs-pandoc LIB_DEPENDS= libwebp.so:graphics/webp -RUN_DEPENDS= ${PY_PILLOW} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}bencode.py>1:converters/py-bencode.py@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}brotli>1:archivers/py-brotli@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}cryptography>1:security/py-cryptography@${PY_FLAVOR} \ -- 2.31.1