Attachment 211612 Details for Bug 243665 – py-pillow-7.0.0-bump-consumers-v2.patch

[patch] py-pillow-7.0.0-bump-consumers-v2.patch

py-pillow-7.0.0-bump-consumers-v2.patch (text/plain), 65.20 KB, created by Kai Knoblich on 2020-02-13 13:04:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kai Knoblich

Created: 2020-02-13 13:04:41 UTC

Size: 65.20 KB

patch

obsolete

>Index: audio/decibel-audio-player/Makefile
>===================================================================
>--- audio/decibel-audio-player/Makefile	(revision 526013)
>+++ audio/decibel-audio-player/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	decibel-audio-player
> PORTVERSION=	1.08
>-PORTREVISION=	7
>+PORTREVISION=	8
> CATEGORIES=	audio multimedia gnome python
> MASTER_SITES=	http://decibel.silent-blade.org/uploads/Main/
> 
>@@ -40,7 +40,7 @@
> AUDIOCD_RUN_DEPENDS=	cd-discid>=0.9:audio/cd-discid \
> 		${PYTHON_PKGNAMEPREFIX}cddb>=1.4:audio/py-cddb@${PY_FLAVOR} \
> 		gstreamer-plugins-cdio>=0.10.16:sysutils/gstreamer-plugins-cdio
>-EXTRAS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \
>+EXTRAS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}notify>=0.1.1:devel/py-notify@${PY_FLAVOR}
> FLAC_USE=	GSTREAMER=flac
> MP3_USE=	GSTREAMER=mp3
>Index: cad/k40-whisperer/Makefile
>===================================================================
>--- cad/k40-whisperer/Makefile	(revision 526013)
>+++ cad/k40-whisperer/Makefile	(working copy)
>@@ -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,7 @@
> 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}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}usb>0:devel/py-usb@${PY_FLAVOR}
> 
> USES=		python:run,-3.7 shebangfix zip
>Index: comms/apitran/Makefile
>===================================================================
>--- comms/apitran/Makefile	(revision 526013)
>+++ comms/apitran/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> 
> PORTNAME=	apitran
> PORTVERSION=	g20180926
>-PORTREVISION=	3
>+PORTREVISION=	4
> CATEGORIES=	comms astro hamradio python
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
> 
>@@ -14,7 +14,7 @@
> 
> 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} \
>+		${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} \
> 		${PYNUMPY} \
> 		sox:audio/sox \
> 		display:graphics/ImageMagick6
>Index: databases/py-mongoengine/Makefile
>===================================================================
>--- databases/py-mongoengine/Makefile	(revision 526013)
>+++ databases/py-mongoengine/Makefile	(working copy)
>@@ -17,7 +17,7 @@
> 		${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}pillow6>=2.0.0:graphics/py-pillow6@${PY_FLAVOR}
> py27_TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${PY_FLAVOR}
> 
> USES=		python
>Index: deskutils/calibre/Makefile
>===================================================================
>--- deskutils/calibre/Makefile	(revision 526013)
>+++ deskutils/calibre/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	calibre
> PORTVERSION=	4.10.1
>+PORTREVISION=	1
> CATEGORIES=	deskutils python
> MASTER_SITES=	http://download.calibre-ebook.com/${PORTVERSION}/
> 
>@@ -23,7 +24,7 @@
> 		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 @@
> 		${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} \
>Index: deskutils/gourmet/Makefile
>===================================================================
>--- deskutils/gourmet/Makefile	(revision 526013)
>+++ deskutils/gourmet/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	gourmet
> PORTVERSION=	0.17.4
>-PORTREVISION=	9
>+PORTREVISION=	10
> CATEGORIES=	deskutils gnome
> 
> MAINTAINER=	rm@FreeBSD.org
>@@ -19,7 +19,7 @@
> 		${PYTHON_PKGNAMEPREFIX}elib.intl>0:textproc/py-elib.intl@${PY_FLAVOR}
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0:databases/py-sqlalchemy10@${PY_FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}poppler>=0:graphics/py-poppler@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}rtf>=0:print/py-rtf@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}reportlab>0:print/py-reportlab@${PY_FLAVOR} \
>Index: deskutils/griffith/Makefile
>===================================================================
>--- deskutils/griffith/Makefile	(revision 526013)
>+++ deskutils/griffith/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	griffith
> PORTVERSION=	0.15
>+PORTREVISION=	1
> CATEGORIES=	deskutils
> 
> MAINTAINER=	ports@FreeBSD.org
>@@ -13,7 +14,7 @@
> 
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}sqlalchemy12>=1.1:databases/py-sqlalchemy12@${PY_FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}pillow>=4.3:graphics/py-pillow@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}pillow6>=4.3:graphics/py-pillow6@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}reportlab>=3.4:print/py-reportlab@${PY_FLAVOR}
> 
> USES=		gettext-runtime gmake gnome python:3.4+ shebangfix
>Index: devel/py-asciimatics/Makefile
>===================================================================
>--- devel/py-asciimatics/Makefile	(revision 526013)
>+++ devel/py-asciimatics/Makefile	(working copy)
>@@ -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 @@
> 
> 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}
> 
>Index: devel/py-factory-boy/Makefile
>===================================================================
>--- devel/py-factory-boy/Makefile	(revision 526013)
>+++ devel/py-factory-boy/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> 
> PORTNAME=	factory-boy
> PORTVERSION=	2.12.0
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	devel python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -21,7 +21,7 @@
> 		${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}pillow6>=0:graphics/py-pillow6@${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} \
>Index: devel/py-mwlib/Makefile
>===================================================================
>--- devel/py-mwlib/Makefile	(revision 526013)
>+++ devel/py-mwlib/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	mwlib
> PORTVERSION=	0.15.19
>+PORTREVISION=	1
> CATEGORIES=	devel python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -22,7 +23,7 @@
> 		${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} \
>Index: devel/py-pydenticon/Makefile
>===================================================================
>--- devel/py-pydenticon/Makefile	(revision 526013)
>+++ devel/py-pydenticon/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	pydenticon
> PORTVERSION=	0.3.1
>+PORTREVISION=	1
> CATEGORIES=	devel python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -13,7 +14,7 @@
> LICENSE=	BSD3CLAUSE
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR}
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow6>=0:graphics/py-pillow6@${PY_FLAVOR}
> TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR}
> 
> USES=		python
>Index: games/fretsonfire/Makefile
>===================================================================
>--- games/fretsonfire/Makefile	(revision 526013)
>+++ games/fretsonfire/Makefile	(working copy)
>@@ -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,7 @@
> RUN_DEPENDS=	${PYNUMPY} \
> 		${PYGAME} \
> 		${PYTHON_PKGNAMEPREFIX}PyOpenGL>=0:graphics/py-PyOpenGL@${PY_FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}pillow6>=0:graphics/py-pillow6@${PY_FLAVOR} \
> 		${LOCALBASE}/share/${PORTNAME}/default.ttf:games/fretsonfire-data
> 
> USES=		dos2unix python
>Index: games/hypatia_engine/Makefile
>===================================================================
>--- games/hypatia_engine/Makefile	(revision 526013)
>+++ games/hypatia_engine/Makefile	(working copy)
>@@ -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,7 +14,7 @@
> 
> RUN_DEPENDS=	${PYGAME} \
> 		${PYTHON_PKGNAMEPREFIX}pyganim>0:graphics/py-pyganim@${PY_FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} \
> 		${PY_ENUM34}
> 
> USES=		python
>Index: games/py-mnemosyne/Makefile
>===================================================================
>--- games/py-mnemosyne/Makefile	(revision 526013)
>+++ games/py-mnemosyne/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	mnemosyne
> PORTVERSION=	2.6.1
>-PORTREVISION=	4
>+PORTREVISION=	5
> PORTEPOCH=	1
> CATEGORIES=	games python
> MASTER_SITES=	SF/mnemosyne-proj/${PORTNAME}/${PORTNAME}-${DISTVERSION}
>@@ -17,7 +17,7 @@
> 
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}PyOpenGL>=0:graphics/py-PyOpenGL@${PY_FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}pillow6>=0:graphics/py-pillow6@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}matplotlib>=0:math/py-matplotlib@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}webob>=1.4:www/py-webob@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}cheroot>=0:www/py-cheroot@${PY_FLAVOR}
>Index: games/pysolfc/Makefile
>===================================================================
>--- games/pysolfc/Makefile	(revision 526013)
>+++ games/pysolfc/Makefile	(working copy)
>@@ -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,7 +16,7 @@
> LICENSE=	GPLv2+ GPLv3+ MIT PCW PD UCP UCJ ULG
> LICENSE_COMB=	multi
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} \
> 		${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}
>Index: games/pythonsudoku/Makefile
>===================================================================
>--- games/pythonsudoku/Makefile	(revision 526013)
>+++ games/pythonsudoku/Makefile	(working copy)
>@@ -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 @@
> 
> 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
>Index: graphics/caffe/Makefile
>===================================================================
>--- graphics/caffe/Makefile	(revision 526013)
>+++ graphics/caffe/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> 
> PORTNAME=	caffe
> PORTVERSION=	1.0
>-PORTREVISION=	31
>+PORTREVISION=	32
> CATEGORIES=	graphics
> 
> MAINTAINER=	eric@camachat.org
>@@ -30,7 +30,7 @@
> 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}
>Index: graphics/impressive/Makefile
>===================================================================
>--- graphics/impressive/Makefile	(revision 526013)
>+++ graphics/impressive/Makefile	(working copy)
>@@ -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 @@
> 
> 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
>Index: graphics/py-PyOpenGL/Makefile
>===================================================================
>--- graphics/py-PyOpenGL/Makefile	(revision 526013)
>+++ graphics/py-PyOpenGL/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	PyOpenGL
> PORTVERSION=	3.1.0
>-PORTREVISION=	4
>+PORTREVISION=	5
> CATEGORIES=	graphics python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -13,7 +13,7 @@
> COMMENT=	OpenGL (and related library) interface for Python
> 
> BUILD_DEPENDS=	${PYNUMPY} \
>-		${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR}
>+		${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR}
> RUN_DEPENDS:=	${BUILD_DEPENDS}
> 
> OPTIONS_DEFINE=	TKINTER
>Index: graphics/py-actdiag/Makefile
>===================================================================
>--- graphics/py-actdiag/Makefile	(revision 526013)
>+++ graphics/py-actdiag/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	actdiag
> PORTVERSION=	0.5.4
>+PORTREVISION=	1
> CATEGORIES=	graphics python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -13,7 +14,7 @@
> 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}blockdiag>=1.5.0:graphics/py-blockdiag@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}funcparserlib>=0.3.6:devel/py-funcparserlib@${PY_FLAVOR}
> 
>Index: graphics/py-blockdiag/Makefile
>===================================================================
>--- graphics/py-blockdiag/Makefile	(revision 526013)
>+++ graphics/py-blockdiag/Makefile	(working copy)
>@@ -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 @@
> 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}
> 
>Index: graphics/py-cartopy/Makefile
>===================================================================
>--- graphics/py-cartopy/Makefile	(revision 526013)
>+++ graphics/py-cartopy/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	cartopy
> PORTVERSION=	0.17.0
>-PORTREVISION=	3
>+PORTREVISION=	4
> CATEGORIES=	graphics python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -37,10 +37,10 @@
> 
> 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}
>+			${PYTHON_PKGNAMEPREFIX}pillow6>=1.7.8:graphics/py-pillow6@${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}pillow6>=1.7.8:graphics/py-pillow6@${PY_FLAVOR} \
> 			${PYTHON_PKGNAMEPREFIX}scipy>=0.10:science/py-scipy@${PY_FLAVOR}
> 
> .include <bsd.port.mk>
>Index: graphics/py-django-easy-thumbnails/Makefile
>===================================================================
>--- graphics/py-django-easy-thumbnails/Makefile	(revision 526013)
>+++ graphics/py-django-easy-thumbnails/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	easy-thumbnails
> PORTVERSION=	2.5
>+PORTREVISION=	1
> CATEGORIES=	graphics python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}django-
>@@ -14,7 +15,7 @@
> 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}
>+		${PYTHON_PKGNAMEPREFIX}pillow6>=0:graphics/py-pillow6@${PY_FLAVOR}
> 
> USES=		python
> USE_PYTHON=	autoplist concurrent distutils
>@@ -25,7 +26,7 @@
> 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}pillow6>0:graphics/py-pillow6@${PY_FLAVOR}
> DOCS_VARS=		PYDISTUTILS_BUILD_TARGET+="build_sphinx -a -E"
> 
> post-patch-DOCS-on:
>Index: graphics/py-face_recognition/Makefile
>===================================================================
>--- graphics/py-face_recognition/Makefile	(revision 526013)
>+++ graphics/py-face_recognition/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	face_recognition
> PORTVERSION=	1.2.3
>+PORTREVISION=	1
> CATEGORIES=	graphics python devel
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -15,7 +16,7 @@
> 
> 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}pillow6>0:graphics/py-pillow6@${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}
> 
>Index: graphics/py-imageio24/Makefile
>===================================================================
>--- graphics/py-imageio24/Makefile	(revision 526013)
>+++ graphics/py-imageio24/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> 
> PORTNAME=	imageio
> DISTVERSION=	2.4.1
>-PORTREVISION=	4
>+PORTREVISION=	5
> CATEGORIES=	graphics python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -19,7 +19,7 @@
> 		${PY_ENUM34} \
> 		${PY_FUTURES} \
> 		${PYNUMPY} \
>-		${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR}
>+		${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR}
> 
> USES=		python
> USE_PYTHON=	distutils concurrent autoplist
>Index: graphics/py-img2pdf/Makefile
>===================================================================
>--- graphics/py-img2pdf/Makefile	(revision 526013)
>+++ graphics/py-img2pdf/Makefile	(working copy)
>@@ -2,6 +2,7 @@
> 
> PORTNAME=	img2pdf
> DISTVERSION=	0.3.3
>+PORTREVISION=	1
> CATEGORIES=	graphics python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -12,7 +13,7 @@
> LICENSE=	LGPL3+
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} \
> 		${PY_ENUM34}
> TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pdfrw>0:textproc/py-pdfrw@${PY_FLAVOR}
> 
>Index: graphics/py-mcomix/Makefile
>===================================================================
>--- graphics/py-mcomix/Makefile	(revision 526013)
>+++ graphics/py-mcomix/Makefile	(working copy)
>@@ -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 @@
> 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
>Index: graphics/py-nwdiag/Makefile
>===================================================================
>--- graphics/py-nwdiag/Makefile	(revision 526013)
>+++ graphics/py-nwdiag/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	nwdiag
> PORTVERSION=	1.0.4
>+PORTREVISION=	1
> CATEGORIES=	graphics python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -13,7 +14,7 @@
> 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}blockdiag>=1.5.0:graphics/py-blockdiag@${PY_FLAVOR}
> 
>Index: graphics/py-photocollage/Makefile
>===================================================================
>--- graphics/py-photocollage/Makefile	(revision 526013)
>+++ graphics/py-photocollage/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> 
> PORTNAME=	photocollage
> DISTVERSION=	1.4.4
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	graphics python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -14,7 +14,7 @@
> 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}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}six>:devel/py-six@${PY_FLAVOR}
> 
> USES=		gettext-tools python
>Index: graphics/py-pyinsane2/Makefile
>===================================================================
>--- graphics/py-pyinsane2/Makefile	(revision 526013)
>+++ graphics/py-pyinsane2/Makefile	(working copy)
>@@ -2,6 +2,7 @@
> 
> PORTNAME=	pyinsane2
> DISTVERSION=	2.0.13
>+PORTREVISION=	1
> CATEGORIES=	graphics python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -13,7 +14,7 @@
> 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}
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR}
> 
> USES=		gmake python
> USE_PYTHON=	distutils autoplist
>Index: graphics/py-pypillowfight/Makefile
>===================================================================
>--- graphics/py-pypillowfight/Makefile	(revision 526013)
>+++ graphics/py-pypillowfight/Makefile	(working copy)
>@@ -2,6 +2,7 @@
> 
> PORTNAME=	pypillowfight
> DISTVERSION=	0.3.0
>+PORTREVISION=	1
> CATEGORIES=	graphics python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -13,7 +14,7 @@
> 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}
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR}
> 
> USES=		python
> USE_PYTHON=	distutils autoplist
>Index: graphics/py-sane/Makefile
>===================================================================
>--- graphics/py-sane/Makefile	(revision 526013)
>+++ graphics/py-sane/Makefile	(working copy)
>@@ -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/
>@@ -14,7 +14,7 @@
> COMMENT=	Python bindings for Sane
> 
> 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
>Index: graphics/py-scikit-image/Makefile
>===================================================================
>--- graphics/py-scikit-image/Makefile	(revision 526013)
>+++ graphics/py-scikit-image/Makefile	(working copy)
>@@ -2,6 +2,7 @@
> 
> PORTNAME=	scikit-image
> PORTVERSION=	0.14.3
>+PORTREVISION=	1
> DISTVERSIONPREFIX=	v
> CATEGORIES=	graphics python
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -20,7 +21,7 @@
> 		${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}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} \
>Index: graphics/py-seqdiag/Makefile
>===================================================================
>--- graphics/py-seqdiag/Makefile	(revision 526013)
>+++ graphics/py-seqdiag/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	seqdiag
> PORTVERSION=	0.9.6
>+PORTREVISION=	1
> CATEGORIES=	graphics python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -13,7 +14,7 @@
> 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}blockdiag>=1.5.0:graphics/py-blockdiag@${PY_FLAVOR}
> 
>Index: graphics/py-sorl-thumbnail/Makefile
>===================================================================
>--- graphics/py-sorl-thumbnail/Makefile	(revision 526013)
>+++ graphics/py-sorl-thumbnail/Makefile	(working copy)
>@@ -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,7 @@
> 
> 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}
>+PILLOW_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${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}
> 
>Index: graphics/py-soya3d/Makefile
>===================================================================
>--- graphics/py-soya3d/Makefile	(revision 526013)
>+++ graphics/py-soya3d/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	soya3d
> PORTVERSION=	0.14
>-PORTREVISION=	14
>+PORTREVISION=	15
> CATEGORIES=	graphics python
> MASTER_SITES=	http://download.gna.org/soya/
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -14,7 +14,7 @@
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	Very high level 3D engine for Python
> 
>-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
>Index: graphics/py-willow/Makefile
>===================================================================
>--- graphics/py-willow/Makefile	(revision 526013)
>+++ graphics/py-willow/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	willow
> PORTVERSION=	1.3
>+PORTREVISION=	1
> CATEGORIES=	graphics python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -27,7 +28,7 @@
> WAND_DESC=	Use Wand as backend
> 
> OPENCV_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}opencv>=0:graphics/py-opencv@${PY_FLAVOR}
>-PILLOW_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR}
>+PILLOW_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow6>=0:graphics/py-pillow6@${PY_FLAVOR}
> WAND_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}wand>=0:graphics/py-wand@${PY_FLAVOR}
> 
> .include <bsd.port.mk>
>Index: graphics/qgis/Makefile
>===================================================================
>--- graphics/qgis/Makefile	(revision 526013)
>+++ graphics/qgis/Makefile	(working copy)
>@@ -4,7 +4,7 @@
> PORTNAME=	qgis
> DISTVERSIONPREFIX=	final-
> DISTVERSION=	3_10_1
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	graphics geography
> 
> MAINTAINER=	rhurlin@gwdg.de
>@@ -51,7 +51,7 @@
> 		${PYTHON_PKGNAMEPREFIX}OWSLib>=0.18.0:graphics/py-OWSLib@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}pandas>=0.24.2:math/py-pandas@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}pbr>=3.1.1:devel/py-pbr@${PY_FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}pillow>=6.0.0:graphics/py-pillow@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}pillow6>=6.0.0:graphics/py-pillow6@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}pip>=9.0.3:devel/py-pip@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}plotly>=3.0.2:graphics/py-plotly@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}psutil>=5.6.3:sysutils/py-psutil@${PY_FLAVOR} \
>Index: graphics/qgis-ltr/Makefile
>===================================================================
>--- graphics/qgis-ltr/Makefile	(revision 526013)
>+++ graphics/qgis-ltr/Makefile	(working copy)
>@@ -4,7 +4,7 @@
> PORTNAME=	qgis
> DISTVERSIONPREFIX=	final-
> DISTVERSION=	3_4_11
>-PORTREVISION=	4
>+PORTREVISION=	5
> CATEGORIES=	graphics geography
> PKGNAMESUFFIX=	-ltr
> 
>@@ -51,7 +51,7 @@
> 		${PYTHON_PKGNAMEPREFIX}numpy>=1.16.1:math/py-numpy@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}OWSLib>=0.17.1:graphics/py-OWSLib@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}pbr>=3.1.1:devel/py-pbr@${PY_FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}pillow>=6.0.0:graphics/py-pillow@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}pillow6>=6.0.0:graphics/py-pillow6@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}pip>=9.0.3:devel/py-pip@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}plotly>=3.0.2:graphics/py-plotly@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}psycopg2>=2.8.3:databases/py-psycopg2@${PY_FLAVOR} \
>Index: graphics/sk1/Makefile
>===================================================================
>--- graphics/sk1/Makefile	(revision 526013)
>+++ graphics/sk1/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> PORTNAME=	sk1
> DISTVERSION=	2.0
> DISTVERSIONSUFFIX=	rc3
>+PORTREVISION=	1
> CATEGORIES=	graphics python
> MASTER_SITES=	https://downloads.sk1project.net/sk1/${DISTVERSIONFULL}/
> 
>@@ -16,7 +17,7 @@
> 		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}
> 
>Index: lang/mono/Makefile
>===================================================================
>--- lang/mono/Makefile	(revision 526013)
>+++ lang/mono/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	mono
> PORTVERSION=	5.10.1.57
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	lang
> MASTER_SITES=	https://download.mono-project.com/sources/mono/
> DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
>@@ -20,7 +20,7 @@
> 		bash:shells/bash \
> 		cmake>0:devel/cmake
> LIB_DEPENDS=	libinotify.so:devel/libinotify
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR} \
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow6>=0:graphics/py-pillow6@${PY_FLAVOR} \
> 		ca_root_nss>=0:security/ca_root_nss
> 
> CONFLICTS_INSTALL=	czmq-3*
>Index: math/asymptote/Makefile
>===================================================================
>--- math/asymptote/Makefile	(revision 526013)
>+++ math/asymptote/Makefile	(working copy)
>@@ -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,7 @@
> 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}pillow6>0:graphics/py-pillow6@${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 \
>Index: math/py-PyWavelets/Makefile
>===================================================================
>--- math/py-PyWavelets/Makefile	(revision 526013)
>+++ math/py-PyWavelets/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> 
> PORTNAME=	PyWavelets
> PORTVERSION=	0.5.2
>-PORTREVISION=	3
>+PORTREVISION=	4
> DISTVERSIONPREFIX=	v
> CATEGORIES=	math python
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -14,9 +14,9 @@
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
> BUILD_DEPENDS=	${PYNUMPY} \
>-		${PYTHON_PKGNAMEPREFIX}pillow>=1.7:graphics/py-pillow@${PY_FLAVOR}
>+		${PYTHON_PKGNAMEPREFIX}pillow6>=1.7:graphics/py-pillow6@${PY_FLAVOR}
> RUN_DEPENDS=	${PYNUMPY} \
>-		${PYTHON_PKGNAMEPREFIX}pillow>=1.7:graphics/py-pillow@${PY_FLAVOR}
>+		${PYTHON_PKGNAMEPREFIX}pillow6>=1.7:graphics/py-pillow6@${PY_FLAVOR}
> 
> USE_GITHUB=	yes
> GH_PROJECT=	pywt
>Index: misc/cs/Makefile
>===================================================================
>--- misc/cs/Makefile	(revision 526013)
>+++ misc/cs/Makefile	(working copy)
>@@ -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,7 +12,7 @@
> 
> LICENSE=	GPLv2+
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR}
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR}
> 
> NO_BUILD=	yes
> 
>Index: misc/ironscanner/Makefile
>===================================================================
>--- misc/ironscanner/Makefile	(revision 526013)
>+++ misc/ironscanner/Makefile	(working copy)
>@@ -2,6 +2,7 @@
> 
> PORTNAME=	ironscanner
> DISTVERSION=	1.1.0.20180828
>+PORTREVISION=	1
> CATEGORIES=	misc python
> 
> MAINTAINER=	yuri@FreeBSD.org
>@@ -10,7 +11,7 @@
> LICENSE=	GPLv3
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}pyinsane2>0:graphics/py-pyinsane2@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR}
> 
>Index: misc/mmdnn/Makefile
>===================================================================
>--- misc/mmdnn/Makefile	(revision 526013)
>+++ misc/mmdnn/Makefile	(working copy)
>@@ -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,7 @@
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
> RUN_DEPENDS=	${PYNUMPY} \
>-		${PYTHON_PKGNAMEPREFIX}pillow>=3.1.0:graphics/py-pillow@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}pillow6>=3.1.0:graphics/py-pillow6@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}protobuf>=3.6.0:devel/py-protobuf@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR}
> 
>Index: misc/py-gluoncv/Makefile
>===================================================================
>--- misc/py-gluoncv/Makefile	(revision 526013)
>+++ misc/py-gluoncv/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> PORTNAME=	gluoncv
> DISTVERSIONPREFIX=	v
> DISTVERSION=	0.6.0
>+PORTREVISION=	1
> CATEGORIES=	misc # machine-learning
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
> 
>@@ -15,7 +16,7 @@
> 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}pillow6>0:graphics/py-pillow6@${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} \
>Index: misc/pylize/Makefile
>===================================================================
>--- misc/pylize/Makefile	(revision 526013)
>+++ misc/pylize/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	pylize
> PORTVERSION=	1.3.b
>-PORTREVISION=	5
>+PORTREVISION=	6
> CATEGORIES=	misc textproc
> MASTER_SITES=	http://www.chrisarndt.de/en/software/pylize/download/ \
> 		http://dryice.name/computer/FreeBSD/distfiles/
>@@ -17,7 +17,7 @@
> EXPIRATION_DATE=	2020-02-19
> 
> BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/HTMLgen.py:www/py-HTMLgen@${PY_FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} \
> 		${PYTHON_SITELIBDIR}/em.py:textproc/py-empy@${PY_FLAVOR}
> RUN_DEPENDS:=	${BUILD_DEPENDS}
> 
>Index: misc/wotsap/Makefile
>===================================================================
>--- misc/wotsap/Makefile	(revision 526013)
>+++ misc/wotsap/Makefile	(working copy)
>@@ -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 @@
> 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
>Index: multimedia/freevo/Makefile
>===================================================================
>--- multimedia/freevo/Makefile	(revision 526013)
>+++ multimedia/freevo/Makefile	(working copy)
>@@ -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 @@
> 		${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}
> 
>Index: net/py-rainbowstream/Makefile
>===================================================================
>--- net/py-rainbowstream/Makefile	(revision 526013)
>+++ net/py-rainbowstream/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	rainbowstream
> PORTVERSION=	1.4.0
>+PORTREVISION=	1
> CATEGORIES=	net python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -18,7 +19,7 @@
> 		${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}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}pysocks>0:net/py-pysocks@${PY_FLAVOR}
> 
> # Actually 2.7,3.2-
>Index: net/tucan/Makefile
>===================================================================
>--- net/tucan/Makefile	(revision 526013)
>+++ net/tucan/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	tucan
> PORTVERSION=	0.3.10
>-PORTREVISION=	3
>+PORTREVISION=	4
> CATEGORIES=	net
> MASTER_SITES=	http://forja.rediris.es/frs/download.php/2051/
> 
>@@ -14,7 +14,7 @@
> DEPRECATED=	Broken, uses EOLed python27
> EXPIRATION_DATE=	2020-02-19
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} \
> 		${LOCALBASE}/bin/cntraining:graphics/tesseract
> 
> NO_BUILD=	yes
>Index: net-p2p/deluge-cli/Makefile
>===================================================================
>--- net-p2p/deluge-cli/Makefile	(revision 526013)
>+++ net-p2p/deluge-cli/Makefile	(working copy)
>@@ -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 @@
> 		${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
>Index: print/hplip/Makefile
>===================================================================
>--- print/hplip/Makefile	(revision 526013)
>+++ print/hplip/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	hplip
> PORTVERSION=	3.19.12
>+PORTREVISION=	1
> CATEGORIES=	print
> MASTER_SITES=	SF
> 
>@@ -53,7 +54,7 @@
> 
> 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_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR}
> SCAN_CONFIGURE_ENABLE=	scan-build
> 
> SNMP_DESC=		Network/JetDirect support
>Index: print/py-reportlab/Makefile
>===================================================================
>--- print/py-reportlab/Makefile	(revision 526013)
>+++ print/py-reportlab/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	reportlab
> PORTVERSION=	3.5.21
>+PORTREVISION=	1
> CATEGORIES=	print python
> MASTER_SITES=	CHEESESHOP \
> 		https://www.reportlab.com/ftp/
>@@ -16,7 +17,7 @@
> 
> LICENSE=	BSD3CLAUSE
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR}
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR}
> 
> USES=		python
> USE_PYTHON=	distutils autoplist
>Index: print/py-trml2pdf/Makefile
>===================================================================
>--- print/py-trml2pdf/Makefile	(revision 526013)
>+++ print/py-trml2pdf/Makefile	(working copy)
>@@ -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}
>@@ -13,7 +13,7 @@
> 
> LICENSE=	LGPL21
> 
>-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
>Index: science/rdkit/Makefile
>===================================================================
>--- science/rdkit/Makefile	(revision 526013)
>+++ science/rdkit/Makefile	(working copy)
>@@ -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,7 @@
> 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}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} \
> 			${PYTHON_PKGNAMEPREFIX}reportlab>0:print/py-reportlab@${PY_FLAVOR}
> 
> PORTDOCS=	*
>Index: security/py-volatility/Makefile
>===================================================================
>--- security/py-volatility/Makefile	(revision 526013)
>+++ security/py-volatility/Makefile	(working copy)
>@@ -4,6 +4,7 @@
> PORTNAME=	volatility
> DISTVERSION=	2.6.1-34
> DISTVERSIONSUFFIX=	-g753bfa87
>+PORTREVISION=	1
> CATEGORIES=	security python
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
> 
>@@ -15,7 +16,7 @@
> 
> 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}
>Index: security/vinetto/Makefile
>===================================================================
>--- security/vinetto/Makefile	(revision 526013)
>+++ security/vinetto/Makefile	(working copy)
>@@ -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,7 +14,7 @@
> LICENSE=	GPLv2+
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR}
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR}
> 
> USES=		python
> USE_PYTHON=	autoplist distutils concurrent optsuffix
>Index: textproc/py-ocrmypdf/Makefile
>===================================================================
>--- textproc/py-ocrmypdf/Makefile	(revision 526013)
>+++ textproc/py-ocrmypdf/Makefile	(working copy)
>@@ -2,6 +2,7 @@
> 
> PORTNAME=	ocrmypdf
> DISTVERSION=	9.3.0
>+PORTREVISION=	1
> CATEGORIES=	textproc python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -19,7 +20,7 @@
> LIB_DEPENDS=	liblept.so:graphics/leptonica
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cffi>=1.9.1:devel/py-cffi@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}img2pdf>=0.3.0,<0.4:graphics/py-img2pdf@${PY_FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}pillow>=6.2.0:graphics/py-pillow@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}pillow6>=6.2.0:graphics/py-pillow6@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}tqdm>=4:misc/py-tqdm@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}reportlab>=3.3.0:print/py-reportlab@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}chardet>=3.0.4,<4:textproc/py-chardet@${PY_FLAVOR} \
>Index: textproc/py-pikepdf/Makefile
>===================================================================
>--- textproc/py-pikepdf/Makefile	(revision 526013)
>+++ textproc/py-pikepdf/Makefile	(working copy)
>@@ -23,7 +23,7 @@
> 		${PYTHON_PKGNAMEPREFIX}pytest-helpers-namespace>=2019.1.8:devel/py-pytest-helpers-namespace@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}pytest-timeout>=1.3.3:devel/py-pytest-timeout@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}pytest-xdist>=1.28,<2:devel/py-pytest-xdist@${PY_FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}pillow>=5.0.0:graphics/py-pillow@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}pillow6>=5.0.0:graphics/py-pillow6@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}python-xmp-toolkit>=2.0.1:textproc/py-python-xmp-toolkit@${PY_FLAVOR}
> 
> USES=		compiler:c++14-lang python:3.5+
>Index: textproc/py-qrcode/Makefile
>===================================================================
>--- textproc/py-qrcode/Makefile	(revision 526013)
>+++ textproc/py-qrcode/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	qrcode
> PORTVERSION=	6.1
>+PORTREVISION=	1
> CATEGORIES=	textproc python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -13,7 +14,7 @@
> LICENSE=	BSD3CLAUSE
> 
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.8:devel/py-six@${PY_FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}pillow>=2.6:graphics/py-pillow@${PY_FLAVOR}
>+		${PYTHON_PKGNAMEPREFIX}pillow6>=2.6:graphics/py-pillow6@${PY_FLAVOR}
> 
> USES=		python
> USE_PYTHON=	autoplist concurrent distutils
>Index: textproc/py-xhtml2pdf/Makefile
>===================================================================
>--- textproc/py-xhtml2pdf/Makefile	(revision 526013)
>+++ textproc/py-xhtml2pdf/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	xhtml2pdf
> PORTVERSION=	0.2.4
>+PORTREVISION=	1
> CATEGORIES=	textproc python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -15,7 +16,7 @@
> 
> 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}pillow6>=0:graphics/py-pillow6@${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}
>Index: www/go-appengine-sdk/Makefile
>===================================================================
>--- www/go-appengine-sdk/Makefile	(revision 526013)
>+++ www/go-appengine-sdk/Makefile	(working copy)
>@@ -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 @@
> 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
>Index: www/google-appengine/Makefile
>===================================================================
>--- www/google-appengine/Makefile	(revision 526013)
>+++ www/google-appengine/Makefile	(working copy)
>@@ -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_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,-,_,}
>Index: www/py-django-filer/Makefile
>===================================================================
>--- www/py-django-filer/Makefile	(revision 526013)
>+++ www/py-django-filer/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	django-filer
> PORTVERSION=	1.3.2
>+PORTREVISION=	1
> CATEGORIES=	www python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -18,7 +19,7 @@
> 		${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}pillow6>=2.3.0:graphics/py-pillow6@${PY_FLAVOR}
> 
> USES=		python
> USE_PYTHON=	autoplist distutils
>Index: www/py-django-markdownx/Makefile
>===================================================================
>--- www/py-django-markdownx/Makefile	(revision 526013)
>+++ www/py-django-markdownx/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	django-markdownx
> PORTVERSION=	2.0.23
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	www python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -16,7 +16,7 @@
> 
> 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}pillow6>0:graphics/py-pillow6@${PY_FLAVOR}
> 
> USES=		python
> USE_PYTHON=	autoplist distutils
>Index: www/py-django-mezzanine/Makefile
>===================================================================
>--- www/py-django-mezzanine/Makefile	(revision 526013)
>+++ www/py-django-mezzanine/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	django-mezzanine
> PORTVERSION=	4.3.1
>+PORTREVISION=	1
> CATEGORIES=	www python
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
> 
>@@ -22,7 +23,7 @@
> 		${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}pillow6>0:graphics/py-pillow6@${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}
>Index: www/py-django-photologue/Makefile
>===================================================================
>--- www/py-django-photologue/Makefile	(revision 526013)
>+++ www/py-django-photologue/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	django-photologue
> PORTVERSION=	3.8.1
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	www python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -17,7 +17,7 @@
> 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}pillow6>=4.3.0:graphics/py-pillow6@${PY_FLAVOR}
> 
> NO_ARCH=	yes
> USES=		python
>Index: www/py-django-simple-captcha/Makefile
>===================================================================
>--- www/py-django-simple-captcha/Makefile	(revision 526013)
>+++ www/py-django-simple-captcha/Makefile	(working copy)
>@@ -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,7 @@
> 
> 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}pillow6>=2.2.2:graphics/py-pillow6@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}six>=1.2.0:devel/py-six@${PY_FLAVOR}
> 
> USES=		python zip
>Index: www/py-instabot/Makefile
>===================================================================
>--- www/py-instabot/Makefile	(revision 526013)
>+++ www/py-instabot/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	instabot
> PORTVERSION=	0.106.0
>+PORTREVISION=	1
> CATEGORIES=	www python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -14,7 +15,7 @@
> 
> 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}pillow6>=0:graphics/py-pillow6@${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} \
>Index: www/py-pywikibot/Makefile
>===================================================================
>--- www/py-pywikibot/Makefile	(revision 526013)
>+++ www/py-pywikibot/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	pywikibot
> DISTVERSION=	3.0.20190722
>+PORTREVISION=	1
> CATEGORIES=	www python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -37,7 +38,7 @@
> 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}
>+PILLOW_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${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}
> 
>Index: www/py-wagtail/Makefile
>===================================================================
>--- www/py-wagtail/Makefile	(revision 526013)
>+++ www/py-wagtail/Makefile	(working copy)
>@@ -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 @@
> 		${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}pillow6>=4.0.0<7.0.0:graphics/py-pillow6@${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} \
>Index: www/seahub/Makefile
>===================================================================
>--- www/seahub/Makefile	(revision 526013)
>+++ www/seahub/Makefile	(working copy)
>@@ -4,6 +4,7 @@
> DISTVERSIONPREFIX=	v
> DISTVERSION=	${SEAHUB_VER}
> DISTVERSIONSUFFIX=	-pro
>+PORTREVISION=	1
> CATEGORIES=	www
> 
> MAINTAINER=	ultima@FreeBSD.org
>@@ -30,7 +31,7 @@
> 		${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}
>Index: www/twms/Makefile
>===================================================================
>--- www/twms/Makefile	(revision 526013)
>+++ www/twms/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	twms
> PORTVERSION=	0.06y
>+PORTREVISION=	1
> CATEGORIES=	www astro
> 
> MAINTAINER=	amdmi3@FreeBSD.org
>@@ -13,7 +14,7 @@
> 
> 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
> 
>Index: x11/cinnamon/Makefile
>===================================================================
>--- x11/cinnamon/Makefile	(revision 526013)
>+++ x11/cinnamon/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	cinnamon
> PORTVERSION=	2.4.6
>-PORTREVISION=	13
>+PORTREVISION=	14
> CATEGORIES=	x11 gnome
> DIST_SUBDIR=	gnome3
> 
>@@ -43,7 +43,7 @@
> 		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 \
>Index: x11/py-pyscreenshot/Makefile
>===================================================================
>--- x11/py-pyscreenshot/Makefile	(revision 526013)
>+++ x11/py-pyscreenshot/Makefile	(working copy)
>@@ -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,7 @@
> 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} \
>+		${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} \
> 		import:graphics/ImageMagick6
> 
> USES=		python
>Index: x11/py-pyvirtualdisplay/Makefile
>===================================================================
>--- x11/py-pyvirtualdisplay/Makefile	(revision 526013)
>+++ x11/py-pyvirtualdisplay/Makefile	(working copy)
>@@ -2,6 +2,7 @@
> 
> PORTNAME=	pyvirtualdisplay
> PORTVERSION=	0.2.4
>+PORTREVISION=	1
> CATEGORIES=	x11 python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -16,7 +17,7 @@
> 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}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}pyscreenshot>0:x11/py-pyscreenshot@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR} \
> 		xauth>0:x11/xauth
>Index: x11/xpra/Makefile
>===================================================================
>--- x11/xpra/Makefile	(revision 526013)
>+++ x11/xpra/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> 
> PORTNAME=	xpra
> PORTVERSION=	2.5.1
>-PORTREVISION=	5
>+PORTREVISION=	6
> CATEGORIES=	x11
> MASTER_SITES=	http://xpra.org/src/
> 
>@@ -30,7 +30,7 @@
> 		${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} \
>Index: x11-toolkits/py-easygui/Makefile
>===================================================================
>--- x11-toolkits/py-easygui/Makefile	(revision 526013)
>+++ x11-toolkits/py-easygui/Makefile	(working copy)
>@@ -2,6 +2,7 @@
> 
> PORTNAME=	easygui
> PORTVERSION=	0.98.1
>+PORTREVISION=	1
> CATEGORIES=	x11-toolkits python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -11,7 +12,7 @@
> 
> LICENSE=	BSD3CLAUSE
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${PY_FLAVOR}
> 
> USES=		python
>Index: x11-toolkits/py-kivy/Makefile
>===================================================================
>--- x11-toolkits/py-kivy/Makefile	(revision 526013)
>+++ x11-toolkits/py-kivy/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> 
> PORTNAME=	kivy
> PORTVERSION=	1.10.1
>-PORTREVISION=	3
>+PORTREVISION=	4
> CATEGORIES=	x11-toolkits python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -64,7 +64,7 @@
> 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}

Actions: View | Diff

Attachments on bug 243665: 211124 | 211125 | 211612