diff options
76 files changed, 606 insertions, 168 deletions
diff --git a/cad/k40-whisperer/Makefile b/cad/k40-whisperer/Makefile index 5d3404e6e7b9..b322da524af3 100644 --- a/cad/k40-whisperer/Makefile +++ b/cad/k40-whisperer/Makefile @@ -2,6 +2,7 @@ PORTNAME= k40-whisperer DISTVERSION= 0.43 +PORTREVISION= 1 CATEGORIES= cad python MASTER_SITES= http://www.scorchworks.com/K40whisperer/ DISTNAME= K40_Whisperer-${DISTVERSION}_src @@ -13,7 +14,6 @@ LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/gpl-3.0.txt RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}usb>0:devel/py-usb@${PY_FLAVOR} USES= python:run,-3.7 shebangfix zip @@ -39,6 +39,14 @@ _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} @@ -47,4 +55,4 @@ do-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${_DOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/comms/apitran/Makefile b/comms/apitran/Makefile index 903c8b36d7b7..daa8d4cd937c 100644 --- a/comms/apitran/Makefile +++ b/comms/apitran/Makefile @@ -2,7 +2,7 @@ PORTNAME= apitran PORTVERSION= g20180926 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= comms astro hamradio python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -14,7 +14,6 @@ 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} \ - ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \ ${PYNUMPY} \ sox:audio/sox \ display:graphics/ImageMagick6 @@ -29,6 +28,14 @@ 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} @@ -40,4 +47,4 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/Examples/$f ${STAGEDIR}${EXAMPLESDIR} .endfor -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/databases/py-mongoengine/Makefile b/databases/py-mongoengine/Makefile index d6fb87c18e92..4d34704c6528 100644 --- a/databases/py-mongoengine/Makefile +++ b/databases/py-mongoengine/Makefile @@ -16,8 +16,7 @@ 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}pillow>=2.0.0:graphics/py-pillow@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}blinker>0:devel/py-blinker@${PY_FLAVOR} py27_TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${PY_FLAVOR} USES= python @@ -25,6 +24,14 @@ 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 @@ -32,4 +39,4 @@ post-patch: do-test: cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/deskutils/calibre/Makefile b/deskutils/calibre/Makefile index 0f0dcf176347..776faa6ff059 100644 --- a/deskutils/calibre/Makefile +++ b/deskutils/calibre/Makefile @@ -3,6 +3,7 @@ PORTNAME= calibre PORTVERSION= 4.11.2 +PORTREVISION= 1 CATEGORIES= deskutils python MASTER_SITES= http://download.calibre-ebook.com/${PORTVERSION}/ @@ -23,7 +24,7 @@ LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libhyphen.so:textproc/hyphen BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pillow6>=0:graphics/py-pillow6@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}css-parser>=1.0.4:www/py-css-parser@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}apsw>=0:databases/py-apsw@${PY_FLAVOR} \ @@ -35,7 +36,7 @@ RUN_DEPENDS= xdg-open:devel/xdg-utils \ ${PYTHON_PKGNAMEPREFIX}dnspython>=0:dns/py-dnspython@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=0:www/py-beautifulsoup@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pillow6>=0:graphics/py-pillow6@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mechanize>=0:www/py-mechanize@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR} \ diff --git a/devel/py-asciimatics/Makefile b/devel/py-asciimatics/Makefile index 90318100e8f5..7e1bc8dc46aa 100644 --- a/devel/py-asciimatics/Makefile +++ b/devel/py-asciimatics/Makefile @@ -2,6 +2,7 @@ PORTNAME= asciimatics PORTVERSION= 1.11.0 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -14,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}pillow>=2.7.0:graphics/py-pillow@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pillow6>=2.7.0:graphics/py-pillow6@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyfiglet>=0.7.2:misc/py-pyfiglet@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wcwidth>0:devel/py-wcwidth@${PY_FLAVOR} diff --git a/devel/py-factory-boy/Makefile b/devel/py-factory-boy/Makefile index 130803911d54..a0367a7cf669 100644 --- a/devel/py-factory-boy/Makefile +++ b/devel/py-factory-boy/Makefile @@ -21,7 +21,6 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage>=0:devel/py-coverage@${PY_FLAVOR} ${PYTHON_PKGNAMEPREFIX}flake8>=0:devel/py-flake8@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}isort>=0:devel/py-isort@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sqlalchemy13>=0:databases/py-sqlalchemy13@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mongoengine>=0:databases/py-mongoengine@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} \ @@ -35,6 +34,13 @@ 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 \ @@ -48,4 +54,4 @@ do-test: -k test_using \ -k test_utils -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/devel/py-mwlib/Makefile b/devel/py-mwlib/Makefile index ed310ea4fc03..8c6feefa2c33 100644 --- a/devel/py-mwlib/Makefile +++ b/devel/py-mwlib/Makefile @@ -3,6 +3,7 @@ PORTNAME= mwlib PORTVERSION= 0.15.19 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -25,7 +26,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}apipkg>=1.2:devel/py-apipkg@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}lockfile>=0.8:devel/py-lockfile@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}timelib>=0.2:devel/py-timelib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pdf>=1.12:print/py-pdf@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}py>=1.4.0:devel/py-py@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}qserve>=0:devel/py-qserve@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}roman>=0:math/py-roman@${PY_FLAVOR} \ diff --git a/devel/py-pydenticon/Makefile b/devel/py-pydenticon/Makefile index c7f619107c01..6b4de5f21c2a 100644 --- a/devel/py-pydenticon/Makefile +++ b/devel/py-pydenticon/Makefile @@ -3,6 +3,7 @@ PORTNAME= pydenticon PORTVERSION= 0.3.1 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -13,7 +14,6 @@ COMMENT= Library for generating identicons - an enhanced port of Sigil LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} USES= python @@ -21,7 +21,15 @@ 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.mk> +.include <bsd.port.post.mk> diff --git a/games/fretsonfire/Makefile b/games/fretsonfire/Makefile index 132416ccf48b..2ea875a4df57 100644 --- a/games/fretsonfire/Makefile +++ b/games/fretsonfire/Makefile @@ -3,7 +3,7 @@ PORTNAME= fretsonfire PORTVERSION= 1.3.110 -PORTREVISION= 13 +PORTREVISION= 14 CATEGORIES= games python MASTER_SITES= SF DISTNAME= ${PORTNAME_UCASE}-${PORTVERSION} @@ -18,7 +18,6 @@ LICENSE_FILE= ${WRKSRC}/copying.txt RUN_DEPENDS= ${PYNUMPY} \ ${PYGAME} \ ${PYTHON_PKGNAMEPREFIX}PyOpenGL>=0:graphics/py-PyOpenGL@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR} \ ${LOCALBASE}/share/${PORTNAME}/default.ttf:games/fretsonfire-data USES= dos2unix python @@ -38,6 +37,14 @@ 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 && \ @@ -53,4 +60,4 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/readme.txt ${STAGEDIR}${DOCSDIR}/README ${INSTALL_DATA} ${WRKSRC}/install.txt ${STAGEDIR}${DOCSDIR}/INSTALL -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/games/hypatia_engine/Makefile b/games/hypatia_engine/Makefile index a6eff66c3fd8..9e6f523fb47a 100644 --- a/games/hypatia_engine/Makefile +++ b/games/hypatia_engine/Makefile @@ -2,7 +2,7 @@ PORTNAME= hypatia_engine PORTVERSION= 0.3.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= games python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -14,10 +14,17 @@ LICENSE= MIT RUN_DEPENDS= ${PYGAME} \ ${PYTHON_PKGNAMEPREFIX}pyganim>0:graphics/py-pyganim@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \ ${PY_ENUM34} USES= python USE_PYTHON= autoplist concurrent distutils -.include <bsd.port.mk> +.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> diff --git a/games/pysolfc/Makefile b/games/pysolfc/Makefile index 78935e5d7822..4f721f532f4c 100644 --- a/games/pysolfc/Makefile +++ b/games/pysolfc/Makefile @@ -2,6 +2,7 @@ PORTNAME= pysolfc DISTVERSION= 2.6.4 +PORTREVISION= 1 CATEGORIES= games python MASTER_SITES= SF/${PORTNAME}/PySolFC/${PYSOLFCDIR} \ SF/${PORTNAME}/PySolFC-Cardsets/${CARDSETDIR}:cardsets @@ -15,8 +16,7 @@ COMMENT= Solitaire game, written in Python and the successor of PySol LICENSE= GPLv2+ GPLv3+ MIT PCW PD UCP UCJ ULG LICENSE_COMB= multi -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}random2>=0:math/py-random2@${PY_FLAVOR} \ +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} @@ -74,6 +74,14 @@ 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 @@ -96,4 +104,4 @@ post-install: (cd ${WRKDIR}/${CARDSETDIR} && \ ${FIND} . -type f | ${SED} -e 's|^./|${DATADIR_REL}/|' >> ${TMPPLIST}) -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/games/pythonsudoku/Makefile b/games/pythonsudoku/Makefile index a8dce4bb8334..222ec1b2070c 100644 --- a/games/pythonsudoku/Makefile +++ b/games/pythonsudoku/Makefile @@ -3,7 +3,7 @@ PORTNAME= pythonsudoku PORTVERSION= 0.13 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= games python MASTER_SITES= SF/${PORTNAME}/Python%20Sudoku/${PORTVERSION}/ \ SF/nemysisfreebsdp/games/:icons @@ -23,7 +23,7 @@ EXPIRATION_DATE= 2020-03-01 LIB_DEPENDS+= libcups.so:print/cups RUN_DEPENDS= ${PYGAME} \ - ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pillow6>=0:graphics/py-pillow6@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}reportlab>=0:print/py-reportlab@${PY_FLAVOR} USES= gnome python:2.7 tar:bzip2 diff --git a/graphics/Makefile b/graphics/Makefile index b02cb7458d15..b716c881d415 100644 --- a/graphics/Makefile +++ b/graphics/Makefile @@ -830,6 +830,7 @@ SUBDIR += py-openimageio SUBDIR += py-photocollage SUBDIR += py-pillow + SUBDIR += py-pillow6 SUBDIR += py-pivy SUBDIR += py-plotly SUBDIR += py-png diff --git a/graphics/caffe/Makefile b/graphics/caffe/Makefile index 53cb0d5a5faf..47c7df58e512 100644 --- a/graphics/caffe/Makefile +++ b/graphics/caffe/Makefile @@ -2,7 +2,7 @@ PORTNAME= caffe PORTVERSION= 1.0 -PORTREVISION= 31 +PORTREVISION= 32 CATEGORIES= graphics MAINTAINER= eric@camachat.org @@ -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}pillow>=1.7:graphics/py-pillow@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pillow6>=1.7:graphics/py-pillow6@${PY_FLAVOR} \ ${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 627608297b4a..4a590ac0a9d4 100644 --- a/graphics/impressive/Makefile +++ b/graphics/impressive/Makefile @@ -3,7 +3,7 @@ PORTNAME= impressive PORTVERSION= 0.12.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics python MASTER_SITES= SF/${PORTNAME}/Impressive/${PORTVERSION}/ DISTNAME= Impressive-${PORTVERSION} @@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/license.txt RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}PyOpenGL>=0:graphics/py-PyOpenGL@${PY_FLAVOR} \ ${PYGAME} \ - ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} USES= python:2.7 sdl shebangfix USE_SDL= sdl diff --git a/graphics/py-PyOpenGL/Makefile b/graphics/py-PyOpenGL/Makefile index ab88134abfe3..0967cfb29540 100644 --- a/graphics/py-PyOpenGL/Makefile +++ b/graphics/py-PyOpenGL/Makefile @@ -3,7 +3,7 @@ PORTNAME= PyOpenGL PORTVERSION= 3.1.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -12,9 +12,8 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= python@FreeBSD.org COMMENT= OpenGL (and related library) interface for Python -BUILD_DEPENDS= ${PYNUMPY} \ - ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} -RUN_DEPENDS:= ${BUILD_DEPENDS} +BUILD_DEPENDS= ${PYNUMPY} +RUN_DEPENDS= ${PYNUMPY} OPTIONS_DEFINE= TKINTER OPTIONS_DEFAULT= TKINTER @@ -27,10 +26,20 @@ 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.mk> +.include <bsd.port.post.mk> diff --git a/graphics/py-actdiag/Makefile b/graphics/py-actdiag/Makefile index a3e695fbd2a6..f459433b001a 100644 --- a/graphics/py-actdiag/Makefile +++ b/graphics/py-actdiag/Makefile @@ -3,6 +3,7 @@ PORTNAME= actdiag PORTVERSION= 0.5.4 +PORTREVISION= 1 CATEGORIES= graphics python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -16,7 +17,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE DEPRECATED= Uses deprecated version of python EXPIRATION_DATE= 2020-08-15 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>=2.2.1:graphics/py-pillow@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow6>=2.2.1:graphics/py-pillow6@${PY_FLAVOR} \ ${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 6ffd1fd37533..cf5511bbd582 100644 --- a/graphics/py-blockdiag/Makefile +++ b/graphics/py-blockdiag/Makefile @@ -3,6 +3,7 @@ PORTNAME= blockdiag PORTVERSION= 1.5.4 +PORTREVISION= 1 CATEGORIES= graphics python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -13,7 +14,7 @@ COMMENT= Simple block-diagram image generator LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>=2.2.1:graphics/py-pillow@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow6>=2.2.1:graphics/py-pillow6@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}funcparserlib>=0.3.6:devel/py-funcparserlib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}webcolors>=0:graphics/py-webcolors@${PY_FLAVOR} diff --git a/graphics/py-cartopy/Makefile b/graphics/py-cartopy/Makefile index 856250bbe495..386b9de27c43 100644 --- a/graphics/py-cartopy/Makefile +++ b/graphics/py-cartopy/Makefile @@ -3,7 +3,7 @@ PORTNAME= cartopy PORTVERSION= 0.17.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -36,11 +36,19 @@ 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} \ - ${PYTHON_PKGNAMEPREFIX}pillow>=1.7.8:graphics/py-pillow@${PY_FLAVOR} +OWS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}OWSLib>=0.8.11:graphics/py-OWSLib@${PY_FLAVOR} 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}pillow>=1.7.8:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>=0.10:science/py-scipy@${PY_FLAVOR} -.include <bsd.port.mk> +.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> diff --git a/graphics/py-django-easy-thumbnails/Makefile b/graphics/py-django-easy-thumbnails/Makefile index 88d3e25d1e7b..d3d876eaa7eb 100644 --- a/graphics/py-django-easy-thumbnails/Makefile +++ b/graphics/py-django-easy-thumbnails/Makefile @@ -3,6 +3,7 @@ PORTNAME= easy-thumbnails PORTVERSION= 2.5 +PORTREVISION= 1 CATEGORIES= graphics python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}django- @@ -13,8 +14,7 @@ COMMENT= Easy thumbnails for Django LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=1.8:www/py-django111@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=1.8:www/py-django111@${PY_FLAVOR} USES= python USE_PYTHON= autoplist concurrent distutils @@ -24,10 +24,19 @@ 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}pillow>0:graphics/py-pillow@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR} 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 @@ -35,4 +44,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.mk> +.include <bsd.port.post.mk> diff --git a/graphics/py-face_recognition/Makefile b/graphics/py-face_recognition/Makefile index be4311117946..9719b859cc3d 100644 --- a/graphics/py-face_recognition/Makefile +++ b/graphics/py-face_recognition/Makefile @@ -3,6 +3,7 @@ PORTNAME= face_recognition PORTVERSION= 1.3.0 +PORTREVISION= 1 CATEGORIES= graphics python devel MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -15,7 +16,6 @@ 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}pillow>0:graphics/py-pillow@${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} @@ -24,4 +24,12 @@ USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes -.include <bsd.port.mk> +.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> diff --git a/graphics/py-imageio24/Makefile b/graphics/py-imageio24/Makefile index c531b4aa2fbe..3f7fbe76b0bd 100644 --- a/graphics/py-imageio24/Makefile +++ b/graphics/py-imageio24/Makefile @@ -2,7 +2,7 @@ PORTNAME= imageio DISTVERSION= 2.4.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -18,8 +18,7 @@ LIB_DEPENDS= libfreeimage.so:graphics/freeimage RUN_DEPENDS= ffmpeg:multimedia/ffmpeg \ ${PY_ENUM34} \ ${PY_FUTURES} \ - ${PYNUMPY} \ - ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} + ${PYNUMPY} USES= python USE_PYTHON= distutils concurrent autoplist @@ -28,4 +27,12 @@ NO_ARCH= yes PORTSCOUT= limit:^2\.4\. -.include <bsd.port.mk> +.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> diff --git a/graphics/py-img2pdf/Makefile b/graphics/py-img2pdf/Makefile index 4c78789c1f45..0264339bcb91 100644 --- a/graphics/py-img2pdf/Makefile +++ b/graphics/py-img2pdf/Makefile @@ -2,6 +2,7 @@ PORTNAME= img2pdf DISTVERSION= 0.3.3 +PORTREVISION= 1 CATEGORIES= graphics python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -12,8 +13,7 @@ COMMENT= Convert images to PDF via direct JPEG inclusion LICENSE= LGPL3+ LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \ - ${PY_ENUM34} +RUN_DEPENDS= ${PY_ENUM34} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pdfrw>0:textproc/py-pdfrw@${PY_FLAVOR} USES= python @@ -21,9 +21,17 @@ 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.mk> +.include <bsd.port.post.mk> diff --git a/graphics/py-mcomix/Makefile b/graphics/py-mcomix/Makefile index 7d9cb46f5689..51bdda0dc97c 100644 --- a/graphics/py-mcomix/Makefile +++ b/graphics/py-mcomix/Makefile @@ -3,7 +3,7 @@ PORTNAME= mcomix PORTVERSION= 1.2.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/MComix-${PORTVERSION} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -17,7 +17,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING DEPRECATED= Old, uses EOLed python27 EXPIRATION_DATE= 2020-03-01 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>=5.2.0:graphics/py-pillow@${PY_FLAVOR} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow6>=5.2.0:graphics/py-pillow6@${PY_FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} USES= gnome python:2.7 tar:bzip2 diff --git a/graphics/py-nwdiag/Makefile b/graphics/py-nwdiag/Makefile index de54f286aa3a..10cae5f05a31 100644 --- a/graphics/py-nwdiag/Makefile +++ b/graphics/py-nwdiag/Makefile @@ -3,6 +3,7 @@ PORTNAME= nwdiag PORTVERSION= 1.0.4 +PORTREVISION= 1 CATEGORIES= graphics python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -16,7 +17,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE DEPRECATED= Uses deprecated version of python EXPIRATION_DATE= 2020-08-15 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>=2.2.1:graphics/py-pillow@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow6>=2.2.1:graphics/py-pillow6@${PY_FLAVOR} \ ${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 6eeb4b72f81e..e3808975d2a8 100644 --- a/graphics/py-photocollage/Makefile +++ b/graphics/py-photocollage/Makefile @@ -2,7 +2,7 @@ PORTNAME= photocollage DISTVERSION= 1.4.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -14,13 +14,20 @@ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cairo>0:graphics/py-cairo@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>:devel/py-six@${PY_FLAVOR} 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}| ; \ @@ -32,4 +39,4 @@ post-patch: ${MV} $$f $$(${ECHO} $$f | ${SED} -E 's|photocollage\.([[:alpha:].]*)|photocollage-${PYTHON_VER}.\1|'); \ done -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/graphics/py-pillow/Makefile b/graphics/py-pillow/Makefile index 5a2700cd5b24..6051e421d28b 100644 --- a/graphics/py-pillow/Makefile +++ b/graphics/py-pillow/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= pillow -PORTVERSION= 6.2.2 +PORTVERSION= 7.0.0 CATEGORIES= graphics python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -17,14 +17,16 @@ LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest-runner>0:devel/py-pytest-runner@${PY_FLAVOR} -# Python 2.7,3.5+ -USES= cpe python +# Python 3.5+ +USES= cpe python:3.5+ USE_GITHUB= yes USE_PYTHON= autoplist concurrent distutils GH_ACCOUNT= python-${PORTNAME} GH_PROJECT= ${PORTNAME:C/p/P/} +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}pillow6 + OPTIONS_DEFINE= FREETYPE JPEG JPEG2000 LCMS OLE PNG TIFF TKINTER WEBP OPTIONS_DEFAULT= FREETYPE JPEG JPEG2000 LCMS OLE PNG TIFF TKINTER WEBP diff --git a/graphics/py-pillow/distinfo b/graphics/py-pillow/distinfo index 22f4c9a333ee..9e0c77dce471 100644 --- a/graphics/py-pillow/distinfo +++ b/graphics/py-pillow/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1579047758 -SHA256 (python-pillow-Pillow-6.2.2_GH0.tar.gz) = cc4ec754ddcc98b7166a1afe062c6355c841776145f0f23bdd3bea1eaa41e2db -SIZE (python-pillow-Pillow-6.2.2_GH0.tar.gz) = 37538464 +TIMESTAMP = 1579047762 +SHA256 (python-pillow-Pillow-7.0.0_GH0.tar.gz) = 925f52e26491063943c14edadc6d276e3a8427b11d6943113fd2ef24dcbeabca +SIZE (python-pillow-Pillow-7.0.0_GH0.tar.gz) = 37880130 diff --git a/graphics/py-pillow6/Makefile b/graphics/py-pillow6/Makefile new file mode 100644 index 000000000000..3569559c60e0 --- /dev/null +++ b/graphics/py-pillow6/Makefile @@ -0,0 +1,83 @@ +# Created by: Kubilay Kocak <koobs@FreeBSD.org> +# $FreeBSD$ + +PORTNAME= pillow +PORTVERSION= 6.2.2 +CATEGORIES= graphics python +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} +PKGNAMESUFFIX= 6 + +MAINTAINER= koobs@FreeBSD.org +COMMENT= Fork of the Python Imaging Library (PIL) + +LICENSE= PIL +LICENSE_NAME= Standard PIL License +LICENSE_FILE= ${WRKSRC}/LICENSE +LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept + +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest-runner>0:devel/py-pytest-runner@${PY_FLAVOR} + +# Python 2.7,3.5+ +USES= cpe python +USE_GITHUB= yes +USE_PYTHON= autoplist concurrent distutils + +GH_ACCOUNT= python-${PORTNAME} +GH_PROJECT= ${PORTNAME:C/p/P/} + +CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}pillow + +OPTIONS_DEFINE= FREETYPE JPEG JPEG2000 LCMS OLE PNG TIFF TKINTER WEBP +OPTIONS_DEFAULT= FREETYPE JPEG JPEG2000 LCMS OLE PNG TIFF TKINTER WEBP + +LCMS_DESC= Little Color Management System +OLE_DESC= Microsoft OLE2 file format support +TKINTER_DESC= Tkinter (Tcl/Tk) BitmapImage & PhotoImage support + +FREETYPE_LIB_DEPENDS= libfreetype.so:print/freetype2 +FREETYPE_VARS= PYDISTUTILS_BUILDARGS+=--enable-freetype +FREETYPE_VARS_OFF= PYDISTUTILS_BUILDARGS+=--disable-freetype + +JPEG_USES= jpeg +JPEG_VARS= PYDISTUTILS_BUILDARGS+=--enable-jpeg +JPEG_VARS_OFF= PYDISTUTILS_BUILDARGS+=--disable-jpeg + +JPEG2000_LIB_DEPENDS= libopenjp2.so:graphics/openjpeg +JPEG2000_VARS= PYDISTUTILS_BUILDARGS+=--enable-jpeg2000 +JPEG2000_VARS_OFF= PYDISTUTILS_BUILDARGS+=--disable-jpeg2000 + +LCMS_LIB_DEPENDS= liblcms2.so:graphics/lcms2 +LCMS_VARS= PYDISTUTILS_BUILDARGS+=--enable-lcms +LCMS_VARS_OFF= PYDISTUTILS_BUILDARGS+=--disable-lcms + +OLE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}olefile>0:devel/py-olefile@${PY_FLAVOR} + +PNG_VARS= PYDISTUTILS_BUILDARGS+=--enable-zlib +PNG_VARS_OFF= PYDISTUTILS_BUILDARGS+=--disable-zlib + +TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff +TIFF_VARS= PYDISTUTILS_BUILDARGS+=--enable-tiff +TIFF_VARS_OFF= PYDISTUTILS_BUILDARGS+=--disable-tiff + +TKINTER_USES= tk +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} +TKINTER_VARS= PYDISTUTILS_BUILDARGS+="--include-dirs=${TCL_INCLUDEDIR}:${TK_INCLUDEDIR}" + +WEBP_LIB_DEPENDS= libwebp.so:graphics/webp +WEBP_VARS= PYDISTUTILS_BUILDARGS+="--enable-webp --enable-webpmux" +WEBP_VARS_OFF= PYDISTUTILS_BUILDARGS+="--disable-webp --disable-webpmux" + +.include <bsd.port.pre.mk> + +PYDISTUTILS_BUILD_TARGET= build build_ext +PYDISTUTILS_BUILDARGS+= saveopts + +post-install: + ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PIL/*.so + +do-test: + @cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test + +.include <bsd.port.post.mk> diff --git a/graphics/py-pillow6/distinfo b/graphics/py-pillow6/distinfo new file mode 100644 index 000000000000..22f4c9a333ee --- /dev/null +++ b/graphics/py-pillow6/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1579047758 +SHA256 (python-pillow-Pillow-6.2.2_GH0.tar.gz) = cc4ec754ddcc98b7166a1afe062c6355c841776145f0f23bdd3bea1eaa41e2db +SIZE (python-pillow-Pillow-6.2.2_GH0.tar.gz) = 37538464 diff --git a/graphics/py-pillow6/pkg-descr b/graphics/py-pillow6/pkg-descr new file mode 100644 index 000000000000..0249c5723e14 --- /dev/null +++ b/graphics/py-pillow6/pkg-descr @@ -0,0 +1,5 @@ +Pillow is the "friendly" PIL fork. PIL is the Python Imaging Library. Pillow +was started for and is currently maintained by the Plone community. But it is +used by many other folks in the Python web community. + +WWW: https://python-pillow.org/ diff --git a/graphics/py-pyinsane2/Makefile b/graphics/py-pyinsane2/Makefile index f7b56a9ca7c5..dd05be7b8927 100644 --- a/graphics/py-pyinsane2/Makefile +++ b/graphics/py-pyinsane2/Makefile @@ -2,6 +2,7 @@ PORTNAME= pyinsane2 DISTVERSION= 2.0.13 +PORTREVISION= 1 CATEGORIES= graphics python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -13,10 +14,17 @@ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=1.0:devel/py-nose@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} USES= gmake python USE_PYTHON= distutils autoplist NO_ARCH= yes -.include <bsd.port.mk> +.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> diff --git a/graphics/py-pypillowfight/Makefile b/graphics/py-pypillowfight/Makefile index a384b842f691..e33fdedb14cd 100644 --- a/graphics/py-pypillowfight/Makefile +++ b/graphics/py-pypillowfight/Makefile @@ -2,6 +2,7 @@ PORTNAME= pypillowfight DISTVERSION= 0.3.0 +PORTREVISION= 1 CATEGORIES= graphics python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -13,9 +14,16 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=1.0:devel/py-nose@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} USES= python USE_PYTHON= distutils autoplist -.include <bsd.port.mk> +.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> diff --git a/graphics/py-sane/Makefile b/graphics/py-sane/Makefile index 6f36ad249d9b..576cc9b3c159 100644 --- a/graphics/py-sane/Makefile +++ b/graphics/py-sane/Makefile @@ -3,7 +3,7 @@ PORTNAME= sane PORTVERSION= 2.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics python MASTER_SITES= http://effbot.org/media/downloads/ \ http://www.pythonware.net/storage/ @@ -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}pillow>0:graphics/py-pillow@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} DIST_SUBDIR= python USES= python:2.7 diff --git a/graphics/py-scikit-image/Makefile b/graphics/py-scikit-image/Makefile index 7713a109a493..d8120655f2b1 100644 --- a/graphics/py-scikit-image/Makefile +++ b/graphics/py-scikit-image/Makefile @@ -2,6 +2,7 @@ PORTNAME= scikit-image PORTVERSION= 0.14.3 +PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= graphics python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -20,7 +21,6 @@ RUN_DEPENDS= ${PYNUMPY} \ ${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} \ - ${PYTHON_PKGNAMEPREFIX}pillow>=1.7:graphics/py-pillow@${PY_FLAVOR} \ ${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} \ @@ -33,6 +33,14 @@ 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} {} \; @@ -42,4 +50,4 @@ do-test: ${PYTHON_CMD} selftest.py && \ ${PYTHON_CMD} -m nose -vx Tests/test_*.py -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/graphics/py-seqdiag/Makefile b/graphics/py-seqdiag/Makefile index 1942a93dda4d..c66f8f65a364 100644 --- a/graphics/py-seqdiag/Makefile +++ b/graphics/py-seqdiag/Makefile @@ -3,6 +3,7 @@ PORTNAME= seqdiag PORTVERSION= 0.9.6 +PORTREVISION= 1 CATEGORIES= graphics python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -16,7 +17,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE DEPRECATED= Uses deprecated version of python EXPIRATION_DATE= 2020-08-15 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>=2.2.1:graphics/py-pillow@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow6>=2.2.1:graphics/py-pillow6@${PY_FLAVOR} \ ${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 5fbb46d00de1..bf7e6e4e3d88 100644 --- a/graphics/py-sorl-thumbnail/Makefile +++ b/graphics/py-sorl-thumbnail/Makefile @@ -3,7 +3,7 @@ PORTNAME= sorl-thumbnail PORTVERSION= 12.4.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -34,7 +34,6 @@ 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= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} REDIS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}redis>0:databases/py-redis@${PY_FLAVOR} WAND_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Wand>0:graphics/py-wand@${PY_FLAVOR} @@ -44,10 +43,20 @@ 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.mk> +.include <bsd.port.post.mk> diff --git a/graphics/py-soya3d/Makefile b/graphics/py-soya3d/Makefile index 2121dfa8c55a..8fb080c42d00 100644 --- a/graphics/py-soya3d/Makefile +++ b/graphics/py-soya3d/Makefile @@ -17,7 +17,7 @@ COMMENT= Very high level 3D engine for Python DEPRECATED= Unmaintained, uses EOLed python27 EXPIRATION_DATE= 2020-03-19 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} LIB_DEPENDS= libode.so:devel/ode \ libcal3d.so:graphics/cal3d \ libfreetype.so:print/freetype2 diff --git a/graphics/sk1/Makefile b/graphics/sk1/Makefile index 8b9e931b3285..5c835254da61 100644 --- a/graphics/sk1/Makefile +++ b/graphics/sk1/Makefile @@ -3,6 +3,7 @@ PORTNAME= sk1 DISTVERSION= 2.0 DISTVERSIONSUFFIX= rc3 +PORTREVISION= 1 CATEGORIES= graphics python MASTER_SITES= https://downloads.sk1project.net/sk1/${DISTVERSIONFULL}/ @@ -19,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}pillow>0:graphics/py-pillow@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pycups>0:print/py-pycups@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}reportlab>0:print/py-reportlab@${PY_FLAVOR} diff --git a/lang/mono/Makefile b/lang/mono/Makefile index 9a6b40324ebb..66870bf1ec48 100644 --- a/lang/mono/Makefile +++ b/lang/mono/Makefile @@ -20,8 +20,7 @@ BUILD_DEPENDS= p5-XML-Parser>=0:textproc/p5-XML-Parser \ bash:shells/bash \ cmake>0:devel/cmake LIB_DEPENDS= libinotify.so:devel/libinotify -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR} \ - ca_root_nss>=0:security/ca_root_nss +RUN_DEPENDS= ca_root_nss>=0:security/ca_root_nss CONFLICTS_INSTALL= czmq-3* @@ -64,6 +63,14 @@ 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} @@ -92,4 +99,4 @@ post-configure: post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/mono -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/math/asymptote/Makefile b/math/asymptote/Makefile index 9e1cf5782ac8..16bb663cb208 100644 --- a/math/asymptote/Makefile +++ b/math/asymptote/Makefile @@ -3,7 +3,7 @@ PORTNAME= asymptote PORTVERSION= 2.56 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= math MASTER_SITES= SF/${PORTNAME}/${PORTVERSION} DISTNAME= ${PORTNAME}-${PORTVERSION}.src @@ -19,7 +19,6 @@ ONLY_FOR_ARCHS= amd64 i386 LIB_DEPENDS= libsigsegv.so:devel/libsigsegv RUN_DEPENDS= animate:graphics/ImageMagick6 \ gv:print/gv \ - ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${PY_FLAVOR} USES= compiler:c++14-lang gettext-runtime ghostscript gl gmake ncurses perl5 python \ @@ -73,6 +72,14 @@ 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,' \ @@ -86,4 +93,4 @@ post-patch: post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/asy -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/math/py-PyWavelets/Makefile b/math/py-PyWavelets/Makefile index 94f4be77ac80..848074072553 100644 --- a/math/py-PyWavelets/Makefile +++ b/math/py-PyWavelets/Makefile @@ -2,7 +2,7 @@ PORTNAME= PyWavelets PORTVERSION= 0.5.2 -PORTREVISION= 3 +PORTREVISION= 4 DISTVERSIONPREFIX= v CATEGORIES= math python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -13,10 +13,8 @@ COMMENT= Discrete Wavelet Transforms in Python LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= ${PYNUMPY} \ - ${PYTHON_PKGNAMEPREFIX}pillow>=1.7:graphics/py-pillow@${PY_FLAVOR} -RUN_DEPENDS= ${PYNUMPY} \ - ${PYTHON_PKGNAMEPREFIX}pillow>=1.7:graphics/py-pillow@${PY_FLAVOR} +BUILD_DEPENDS= ${PYNUMPY} +RUN_DEPENDS= ${PYNUMPY} USE_GITHUB= yes GH_PROJECT= pywt @@ -27,4 +25,12 @@ USE_PYTHON= autoplist distutils cython cython_run PYDISTUTILS_BUILD_TARGET= build build_ext PYDISTUTILS_BUILDARGS+= saveopts -.include <bsd.port.mk> +.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> diff --git a/misc/cs/Makefile b/misc/cs/Makefile index 47122328ae5c..985db38c75ed 100644 --- a/misc/cs/Makefile +++ b/misc/cs/Makefile @@ -3,7 +3,7 @@ PORTNAME= cs PORTVERSION= 0.9.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= misc MASTER_SITES= http://njhurst.com/programming/cross-stitch/ @@ -12,8 +12,6 @@ COMMENT= Cross Stitch software LICENSE= GPLv2+ -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} - NO_BUILD= yes USES= python:run shebangfix tar:tgz @@ -21,7 +19,15 @@ 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.mk> +.include <bsd.port.post.mk> diff --git a/misc/mmdnn/Makefile b/misc/mmdnn/Makefile index 59bff3064e99..036a3c7bca4d 100644 --- a/misc/mmdnn/Makefile +++ b/misc/mmdnn/Makefile @@ -3,6 +3,7 @@ PORTNAME= mmdnn DISTVERSION= 0.2.5-21 DISTVERSIONSUFFIX= -gc1c748e +PORTREVISION= 1 CATEGORIES= misc python # machine-learning MAINTAINER= yuri@FreeBSD.org @@ -12,7 +13,6 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYNUMPY} \ - ${PYTHON_PKGNAMEPREFIX}pillow>=3.1.0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}protobuf>=3.6.0:devel/py-protobuf@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} @@ -24,4 +24,12 @@ USE_PYTHON= distutils noflavors autoplist NO_ARCH= yes -.include <bsd.port.mk> +.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> diff --git a/misc/py-gluoncv/Makefile b/misc/py-gluoncv/Makefile index 7c681f4e3c7d..0edab3279e99 100644 --- a/misc/py-gluoncv/Makefile +++ b/misc/py-gluoncv/Makefile @@ -3,6 +3,7 @@ PORTNAME= gluoncv DISTVERSIONPREFIX= v DISTVERSION= 0.6.0 +PORTREVISION= 1 CATEGORIES= misc # machine-learning PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -15,7 +16,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE PY_DEPENDS= ${PYNUMPY} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mxnet>0:misc/py-mxnet@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}portalocker>0:devel/py-portalocker@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>=1.0:science/py-scipy@${PY_FLAVOR} \ @@ -32,10 +32,18 @@ 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.mk> +.include <bsd.port.post.mk> diff --git a/misc/wotsap/Makefile b/misc/wotsap/Makefile index c764278b701c..f653edf806af 100644 --- a/misc/wotsap/Makefile +++ b/misc/wotsap/Makefile @@ -3,7 +3,7 @@ PORTNAME= wotsap PORTVERSION= 0.7 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= misc MASTER_SITES= http://www.lysator.liu.se/~jc/wotsap/download/ EXTRACT_SUFX= .tgz @@ -11,7 +11,7 @@ EXTRACT_SUFX= .tgz MAINTAINER= danilo@FreeBSD.org COMMENT= Web of trust statistics and pathfinder -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} USES= python:2.7,run shebangfix NO_BUILD= yes diff --git a/multimedia/freevo/Makefile b/multimedia/freevo/Makefile index a2c8022d7dd2..a37017df0dbb 100644 --- a/multimedia/freevo/Makefile +++ b/multimedia/freevo/Makefile @@ -3,7 +3,7 @@ PORTNAME= freevo PORTVERSION= 1.9.0 -PORTREVISION= 20 +PORTREVISION= 21 CATEGORIES= multimedia MASTER_SITES= SF/${PORTNAME}/Freevo%20releases/${PORTVERSION} @@ -23,7 +23,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}pillow>0:graphics/py-pillow@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} \ ${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-p2p/deluge-cli/Makefile b/net-p2p/deluge-cli/Makefile index f826d53546c2..c6aa76a35ee2 100644 --- a/net-p2p/deluge-cli/Makefile +++ b/net-p2p/deluge-cli/Makefile @@ -3,7 +3,7 @@ PORTNAME= deluge DISTVERSIONPREFIX= ${PORTNAME}- DISTVERSION= 1.3.15 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= net-p2p python PKGNAMESUFFIX= -cli @@ -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}pillow>0:graphics/py-pillow@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} USES= gettext python:2.7 USE_PYTHON= autoplist distutils diff --git a/net/py-rainbowstream/Makefile b/net/py-rainbowstream/Makefile index 871b212658b5..e0434660e2d8 100644 --- a/net/py-rainbowstream/Makefile +++ b/net/py-rainbowstream/Makefile @@ -3,6 +3,7 @@ PORTNAME= rainbowstream PORTVERSION= 1.4.0 +PORTREVISION= 1 CATEGORIES= net python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -21,7 +22,6 @@ 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}pillow>0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pysocks>0:net/py-pysocks@${PY_FLAVOR} # Actually 2.7,3.2- @@ -31,4 +31,12 @@ USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes -.include <bsd.port.mk> +.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> diff --git a/print/hplip/Makefile b/print/hplip/Makefile index 658ef082dd82..8bd76e749516 100644 --- a/print/hplip/Makefile +++ b/print/hplip/Makefile @@ -3,6 +3,7 @@ PORTNAME= hplip PORTVERSION= 3.19.12 +PORTREVISION= 1 CATEGORIES= print MASTER_SITES= SF @@ -53,7 +54,6 @@ FAX_CONFIGURE_ENABLE= fax-build SCAN_DESC= Scanning support SCAN_LIB_DEPENDS= libsane.so:graphics/sane-backends -SCAN_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} SCAN_CONFIGURE_ENABLE= scan-build SNMP_DESC= Network/JetDirect support @@ -82,6 +82,16 @@ 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' \ @@ -143,4 +153,4 @@ post-install-SCAN-on: ${MV} ${STAGEDIR}${PREFIX}/etc/sane.d/dll.conf \ ${STAGEDIR}${PREFIX}/etc/sane.d/dll.d/hpaio -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/print/py-reportlab/Makefile b/print/py-reportlab/Makefile index b34431ad7a65..4960ef48b28b 100644 --- a/print/py-reportlab/Makefile +++ b/print/py-reportlab/Makefile @@ -3,6 +3,7 @@ PORTNAME= reportlab PORTVERSION= 3.5.21 +PORTREVISION= 1 CATEGORIES= print python MASTER_SITES= CHEESESHOP \ https://www.reportlab.com/ftp/ @@ -16,8 +17,6 @@ COMMENT= Library to create PDF documents using the Python language LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} - USES= python USE_PYTHON= distutils autoplist @@ -42,7 +41,13 @@ 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.options.mk> +.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}|' \ @@ -66,4 +71,4 @@ post-install-DOCS-on: ${INSTALL_DATA} ${WRKSRC}/docs/${i} ${STAGEDIR}${DOCSDIR} .endfor -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/print/py-trml2pdf/Makefile b/print/py-trml2pdf/Makefile index 0f316faf9d32..5908b9b64410 100644 --- a/print/py-trml2pdf/Makefile +++ b/print/py-trml2pdf/Makefile @@ -3,7 +3,7 @@ PORTNAME= trml2pdf PORTVERSION= 1.2 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= print python MASTER_SITES= SF/kraft/${PORTNAME}/${PORTVERSION} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -16,7 +16,7 @@ LICENSE= LGPL21 DEPRECATED= Uses deprecated version of python EXPIRATION_DATE= 2020-08-15 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}reportlab>=0:print/py-reportlab@${PY_FLAVOR} USES= python:2.7 shebangfix tar:bzip2 diff --git a/science/rdkit/Makefile b/science/rdkit/Makefile index 8506cfc85967..df367f89d74d 100644 --- a/science/rdkit/Makefile +++ b/science/rdkit/Makefile @@ -3,7 +3,7 @@ PORTNAME= rdkit DISTVERSIONPREFIX= Release_ DISTVERSION= 2018_09_3 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= science MAINTAINER= yuri@FreeBSD.org @@ -42,7 +42,6 @@ PYTHON_BUILD_DEPENDS= ${PYNUMPY} PYTHON_LIB_DEPENDS= ${PY_BOOST} PYTHON_RUN_DEPENDS= ${PYNUMPY} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}reportlab>0:print/py-reportlab@${PY_FLAVOR} PORTDOCS= * @@ -55,6 +54,14 @@ 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 @@ -63,4 +70,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.mk> +.include <bsd.port.post.mk> diff --git a/security/py-volatility/Makefile b/security/py-volatility/Makefile index 0f525573c6ec..6390b853b09c 100644 --- a/security/py-volatility/Makefile +++ b/security/py-volatility/Makefile @@ -4,6 +4,7 @@ PORTNAME= volatility DISTVERSION= 2.6.1-34 DISTVERSIONSUFFIX= -g753bfa87 +PORTREVISION= 1 CATEGORIES= security python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -18,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}pillow>=0:graphics/py-pillow@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pillow6>=0:graphics/py-pillow6@${PY_FLAVOR} \ ${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 9bb67705beb2..6f9b03d44134 100644 --- a/security/vinetto/Makefile +++ b/security/vinetto/Makefile @@ -3,7 +3,7 @@ PORTNAME= vinetto PORTVERSION= 0.07 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= security MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-beta-${PORTVERSION} DISTNAME= ${PORTNAME}-beta-${PORTVERSION} @@ -14,16 +14,22 @@ COMMENT= Forensics tool to examine Thumbs.db files LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} - 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.mk> +.include <bsd.port.post.mk> diff --git a/textproc/py-qrcode/Makefile b/textproc/py-qrcode/Makefile index 0701e0f4b9d8..e47f59e09ede 100644 --- a/textproc/py-qrcode/Makefile +++ b/textproc/py-qrcode/Makefile @@ -3,6 +3,7 @@ PORTNAME= qrcode PORTVERSION= 6.1 +PORTREVISION= 1 CATEGORIES= textproc python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -12,13 +13,20 @@ COMMENT= QR Code image generator LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.8:devel/py-six@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pillow>=2.6:graphics/py-pillow@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.8:devel/py-six@${PY_FLAVOR} 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.mk> +.include <bsd.port.post.mk> diff --git a/textproc/py-xhtml2pdf/Makefile b/textproc/py-xhtml2pdf/Makefile index 58ccf4e381cd..8704e686df7a 100644 --- a/textproc/py-xhtml2pdf/Makefile +++ b/textproc/py-xhtml2pdf/Makefile @@ -3,6 +3,7 @@ PORTNAME= xhtml2pdf PORTVERSION= 0.2.4 +PORTREVISION= 1 CATEGORIES= textproc python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -15,7 +16,6 @@ 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}pillow>=0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}reportlab>=3.0:print/py-reportlab@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=1.0:devel/py-nose@${PY_FLAVOR} @@ -25,4 +25,12 @@ USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes -.include <bsd.port.mk> +.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> diff --git a/www/go-appengine-sdk/Makefile b/www/go-appengine-sdk/Makefile index a6d10cb110f2..3fd2123413dc 100644 --- a/www/go-appengine-sdk/Makefile +++ b/www/go-appengine-sdk/Makefile @@ -2,6 +2,7 @@ PORTNAME= go-appengine-sdk DISTVERSION= 1.9.70 +PORTREVISION= 1 CATEGORIES= www devel MASTER_SITES= https://storage.googleapis.com/appengine-sdks/featured/ DISTNAME= ${PORTNAME:S,-,_,g}_linux_amd64-${PORTVERSION} @@ -18,7 +19,7 @@ LICENSE_FILE_MIT= ${WRKSRC}/LICENSE ONLY_FOR_ARCHS= amd64 i386 RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>=${PYTHON_VER}:databases/py-sqlite3@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} \ ${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 c7a800befce6..eca1c7ec44d1 100644 --- a/www/google-appengine/Makefile +++ b/www/google-appengine/Makefile @@ -3,6 +3,7 @@ PORTNAME= google-appengine DISTVERSION= 1.9.82 +PORTREVISION= 1 CATEGORIES= www devel python MASTER_SITES= https://storage.googleapis.com/appengine-sdks/featured/ DISTFILES= ${PORTNAME:S|-|_|}_${PORTVERSION}.zip @@ -14,7 +15,7 @@ LICENSE= APACHE20 BSD3CLAUSE GPLv2 LGPL21 MIT MPL11 PSFL LICENSE_COMB= multi RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>=${PYTHON_VER}:databases/py-sqlite3@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pycrypto>=2.6:security/py-pycrypto@${PY_FLAVOR} WRKSRC= ${WRKDIR}/${PORTNAME:S,-,_,} diff --git a/www/py-django-filer/Makefile b/www/py-django-filer/Makefile index dfe7a547eda3..0f6031137948 100644 --- a/www/py-django-filer/Makefile +++ b/www/py-django-filer/Makefile @@ -3,6 +3,7 @@ PORTNAME= django-filer PORTVERSION= 1.3.2 +PORTREVISION= 1 CATEGORIES= www python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -17,11 +18,18 @@ 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}pillow>=2.3.0:graphics/py-pillow@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}unidecode>=0:converters/py-unidecode@${PY_FLAVOR} USES= python USE_PYTHON= autoplist distutils NO_ARCH= yes -.include <bsd.port.mk> +.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> diff --git a/www/py-django-markdownx/Makefile b/www/py-django-markdownx/Makefile index 893cafb3b4bf..c9907ade3cab 100644 --- a/www/py-django-markdownx/Makefile +++ b/www/py-django-markdownx/Makefile @@ -3,7 +3,7 @@ PORTNAME= django-markdownx PORTVERSION= 2.0.23 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -15,11 +15,18 @@ 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}pillow>0:graphics/py-pillow@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}markdown>0:textproc/py-markdown@${PY_FLAVOR} USES= python USE_PYTHON= autoplist distutils NO_ARCH= yes -.include <bsd.port.mk> +.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> diff --git a/www/py-django-mezzanine/Makefile b/www/py-django-mezzanine/Makefile index e5c6ead0b24d..7da67d733a16 100644 --- a/www/py-django-mezzanine/Makefile +++ b/www/py-django-mezzanine/Makefile @@ -3,6 +3,7 @@ PORTNAME= django-mezzanine PORTVERSION= 4.3.1 +PORTREVISION= 1 CATEGORIES= www python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -22,7 +23,6 @@ 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}pillow>0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}chardet>0:textproc/py-chardet@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pep8>=1.4.1:devel/pep8@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyflakes>=0.6.1:devel/py-pyflakes@${PY_FLAVOR} @@ -39,7 +39,15 @@ 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.mk> +.include <bsd.port.post.mk> diff --git a/www/py-django-photologue/Makefile b/www/py-django-photologue/Makefile index 371f4b403740..3e6a0cea262e 100644 --- a/www/py-django-photologue/Makefile +++ b/www/py-django-photologue/Makefile @@ -3,7 +3,7 @@ PORTNAME= django-photologue PORTVERSION= 3.8.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -16,11 +16,18 @@ 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}pillow>=4.3.0:graphics/py-pillow@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}ExifRead>=2.1.2:graphics/py-exifread@${PY_FLAVOR} NO_ARCH= yes USES= python USE_PYTHON= autoplist distutils -.include <bsd.port.mk> +.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> diff --git a/www/py-django-simple-captcha/Makefile b/www/py-django-simple-captcha/Makefile index e6758dbc704f..1a86e9120212 100644 --- a/www/py-django-simple-captcha/Makefile +++ b/www/py-django-simple-captcha/Makefile @@ -3,6 +3,7 @@ PORTNAME= django-simple-captcha PORTVERSION= 0.5.12 +PORTREVISION= 1 CATEGORIES= www python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -15,7 +16,6 @@ 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}pillow>=2.2.2:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>=1.2.0:devel/py-six@${PY_FLAVOR} USES= python zip @@ -31,8 +31,16 @@ 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.mk> +.include <bsd.port.post.mk> diff --git a/www/py-instabot/Makefile b/www/py-instabot/Makefile index 4a63f770b68a..5e1a2581659a 100644 --- a/www/py-instabot/Makefile +++ b/www/py-instabot/Makefile @@ -3,6 +3,7 @@ PORTNAME= instabot PORTVERSION= 0.106.0 +PORTREVISION= 1 CATEGORIES= www python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -14,7 +15,6 @@ LICENSE= APACHE20 RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}future>=0.17.1:devel/py-future@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}huepy>=0.9.8.1:misc/py-huepy@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pysocks>=1.6.8:net/py-pysocks@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytz>=2019.1:devel/py-pytz@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=2.21.0:www/py-requests@${PY_FLAVOR} \ @@ -29,4 +29,12 @@ USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes -.include <bsd.port.mk> +.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> diff --git a/www/py-pywikibot/Makefile b/www/py-pywikibot/Makefile index b66665722975..46ef1e4d8e9b 100644 --- a/www/py-pywikibot/Makefile +++ b/www/py-pywikibot/Makefile @@ -3,6 +3,7 @@ PORTNAME= pywikibot DISTVERSION= 3.0.20190722 +PORTREVISION= 1 CATEGORIES= www python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -37,7 +38,6 @@ 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= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} MWOAUTH_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mwoauth>0:www/py-mwoauth@${PY_FLAVOR} HTML_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beautifulsoup>0:www/py-beautifulsoup@${PY_FLAVOR} @@ -47,4 +47,12 @@ 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 51966a8622f7..72e0e219a7bc 100644 --- a/www/py-wagtail/Makefile +++ b/www/py-wagtail/Makefile @@ -3,6 +3,7 @@ PORTNAME= wagtail PORTVERSION= 2.7.1 +PORTREVISION= 1 CATEGORIES= www python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -21,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<7.0.0:graphics/py-pillow@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pillow>=4.0.0:graphics/py-pillow@${PY_FLAVOR} \ ${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-wagtail/files/patch-setup.py b/www/py-wagtail/files/patch-setup.py new file mode 100644 index 000000000000..f7780f98f968 --- /dev/null +++ b/www/py-wagtail/files/patch-setup.py @@ -0,0 +1,11 @@ +--- setup.py.orig 2020-01-08 11:30:31 UTC ++++ setup.py +@@ -27,7 +27,7 @@ install_requires = [ + "django-treebeard>=4.2.0,<5.0", + "djangorestframework>=3.7.4,<4.0", + "draftjs_exporter>=2.1.5,<3.0", +- "Pillow>=4.0.0,<7.0.0", ++ "Pillow>=4.0.0", + "beautifulsoup4>=4.5.1,<4.6.1", + "html5lib>=0.999,<2", + "Unidecode>=0.04.14,<2.0", diff --git a/www/seahub/Makefile b/www/seahub/Makefile index 9733f00e4d6e..6d96b70f82b8 100644 --- a/www/seahub/Makefile +++ b/www/seahub/Makefile @@ -4,6 +4,7 @@ PORTNAME= seahub DISTVERSIONPREFIX= v DISTVERSION= ${SEAHUB_VER} DISTVERSIONSUFFIX= -pro +PORTREVISION= 1 CATEGORIES= www MAINTAINER= ultima@FreeBSD.org @@ -30,7 +31,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}pillow>=0:graphics/py-pillow@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pillow6>=0:graphics/py-pillow6@${PY_FLAVOR} \ ${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 7f2f97ee2473..74666cbd07ab 100644 --- a/www/twms/Makefile +++ b/www/twms/Makefile @@ -3,6 +3,7 @@ PORTNAME= twms PORTVERSION= 0.06y +PORTREVISION= 1 CATEGORIES= www astro MAINTAINER= amdmi3@FreeBSD.org @@ -13,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyproj>0:graphics/py-pyproj@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}webpy>0:www/webpy@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}cairo>0:graphics/py-cairo@${PY_FLAVOR} \ ${FREESANS}:x11-fonts/freefont-ttf diff --git a/x11-toolkits/py-easygui/Makefile b/x11-toolkits/py-easygui/Makefile index 67b8ed4fb09a..18a402ab72b8 100644 --- a/x11-toolkits/py-easygui/Makefile +++ b/x11-toolkits/py-easygui/Makefile @@ -2,6 +2,7 @@ PORTNAME= easygui PORTVERSION= 0.98.1 +PORTREVISION= 1 CATEGORIES= x11-toolkits python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -11,12 +12,19 @@ COMMENT= Easy GUI programming in python LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${PY_FLAVOR} USES= python USE_PYTHON= distutils autoplist NO_ARCH= yes -.include <bsd.port.mk> +.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> diff --git a/x11-toolkits/py-kivy/Makefile b/x11-toolkits/py-kivy/Makefile index 92e47feb7b75..4a92841e3269 100644 --- a/x11-toolkits/py-kivy/Makefile +++ b/x11-toolkits/py-kivy/Makefile @@ -2,7 +2,7 @@ PORTNAME= kivy PORTVERSION= 1.10.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-toolkits python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -67,7 +67,7 @@ GSTREAMER_USES= gettext-runtime gnome pkgconfig GSTREAMER_USE= GNOME=glib20 OPENCV_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/cv2.so:graphics/py-opencv@${PY_FLAVOR} PIL_DESC= Text and window rendering support via Pillow -PIL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} +PIL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} PYGAME_DESC= Window, text and image rendering support via PyGame PYGAME_RUN_DEPENDS= ${PYGAME} PYGLET_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyglet>0:graphics/py-pyglet@${PY_FLAVOR} diff --git a/x11/cinnamon/Makefile b/x11/cinnamon/Makefile index 0116f1c57e6b..a29820bb1eb9 100644 --- a/x11/cinnamon/Makefile +++ b/x11/cinnamon/Makefile @@ -3,7 +3,7 @@ PORTNAME= cinnamon PORTVERSION= 2.4.6 -PORTREVISION= 13 +PORTREVISION= 14 CATEGORIES= x11 gnome DIST_SUBDIR= gnome3 @@ -43,7 +43,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}pillow>=0:graphics/py-pillow@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pillow6>=0:graphics/py-pillow6@${PY_FLAVOR} \ ${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 78e39a46fd1b..832381527a0e 100644 --- a/x11/py-pyscreenshot/Makefile +++ b/x11/py-pyscreenshot/Makefile @@ -2,7 +2,7 @@ PORTNAME= pyscreenshot PORTVERSION= 0.5.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -15,7 +15,6 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}easyprocess>0:devel/py-easyprocess@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \ import:graphics/ImageMagick6 USES= python @@ -23,4 +22,12 @@ USES= python NO_ARCH= yes USE_PYTHON= autoplist distutils -.include <bsd.port.mk> +.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> diff --git a/x11/py-pyvirtualdisplay/Makefile b/x11/py-pyvirtualdisplay/Makefile index 658fca30b4d9..8e2ef63912e9 100644 --- a/x11/py-pyvirtualdisplay/Makefile +++ b/x11/py-pyvirtualdisplay/Makefile @@ -2,6 +2,7 @@ PORTNAME= pyvirtualdisplay PORTVERSION= 0.2.4 +PORTREVISION= 1 CATEGORIES= x11 python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -16,7 +17,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cog>=2.3:devel/py-cog@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}easyprocess>0:devel/py-easyprocess@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}paver>0:devel/py-paver@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyscreenshot>0:x11/py-pyscreenshot@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR} \ xauth>0:x11/xauth @@ -38,4 +38,12 @@ XVNC_RUN_DEPENDS= tightvnc>=0:net/tightvnc NO_ARCH= yes -.include <bsd.port.mk> +.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> diff --git a/x11/xpra/Makefile b/x11/xpra/Makefile index 7ab39850e9ad..e3b776497aa6 100644 --- a/x11/xpra/Makefile +++ b/x11/xpra/Makefile @@ -2,6 +2,7 @@ PORTNAME= xpra PORTVERSION= 2.5.3 +PORTREVISION= 1 CATEGORIES= x11 MASTER_SITES= http://xpra.org/src/ @@ -29,7 +30,7 @@ RUN_DEPENDS= ${LOCALBASE}/share/X11/xkb/rules/base:x11/xkeyboard-config \ ${PYTHON_PKGNAMEPREFIX}lz4>=0.7.0_1:archivers/py-lz4@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}netifaces>0:net/py-netifaces@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}paramiko>0:security/py-paramiko@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pillow>=3.0:graphics/py-pillow@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pillow6>=3.0:graphics/py-pillow6@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyinotify>0:devel/py-pyinotify@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}PyOpenGL-accelerate>=3.1.0:graphics/py-PyOpenGL-accelerate@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}PyOpenGL>=3.1.0:graphics/py-PyOpenGL@${PY_FLAVOR} \ |