Date: Tue, 24 Mar 2020 19:54:57 +0000 (UTC) From: Antoine Brodin <antoine@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r529063 - in head: astro/py-astLib audio/lollypop cad/k40-whisperer comms/apitran databases/py-mongoengine deskutils/calibre deskutils/griffith devel/py-asciimatics devel/py-factory-boy... Message-ID: <202003241954.02OJsvZp065347@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: antoine Date: Tue Mar 24 19:54:57 2020 New Revision: 529063 URL: https://svnweb.freebsd.org/changeset/ports/529063 Log: Convert the tree to use PY_PILLOW With hat: portmgr Originally submitted by: kai Modified: head/astro/py-astLib/Makefile head/audio/lollypop/Makefile head/cad/k40-whisperer/Makefile head/comms/apitran/Makefile head/databases/py-mongoengine/Makefile head/deskutils/calibre/Makefile head/deskutils/griffith/Makefile head/devel/py-asciimatics/Makefile head/devel/py-factory-boy/Makefile head/devel/py-pydenticon/Makefile head/games/fretsonfire/Makefile head/games/hypatia_engine/Makefile head/games/openage/Makefile head/games/py-mnemosyne/Makefile head/games/pysolfc/Makefile head/games/unknown-horizons/Makefile head/graphics/caffe/Makefile head/graphics/impressive/Makefile head/graphics/py-PyOpenGL/Makefile head/graphics/py-actdiag/Makefile head/graphics/py-blockdiag/Makefile head/graphics/py-cairosvg/Makefile head/graphics/py-cartopy/Makefile head/graphics/py-django-easy-thumbnails/Makefile head/graphics/py-face_recognition/Makefile head/graphics/py-imageio/Makefile head/graphics/py-imageio24/Makefile head/graphics/py-img2pdf/Makefile head/graphics/py-nwdiag/Makefile head/graphics/py-photocollage/Makefile head/graphics/py-pyinsane2/Makefile head/graphics/py-pyocr/Makefile head/graphics/py-pypillowfight/Makefile head/graphics/py-sane/Makefile head/graphics/py-scikit-image/Makefile head/graphics/py-seqdiag/Makefile head/graphics/py-sorl-thumbnail/Makefile head/graphics/py-willow/Makefile head/graphics/qgis-ltr/Makefile head/graphics/qgis/Makefile head/graphics/sk1/Makefile head/graphics/variety/Makefile head/lang/mono/Makefile head/math/asymptote/Makefile head/math/py-PyWavelets/Makefile head/math/py-plastex/Makefile head/misc/cs/Makefile head/misc/ironscanner/Makefile head/misc/mmdnn/Makefile head/misc/py-gluoncv/Makefile head/misc/py-tflearn/Makefile head/misc/wotsap/Makefile head/multimedia/freevo/Makefile head/net-im/py-matrix-synapse/Makefile head/net-mgmt/netbox/Makefile head/net-p2p/deluge-cli/Makefile head/net/py-rainbowstream/Makefile head/print/hplip/Makefile head/print/py-reportlab/Makefile head/print/py-trml2pdf/Makefile head/science/gramps/Makefile head/science/rdkit/Makefile head/security/py-volatility/Makefile head/security/vinetto/Makefile head/textproc/py-ocrmypdf/Makefile head/textproc/py-pikepdf/Makefile head/textproc/py-qrcode/Makefile head/textproc/py-xhtml2pdf/Makefile head/www/go-appengine-sdk/Makefile head/www/google-appengine/Makefile head/www/py-bokeh/Makefile head/www/py-django-filer/Makefile head/www/py-django-markdownx/Makefile head/www/py-django-mezzanine/Makefile head/www/py-django-photologue/Makefile head/www/py-django-simple-captcha/Makefile head/www/py-instabot/Makefile head/www/py-pywikibot/Makefile head/www/py-wagtail/Makefile head/www/py-weboob/Makefile head/www/seahub/Makefile head/www/twms/Makefile head/www/xist/Makefile head/x11-toolkits/py-easygui/Makefile head/x11/cinnamon/Makefile head/x11/py-pyscreenshot/Makefile head/x11/py-pyvirtualdisplay/Makefile Modified: head/astro/py-astLib/Makefile ============================================================================== --- head/astro/py-astLib/Makefile Tue Mar 24 19:53:21 2020 (r529062) +++ head/astro/py-astLib/Makefile Tue Mar 24 19:54:57 2020 (r529063) @@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}astropy>=1.1:astro/py-astropy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>=0.98:math/py-matplotlib@${PY_FLAVOR} \ ${PYNUMPY} \ - ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR} \ + ${PY_PILLOW} \ ${PYTHON_PKGNAMEPREFIX}scipy>=0.7.0:science/py-scipy@${PY_FLAVOR} PORTSCOUT= skipv:0.15,0.17,0.17.1 # incorrect versioning upstream Modified: head/audio/lollypop/Makefile ============================================================================== --- head/audio/lollypop/Makefile Tue Mar 24 19:53:21 2020 (r529062) +++ head/audio/lollypop/Makefile Tue Mar 24 19:54:57 2020 (r529063) @@ -17,7 +17,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7.8:dat ${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} \ - ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR} + ${PY_PILLOW} LIB_DEPENDS= libnotify.so:devel/libnotify \ libappstream-glib.so:devel/appstream-glib \ libtotem-plparser.so:multimedia/totem-pl-parser Modified: head/cad/k40-whisperer/Makefile ============================================================================== --- head/cad/k40-whisperer/Makefile Tue Mar 24 19:53:21 2020 (r529062) +++ head/cad/k40-whisperer/Makefile Tue Mar 24 19:54:57 2020 (r529063) @@ -14,7 +14,8 @@ LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/gpl-3.0.txt RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}usb>0:devel/py-usb@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}usb>0:devel/py-usb@${PY_FLAVOR} \ + ${PY_PILLOW} USES= python:run,-3.7 shebangfix zip SHEBANG_FILES= *.py @@ -39,14 +40,6 @@ _NON_DATA_FILES= ${_DOCS} ${LICENSE_FILE:S,${WRKSRC}/, py2exe_setup.py requirements.txt _WHISPERER_COMMAND= ${PORTNAME} -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3500 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} -.else -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} -.endif - do-install: ${INSTALL_SCRIPT} ${WRKDIR}/${_WHISPERER_COMMAND} ${STAGEDIR}${PREFIX}/bin @${MKDIR} ${STAGEDIR}${DATADIR} @@ -55,4 +48,4 @@ do-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${_DOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/comms/apitran/Makefile ============================================================================== --- head/comms/apitran/Makefile Tue Mar 24 19:53:21 2020 (r529062) +++ head/comms/apitran/Makefile Tue Mar 24 19:54:57 2020 (r529063) @@ -15,6 +15,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} \ sox:audio/sox \ display:graphics/ImageMagick6 @@ -28,14 +29,6 @@ NO_BUILD= yes NO_ARCH= yes SHEBANG_FILES= apitran -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3500 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} -.else -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} -.endif - do-install: ${INSTALL_SCRIPT} ${WRKSRC}/apitran ${STAGEDIR}${PREFIX}/bin ${MKDIR} ${STAGEDIR}${DOCSDIR} @@ -47,4 +40,4 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/Examples/$f ${STAGEDIR}${EXAMPLESDIR} .endfor -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/databases/py-mongoengine/Makefile ============================================================================== --- head/databases/py-mongoengine/Makefile Tue Mar 24 19:53:21 2020 (r529062) +++ head/databases/py-mongoengine/Makefile Tue Mar 24 19:54:57 2020 (r529063) @@ -16,7 +16,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pymongo>=3.4:databases/pymongo@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}blinker>0:devel/py-blinker@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}blinker>0:devel/py-blinker@${PY_FLAVOR} \ + ${PY_PILLOW} py27_TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${PY_FLAVOR} USES= python @@ -24,14 +25,6 @@ USE_PYTHON= autoplist distutils NO_ARCH= yes -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3500 -TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow6>=2.0.0:graphics/py-pillow6@${PY_FLAVOR} -.else -TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow>=2.0.0:graphics/py-pillow@${PY_FLAVOR} -.endif - # bson is provided by pymongo post-patch: @${RM} -r ${WRKSRC}/bson @@ -39,4 +32,4 @@ post-patch: do-test: cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/deskutils/calibre/Makefile ============================================================================== --- head/deskutils/calibre/Makefile Tue Mar 24 19:53:21 2020 (r529062) +++ head/deskutils/calibre/Makefile Tue Mar 24 19:54:57 2020 (r529063) @@ -29,7 +29,8 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:datab ${PYTHON_PKGNAMEPREFIX}apsw>=0:databases/py-apsw@${PY_FLAVOR} \ ${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} + ${PYTHON_PKGNAMEPREFIX}html5-parser>=0.4.3:www/py-html5-parser@${PY_FLAVOR} \ + ${PY_PILLOW} RUN_DEPENDS= xdg-open:devel/xdg-utils \ ${PYTHON_PKGNAMEPREFIX}css-parser>=1.0.4:www/py-css-parser@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dnspython>=0:dns/py-dnspython@${PY_FLAVOR} \ @@ -47,6 +48,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} \ pdftohtml:graphics/poppler-utils USES= desktop-file-utils gettext-runtime gl gnome localbase:ldflags \ @@ -85,16 +87,12 @@ OPTIONS_SINGLE_PYTHON= PYTHON2 PYTHON3 OPTIONS_DEFAULT= PYTHON2 OPTINS_SUB= yes -PYTHON2_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow6>=0:graphics/py-pillow6@${PY_FLAVOR} -PYTHON2_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow6>=0:graphics/py-pillow6@${PY_FLAVOR} PYTHON2_USES= python:2.7 PYTHON2_VARS= PYTHON_BIN=${LOCALBASE}/bin/python2 \ DEPRECATED="Uses deprecated version of python" \ EXPIRATION_DATE=2020-09-15 PYTHON2_PLIST_SUB= SODIR="" -PYTHON3_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR} -PYTHON3_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR} PYTHON3_USES= python:3.5+ PYTHON3_VARS= PYTHON_BIN=${LOCALBASE}/bin/python3 PYTHON3_MAKE_ENV= CALIBRE_PY3_PORT=1 Modified: head/deskutils/griffith/Makefile ============================================================================== --- head/deskutils/griffith/Makefile Tue Mar 24 19:53:21 2020 (r529062) +++ head/deskutils/griffith/Makefile Tue Mar 24 19:54:57 2020 (r529063) @@ -13,7 +13,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} \ - ${PYTHON_PKGNAMEPREFIX}pillow>=4.3:graphics/py-pillow@${PY_FLAVOR} \ + ${PY_PILLOW} \ ${PYTHON_PKGNAMEPREFIX}reportlab>=3.4:print/py-reportlab@${PY_FLAVOR} USES= gettext-runtime gmake gnome python:3.4+ shebangfix Modified: head/devel/py-asciimatics/Makefile ============================================================================== --- head/devel/py-asciimatics/Makefile Tue Mar 24 19:53:21 2020 (r529062) +++ head/devel/py-asciimatics/Makefile Tue Mar 24 19:54:57 2020 (r529063) @@ -15,7 +15,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} \ - ${PYTHON_PKGNAMEPREFIX}pillow6>=2.7.0:graphics/py-pillow6@${PY_FLAVOR} \ + ${PY_PILLOW} \ ${PYTHON_PKGNAMEPREFIX}pyfiglet>=0.7.2:misc/py-pyfiglet@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wcwidth>0:devel/py-wcwidth@${PY_FLAVOR} Modified: head/devel/py-factory-boy/Makefile ============================================================================== --- head/devel/py-factory-boy/Makefile Tue Mar 24 19:53:21 2020 (r529062) +++ head/devel/py-factory-boy/Makefile Tue Mar 24 19:54:57 2020 (r529063) @@ -25,7 +25,8 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage>=0:devel ${PYTHON_PKGNAMEPREFIX}mongoengine>=0:databases/py-mongoengine@${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} + ${PYTHON_PKGNAMEPREFIX}text-unidecode>=0:converters/py-text-unidecode@${PY_FLAVOR} \ + ${PY_PILLOW} USES= python USE_PYTHON= autoplist concurrent distutils @@ -34,13 +35,6 @@ TEST_ENV= PYTHONPATH=${WRKSRC}/src NO_ARCH= yes -.include <bsd.port.pre.mk> -.if ${PYTHON_REL} < 3500 -TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow6>=0:graphics/py-pillow6@${PY_FLAVOR} -.else -TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR} -.endif - do-test: cd ${WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m unittest discover \ -k test_alchemy \ @@ -54,4 +48,4 @@ do-test: -k test_using \ -k test_utils -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/devel/py-pydenticon/Makefile ============================================================================== --- head/devel/py-pydenticon/Makefile Tue Mar 24 19:53:21 2020 (r529062) +++ head/devel/py-pydenticon/Makefile Tue Mar 24 19:54:57 2020 (r529063) @@ -14,6 +14,7 @@ COMMENT= Library for generating identicons - an enhanc LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE +RUN_DEPENDS= ${PY_PILLOW} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} USES= python @@ -21,15 +22,7 @@ USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3500 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow6>=0:graphics/py-pillow6@${PY_FLAVOR} -.else -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR} -.endif - do-test: @(cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test) -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/games/fretsonfire/Makefile ============================================================================== --- head/games/fretsonfire/Makefile Tue Mar 24 19:53:21 2020 (r529062) +++ head/games/fretsonfire/Makefile Tue Mar 24 19:54:57 2020 (r529063) @@ -17,6 +17,7 @@ LICENSE_FILE= ${WRKSRC}/copying.txt RUN_DEPENDS= ${PYNUMPY} \ ${PYGAME} \ + ${PY_PILLOW} \ ${PYTHON_PKGNAMEPREFIX}PyOpenGL>=0:graphics/py-PyOpenGL@${PY_FLAVOR} \ ${LOCALBASE}/share/${PORTNAME}/default.ttf:games/fretsonfire-data @@ -37,14 +38,6 @@ OPTIONS_DEFINE= DOCS PORTNAME_UCASE= FretsOnFire -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3500 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow6>=0:graphics/py-pillow6@${PY_FLAVOR} -.else -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR} -.endif - do-install: @${MKDIR} ${STAGEDIR}${FOF_DIR}/${PORTNAME_UCASE} @cd ${WRKSRC}/src && \ @@ -60,4 +53,4 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/readme.txt ${STAGEDIR}${DOCSDIR}/README ${INSTALL_DATA} ${WRKSRC}/install.txt ${STAGEDIR}${DOCSDIR}/INSTALL -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/games/hypatia_engine/Makefile ============================================================================== --- head/games/hypatia_engine/Makefile Tue Mar 24 19:53:21 2020 (r529062) +++ head/games/hypatia_engine/Makefile Tue Mar 24 19:54:57 2020 (r529063) @@ -14,17 +14,10 @@ LICENSE= MIT RUN_DEPENDS= ${PYGAME} \ ${PYTHON_PKGNAMEPREFIX}pyganim>0:graphics/py-pyganim@${PY_FLAVOR} \ - ${PY_ENUM34} + ${PY_ENUM34} \ + ${PY_PILLOW} USES= python USE_PYTHON= autoplist concurrent distutils -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3500 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} -.else -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/games/openage/Makefile ============================================================================== --- head/games/openage/Makefile Tue Mar 24 19:53:21 2020 (r529062) +++ head/games/openage/Makefile Tue Mar 24 19:54:57 2020 (r529063) @@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/legal/GPLv3 BUILD_DEPENDS= ${PYNUMPY} \ ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \ + ${PY_PILLOW} \ ${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments@${PY_FLAVOR} LIB_DEPENDS= libepoxy.so:graphics/libepoxy \ libfontconfig.so:x11-fonts/fontconfig \ @@ -28,7 +28,7 @@ LIB_DEPENDS= libepoxy.so:graphics/libepoxy \ libnyan.so:lang/nyan RUN_DEPENDS= ${PYNUMPY} \ ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \ + ${PY_PILLOW} \ ${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments@${PY_FLAVOR} USES= cmake compiler:c++17-lang gl python:3.4+ qt:5 sdl shebangfix Modified: head/games/py-mnemosyne/Makefile ============================================================================== --- head/games/py-mnemosyne/Makefile Tue Mar 24 19:53:21 2020 (r529062) +++ head/games/py-mnemosyne/Makefile Tue Mar 24 19:54:57 2020 (r529063) @@ -17,7 +17,7 @@ LICENSE= LGPL3 RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}PyOpenGL>=0:graphics/py-PyOpenGL@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR} \ + ${PY_PILLOW} \ ${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} Modified: head/games/pysolfc/Makefile ============================================================================== --- head/games/pysolfc/Makefile Tue Mar 24 19:53:21 2020 (r529062) +++ head/games/pysolfc/Makefile Tue Mar 24 19:54:57 2020 (r529063) @@ -18,7 +18,8 @@ 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} + ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${PY_FLAVOR} \ + ${PY_PILLOW} LICENSE_FILE_GPLv3+ = ${WRKSRC}/COPYING LICENSE_DISTFILES_GPLv3+ = ${PYSOLFCDIST} @@ -74,14 +75,6 @@ PYSOLFCDIST= ${PYSOLFCDIR}${EXTRACT_SUFX} CARDSETDIR= PySolFC-Cardsets-2.0 CARDSETDIST= ${CARDSETDIR}.tar.bz2 -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3500 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} -.else -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} -.endif - post-patch: @${MV} ${WRKSRC}/pysol.py ${WRKSRC}/pysolfc @${REINPLACE_CMD} -e 's|pysol.py|pysolfc|' ${WRKSRC}/setup.py @@ -104,4 +97,4 @@ post-install: (cd ${WRKDIR}/${CARDSETDIR} && \ ${FIND} . -type f | ${SED} -e 's|^./|${DATADIR_REL}/|' >> ${TMPPLIST}) -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/games/unknown-horizons/Makefile ============================================================================== --- head/games/unknown-horizons/Makefile Tue Mar 24 19:53:21 2020 (r529062) +++ head/games/unknown-horizons/Makefile Tue Mar 24 19:54:57 2020 (r529063) @@ -11,7 +11,7 @@ COMMENT= Real time simulation game LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/doc/licenses/GPL -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR} \ +BUILD_DEPENDS= ${PY_PILLOW} \ ${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} \ Modified: head/graphics/caffe/Makefile ============================================================================== --- head/graphics/caffe/Makefile Tue Mar 24 19:53:21 2020 (r529062) +++ head/graphics/caffe/Makefile Tue Mar 24 19:54:57 2020 (r529063) @@ -30,7 +30,7 @@ LIB_DEPENDS= libsnappy.so:archivers/snappy \ RUN_DEPENDS= ${PYNUMPY} \ ${PYTHON_PKGNAMEPREFIX}protobuf>=2.5.0:devel/py-protobuf@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scikit-image>=0.12:graphics/py-scikit-image@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pillow6>=1.7:graphics/py-pillow6@${PY_FLAVOR} \ + ${PY_PILLOW} \ ${PYTHON_PKGNAMEPREFIX}networkx>=1.8:math/py-networkx@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>=1.1:math/py-matplotlib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}PyWavelets>=0.4:math/py-PyWavelets@${PY_FLAVOR} Modified: head/graphics/impressive/Makefile ============================================================================== --- head/graphics/impressive/Makefile Tue Mar 24 19:53:21 2020 (r529062) +++ head/graphics/impressive/Makefile Tue Mar 24 19:54:57 2020 (r529063) @@ -19,7 +19,7 @@ EXPIRATION_DATE= 2020-09-15 RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}PyOpenGL>=0:graphics/py-PyOpenGL@${PY_FLAVOR} \ ${PYGAME} \ - ${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} + ${PY_PILLOW} USES= python:2.7 sdl shebangfix USE_SDL= sdl Modified: head/graphics/py-PyOpenGL/Makefile ============================================================================== --- head/graphics/py-PyOpenGL/Makefile Tue Mar 24 19:53:21 2020 (r529062) +++ head/graphics/py-PyOpenGL/Makefile Tue Mar 24 19:54:57 2020 (r529063) @@ -12,8 +12,10 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= python@FreeBSD.org COMMENT= OpenGL (and related library) interface for Python -BUILD_DEPENDS= ${PYNUMPY} -RUN_DEPENDS= ${PYNUMPY} +BUILD_DEPENDS= ${PYNUMPY} \ + ${PY_PILLOW} +RUN_DEPENDS= ${PYNUMPY} \ + ${PY_PILLOW} OPTIONS_DEFINE= TKINTER OPTIONS_DEFAULT= TKINTER @@ -26,20 +28,10 @@ USE_PYTHON= distutils autoplist TKINTER_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${PY_FLAVOR} TKINTER_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${PY_FLAVOR} -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3500 -BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} -.else -BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} -.endif - post-patch: @${FIND} ${WRKSRC} -name '*.[ch]' | ${XARGS} ${REINPLACE_CMD} -e \ 's|<malloc\.h>|<stdlib.h>|g' @${FIND} ${WRKSRC} -name "*.bak" -delete ${REINPLACE_CMD} -e 's|posix |posix|g' ${WRKSRC}/OpenGL/__init__.py -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/graphics/py-actdiag/Makefile ============================================================================== --- head/graphics/py-actdiag/Makefile Tue Mar 24 19:53:21 2020 (r529062) +++ head/graphics/py-actdiag/Makefile Tue Mar 24 19:54:57 2020 (r529063) @@ -17,7 +17,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE DEPRECATED= Uses deprecated version of python EXPIRATION_DATE= 2020-08-15 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow6>=2.2.1:graphics/py-pillow6@${PY_FLAVOR} \ +RUN_DEPENDS= ${PY_PILLOW} \ ${PYTHON_PKGNAMEPREFIX}blockdiag>=1.5.0:graphics/py-blockdiag@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}funcparserlib>=0.3.6:devel/py-funcparserlib@${PY_FLAVOR} Modified: head/graphics/py-blockdiag/Makefile ============================================================================== --- head/graphics/py-blockdiag/Makefile Tue Mar 24 19:53:21 2020 (r529062) +++ head/graphics/py-blockdiag/Makefile Tue Mar 24 19:54:57 2020 (r529063) @@ -14,7 +14,7 @@ COMMENT= Simple block-diagram image generator LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow6>=2.2.1:graphics/py-pillow6@${PY_FLAVOR} \ +RUN_DEPENDS= ${PY_PILLOW} \ ${PYTHON_PKGNAMEPREFIX}funcparserlib>=0.3.6:devel/py-funcparserlib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}webcolors>=0:graphics/py-webcolors@${PY_FLAVOR} Modified: head/graphics/py-cairosvg/Makefile ============================================================================== --- head/graphics/py-cairosvg/Makefile Tue Mar 24 19:53:21 2020 (r529062) +++ head/graphics/py-cairosvg/Makefile Tue Mar 24 19:54:57 2020 (r529063) @@ -18,7 +18,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-runner>=0 RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cairocffi>=0:graphics/py-cairocffi@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}cssselect2>=0:textproc/py-cssselect2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}defusedxml>=0:devel/py-defusedxml@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR} \ + ${PY_PILLOW} \ ${PYTHON_PKGNAMEPREFIX}tinycss2>=0:textproc/py-tinycss2@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest-isort>=0:devel/py-pytest-isort@${PY_FLAVOR} \ Modified: head/graphics/py-cartopy/Makefile ============================================================================== --- head/graphics/py-cartopy/Makefile Tue Mar 24 19:53:21 2020 (r529062) +++ head/graphics/py-cartopy/Makefile Tue Mar 24 19:54:57 2020 (r529063) @@ -36,19 +36,11 @@ OWS_DESC= OGC Web Service support PLOTTING_DESC= Plotting support EPSG_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyepsg>=0:graphics/py-pyepsg@${PY_FLAVOR} -OWS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}OWSLib>=0.8.11:graphics/py-OWSLib@${PY_FLAVOR} +OWS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}OWSLib>=0.8.11:graphics/py-OWSLib@${PY_FLAVOR} \ + ${PY_PILLOW} PLOTTING_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gdal>=1.10.0:graphics/py-gdal@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>=1.5.1:math/py-matplotlib@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}scipy>=0.10:science/py-scipy@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}scipy>=0.10:science/py-scipy@${PY_FLAVOR} \ + ${PY_PILLOW} -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3500 -OWS_RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow6>=1.7.8:graphics/py-pillow6@${PY_FLAVOR} -PLOTTING_RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow6>=1.7.8:graphics/py-pillow6@${PY_FLAVOR} -.else -OWS_RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow>=1.7.8:graphics/py-pillow@${PY_FLAVOR} -PLOTTING_RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow>=1.7.8:graphics/py-pillow@${PY_FLAVOR} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/graphics/py-django-easy-thumbnails/Makefile ============================================================================== --- head/graphics/py-django-easy-thumbnails/Makefile Tue Mar 24 19:53:21 2020 (r529062) +++ head/graphics/py-django-easy-thumbnails/Makefile Tue Mar 24 19:54:57 2020 (r529063) @@ -14,7 +14,8 @@ COMMENT= Easy thumbnails for Django LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=1.8:www/py-django111@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=1.8:www/py-django111@${PY_FLAVOR} \ + ${PY_PILLOW} USES= python USE_PYTHON= autoplist concurrent distutils @@ -24,19 +25,10 @@ PORTDOCS= * OPTIONS_DEFINE= DOCS DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=1.8:www/py-django111@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR} \ + ${PY_PILLOW} DOCS_VARS= PYDISTUTILS_BUILD_TARGET+="build_sphinx -a -E" -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3500 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow6>=0:graphics/py-pillow6@${PY_FLAVOR} -DOCS_BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} -.else -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR} -DOCS_BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} -.endif - post-patch-DOCS-on: @${REINPLACE_CMD} -e 's|^\(release = \)\(easy_thumbnails.get_version()\)|\1version|' ${WRKSRC}/docs/conf.py @@ -44,4 +36,4 @@ post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC}/build/sphinx/html && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} "! -name .buildinfo -and ! -name objects.inv") -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/graphics/py-face_recognition/Makefile ============================================================================== --- head/graphics/py-face_recognition/Makefile Tue Mar 24 19:53:21 2020 (r529062) +++ head/graphics/py-face_recognition/Makefile Tue Mar 24 19:54:57 2020 (r529063) @@ -17,19 +17,12 @@ LICENSE_FILE= ${WRKSRC}/LICENSE 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} + ${PYTHON_PKGNAMEPREFIX}dlib>=19.7:science/py-dlib@${PY_FLAVOR} \ + ${PY_PILLOW} USES= python USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3500 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} -.else -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/graphics/py-imageio/Makefile ============================================================================== --- head/graphics/py-imageio/Makefile Tue Mar 24 19:53:21 2020 (r529062) +++ head/graphics/py-imageio/Makefile Tue Mar 24 19:54:57 2020 (r529063) @@ -16,7 +16,7 @@ LIB_DEPENDS= libfreeimage.so:graphics/freeimage RUN_DEPENDS= ffmpeg:multimedia/ffmpeg \ ${PYTHON_PKGNAMEPREFIX}imageio-ffmpeg>=0:graphics/py-imageio-ffmpeg@${PY_FLAVOR} \ ${PYNUMPY} \ - ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR} + ${PY_PILLOW} USES= python:3.4+ USE_PYTHON= autoplist distutils Modified: head/graphics/py-imageio24/Makefile ============================================================================== --- head/graphics/py-imageio24/Makefile Tue Mar 24 19:53:21 2020 (r529062) +++ head/graphics/py-imageio24/Makefile Tue Mar 24 19:54:57 2020 (r529063) @@ -18,6 +18,7 @@ LIB_DEPENDS= libfreeimage.so:graphics/freeimage RUN_DEPENDS= ffmpeg:multimedia/ffmpeg \ ${PY_ENUM34} \ ${PY_FUTURES} \ + ${PY_PILLOW} \ ${PYNUMPY} USES= python @@ -27,12 +28,4 @@ NO_ARCH= yes PORTSCOUT= limit:^2\.4\. -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3500 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} -.else -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/graphics/py-img2pdf/Makefile ============================================================================== --- head/graphics/py-img2pdf/Makefile Tue Mar 24 19:53:21 2020 (r529062) +++ head/graphics/py-img2pdf/Makefile Tue Mar 24 19:54:57 2020 (r529063) @@ -13,7 +13,8 @@ COMMENT= Convert images to PDF via direct JPEG inclusi LICENSE= LGPL3+ LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PY_ENUM34} +RUN_DEPENDS= ${PY_ENUM34} \ + ${PY_PILLOW} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pdfrw>0:textproc/py-pdfrw@${PY_FLAVOR} USES= python @@ -21,17 +22,9 @@ USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3500 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} -.else -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} -.endif - # Note: The tests only work with Python 3, see also: # https://gitlab.mister-muffin.de/josch/img2pdf/issues/60 do-test: @(cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test) -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/graphics/py-nwdiag/Makefile ============================================================================== --- head/graphics/py-nwdiag/Makefile Tue Mar 24 19:53:21 2020 (r529062) +++ head/graphics/py-nwdiag/Makefile Tue Mar 24 19:54:57 2020 (r529063) @@ -17,7 +17,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE DEPRECATED= Uses deprecated version of python EXPIRATION_DATE= 2020-08-15 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow6>=2.2.1:graphics/py-pillow6@${PY_FLAVOR} \ +RUN_DEPENDS= ${PY_PILLOW} \ ${PYTHON_PKGNAMEPREFIX}funcparserlib>=0.3.6:devel/py-funcparserlib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}blockdiag>=1.5.0:graphics/py-blockdiag@${PY_FLAVOR} Modified: head/graphics/py-photocollage/Makefile ============================================================================== --- head/graphics/py-photocollage/Makefile Tue Mar 24 19:53:21 2020 (r529062) +++ head/graphics/py-photocollage/Makefile Tue Mar 24 19:54:57 2020 (r529063) @@ -14,20 +14,13 @@ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cairo>0:graphics/py-cairo@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}six>:devel/py-six@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}six>:devel/py-six@${PY_FLAVOR} \ + ${PY_PILLOW} USES= gettext-tools python USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3500 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} -.else -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} -.endif - post-patch: @${REINPLACE_CMD} -e ' \ s|${PORTNAME}|${PORTNAME}-${PYTHON_VER}| ; \ @@ -39,4 +32,4 @@ post-patch: ${MV} $$f $$(${ECHO} $$f | ${SED} -E 's|photocollage\.([[:alpha:].]*)|photocollage-${PYTHON_VER}.\1|'); \ done -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/graphics/py-pyinsane2/Makefile ============================================================================== --- head/graphics/py-pyinsane2/Makefile Tue Mar 24 19:53:21 2020 (r529062) +++ head/graphics/py-pyinsane2/Makefile Tue Mar 24 19:54:57 2020 (r529063) @@ -14,17 +14,10 @@ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=1.0:devel/py-nose@${PY_FLAVOR} +RUN_DEPENDS= ${PY_PILLOW} USES= gmake python USE_PYTHON= distutils autoplist NO_ARCH= yes -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3500 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} -.else -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/graphics/py-pyocr/Makefile ============================================================================== --- head/graphics/py-pyocr/Makefile Tue Mar 24 19:53:21 2020 (r529062) +++ head/graphics/py-pyocr/Makefile Tue Mar 24 19:54:57 2020 (r529063) @@ -13,7 +13,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= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} +RUN_DEPENDS= ${PY_PILLOW} USES= gmake python:3.4+ USE_PYTHON= distutils autoplist Modified: head/graphics/py-pypillowfight/Makefile ============================================================================== --- head/graphics/py-pypillowfight/Makefile Tue Mar 24 19:53:21 2020 (r529062) +++ head/graphics/py-pypillowfight/Makefile Tue Mar 24 19:54:57 2020 (r529063) @@ -14,16 +14,9 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=1.0:devel/py-nose@${PY_FLAVOR} +RUN_DEPENDS= ${PY_PILLOW} USES= python USE_PYTHON= distutils autoplist -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3500 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} -.else -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/graphics/py-sane/Makefile ============================================================================== --- head/graphics/py-sane/Makefile Tue Mar 24 19:53:21 2020 (r529062) +++ head/graphics/py-sane/Makefile Tue Mar 24 19:54:57 2020 (r529063) @@ -17,7 +17,7 @@ DEPRECATED= Uses deprecated version of python EXPIRATION_DATE= 2020-08-15 LIB_DEPENDS= libsane.so:graphics/sane-backends -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} +RUN_DEPENDS= ${PY_PILLOW} DIST_SUBDIR= python USES= python:2.7 Modified: head/graphics/py-scikit-image/Makefile ============================================================================== --- head/graphics/py-scikit-image/Makefile Tue Mar 24 19:53:21 2020 (r529062) +++ head/graphics/py-scikit-image/Makefile Tue Mar 24 19:54:57 2020 (r529063) @@ -18,6 +18,7 @@ BUILD_DEPENDS= ${PYNUMPY} \ ${PYTHON_PKGNAMEPREFIX}scipy>=0.9:science/py-scipy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}numpydoc>=0.6:textproc/py-numpydoc@${PY_FLAVOR} RUN_DEPENDS= ${PYNUMPY} \ + ${PY_PILLOW} \ ${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py-six@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>=0.9:science/py-scipy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}numpydoc>=0.6:textproc/py-numpydoc@${PY_FLAVOR} \ @@ -33,14 +34,6 @@ USE_PYTHON= autoplist concurrent distutils cython cyth PYDISTUTILS_BUILD_TARGET= build build_ext PYDISTUTILS_BUILDARGS+= saveopts -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3500 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow6>=1.7:graphics/py-pillow6@${PY_FLAVOR} -.else -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow>=1.7:graphics/py-pillow@${PY_FLAVOR} -.endif - post-install: @${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR}/skimage -name "*.so" -exec ${STRIP_CMD} {} \; @@ -50,4 +43,4 @@ do-test: ${PYTHON_CMD} selftest.py && \ ${PYTHON_CMD} -m nose -vx Tests/test_*.py -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/graphics/py-seqdiag/Makefile ============================================================================== --- head/graphics/py-seqdiag/Makefile Tue Mar 24 19:53:21 2020 (r529062) +++ head/graphics/py-seqdiag/Makefile Tue Mar 24 19:54:57 2020 (r529063) @@ -17,7 +17,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE DEPRECATED= Uses deprecated version of python EXPIRATION_DATE= 2020-08-15 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow6>=2.2.1:graphics/py-pillow6@${PY_FLAVOR} \ +RUN_DEPENDS= ${PY_PILLOW} \ ${PYTHON_PKGNAMEPREFIX}funcparserlib>=0.3.6:devel/py-funcparserlib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}blockdiag>=1.5.0:graphics/py-blockdiag@${PY_FLAVOR} Modified: head/graphics/py-sorl-thumbnail/Makefile ============================================================================== --- head/graphics/py-sorl-thumbnail/Makefile Tue Mar 24 19:53:21 2020 (r529062) +++ head/graphics/py-sorl-thumbnail/Makefile Tue Mar 24 19:54:57 2020 (r529063) @@ -34,6 +34,7 @@ DOCS_VARS= PYDISTUTILS_BUILD_TARGET+="build_sphinx -a GRAPHICSMAGICK_RUN_DEPENDS= ${LOCALBASE}/bin/gm:graphics/GraphicsMagick IMAGEMAGICK_RUN_DEPENDS= ${LOCALBASE}/bin/convert:graphics/ImageMagick6 +PILLOW_RUN_DEPENDS= ${PY_PILLOW} REDIS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}redis>0:databases/py-redis@${PY_FLAVOR} WAND_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Wand>0:graphics/py-wand@${PY_FLAVOR} @@ -43,20 +44,10 @@ PILLOW_DESC= Use internal image processing REDIS_DESC= Use REDIS as Key Value Store WAND_DESC= Use Wand with ImageMagick -.include <bsd.port.pre.mk> - -.if ${PORT_OPTIONS:MPILLOW} -.if ${PYTHON_REL} < 3500 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} -.else -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} -.endif -.endif - post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC}/build/sphinx/html && \ ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} \ "! -name .buildinfo -and ! -name objects.inv") -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/graphics/py-willow/Makefile ============================================================================== --- head/graphics/py-willow/Makefile Tue Mar 24 19:53:21 2020 (r529062) +++ head/graphics/py-willow/Makefile Tue Mar 24 19:54:57 2020 (r529063) @@ -27,7 +27,7 @@ PILLOW_DESC= Use Pillow as backend WAND_DESC= Use Wand as backend OPENCV_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}opencv>=0:graphics/py-opencv@${PY_FLAVOR} -PILLOW_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR} +PILLOW_RUN_DEPENDS= ${PY_PILLOW} WAND_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}wand>=0:graphics/py-wand@${PY_FLAVOR} .include <bsd.port.mk> Modified: head/graphics/qgis-ltr/Makefile ============================================================================== --- head/graphics/qgis-ltr/Makefile Tue Mar 24 19:53:21 2020 (r529062) +++ head/graphics/qgis-ltr/Makefile Tue Mar 24 19:54:57 2020 (r529063) @@ -51,7 +51,7 @@ RUN_DEPENDS= astyle:devel/astyle \ ${PYTHON_PKGNAMEPREFIX}numpy>=1.16.1:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}OWSLib>=0.17.1:graphics/py-OWSLib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pbr>=3.1.1:devel/py-pbr@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pillow>=6.0.0:graphics/py-pillow@${PY_FLAVOR} \ + ${PY_PILLOW} \ ${PYTHON_PKGNAMEPREFIX}pip>=9.0.3:devel/py-pip@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}plotly>=3.0.2:graphics/py-plotly@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}psycopg2>=2.8.3:databases/py-psycopg2@${PY_FLAVOR} \ Modified: head/graphics/qgis/Makefile ============================================================================== --- head/graphics/qgis/Makefile Tue Mar 24 19:53:21 2020 (r529062) +++ head/graphics/qgis/Makefile Tue Mar 24 19:54:57 2020 (r529063) @@ -51,7 +51,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} \ - ${PYTHON_PKGNAMEPREFIX}pillow>=6.0.0:graphics/py-pillow@${PY_FLAVOR} \ + ${PY_PILLOW} \ ${PYTHON_PKGNAMEPREFIX}pip>=9.0.3:devel/py-pip@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}plotly>=3.0.2:graphics/py-plotly@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}psutil>=5.6.3:sysutils/py-psutil@${PY_FLAVOR} \ Modified: head/graphics/sk1/Makefile ============================================================================== --- head/graphics/sk1/Makefile Tue Mar 24 19:53:21 2020 (r529062) +++ head/graphics/sk1/Makefile Tue Mar 24 19:54:57 2020 (r529063) @@ -20,7 +20,7 @@ LIB_DEPENDS= liblcms2.so:graphics/lcms2 \ libMagickCore-6.so:graphics/ImageMagick6 BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cairo>0:graphics/py-cairo@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cairo>0:graphics/py-cairo@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} \ + ${PY_PILLOW} \ ${PYTHON_PKGNAMEPREFIX}pycups>0:print/py-pycups@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}reportlab>0:print/py-reportlab@${PY_FLAVOR} Modified: head/graphics/variety/Makefile ============================================================================== --- head/graphics/variety/Makefile Tue Mar 24 19:53:21 2020 (r529062) +++ head/graphics/variety/Makefile Tue Mar 24 19:54:57 2020 (r529063) @@ -19,7 +19,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.3 ${PYTHON_PKGNAMEPREFIX}configobj>=5.0.6:devel/py-configobj@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dbus>=1.1.1_1:devel/py-dbus@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}httplib2>=0.9:www/py-httplib2@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pillow>=2.6.0:graphics/py-pillow@${PY_FLAVOR} \ + ${PY_PILLOW} \ ${PYTHON_PKGNAMEPREFIX}lxml>=3.4.1_1:devel/py-lxml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \ ImageMagick6>=6.9.0.4,1:graphics/ImageMagick6 \ Modified: head/lang/mono/Makefile ============================================================================== --- head/lang/mono/Makefile Tue Mar 24 19:53:21 2020 (r529062) +++ head/lang/mono/Makefile Tue Mar 24 19:54:57 2020 (r529063) @@ -20,7 +20,8 @@ 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= ca_root_nss>=0:security/ca_root_nss +RUN_DEPENDS= ${PY_PILLOW} \ + ca_root_nss>=0:security/ca_root_nss CONFLICTS_INSTALL= czmq-3* @@ -63,14 +64,6 @@ LOCALBASE?= /usr/local OPTIONS_SLAVE= MONOLITE .endif -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3500 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow6>=0:graphics/py-pillow6@${PY_FLAVOR} -.else -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR} -.endif - post-extract-MONOLITE-on: ${MKDIR} ${WRKSRC}/mcs/class/lib/monolite-linux ${MV} ${WRKDIR}/monolite-linux-${MONOLITE_VERSION}-latest ${WRKSRC}/mcs/class/lib/monolite-linux/${MONOLITE_VERSION} @@ -99,4 +92,4 @@ post-configure: post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/mono -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/math/asymptote/Makefile ============================================================================== --- head/math/asymptote/Makefile Tue Mar 24 19:53:21 2020 (r529062) +++ head/math/asymptote/Makefile Tue Mar 24 19:54:57 2020 (r529063) @@ -19,7 +19,8 @@ ONLY_FOR_ARCHS= amd64 i386 LIB_DEPENDS= libsigsegv.so:devel/libsigsegv RUN_DEPENDS= animate:graphics/ImageMagick6 \ gv:print/gv \ - ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${PY_FLAVOR} \ + ${PY_PILLOW} USES= compiler:c++14-lang gettext-runtime ghostscript gl gmake ncurses perl5 python \ shebangfix tar:tgz @@ -72,14 +73,6 @@ OFFSCREEN_LIB_DEPENDS= libOSMesa.so:graphics/libosmesa READLINE_CONFIGURE_ENABLE= readline READLINE_USES= readline:port -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3500 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} -.else -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} -.endif - post-patch: @${REINPLACE_CMD} 's/-lgc/-lgc-threaded/' ${WRKSRC}/configure @${REINPLACE_CMD} 's,/usr/lib/libgs.so,${LOCALBASE}/lib/libgs.so,' \ @@ -93,4 +86,4 @@ post-patch: post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/asy -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/math/py-PyWavelets/Makefile ============================================================================== --- head/math/py-PyWavelets/Makefile Tue Mar 24 19:53:21 2020 (r529062) +++ head/math/py-PyWavelets/Makefile Tue Mar 24 19:54:57 2020 (r529063) @@ -14,7 +14,8 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= ${PYNUMPY} -RUN_DEPENDS= ${PYNUMPY} +RUN_DEPENDS= ${PYNUMPY} \ + ${PY_PILLOW} USE_GITHUB= yes GH_PROJECT= pywt @@ -25,12 +26,4 @@ USE_PYTHON= autoplist distutils cython cython_run PYDISTUTILS_BUILD_TARGET= build build_ext PYDISTUTILS_BUILDARGS+= saveopts -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3500 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow6>=1.7:graphics/py-pillow6@${PY_FLAVOR} -.else -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow>=1.7:graphics/py-pillow@${PY_FLAVOR} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/math/py-plastex/Makefile ============================================================================== --- head/math/py-plastex/Makefile Tue Mar 24 19:53:21 2020 (r529062) +++ head/math/py-plastex/Makefile Tue Mar 24 19:54:57 2020 (r529063) @@ -13,7 +13,7 @@ COMMENT= LaTeX Document Processing Framework LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR} +RUN_DEPENDS= ${PY_PILLOW} USES= python:3.5+ USE_PYTHON= autoplist distutils Modified: head/misc/cs/Makefile ============================================================================== --- head/misc/cs/Makefile Tue Mar 24 19:53:21 2020 (r529062) +++ head/misc/cs/Makefile Tue Mar 24 19:54:57 2020 (r529063) @@ -12,6 +12,8 @@ COMMENT= Cross Stitch software LICENSE= GPLv2+ +RUN_DEPENDS= ${PY_PILLOW} + NO_BUILD= yes USES= python:run shebangfix tar:tgz @@ -19,15 +21,7 @@ SHEBANG_FILES= xs.py PLIST_FILES= bin/xs -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3500 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} -.else -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} -.endif - do-install: (cd ${WRKSRC} && ${INSTALL_SCRIPT} xs.py ${STAGEDIR}${PREFIX}/bin/xs) -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/misc/ironscanner/Makefile ============================================================================== --- head/misc/ironscanner/Makefile Tue Mar 24 19:53:21 2020 (r529062) +++ head/misc/ironscanner/Makefile Tue Mar 24 19:54:57 2020 (r529063) @@ -10,7 +10,7 @@ COMMENT= Collect as much information as possible on im LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \ +RUN_DEPENDS= ${PY_PILLOW} \ ${PYTHON_PKGNAMEPREFIX}pyinsane2>0:graphics/py-pyinsane2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR} Modified: head/misc/mmdnn/Makefile ============================================================================== --- head/misc/mmdnn/Makefile Tue Mar 24 19:53:21 2020 (r529062) +++ head/misc/mmdnn/Makefile Tue Mar 24 19:54:57 2020 (r529063) @@ -13,6 +13,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYNUMPY} \ *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202003241954.02OJsvZp065347>