diff options
Diffstat (limited to 'graphics')
26 files changed, 49 insertions, 131 deletions
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 \ |