svn commit: r526962 - in head: cad/k40-whisperer comms/apitran databases/py-mongoengine deskutils/calibre devel/py-asciimatics devel/py-factory-boy devel/py-mwlib devel/py-pydenticon games/fretsonf...
Kai Knoblich
kai at FreeBSD.org
Mon Feb 24 11:36:24 UTC 2020
Author: kai
Date: Mon Feb 24 11:36:15 2020
New Revision: 526962
URL: https://svnweb.freebsd.org/changeset/ports/526962
Log:
graphics/py-pillow: Update to 7.0.0
* Repo-Copy the Pillow 6.2.2 release to graphics/py-pillow6 to retain
backwards compatibility for Python 2 consumers as the Pillow 7.0.0 release
dropped the support for Python 2.
* Apply conditional statements to use either Pillow 7.x or Pillow 6.x for
consumers that can be built for Python 2 or newer.
* Exceptions are ports that can be built only for either Python 2 or
Python 3. For the first case, consumers are just assigned to the
repo-copied graphics/py-pillow6.
* Also remove Pillow from BUILD_DEPENDS of math/py-PyWavelets as it is not
listed in setup.py as a build dependency [1] and relax the version
requirements of Pillow for www/py-wagtail.
Release Notes:
* https://pillow.readthedocs.io/en/latest/releasenotes/index.html
Backward Incompatible Changes (7.0.0):
* https://pillow.readthedocs.io/en/latest/releasenotes/7.0.0.html#backwards-incompatible-changes
Detailed Changelog:
* https://github.com/python-pillow/Pillow/blob/7.0.0/CHANGES.rst
PR: 243665
Submitted by: sunpoet (patch for 7.0.0 and repo-copied version)
Reviewed by: koobs [1], sunpoet
Approved by: koobs (maintainer)
Differential Revision: https://reviews.freebsd.org/D23713
Added:
head/graphics/py-pillow6/
- copied from r526961, head/graphics/py-pillow/
head/www/py-wagtail/files/
head/www/py-wagtail/files/patch-setup.py (contents, props changed)
Modified:
head/cad/k40-whisperer/Makefile
head/comms/apitran/Makefile
head/databases/py-mongoengine/Makefile
head/deskutils/calibre/Makefile
head/devel/py-asciimatics/Makefile
head/devel/py-factory-boy/Makefile
head/devel/py-mwlib/Makefile
head/devel/py-pydenticon/Makefile
head/games/fretsonfire/Makefile
head/games/hypatia_engine/Makefile
head/games/pysolfc/Makefile
head/games/pythonsudoku/Makefile
head/graphics/Makefile
head/graphics/caffe/Makefile
head/graphics/impressive/Makefile
head/graphics/py-PyOpenGL/Makefile
head/graphics/py-actdiag/Makefile
head/graphics/py-blockdiag/Makefile
head/graphics/py-cartopy/Makefile
head/graphics/py-django-easy-thumbnails/Makefile
head/graphics/py-face_recognition/Makefile
head/graphics/py-imageio24/Makefile
head/graphics/py-img2pdf/Makefile
head/graphics/py-mcomix/Makefile
head/graphics/py-nwdiag/Makefile
head/graphics/py-photocollage/Makefile
head/graphics/py-pillow/Makefile
head/graphics/py-pillow/distinfo
head/graphics/py-pillow6/Makefile
head/graphics/py-pyinsane2/Makefile
head/graphics/py-pypillowfight/Makefile
head/graphics/py-sane/Makefile
head/graphics/py-scikit-image/Makefile
head/graphics/py-seqdiag/Makefile
head/graphics/py-sorl-thumbnail/Makefile
head/graphics/py-soya3d/Makefile
head/graphics/sk1/Makefile
head/lang/mono/Makefile
head/math/asymptote/Makefile
head/math/py-PyWavelets/Makefile
head/misc/cs/Makefile
head/misc/mmdnn/Makefile
head/misc/py-gluoncv/Makefile
head/misc/wotsap/Makefile
head/multimedia/freevo/Makefile
head/net-p2p/deluge-cli/Makefile
head/net/py-rainbowstream/Makefile
head/print/hplip/Makefile
head/print/py-reportlab/Makefile
head/print/py-trml2pdf/Makefile
head/science/rdkit/Makefile
head/security/py-volatility/Makefile
head/security/vinetto/Makefile
head/textproc/py-qrcode/Makefile
head/textproc/py-xhtml2pdf/Makefile
head/www/go-appengine-sdk/Makefile
head/www/google-appengine/Makefile
head/www/py-django-filer/Makefile
head/www/py-django-markdownx/Makefile
head/www/py-django-mezzanine/Makefile
head/www/py-django-photologue/Makefile
head/www/py-django-simple-captcha/Makefile
head/www/py-instabot/Makefile
head/www/py-pywikibot/Makefile
head/www/py-wagtail/Makefile
head/www/seahub/Makefile
head/www/twms/Makefile
head/x11-toolkits/py-easygui/Makefile
head/x11-toolkits/py-kivy/Makefile
head/x11/cinnamon/Makefile
head/x11/py-pyscreenshot/Makefile
head/x11/py-pyvirtualdisplay/Makefile
head/x11/xpra/Makefile
Modified: head/cad/k40-whisperer/Makefile
==============================================================================
--- head/cad/k40-whisperer/Makefile Mon Feb 24 10:51:29 2020 (r526961)
+++ head/cad/k40-whisperer/Makefile Mon Feb 24 11:36:15 2020 (r526962)
@@ -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}/,
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>
Modified: head/comms/apitran/Makefile
==============================================================================
--- head/comms/apitran/Makefile Mon Feb 24 10:51:29 2020 (r526961)
+++ head/comms/apitran/Makefile Mon Feb 24 11:36:15 2020 (r526962)
@@ -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>
Modified: head/databases/py-mongoengine/Makefile
==============================================================================
--- head/databases/py-mongoengine/Makefile Mon Feb 24 10:51:29 2020 (r526961)
+++ head/databases/py-mongoengine/Makefile Mon Feb 24 11:36:15 2020 (r526962)
@@ -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>
Modified: head/deskutils/calibre/Makefile
==============================================================================
--- head/deskutils/calibre/Makefile Mon Feb 24 10:51:29 2020 (r526961)
+++ head/deskutils/calibre/Makefile Mon Feb 24 11:36:15 2020 (r526962)
@@ -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} \
Modified: head/devel/py-asciimatics/Makefile
==============================================================================
--- head/devel/py-asciimatics/Makefile Mon Feb 24 10:51:29 2020 (r526961)
+++ head/devel/py-asciimatics/Makefile Mon Feb 24 11:36:15 2020 (r526962)
@@ -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}
Modified: head/devel/py-factory-boy/Makefile
==============================================================================
--- head/devel/py-factory-boy/Makefile Mon Feb 24 10:51:29 2020 (r526961)
+++ head/devel/py-factory-boy/Makefile Mon Feb 24 11:36:15 2020 (r526962)
@@ -21,7 +21,6 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage>=0:devel
${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>
Modified: head/devel/py-mwlib/Makefile
==============================================================================
--- head/devel/py-mwlib/Makefile Mon Feb 24 10:51:29 2020 (r526961)
+++ head/devel/py-mwlib/Makefile Mon Feb 24 11:36:15 2020 (r526962)
@@ -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/
${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} \
Modified: head/devel/py-pydenticon/Makefile
==============================================================================
--- head/devel/py-pydenticon/Makefile Mon Feb 24 10:51:29 2020 (r526961)
+++ head/devel/py-pydenticon/Makefile Mon Feb 24 11:36:15 2020 (r526962)
@@ -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 enhanc
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>
Modified: head/games/fretsonfire/Makefile
==============================================================================
--- head/games/fretsonfire/Makefile Mon Feb 24 10:51:29 2020 (r526961)
+++ head/games/fretsonfire/Makefile Mon Feb 24 11:36:15 2020 (r526962)
@@ -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>
Modified: head/games/hypatia_engine/Makefile
==============================================================================
--- head/games/hypatia_engine/Makefile Mon Feb 24 10:51:29 2020 (r526961)
+++ head/games/hypatia_engine/Makefile Mon Feb 24 11:36:15 2020 (r526962)
@@ -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>
Modified: head/games/pysolfc/Makefile
==============================================================================
--- head/games/pysolfc/Makefile Mon Feb 24 10:51:29 2020 (r526961)
+++ head/games/pysolfc/Makefile Mon Feb 24 11:36:15 2020 (r526962)
@@ -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 suc
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>
Modified: head/games/pythonsudoku/Makefile
==============================================================================
--- head/games/pythonsudoku/Makefile Mon Feb 24 10:51:29 2020 (r526961)
+++ head/games/pythonsudoku/Makefile Mon Feb 24 11:36:15 2020 (r526962)
@@ -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
Modified: head/graphics/Makefile
==============================================================================
--- head/graphics/Makefile Mon Feb 24 10:51:29 2020 (r526961)
+++ head/graphics/Makefile Mon Feb 24 11:36:15 2020 (r526962)
@@ -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
Modified: head/graphics/caffe/Makefile
==============================================================================
--- head/graphics/caffe/Makefile Mon Feb 24 10:51:29 2020 (r526961)
+++ head/graphics/caffe/Makefile Mon Feb 24 11:36:15 2020 (r526962)
@@ -2,7 +2,7 @@
PORTNAME= caffe
PORTVERSION= 1.0
-PORTREVISION= 31
+PORTREVISION= 32
CATEGORIES= graphics
MAINTAINER= eric at 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}
Modified: head/graphics/impressive/Makefile
==============================================================================
--- head/graphics/impressive/Makefile Mon Feb 24 10:51:29 2020 (r526961)
+++ head/graphics/impressive/Makefile Mon Feb 24 11:36:15 2020 (r526962)
@@ -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
Modified: head/graphics/py-PyOpenGL/Makefile
==============================================================================
--- head/graphics/py-PyOpenGL/Makefile Mon Feb 24 10:51:29 2020 (r526961)
+++ head/graphics/py-PyOpenGL/Makefile Mon Feb 24 11:36:15 2020 (r526962)
@@ -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 at 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>
Modified: head/graphics/py-actdiag/Makefile
==============================================================================
--- head/graphics/py-actdiag/Makefile Mon Feb 24 10:51:29 2020 (r526961)
+++ head/graphics/py-actdiag/Makefile Mon Feb 24 11:36:15 2020 (r526962)
@@ -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}
Modified: head/graphics/py-blockdiag/Makefile
==============================================================================
--- head/graphics/py-blockdiag/Makefile Mon Feb 24 10:51:29 2020 (r526961)
+++ head/graphics/py-blockdiag/Makefile Mon Feb 24 11:36:15 2020 (r526962)
@@ -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}
Modified: head/graphics/py-cartopy/Makefile
==============================================================================
--- head/graphics/py-cartopy/Makefile Mon Feb 24 10:51:29 2020 (r526961)
+++ head/graphics/py-cartopy/Makefile Mon Feb 24 11:36:15 2020 (r526962)
@@ -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>
Modified: head/graphics/py-django-easy-thumbnails/Makefile
==============================================================================
--- head/graphics/py-django-easy-thumbnails/Makefile Mon Feb 24 10:51:29 2020 (r526961)
+++ head/graphics/py-django-easy-thumbnails/Makefile Mon Feb 24 11:36:15 2020 (r526962)
@@ -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>
Modified: head/graphics/py-face_recognition/Makefile
==============================================================================
--- head/graphics/py-face_recognition/Makefile Mon Feb 24 10:51:29 2020 (r526961)
+++ head/graphics/py-face_recognition/Makefile Mon Feb 24 11:36:15 2020 (r526962)
@@ -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>
Modified: head/graphics/py-imageio24/Makefile
==============================================================================
--- head/graphics/py-imageio24/Makefile Mon Feb 24 10:51:29 2020 (r526961)
+++ head/graphics/py-imageio24/Makefile Mon Feb 24 11:36:15 2020 (r526962)
@@ -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>
Modified: head/graphics/py-img2pdf/Makefile
==============================================================================
--- head/graphics/py-img2pdf/Makefile Mon Feb 24 10:51:29 2020 (r526961)
+++ head/graphics/py-img2pdf/Makefile Mon Feb 24 11:36:15 2020 (r526962)
@@ -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 inclusi
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>
Modified: head/graphics/py-mcomix/Makefile
==============================================================================
--- head/graphics/py-mcomix/Makefile Mon Feb 24 10:51:29 2020 (r526961)
+++ head/graphics/py-mcomix/Makefile Mon Feb 24 11:36:15 2020 (r526962)
@@ -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
Modified: head/graphics/py-nwdiag/Makefile
==============================================================================
--- head/graphics/py-nwdiag/Makefile Mon Feb 24 10:51:29 2020 (r526961)
+++ head/graphics/py-nwdiag/Makefile Mon Feb 24 11:36:15 2020 (r526962)
@@ -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}
Modified: head/graphics/py-photocollage/Makefile
==============================================================================
--- head/graphics/py-photocollage/Makefile Mon Feb 24 10:51:29 2020 (r526961)
+++ head/graphics/py-photocollage/Makefile Mon Feb 24 11:36:15 2020 (r526962)
@@ -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>
Modified: head/graphics/py-pillow/Makefile
==============================================================================
--- head/graphics/py-pillow/Makefile Mon Feb 24 10:51:29 2020 (r526961)
+++ head/graphics/py-pillow/Makefile Mon Feb 24 11:36:15 2020 (r526962)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= pillow
-PORTVERSION= 6.2.2
+PORTVERSION= 7.0.0
CATEGORIES= graphics python
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -17,13 +17,15 @@ LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-se
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
Modified: head/graphics/py-pillow/distinfo
==============================================================================
--- head/graphics/py-pillow/distinfo Mon Feb 24 10:51:29 2020 (r526961)
+++ head/graphics/py-pillow/distinfo Mon Feb 24 11:36:15 2020 (r526962)
@@ -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
Modified: head/graphics/py-pillow6/Makefile
==============================================================================
--- head/graphics/py-pillow/Makefile Mon Feb 24 10:51:29 2020 (r526961)
+++ head/graphics/py-pillow6/Makefile Mon Feb 24 11:36:15 2020 (r526962)
@@ -5,6 +5,7 @@ PORTNAME= pillow
PORTVERSION= 6.2.2
CATEGORIES= graphics python
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
+PKGNAMESUFFIX= 6
MAINTAINER= koobs at FreeBSD.org
COMMENT= Fork of the Python Imaging Library (PIL)
@@ -24,6 +25,8 @@ 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
Modified: head/graphics/py-pyinsane2/Makefile
==============================================================================
--- head/graphics/py-pyinsane2/Makefile Mon Feb 24 10:51:29 2020 (r526961)
+++ head/graphics/py-pyinsane2/Makefile Mon Feb 24 11:36:15 2020 (r526962)
@@ -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>
Modified: head/graphics/py-pypillowfight/Makefile
==============================================================================
--- head/graphics/py-pypillowfight/Makefile Mon Feb 24 10:51:29 2020 (r526961)
+++ head/graphics/py-pypillowfight/Makefile Mon Feb 24 11:36:15 2020 (r526962)
@@ -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>
Modified: head/graphics/py-sane/Makefile
==============================================================================
--- head/graphics/py-sane/Makefile Mon Feb 24 10:51:29 2020 (r526961)
+++ head/graphics/py-sane/Makefile Mon Feb 24 11:36:15 2020 (r526962)
@@ -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
Modified: head/graphics/py-scikit-image/Makefile
==============================================================================
--- head/graphics/py-scikit-image/Makefile Mon Feb 24 10:51:29 2020 (r526961)
+++ head/graphics/py-scikit-image/Makefile Mon Feb 24 11:36:15 2020 (r526962)
@@ -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 cyth
PYDISTUTILS_BUILD_TARGET= build build_ext
PYDISTUTILS_BUILDARGS+= saveopts
+.include <bsd.port.pre.mk>
+
+.if ${PYTHON_REL} < 3500
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow6>=1.7:graphics/py-pillow6@${PY_FLAVOR}
+.else
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow>=1.7:graphics/py-pillow@${PY_FLAVOR}
+.endif
+
post-install:
@${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR}/skimage -name "*.so" -exec ${STRIP_CMD} {} \;
@@ -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>
Modified: head/graphics/py-seqdiag/Makefile
==============================================================================
--- head/graphics/py-seqdiag/Makefile Mon Feb 24 10:51:29 2020 (r526961)
+++ head/graphics/py-seqdiag/Makefile Mon Feb 24 11:36:15 2020 (r526962)
@@ -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}
Modified: head/graphics/py-sorl-thumbnail/Makefile
==============================================================================
--- head/graphics/py-sorl-thumbnail/Makefile Mon Feb 24 10:51:29 2020 (r526961)
+++ head/graphics/py-sorl-thumbnail/Makefile Mon Feb 24 11:36:15 2020 (r526962)
@@ -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
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
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-ports-head
mailing list