diff options
87 files changed, 164 insertions, 463 deletions
diff --git a/astro/py-astLib/Makefile b/astro/py-astLib/Makefile index abae9e6bded8..eac2aaa357fc 100644 --- a/astro/py-astLib/Makefile +++ b/astro/py-astLib/Makefile @@ -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 diff --git a/audio/lollypop/Makefile b/audio/lollypop/Makefile index 9d09dde2d001..f25960e505b5 100644 --- a/audio/lollypop/Makefile +++ b/audio/lollypop/Makefile @@ -17,7 +17,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} \ - ${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 diff --git a/cad/k40-whisperer/Makefile b/cad/k40-whisperer/Makefile index b322da524af3..b87a2473da68 100644 --- a/cad/k40-whisperer/Makefile +++ b/cad/k40-whisperer/Makefile @@ -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}/,,} build_exe.bat \ 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> diff --git a/comms/apitran/Makefile b/comms/apitran/Makefile index daa8d4cd937c..e6804e8485a3 100644 --- a/comms/apitran/Makefile +++ b/comms/apitran/Makefile @@ -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> diff --git a/databases/py-mongoengine/Makefile b/databases/py-mongoengine/Makefile index 4d34704c6528..312d3fa09f73 100644 --- a/databases/py-mongoengine/Makefile +++ b/databases/py-mongoengine/Makefile @@ -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> diff --git a/deskutils/calibre/Makefile b/deskutils/calibre/Makefile index 2675b4bc6c0d..72127ed97cc9 100644 --- a/deskutils/calibre/Makefile +++ b/deskutils/calibre/Makefile @@ -29,7 +29,8 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVO ${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 diff --git a/deskutils/griffith/Makefile b/deskutils/griffith/Makefile index 2a7193f31cfe..a79847c13bc9 100644 --- a/deskutils/griffith/Makefile +++ b/deskutils/griffith/Makefile @@ -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 diff --git a/devel/py-asciimatics/Makefile b/devel/py-asciimatics/Makefile index 7e1bc8dc46aa..b5963947808c 100644 --- a/devel/py-asciimatics/Makefile +++ b/devel/py-asciimatics/Makefile @@ -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} diff --git a/devel/py-factory-boy/Makefile b/devel/py-factory-boy/Makefile index a0367a7cf669..c3101736d332 100644 --- a/devel/py-factory-boy/Makefile +++ b/devel/py-factory-boy/Makefile @@ -25,7 +25,8 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage>=0:devel/py-coverage@${PY_FLAVOR} ${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> diff --git a/devel/py-pydenticon/Makefile b/devel/py-pydenticon/Makefile index 6b4de5f21c2a..7a3bfd882d64 100644 --- a/devel/py-pydenticon/Makefile +++ b/devel/py-pydenticon/Makefile @@ -14,6 +14,7 @@ COMMENT= Library for generating identicons - an enhanced port of Sigil 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> diff --git a/games/fretsonfire/Makefile b/games/fretsonfire/Makefile index 2ea875a4df57..69f3f9054c60 100644 --- a/games/fretsonfire/Makefile +++ b/games/fretsonfire/Makefile @@ -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> diff --git a/games/hypatia_engine/Makefile b/games/hypatia_engine/Makefile index 9e6f523fb47a..712ffa872626 100644 --- a/games/hypatia_engine/Makefile +++ b/games/hypatia_engine/Makefile @@ -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> diff --git a/games/openage/Makefile b/games/openage/Makefile index 53014340d836..b8feaf2a27f7 100644 --- a/games/openage/Makefile +++ b/games/openage/Makefile @@ -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 diff --git a/games/py-mnemosyne/Makefile b/games/py-mnemosyne/Makefile index bdb1b2e2a28d..dac7382f6da4 100644 --- a/games/py-mnemosyne/Makefile +++ b/games/py-mnemosyne/Makefile @@ -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} diff --git a/games/pysolfc/Makefile b/games/pysolfc/Makefile index 4f721f532f4c..cb4b06758b78 100644 --- a/games/pysolfc/Makefile +++ b/games/pysolfc/Makefile @@ -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> diff --git a/games/unknown-horizons/Makefile b/games/unknown-horizons/Makefile index bcca8b4215bc..b8c85f49334a 100644 --- a/games/unknown-horizons/Makefile +++ b/games/unknown-horizons/Makefile @@ -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} \ diff --git a/graphics/caffe/Makefile b/graphics/caffe/Makefile index 47c7df58e512..d3e17144a0e6 100644 --- a/graphics/caffe/Makefile +++ b/graphics/caffe/Makefile @@ -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} diff --git a/graphics/impressive/Makefile b/graphics/impressive/Makefile index eae65211dd97..6c3a1aaeed59 100644 --- a/graphics/impressive/Makefile +++ b/graphics/impressive/Makefile @@ -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 diff --git a/graphics/py-PyOpenGL/Makefile b/graphics/py-PyOpenGL/Makefile index 0967cfb29540..13a8f65a48b2 100644 --- a/graphics/py-PyOpenGL/Makefile +++ b/graphics/py-PyOpenGL/Makefile @@ -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> diff --git a/graphics/py-actdiag/Makefile b/graphics/py-actdiag/Makefile index f459433b001a..47e7803ddbc7 100644 --- a/graphics/py-actdiag/Makefile +++ b/graphics/py-actdiag/Makefile @@ -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} diff --git a/graphics/py-blockdiag/Makefile b/graphics/py-blockdiag/Makefile index cf5511bbd582..3c316380ec62 100644 --- a/graphics/py-blockdiag/Makefile +++ b/graphics/py-blockdiag/Makefile @@ -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} diff --git a/graphics/py-cairosvg/Makefile b/graphics/py-cairosvg/Makefile index 2c37c5b11a55..e686349454c2 100644 --- a/graphics/py-cairosvg/Makefile +++ b/graphics/py-cairosvg/Makefile @@ -18,7 +18,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-runner>=0:devel/py-pytest-runner@${ 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} \ diff --git a/graphics/py-cartopy/Makefile b/graphics/py-cartopy/Makefile index 386b9de27c43..fbdd361cc59d 100644 --- a/graphics/py-cartopy/Makefile +++ b/graphics/py-cartopy/Makefile @@ -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> diff --git a/graphics/py-django-easy-thumbnails/Makefile b/graphics/py-django-easy-thumbnails/Makefile index d3d876eaa7eb..d7e7a5c40a1e 100644 --- a/graphics/py-django-easy-thumbnails/Makefile +++ b/graphics/py-django-easy-thumbnails/Makefile @@ -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> diff --git a/graphics/py-face_recognition/Makefile b/graphics/py-face_recognition/Makefile index 9719b859cc3d..ac7e2a035f4b 100644 --- a/graphics/py-face_recognition/Makefile +++ b/graphics/py-face_recognition/Makefile @@ -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> diff --git a/graphics/py-imageio/Makefile b/graphics/py-imageio/Makefile index 26262dc6c151..fa2cd91abdcf 100644 --- a/graphics/py-imageio/Makefile +++ b/graphics/py-imageio/Makefile @@ -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 diff --git a/graphics/py-imageio24/Makefile b/graphics/py-imageio24/Makefile index 3f7fbe76b0bd..b9af8a46358c 100644 --- a/graphics/py-imageio24/Makefile +++ b/graphics/py-imageio24/Makefile @@ -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> diff --git a/graphics/py-img2pdf/Makefile b/graphics/py-img2pdf/Makefile index 0264339bcb91..fe4645b8dde9 100644 --- a/graphics/py-img2pdf/Makefile +++ b/graphics/py-img2pdf/Makefile @@ -13,7 +13,8 @@ COMMENT= Convert images to PDF via direct JPEG inclusion 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> diff --git a/graphics/py-nwdiag/Makefile b/graphics/py-nwdiag/Makefile index 10cae5f05a31..76d7c0916532 100644 --- a/graphics/py-nwdiag/Makefile +++ b/graphics/py-nwdiag/Makefile @@ -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} diff --git a/graphics/py-photocollage/Makefile b/graphics/py-photocollage/Makefile index e3808975d2a8..d2e2c251edbb 100644 --- a/graphics/py-photocollage/Makefile +++ b/graphics/py-photocollage/Makefile @@ -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> diff --git a/graphics/py-pyinsane2/Makefile b/graphics/py-pyinsane2/Makefile index dd05be7b8927..3c879f9b661a 100644 --- a/graphics/py-pyinsane2/Makefile +++ b/graphics/py-pyinsane2/Makefile @@ -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> diff --git a/graphics/py-pyocr/Makefile b/graphics/py-pyocr/Makefile index 09dace7b4f19..a7e0facac397 100644 --- a/graphics/py-pyocr/Makefile +++ b/graphics/py-pyocr/Makefile @@ -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 diff --git a/graphics/py-pypillowfight/Makefile b/graphics/py-pypillowfight/Makefile index e33fdedb14cd..3dd129e6ac9c 100644 --- a/graphics/py-pypillowfight/Makefile +++ b/graphics/py-pypillowfight/Makefile @@ -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> diff --git a/graphics/py-sane/Makefile b/graphics/py-sane/Makefile index 576cc9b3c159..c19d329413be 100644 --- a/graphics/py-sane/Makefile +++ b/graphics/py-sane/Makefile @@ -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 diff --git a/graphics/py-scikit-image/Makefile b/graphics/py-scikit-image/Makefile index d8120655f2b1..01abf85e37f5 100644 --- a/graphics/py-scikit-image/Makefile +++ b/graphics/py-scikit-image/Makefile @@ -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 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 - 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> diff --git a/graphics/py-seqdiag/Makefile b/graphics/py-seqdiag/Makefile index c66f8f65a364..5420f88b9f27 100644 --- a/graphics/py-seqdiag/Makefile +++ b/graphics/py-seqdiag/Makefile @@ -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} diff --git a/graphics/py-sorl-thumbnail/Makefile b/graphics/py-sorl-thumbnail/Makefile index bf7e6e4e3d88..5ef18524e982 100644 --- a/graphics/py-sorl-thumbnail/Makefile +++ b/graphics/py-sorl-thumbnail/Makefile @@ -34,6 +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} 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> diff --git a/graphics/py-willow/Makefile b/graphics/py-willow/Makefile index f92e547a674e..3b229c0df917 100644 --- a/graphics/py-willow/Makefile +++ b/graphics/py-willow/Makefile @@ -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> diff --git a/graphics/qgis-ltr/Makefile b/graphics/qgis-ltr/Makefile index e3c361f58571..a48de67c37de 100644 --- a/graphics/qgis-ltr/Makefile +++ b/graphics/qgis-ltr/Makefile @@ -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} \ diff --git a/graphics/qgis/Makefile b/graphics/qgis/Makefile index 289903e42e5b..3aa767e9989d 100644 --- a/graphics/qgis/Makefile +++ b/graphics/qgis/Makefile @@ -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} \ diff --git a/graphics/sk1/Makefile b/graphics/sk1/Makefile index 54d9efd13c9e..1e0055ed93aa 100644 --- a/graphics/sk1/Makefile +++ b/graphics/sk1/Makefile @@ -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} diff --git a/graphics/variety/Makefile b/graphics/variety/Makefile index d5753a25a9c9..e064688fd6b7 100644 --- a/graphics/variety/Makefile +++ b/graphics/variety/Makefile @@ -19,7 +19,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.3.2:www/py-beautifulsoup@${ ${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 \ diff --git a/lang/mono/Makefile b/lang/mono/Makefile index 66870bf1ec48..a67eb4e35841 100644 --- a/lang/mono/Makefile +++ b/lang/mono/Makefile @@ -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> diff --git a/math/asymptote/Makefile b/math/asymptote/Makefile index 16bb663cb208..f59fba82b028 100644 --- a/math/asymptote/Makefile +++ b/math/asymptote/Makefile @@ -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> diff --git a/math/py-PyWavelets/Makefile b/math/py-PyWavelets/Makefile index 848074072553..abeb35cbed86 100644 --- a/math/py-PyWavelets/Makefile +++ b/math/py-PyWavelets/Makefile @@ -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> diff --git a/math/py-plastex/Makefile b/math/py-plastex/Makefile index 32d4d7b36c86..e21c9b3fe95a 100644 --- a/math/py-plastex/Makefile +++ b/math/py-plastex/Makefile @@ -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 diff --git a/misc/cs/Makefile b/misc/cs/Makefile index 985db38c75ed..0f81a0c752eb 100644 --- a/misc/cs/Makefile +++ b/misc/cs/Makefile @@ -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> diff --git a/misc/ironscanner/Makefile b/misc/ironscanner/Makefile index 50ead669bce2..39f49cbadfe3 100644 --- a/misc/ironscanner/Makefile +++ b/misc/ironscanner/Makefile @@ -10,7 +10,7 @@ COMMENT= Collect as much information as possible on image scanners 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} diff --git a/misc/mmdnn/Makefile b/misc/mmdnn/Makefile index 036a3c7bca4d..dfde7ed8cb86 100644 --- a/misc/mmdnn/Makefile +++ b/misc/mmdnn/Makefile @@ -13,6 +13,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYNUMPY} \ + ${PY_PILLOW} \ ${PYTHON_PKGNAMEPREFIX}protobuf>=3.6.0:devel/py-protobuf@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} @@ -24,12 +25,4 @@ USE_PYTHON= distutils noflavors autoplist NO_ARCH= yes -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3500 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow6>=3.1.0:graphics/py-pillow6@${PY_FLAVOR} -.else -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow>=3.1.0:graphics/py-pillow@${PY_FLAVOR} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/misc/py-gluoncv/Makefile b/misc/py-gluoncv/Makefile index 0edab3279e99..be7c918cfb1f 100644 --- a/misc/py-gluoncv/Makefile +++ b/misc/py-gluoncv/Makefile @@ -14,6 +14,7 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE PY_DEPENDS= ${PYNUMPY} \ + ${PY_PILLOW} \ ${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} \ @@ -32,18 +33,10 @@ USE_PYTHON= distutils cython autoplist PYDISTUTILS_BUILDARGS= --with-cython PYDISTUTILS_INSTALLARGS= --with-cython -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3500 -PY_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} -.else -PY_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} -.endif - post-patch: # https://github.com/dmlc/gluon-cv/issues/1095 @truncate -s 0 ${WRKSRC}/README.md post-install: @${FIND} ${STAGEDIR}${PREFIX} -name "*.so" | ${XARGS} ${STRIP_CMD} -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/misc/py-tflearn/Makefile b/misc/py-tflearn/Makefile index d0fff514d9f2..d5404f36f180 100644 --- a/misc/py-tflearn/Makefile +++ b/misc/py-tflearn/Makefile @@ -13,7 +13,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYNUMPY} \ - ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \ + ${PY_PILLOW} \ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}tensorflow>0:science/py-tensorflow@${PY_FLAVOR} diff --git a/misc/wotsap/Makefile b/misc/wotsap/Makefile index 8167809575ea..66901ba5999f 100644 --- a/misc/wotsap/Makefile +++ b/misc/wotsap/Makefile @@ -14,7 +14,7 @@ COMMENT= Web of trust statistics and pathfinder DEPRECATED= Uses deprecated version of python EXPIRATION_DATE= 2020-09-15 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} +RUN_DEPENDS= ${PY_PILLOW} USES= python:2.7,run shebangfix NO_BUILD= yes diff --git a/multimedia/freevo/Makefile b/multimedia/freevo/Makefile index b56505e124e5..d78026635775 100644 --- a/multimedia/freevo/Makefile +++ b/multimedia/freevo/Makefile @@ -26,7 +26,7 @@ RUN_DEPENDS= mplayer:multimedia/mplayer \ ${PYTHON_SITELIBDIR}/kaa/metadata/__init__.py:multimedia/py-kaa-metadata@${PY_FLAVOR} \ ${PYTHON_SITELIBDIR}/BeautifulSoup.py:www/py-beautifulsoup32@${PY_FLAVOR} \ ${PYGAME} \ - ${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} \ + ${PY_PILLOW} \ ${PYTHON_SITELIBDIR}/Numeric/Numeric_headers/__init__.py:math/py-numeric@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${PY_FLAVOR} diff --git a/net-im/py-matrix-synapse/Makefile b/net-im/py-matrix-synapse/Makefile index 83259674eca5..a698aaf585e0 100644 --- a/net-im/py-matrix-synapse/Makefile +++ b/net-im/py-matrix-synapse/Makefile @@ -30,7 +30,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}jsonschema>=2.5.1:devel/py-jsonschema@${PY_F ${PYTHON_PKGNAMEPREFIX}pyasn1-modules>=0.0.7:devel/py-pyasn1-modules@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}daemonize>=2.4.2:devel/py-daemonize@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}bcrypt>=3.1.0:security/py-bcrypt@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pillow>=4.3.0:graphics/py-pillow@${PY_FLAVOR} \ + ${PY_PILLOW} \ ${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 665c6d2fc73b..826be9d9ba8f 100644 --- a/net-mgmt/netbox/Makefile +++ b/net-mgmt/netbox/Makefile @@ -31,7 +31,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django22>=2.2<2.3:www/py-django22@${PY_FLAVO ${PYTHON_PKGNAMEPREFIX}markdown>=2.6.11:textproc/py-markdown@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}netaddr>=0.7.19:net/py-netaddr@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pycryptodome>=3.8.2:security/py-pycryptodome@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \ + ${PY_PILLOW} \ ${PYTHON_PKGNAMEPREFIX}psycopg2>=2.8.4:databases/py-psycopg2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}redis>=3.3.11:databases/py-redis@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}svgwrite>=1.3.1:graphics/py-svgwrite@${PY_FLAVOR} \ diff --git a/net-p2p/deluge-cli/Makefile b/net-p2p/deluge-cli/Makefile index 5471545c7423..26aa5caad028 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} \ - ${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} + ${PY_PILLOW} USES= gettext python:2.7 USE_PYTHON= autoplist distutils diff --git a/net/py-rainbowstream/Makefile b/net/py-rainbowstream/Makefile index e0434660e2d8..d2a739be6245 100644 --- a/net/py-rainbowstream/Makefile +++ b/net/py-rainbowstream/Makefile @@ -22,7 +22,8 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=2.5.3:www/py-requests@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyfiglet>0:misc/py-pyfiglet@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}twitter-tools>0:net/py-twitter-tools@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pysocks>0:net/py-pysocks@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}pysocks>0:net/py-pysocks@${PY_FLAVOR} \ + ${PY_PILLOW} # Actually 2.7,3.2- # Limited to -3.6 because of pyfiglet. @@ -31,12 +32,4 @@ 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> diff --git a/print/hplip/Makefile b/print/hplip/Makefile index 31dcfc9d04de..8dbb006cd59a 100644 --- a/print/hplip/Makefile +++ b/print/hplip/Makefile @@ -53,6 +53,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_LIB_DEPENDS= libsane.so:graphics/sane-backends SCAN_CONFIGURE_ENABLE= scan-build @@ -82,16 +83,6 @@ CONFIGURE_ARGS+= --disable-qt5 BROKEN= The X11 option requires the QT5 option .endif -.include <bsd.port.pre.mk> - -.if ${PORT_OPTIONS:MSCAN} -.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-patch: @${REINPLACE_CMD} -e 's|-ldld||g;' \ -e 's|-ldl||g' \ @@ -153,4 +144,4 @@ post-install-SCAN-on: ${MV} ${STAGEDIR}${PREFIX}/etc/sane.d/dll.conf \ ${STAGEDIR}${PREFIX}/etc/sane.d/dll.d/hpaio -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/print/py-reportlab/Makefile b/print/py-reportlab/Makefile index 4960ef48b28b..10b7822577a5 100644 --- a/print/py-reportlab/Makefile +++ b/print/py-reportlab/Makefile @@ -17,6 +17,8 @@ COMMENT= Library to create PDF documents using the Python language LICENSE= BSD3CLAUSE +RUN_DEPENDS= ${PY_PILLOW} + USES= python USE_PYTHON= distutils autoplist @@ -41,14 +43,6 @@ CJK_DESC= Adobe CMaps CJK_RUN_DEPENDS= ${LOCALBASE}/share/fonts/adobe-cmaps/ac15/cid2code.txt:print/adobe-cmaps FREETYPE_LIB_DEPENDS= libfreetype.so:print/freetype2 -.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|%%DISTDIR%%|${DISTDIR}|' \ -e 's|%%PFBFER%%|${PFBFER}|' \ @@ -71,4 +65,4 @@ post-install-DOCS-on: ${INSTALL_DATA} ${WRKSRC}/docs/${i} ${STAGEDIR}${DOCSDIR} .endfor -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/print/py-trml2pdf/Makefile b/print/py-trml2pdf/Makefile index 5908b9b64410..d2841eccd822 100644 --- a/print/py-trml2pdf/Makefile +++ b/print/py-trml2pdf/Makefile @@ -16,7 +16,7 @@ LICENSE= LGPL21 DEPRECATED= Uses deprecated version of python EXPIRATION_DATE= 2020-08-15 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} \ +RUN_DEPENDS= ${PY_PILLOW} \ ${PYTHON_PKGNAMEPREFIX}reportlab>=0:print/py-reportlab@${PY_FLAVOR} USES= python:2.7 shebangfix tar:bzip2 diff --git a/science/gramps/Makefile b/science/gramps/Makefile index 20fd9cdf7633..5b8c4d5464f8 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= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} +PIL_RUN_DEPENDS= ${PY_PILLOW} 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 df367f89d74d..6fd5f931c763 100644 --- a/science/rdkit/Makefile +++ b/science/rdkit/Makefile @@ -41,6 +41,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}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}reportlab>0:print/py-reportlab@${PY_FLAVOR} @@ -54,14 +55,6 @@ PLIST_SUB+= LITTLE_ENDIAN="" PLIST_SUB+= LITTLE_ENDIAN="@comment " .endif -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3500 -PYTHON_RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} -.else -PYTHON_RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} -.endif - post-extract: @${MKDIR} ${WRKSRC}/External/rapidjson-1.1.0 @cd ${WRKSRC}/External/rapidjson-1.1.0 && ${LN} -s ${LOCALBASE}/include/rapidjson include @@ -70,4 +63,4 @@ post-stage: # https://github.com/rdkit/rdkit/issues/2094 #@${MKDIR} ${STAGEDIR}${PREFIX}/lib/cmake #@${MV} ${STAGEDIR}${PREFIX}/lib/*.cmake ${STAGEDIR}${PREFIX}/lib/cmake -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/security/py-volatility/Makefile b/security/py-volatility/Makefile index 6390b853b09c..f1fd97ed4b27 100644 --- a/security/py-volatility/Makefile +++ b/security/py-volatility/Makefile @@ -19,7 +19,7 @@ EXPIRATION_DATE= 2020-08-15 RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}distorm>=0:devel/py-distorm@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pillow6>=0:graphics/py-pillow6@${PY_FLAVOR} \ + ${PY_PILLOW} \ ${PYTHON_PKGNAMEPREFIX}pycrypto>=0:security/py-pycrypto@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}yara>=0:security/py-yara@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}openpyxl>=0:textproc/py-openpyxl@${PY_FLAVOR} diff --git a/security/vinetto/Makefile b/security/vinetto/Makefile index 6f9b03d44134..836e20c54a01 100644 --- a/security/vinetto/Makefile +++ b/security/vinetto/Makefile @@ -14,22 +14,16 @@ COMMENT= Forensics tool to examine Thumbs.db files LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING +RUN_DEPENDS= ${PY_PILLOW} + USES= python USE_PYTHON= autoplist distutils concurrent optsuffix PYDISTUTILS_PKGVERSION= 0.06alpha 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|/usr/share/vinetto|${DATADIR}|g" ${WRKSRC}/setup.py @${REINPLACE_CMD} -e "s|/usr/share/vinetto|${DATADIR}|g" ${WRKSRC}/vinreport.py @${REINPLACE_CMD} -e "s|/usr/share/vinetto|${DATADIR}|g" ${WRKSRC}/vinetto -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/textproc/py-ocrmypdf/Makefile b/textproc/py-ocrmypdf/Makefile index 165f94dc2438..2788528596d5 100644 --- a/textproc/py-ocrmypdf/Makefile +++ b/textproc/py-ocrmypdf/Makefile @@ -19,7 +19,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=1.9.1:devel/py-cffi@${PY_FLAVOR} \ LIB_DEPENDS= liblept.so:graphics/leptonica RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=1.9.1:devel/py-cffi@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}img2pdf>=0.3.0,<0.4:graphics/py-img2pdf@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pillow>=6.2.0:graphics/py-pillow@${PY_FLAVOR} \ + ${PY_PILLOW} \ ${PYTHON_PKGNAMEPREFIX}tqdm>=4:misc/py-tqdm@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}reportlab>=3.3.0:print/py-reportlab@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}chardet>=3.0.4,<4:textproc/py-chardet@${PY_FLAVOR} \ diff --git a/textproc/py-pikepdf/Makefile b/textproc/py-pikepdf/Makefile index bf3eb64d8a7a..b7022405dea6 100644 --- a/textproc/py-pikepdf/Makefile +++ b/textproc/py-pikepdf/Makefile @@ -23,7 +23,7 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}attrs>=19.1.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,<2:devel/py-pytest-xdist@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pillow>=5.0.0:graphics/py-pillow@${PY_FLAVOR} \ + ${PY_PILLOW} \ ${PYTHON_PKGNAMEPREFIX}python-xmp-toolkit>=2.0.1:textproc/py-python-xmp-toolkit@${PY_FLAVOR} USES= compiler:c++14-lang python:3.5+ diff --git a/textproc/py-qrcode/Makefile b/textproc/py-qrcode/Makefile index e47f59e09ede..54b9973f7ebf 100644 --- a/textproc/py-qrcode/Makefile +++ b/textproc/py-qrcode/Makefile @@ -13,20 +13,13 @@ COMMENT= QR Code image generator LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.8:devel/py-six@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.8:devel/py-six@${PY_FLAVOR} \ + ${PY_PILLOW} USES= python USE_PYTHON= autoplist concurrent distutils -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3500 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow6>=2.6:graphics/py-pillow6@${PY_FLAVOR} -.else -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow>=2.6:graphics/py-pillow@${PY_FLAVOR} -.endif - post-patch: ${REINPLACE_CMD} -e 's|share/\(man/man1\)|\1|' ${WRKSRC}/setup.py -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/textproc/py-xhtml2pdf/Makefile b/textproc/py-xhtml2pdf/Makefile index 8704e686df7a..3d964787c5d4 100644 --- a/textproc/py-xhtml2pdf/Makefile +++ b/textproc/py-xhtml2pdf/Makefile @@ -17,7 +17,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}html5lib>=1.0:www/py-html5lib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pdf2>=0:print/py-pdf2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}reportlab>=3.0:print/py-reportlab@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR} \ + ${PY_PILLOW} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=1.0:devel/py-nose@${PY_FLAVOR} USES= python @@ -25,12 +26,4 @@ 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> diff --git a/www/go-appengine-sdk/Makefile b/www/go-appengine-sdk/Makefile index f4dbd7ced03e..b44d04f7889e 100644 --- a/www/go-appengine-sdk/Makefile +++ b/www/go-appengine-sdk/Makefile @@ -22,7 +22,7 @@ EXPIRATION_DATE= 2020-09-15 ONLY_FOR_ARCHS= amd64 i386 RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>=${PYTHON_VER}:databases/py-sqlite3@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} \ + ${PY_PILLOW} \ ${PYTHON_PKGNAMEPREFIX}pycrypto>=2.6:security/py-pycrypto@${PY_FLAVOR} USES= gettext go python:2.7 shebangfix zip diff --git a/www/google-appengine/Makefile b/www/google-appengine/Makefile index 850ff45e1f1c..42d4c81252e9 100644 --- a/www/google-appengine/Makefile +++ b/www/google-appengine/Makefile @@ -18,7 +18,7 @@ DEPRECATED= Uses deprecated version of python EXPIRATION_DATE= 2020-09-15 RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>=${PYTHON_VER}:databases/py-sqlite3@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} \ + ${PY_PILLOW} \ ${PYTHON_PKGNAMEPREFIX}pycrypto>=2.6:security/py-pycrypto@${PY_FLAVOR} WRKSRC= ${WRKDIR}/${PORTNAME:S,-,_,} diff --git a/www/py-bokeh/Makefile b/www/py-bokeh/Makefile index a85be67983b6..2a5f1c7f9051 100644 --- a/www/py-bokeh/Makefile +++ b/www/py-bokeh/Makefile @@ -18,7 +18,7 @@ RUN_DEPENDS= ${PY_FUTURES} \ ${PYNUMPY} \ ${PYTHON_PKGNAMEPREFIX}packaging>=16.8:devel/py-packaging@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dateutil>=2.1:devel/py-dateutil@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pillow>=4.0:graphics/py-pillow@${PY_FLAVOR} \ + ${PY_PILLOW} \ ${PYTHON_PKGNAMEPREFIX}yaml>=3.10:devel/py-yaml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>=1.5.2:devel/py-six@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}tornado>=4.3:www/py-tornado@${PY_FLAVOR} diff --git a/www/py-django-filer/Makefile b/www/py-django-filer/Makefile index 0f6031137948..51d269ed58f8 100644 --- a/www/py-django-filer/Makefile +++ b/www/py-django-filer/Makefile @@ -18,18 +18,11 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=0:www/py-django111@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}django-easy-thumbnails>=2:graphics/py-django-easy-thumbnails@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}django-mptt>=0.6:www/py-django-mptt@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}django_polymorphic>=0.7:www/py-django_polymorphic@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}unidecode>=0:converters/py-unidecode@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}unidecode>=0:converters/py-unidecode@${PY_FLAVOR} \ + ${PY_PILLOW} USES= python USE_PYTHON= autoplist distutils NO_ARCH= yes -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3500 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow6>=2.3.0:graphics/py-pillow6@${PY_FLAVOR} -.else -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow>=2.3.0:graphics/py-pillow@${PY_FLAVOR} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/www/py-django-markdownx/Makefile b/www/py-django-markdownx/Makefile index c9907ade3cab..9947453c1f08 100644 --- a/www/py-django-markdownx/Makefile +++ b/www/py-django-markdownx/Makefile @@ -15,18 +15,11 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=1.11:www/py-django111@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}markdown>0:textproc/py-markdown@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}markdown>0:textproc/py-markdown@${PY_FLAVOR} \ + ${PY_PILLOW} USES= python USE_PYTHON= autoplist 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> diff --git a/www/py-django-mezzanine/Makefile b/www/py-django-mezzanine/Makefile index 7da67d733a16..c054f5e213ef 100644 --- a/www/py-django-mezzanine/Makefile +++ b/www/py-django-mezzanine/Makefile @@ -23,7 +23,8 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=1.8:www/py-django111@${PY_FLAVOR} ${PYTHON_PKGNAMEPREFIX}requests>=2.1.0:www/py-requests@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests-oauthlib>=0.4:www/py-requests-oauthlib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}future>=0.9.0:devel/py-future@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}chardet>0:textproc/py-chardet@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}chardet>0:textproc/py-chardet@${PY_FLAVOR} \ + ${PY_PILLOW} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pep8>=1.4.1:devel/pep8@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyflakes>=0.6.1:devel/py-pyflakes@${PY_FLAVOR} @@ -39,15 +40,7 @@ NO_ARCH= yes SUB_FILES= pkg-message SUB_LIST= PYTHON_VER=${PYTHON_VER} -.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} && ${SETENV} TZ=UTC LC_ALL=en_US.UTF-8 ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/www/py-django-photologue/Makefile b/www/py-django-photologue/Makefile index 3e6a0cea262e..7558565afbf4 100644 --- a/www/py-django-photologue/Makefile +++ b/www/py-django-photologue/Makefile @@ -16,18 +16,11 @@ LICENSE= BSD3CLAUSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=1.11:www/py-django111@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}django-sortedm2m>=1.5.0:www/py-django-sortedm2m@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}ExifRead>=2.1.2:graphics/py-exifread@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}ExifRead>=2.1.2:graphics/py-exifread@${PY_FLAVOR} \ + ${PY_PILLOW} NO_ARCH= yes USES= python USE_PYTHON= autoplist distutils -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3500 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow6>=4.3.0:graphics/py-pillow6@${PY_FLAVOR} -.else -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow>=4.3.0:graphics/py-pillow@${PY_FLAVOR} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/www/py-django-simple-captcha/Makefile b/www/py-django-simple-captcha/Makefile index 1a86e9120212..6852e223e7ea 100644 --- a/www/py-django-simple-captcha/Makefile +++ b/www/py-django-simple-captcha/Makefile @@ -16,7 +16,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=1.7.0:www/py-django111@${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} + ${PYTHON_PKGNAMEPREFIX}six>=1.2.0:devel/py-six@${PY_FLAVOR} \ + ${PY_PILLOW} USES= python zip USE_PYTHON= autoplist concurrent distutils @@ -31,16 +32,8 @@ DOCS_VARS= PYDISTUTILS_BUILD_TARGET+="build_sphinx -a -E" MIGRATIONS_DESC= Schema and data migration support (via south) MIGRATIONS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}south>0:databases/py-south@${PY_FLAVOR} -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3500 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow6>=2.2.2:graphics/py-pillow6@${PY_FLAVOR} -.else -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow>=2.2.2:graphics/py-pillow@${PY_FLAVOR} -.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> diff --git a/www/py-instabot/Makefile b/www/py-instabot/Makefile index 5e1a2581659a..329780bd22e6 100644 --- a/www/py-instabot/Makefile +++ b/www/py-instabot/Makefile @@ -22,19 +22,12 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}future>=0.17.1:devel/py-future@${PY_FLAVOR} ${PYTHON_PKGNAMEPREFIX}responses>=0.10.5:devel/py-responses@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}schedule>=0.6.0:devel/py-schedule@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>=1.12.0:devel/py-six@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}tqdm>=4.30.0:misc/py-tqdm@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}tqdm>=4.30.0:misc/py-tqdm@${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> diff --git a/www/py-pywikibot/Makefile b/www/py-pywikibot/Makefile index 46ef1e4d8e9b..ce2330dc450c 100644 --- a/www/py-pywikibot/Makefile +++ b/www/py-pywikibot/Makefile @@ -38,6 +38,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} MWOAUTH_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mwoauth>0:www/py-mwoauth@${PY_FLAVOR} HTML_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beautifulsoup>0:www/py-beautifulsoup@${PY_FLAVOR} @@ -47,12 +48,4 @@ HTML_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beautifulsoup>0:www/py-beautifulsoup@$ RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}ipaddr>0:devel/py-ipaddr@${PY_FLAVOR} .endif -.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 - .include <bsd.port.post.mk> diff --git a/www/py-wagtail/Makefile b/www/py-wagtail/Makefile index 72e0e219a7bc..782d3bcd24f1 100644 --- a/www/py-wagtail/Makefile +++ b/www/py-wagtail/Makefile @@ -22,7 +22,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beautifulsoup460>=4.5.1<4.6.1:www/py-beautif ${PYTHON_PKGNAMEPREFIX}dj22-djangorestframework>=3.7.4<4.0:www/py-dj22-djangorestframework@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}draftjs_exporter>=2.1.5:www/py-draftjs_exporter@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}html5lib>=0.999<2:www/py-html5lib@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pillow>=4.0.0:graphics/py-pillow@${PY_FLAVOR} \ + ${PY_PILLOW} \ ${PYTHON_PKGNAMEPREFIX}pytz>=2016.6:devel/py-pytz@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=2.11.1<3.0:www/py-requests@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>=1.11<2.0:devel/py-six@${PY_FLAVOR} \ diff --git a/www/py-weboob/Makefile b/www/py-weboob/Makefile index 1e121488953e..f4a9fb375fdd 100644 --- a/www/py-weboob/Makefile +++ b/www/py-weboob/Makefile @@ -18,7 +18,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} \ - ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR} \ + ${PY_PILLOW} \ ${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 2e6e803fa585..9c3dbc4e9ad1 100644 --- a/www/seahub/Makefile +++ b/www/seahub/Makefile @@ -34,7 +34,7 @@ RUN_DEPENDS= bash:shells/bash \ ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}social-auth-core>=1.7.0:security/py-social-auth-core@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}openpyxl>=0:textproc/py-openpyxl@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pillow6>=0:graphics/py-pillow6@${PY_FLAVOR} \ + ${PY_PILLOW} \ ${PYTHON_PKGNAMEPREFIX}MySQLdb>0:databases/py-MySQLdb@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}qrcode>0:textproc/py-qrcode@${PY_FLAVOR} \ ${PY_FUTURES} diff --git a/www/twms/Makefile b/www/twms/Makefile index 435981a69e57..522bb630cf26 100644 --- a/www/twms/Makefile +++ b/www/twms/Makefile @@ -17,7 +17,7 @@ EXPIRATION_DATE= 2020-09-15 RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyproj>0:graphics/py-pyproj@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}webpy>0:www/webpy@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} \ + ${PY_PILLOW} \ ${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 541e98ef695d..bfe1615af157 100644 --- a/www/xist/Makefile +++ b/www/xist/Makefile @@ -16,7 +16,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} \ - ${PYTHON_PKGNAMEPREFIX}pillow>=2.6:graphics/py-pillow@${PY_FLAVOR} + ${PY_PILLOW} 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 18a402ab72b8..85d9f5bb2f32 100644 --- a/x11-toolkits/py-easygui/Makefile +++ b/x11-toolkits/py-easygui/Makefile @@ -12,19 +12,12 @@ COMMENT= Easy GUI programming in python LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${PY_FLAVOR} \ + ${PY_PILLOW} USES= 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> diff --git a/x11/cinnamon/Makefile b/x11/cinnamon/Makefile index 9e7f95d74280..a2567a4c2e70 100644 --- a/x11/cinnamon/Makefile +++ b/x11/cinnamon/Makefile @@ -46,7 +46,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0:devel/py-dbus@${PY_FLAVOR} \ cinnamon-translations>=0:misc/cinnamon-translations \ cinnamon-screensaver:x11/cinnamon-screensaver \ nemo:x11-fm/nemo \ - ${PYTHON_PKGNAMEPREFIX}pillow6>=0:graphics/py-pillow6@${PY_FLAVOR} \ + ${PY_PILLOW} \ ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR} USES= autoreconf compiler:c11 gettext gmake gnome gl libtool \ diff --git a/x11/py-pyscreenshot/Makefile b/x11/py-pyscreenshot/Makefile index 832381527a0e..a601ba4b4a4c 100644 --- a/x11/py-pyscreenshot/Makefile +++ b/x11/py-pyscreenshot/Makefile @@ -15,6 +15,7 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}easyprocess>0:devel/py-easyprocess@${PY_FLAVOR} \ + ${PY_PILLOW} \ import:graphics/ImageMagick6 USES= python @@ -22,12 +23,4 @@ USES= python NO_ARCH= yes USE_PYTHON= autoplist 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> diff --git a/x11/py-pyvirtualdisplay/Makefile b/x11/py-pyvirtualdisplay/Makefile index 8e2ef63912e9..7708005c81e8 100644 --- a/x11/py-pyvirtualdisplay/Makefile +++ b/x11/py-pyvirtualdisplay/Makefile @@ -19,6 +19,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:textproc/py-sphinx@${PY_FLAVOR} \ + ${PY_PILLOW} \ xauth>0:x11/xauth USES= python @@ -38,12 +39,4 @@ XVNC_RUN_DEPENDS= tightvnc>=0:net/tightvnc 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> |