Index: Mk/Uses/python.mk
===================================================================
--- Mk/Uses/python.mk
+++ Mk/Uses/python.mk
@@ -631,8 +631,10 @@
 
 # Common Python modules that can be needed but only for some versions of Python.
 .if ${PYTHON_REL} < 3500
+PY_PILLOW=	${PYTHON_PKGNAMEPREFIX}pillow6>=6.0.0:graphics/py-pillow6@${PY_FLAVOR}
 PY_TYPING=	${PYTHON_PKGNAMEPREFIX}typing>=3.7.4:devel/py-typing@${PY_FLAVOR}
 .else
+PY_PILLOW=	${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR}
 PY_TYPING=
 .endif
 
Index: astro/py-astLib/Makefile
===================================================================
--- astro/py-astLib/Makefile
+++ astro/py-astLib/Makefile
@@ -16,7 +16,7 @@
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}astropy>=1.1:astro/py-astropy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>=0.98:math/py-matplotlib@${PY_FLAVOR} \
 		${PYNUMPY} \
-		${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR} \
+		${PY_PILLOW} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=0.7.0:science/py-scipy@${PY_FLAVOR}
 
 PORTSCOUT=	skipv:0.15,0.17,0.17.1 # incorrect versioning upstream
Index: audio/lollypop/Makefile
===================================================================
--- audio/lollypop/Makefile
+++ audio/lollypop/Makefile
@@ -17,7 +17,7 @@
 		${PYTHON_PKGNAMEPREFIX}dbus>=1.1.1:devel/py-dbus@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}gstreamer1>=1.4.0:multimedia/py-gstreamer1@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pylast>=1.4.0:audio/py-pylast@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR}
+		${PY_PILLOW}
 LIB_DEPENDS=	libnotify.so:devel/libnotify \
 		libappstream-glib.so:devel/appstream-glib \
 		libtotem-plparser.so:multimedia/totem-pl-parser
Index: cad/k40-whisperer/Makefile
===================================================================
--- cad/k40-whisperer/Makefile
+++ cad/k40-whisperer/Makefile
@@ -14,7 +14,8 @@
 LICENSE_FILE=	${WRKSRC}/gpl-3.0.txt
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}usb>0:devel/py-usb@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}usb>0:devel/py-usb@${PY_FLAVOR} \
+		${PY_PILLOW}
 
 USES=		python:run,-3.7 shebangfix zip
 SHEBANG_FILES=	*.py
@@ -39,14 +40,6 @@
 			py2exe_setup.py requirements.txt
 _WHISPERER_COMMAND=	${PORTNAME}
 
-.include <bsd.port.pre.mk>
-
-.if ${PYTHON_REL} < 3500
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR}
-.else
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR}
-.endif
-
 do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/${_WHISPERER_COMMAND} ${STAGEDIR}${PREFIX}/bin
 	@${MKDIR} ${STAGEDIR}${DATADIR}
@@ -55,4 +48,4 @@
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${_DOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: comms/apitran/Makefile
===================================================================
--- comms/apitran/Makefile
+++ comms/apitran/Makefile
@@ -15,6 +15,7 @@
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \
 		${PYNUMPY} \
+		${PY_PILLOW} \
 		sox:audio/sox \
 		display:graphics/ImageMagick6
 
@@ -28,14 +29,6 @@
 NO_ARCH=	yes
 SHEBANG_FILES=	apitran
 
-.include <bsd.port.pre.mk>
-
-.if ${PYTHON_REL} < 3500
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR}
-.else
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR}
-.endif
-
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/apitran ${STAGEDIR}${PREFIX}/bin
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
@@ -47,4 +40,4 @@
 	${INSTALL_DATA} ${WRKSRC}/Examples/$f ${STAGEDIR}${EXAMPLESDIR}
 .endfor
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: databases/py-mongoengine/Makefile
===================================================================
--- databases/py-mongoengine/Makefile
+++ databases/py-mongoengine/Makefile
@@ -16,7 +16,8 @@
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pymongo>=3.4:databases/pymongo@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}blinker>0:devel/py-blinker@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}blinker>0:devel/py-blinker@${PY_FLAVOR} \
+		${PY_PILLOW}
 py27_TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${PY_FLAVOR}
 
 USES=		python
@@ -24,14 +25,6 @@
 
 NO_ARCH=	yes
 
-.include <bsd.port.pre.mk>
-
-.if ${PYTHON_REL} < 3500
-TEST_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pillow6>=2.0.0:graphics/py-pillow6@${PY_FLAVOR}
-.else
-TEST_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pillow>=2.0.0:graphics/py-pillow@${PY_FLAVOR}
-.endif
-
 # bson is provided by pymongo
 post-patch:
 	@${RM} -r ${WRKSRC}/bson
@@ -39,4 +32,4 @@
 do-test:
 	cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: deskutils/calibre/Makefile
===================================================================
--- deskutils/calibre/Makefile
+++ deskutils/calibre/Makefile
@@ -24,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}pillow6>=0:graphics/py-pillow6@${PY_FLAVOR} \
+		${PY_PILLOW} \
 		${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} \
@@ -36,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}pillow6>=0:graphics/py-pillow6@${PY_FLAVOR} \
+		${PY_PILLOW} \
 		${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/griffith/Makefile
===================================================================
--- deskutils/griffith/Makefile
+++ deskutils/griffith/Makefile
@@ -13,7 +13,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} \
+		${PY_PILLOW} \
 		${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
+++ devel/py-asciimatics/Makefile
@@ -15,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}pillow6>=2.7.0:graphics/py-pillow6@${PY_FLAVOR} \
+		${PY_PILLOW} \
 		${PYTHON_PKGNAMEPREFIX}pyfiglet>=0.7.2:misc/py-pyfiglet@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wcwidth>0:devel/py-wcwidth@${PY_FLAVOR}
 
Index: devel/py-factory-boy/Makefile
===================================================================
--- devel/py-factory-boy/Makefile
+++ devel/py-factory-boy/Makefile
@@ -25,7 +25,8 @@
 		${PYTHON_PKGNAMEPREFIX}mongoengine>=0:databases/py-mongoengine@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tox>=0:devel/py-tox@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}text-unidecode>=0:converters/py-text-unidecode@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}text-unidecode>=0:converters/py-text-unidecode@${PY_FLAVOR} \
+		${PY_PILLOW}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent distutils
@@ -34,13 +35,6 @@
 
 NO_ARCH=	yes
 
-.include <bsd.port.pre.mk>
-.if ${PYTHON_REL} < 3500
-TEST_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pillow6>=0:graphics/py-pillow6@${PY_FLAVOR}
-.else
-TEST_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR}
-.endif
-
 do-test:
 	cd ${WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m unittest discover \
 		-k test_alchemy \
@@ -54,4 +48,4 @@
 		-k test_using \
 		-k test_utils
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: devel/py-mwlib/Makefile
===================================================================
--- devel/py-mwlib/Makefile
+++ devel/py-mwlib/Makefile
@@ -26,7 +26,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}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} \
+		${PY_PILLOW} \
 		${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
+++ devel/py-pydenticon/Makefile
@@ -14,6 +14,7 @@
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+RUN_DEPENDS=	${PY_PILLOW}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR}
 
 USES=		python
@@ -21,15 +22,7 @@
 
 NO_ARCH=	yes
 
-.include <bsd.port.pre.mk>
-
-.if ${PYTHON_REL} < 3500
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pillow6>=0:graphics/py-pillow6@${PY_FLAVOR}
-.else
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR}
-.endif
-
 do-test:
 	@(cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test)
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: games/fretsonfire/Makefile
===================================================================
--- games/fretsonfire/Makefile
+++ games/fretsonfire/Makefile
@@ -17,6 +17,7 @@
 
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYGAME} \
+		${PY_PILLOW} \
 		${PYTHON_PKGNAMEPREFIX}PyOpenGL>=0:graphics/py-PyOpenGL@${PY_FLAVOR} \
 		${LOCALBASE}/share/${PORTNAME}/default.ttf:games/fretsonfire-data
 
@@ -37,14 +38,6 @@
 
 PORTNAME_UCASE=	FretsOnFire
 
-.include <bsd.port.pre.mk>
-
-.if ${PYTHON_REL} < 3500
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pillow6>=0:graphics/py-pillow6@${PY_FLAVOR}
-.else
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR}
-.endif
-
 do-install:
 	@${MKDIR} ${STAGEDIR}${FOF_DIR}/${PORTNAME_UCASE}
 	@cd ${WRKSRC}/src && \
@@ -60,4 +53,4 @@
 	${INSTALL_DATA} ${WRKSRC}/readme.txt ${STAGEDIR}${DOCSDIR}/README
 	${INSTALL_DATA} ${WRKSRC}/install.txt ${STAGEDIR}${DOCSDIR}/INSTALL
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: games/hypatia_engine/Makefile
===================================================================
--- games/hypatia_engine/Makefile
+++ games/hypatia_engine/Makefile
@@ -14,17 +14,10 @@
 
 RUN_DEPENDS=	${PYGAME} \
 		${PYTHON_PKGNAMEPREFIX}pyganim>0:graphics/py-pyganim@${PY_FLAVOR} \
-		${PY_ENUM34}
+		${PY_ENUM34} \
+		${PY_PILLOW}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent distutils
 
-.include <bsd.port.pre.mk>
-
-.if ${PYTHON_REL} < 3500
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR}
-.else
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR}
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: games/openage/Makefile
===================================================================
--- games/openage/Makefile
+++ games/openage/Makefile
@@ -15,7 +15,7 @@
 
 BUILD_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \
+		${PY_PILLOW} \
 		${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments@${PY_FLAVOR}
 LIB_DEPENDS=	libepoxy.so:graphics/libepoxy \
 		libfontconfig.so:x11-fonts/fontconfig \
@@ -28,7 +28,7 @@
 		libnyan.so:lang/nyan
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \
+		${PY_PILLOW} \
 		${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments@${PY_FLAVOR}
 
 USES=		cmake compiler:c++17-lang gl python:3.4+ qt:5 sdl shebangfix
Index: games/py-mnemosyne/Makefile
===================================================================
--- games/py-mnemosyne/Makefile
+++ games/py-mnemosyne/Makefile
@@ -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} \
+		${PY_PILLOW} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>=0:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}webob>=1.4:www/py-webob@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cheroot>=0:www/py-cheroot@${PY_FLAVOR}
Index: games/pysolfc/Makefile
===================================================================
--- games/pysolfc/Makefile
+++ games/pysolfc/Makefile
@@ -18,7 +18,8 @@
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}random2>=0:math/py-random2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${PY_FLAVOR} \
+		${PY_PILLOW}
 
 LICENSE_FILE_GPLv3+ =		${WRKSRC}/COPYING
 LICENSE_DISTFILES_GPLv3+ =	${PYSOLFCDIST}
@@ -74,14 +75,6 @@
 CARDSETDIR=	PySolFC-Cardsets-2.0
 CARDSETDIST=	${CARDSETDIR}.tar.bz2
 
-.include <bsd.port.pre.mk>
-
-.if ${PYTHON_REL} < 3500
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR}
-.else
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR}
-.endif
-
 post-patch:
 	@${MV} ${WRKSRC}/pysol.py ${WRKSRC}/pysolfc
 	@${REINPLACE_CMD} -e 's|pysol.py|pysolfc|' ${WRKSRC}/setup.py
@@ -104,4 +97,4 @@
 	(cd ${WRKDIR}/${CARDSETDIR} && \
 		${FIND} . -type f | ${SED} -e 's|^./|${DATADIR_REL}/|' >> ${TMPPLIST})
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: games/unknown-horizons/Makefile
===================================================================
--- games/unknown-horizons/Makefile
+++ games/unknown-horizons/Makefile
@@ -11,7 +11,7 @@
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/doc/licenses/GPL
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR} \
+BUILD_DEPENDS=	${PY_PILLOW} \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}fife>0:games/py-fife@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
Index: graphics/caffe/Makefile
===================================================================
--- graphics/caffe/Makefile
+++ graphics/caffe/Makefile
@@ -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}pillow6>=1.7:graphics/py-pillow6@${PY_FLAVOR} \
+		${PY_PILLOW} \
 		${PYTHON_PKGNAMEPREFIX}networkx>=1.8:math/py-networkx@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>=1.1:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}PyWavelets>=0.4:math/py-PyWavelets@${PY_FLAVOR}
Index: graphics/impressive/Makefile
===================================================================
--- graphics/impressive/Makefile
+++ graphics/impressive/Makefile
@@ -16,7 +16,7 @@
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}PyOpenGL>=0:graphics/py-PyOpenGL@${PY_FLAVOR} \
 		${PYGAME} \
-		${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR}
+		${PY_PILLOW}
 
 USES=		python:2.7 sdl shebangfix
 USE_SDL=	sdl
Index: graphics/py-PyOpenGL/Makefile
===================================================================
--- graphics/py-PyOpenGL/Makefile
+++ graphics/py-PyOpenGL/Makefile
@@ -12,8 +12,10 @@
 MAINTAINER=	python@FreeBSD.org
 COMMENT=	OpenGL (and related library) interface for Python
 
-BUILD_DEPENDS=	${PYNUMPY}
-RUN_DEPENDS=	${PYNUMPY}
+BUILD_DEPENDS=	${PYNUMPY} \
+		${PY_PILLOW}
+RUN_DEPENDS=	${PYNUMPY} \
+		${PY_PILLOW}
 
 OPTIONS_DEFINE=	TKINTER
 OPTIONS_DEFAULT=	TKINTER
@@ -26,20 +28,10 @@
 TKINTER_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${PY_FLAVOR}
 TKINTER_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${PY_FLAVOR}
 
-.include <bsd.port.pre.mk>
-
-.if ${PYTHON_REL} < 3500
-BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR}
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR}
-.else
-BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR}
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR}
-.endif
-
 post-patch:
 	@${FIND} ${WRKSRC} -name '*.[ch]' | ${XARGS} ${REINPLACE_CMD} -e \
 		's|<malloc\.h>|<stdlib.h>|g'
 	@${FIND} ${WRKSRC} -name "*.bak" -delete
 	${REINPLACE_CMD} -e 's|posix |posix|g' ${WRKSRC}/OpenGL/__init__.py
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: graphics/py-actdiag/Makefile
===================================================================
--- graphics/py-actdiag/Makefile
+++ graphics/py-actdiag/Makefile
@@ -17,7 +17,7 @@
 DEPRECATED=	Uses deprecated version of python
 EXPIRATION_DATE=	2020-08-15
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow6>=2.2.1:graphics/py-pillow6@${PY_FLAVOR} \
+RUN_DEPENDS=	${PY_PILLOW} \
 		${PYTHON_PKGNAMEPREFIX}blockdiag>=1.5.0:graphics/py-blockdiag@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}funcparserlib>=0.3.6:devel/py-funcparserlib@${PY_FLAVOR}
 
Index: graphics/py-blockdiag/Makefile
===================================================================
--- graphics/py-blockdiag/Makefile
+++ graphics/py-blockdiag/Makefile
@@ -14,7 +14,7 @@
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow6>=2.2.1:graphics/py-pillow6@${PY_FLAVOR} \
+RUN_DEPENDS=	${PY_PILLOW} \
 		${PYTHON_PKGNAMEPREFIX}funcparserlib>=0.3.6:devel/py-funcparserlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}webcolors>=0:graphics/py-webcolors@${PY_FLAVOR}
 
Index: graphics/py-cairosvg/Makefile
===================================================================
--- graphics/py-cairosvg/Makefile
+++ graphics/py-cairosvg/Makefile
@@ -18,7 +18,7 @@
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cairocffi>=0:graphics/py-cairocffi@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cssselect2>=0:textproc/py-cssselect2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}defusedxml>=0:devel/py-defusedxml@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR} \
+		${PY_PILLOW} \
 		${PYTHON_PKGNAMEPREFIX}tinycss2>=0:textproc/py-tinycss2@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-isort>=0:devel/py-pytest-isort@${PY_FLAVOR} \
Index: graphics/py-cartopy/Makefile
===================================================================
--- graphics/py-cartopy/Makefile
+++ graphics/py-cartopy/Makefile
@@ -36,19 +36,11 @@
 PLOTTING_DESC=	Plotting support
 
 EPSG_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyepsg>=0:graphics/py-pyepsg@${PY_FLAVOR}
-OWS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}OWSLib>=0.8.11:graphics/py-OWSLib@${PY_FLAVOR}
+OWS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}OWSLib>=0.8.11:graphics/py-OWSLib@${PY_FLAVOR} \
+			${PY_PILLOW}
 PLOTTING_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gdal>=1.10.0:graphics/py-gdal@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}matplotlib>=1.5.1:math/py-matplotlib@${PY_FLAVOR} \
-			${PYTHON_PKGNAMEPREFIX}scipy>=0.10:science/py-scipy@${PY_FLAVOR}
+			${PYTHON_PKGNAMEPREFIX}scipy>=0.10:science/py-scipy@${PY_FLAVOR} \
+			${PY_PILLOW}
 
-.include <bsd.port.pre.mk>
-
-.if ${PYTHON_REL} < 3500
-OWS_RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pillow6>=1.7.8:graphics/py-pillow6@${PY_FLAVOR}
-PLOTTING_RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pillow6>=1.7.8:graphics/py-pillow6@${PY_FLAVOR}
-.else
-OWS_RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pillow>=1.7.8:graphics/py-pillow@${PY_FLAVOR}
-PLOTTING_RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pillow>=1.7.8:graphics/py-pillow@${PY_FLAVOR}
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: graphics/py-django-easy-thumbnails/Makefile
===================================================================
--- graphics/py-django-easy-thumbnails/Makefile
+++ graphics/py-django-easy-thumbnails/Makefile
@@ -14,7 +14,8 @@
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django111>=1.8:www/py-django111@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django111>=1.8:www/py-django111@${PY_FLAVOR} \
+		${PY_PILLOW}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent distutils
@@ -24,19 +25,10 @@
 
 OPTIONS_DEFINE=	DOCS
 DOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django111>=1.8:www/py-django111@${PY_FLAVOR} \
-			${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR}
+			${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR} \
+			${PY_PILLOW}
 DOCS_VARS=		PYDISTUTILS_BUILD_TARGET+="build_sphinx -a -E"
 
-.include <bsd.port.pre.mk>
-
-.if ${PYTHON_REL} < 3500
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pillow6>=0:graphics/py-pillow6@${PY_FLAVOR}
-DOCS_BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR}
-.else
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR}
-DOCS_BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR}
-.endif
-
 post-patch-DOCS-on:
 	@${REINPLACE_CMD} -e 's|^\(release = \)\(easy_thumbnails.get_version()\)|\1version|' ${WRKSRC}/docs/conf.py
 
@@ -44,4 +36,4 @@
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC}/build/sphinx/html && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} "! -name .buildinfo -and ! -name objects.inv")
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: graphics/py-face_recognition/Makefile
===================================================================
--- graphics/py-face_recognition/Makefile
+++ graphics/py-face_recognition/Makefile
@@ -17,19 +17,12 @@
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}click>=6.0:devel/py-click@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}face_recognition_models>0:graphics/py-face_recognition_models@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}dlib>=19.7:science/py-dlib@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}dlib>=19.7:science/py-dlib@${PY_FLAVOR} \
+		${PY_PILLOW}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
-.include <bsd.port.pre.mk>
-
-.if ${PYTHON_REL} < 3500
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR}
-.else
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR}
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: graphics/py-imageio/Makefile
===================================================================
--- graphics/py-imageio/Makefile
+++ graphics/py-imageio/Makefile
@@ -16,7 +16,7 @@
 RUN_DEPENDS=	ffmpeg:multimedia/ffmpeg \
 		${PYTHON_PKGNAMEPREFIX}imageio-ffmpeg>=0:graphics/py-imageio-ffmpeg@${PY_FLAVOR} \
 		${PYNUMPY} \
-		${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR}
+		${PY_PILLOW}
 
 USES=		python:3.4+
 USE_PYTHON=	autoplist distutils
Index: graphics/py-imageio24/Makefile
===================================================================
--- graphics/py-imageio24/Makefile
+++ graphics/py-imageio24/Makefile
@@ -18,6 +18,7 @@
 RUN_DEPENDS=	ffmpeg:multimedia/ffmpeg \
 		${PY_ENUM34} \
 		${PY_FUTURES} \
+		${PY_PILLOW} \
 		${PYNUMPY}
 
 USES=		python
@@ -27,12 +28,4 @@
 
 PORTSCOUT=	limit:^2\.4\.
 
-.include <bsd.port.pre.mk>
-
-.if ${PYTHON_REL} < 3500
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR}
-.else
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR}
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: graphics/py-img2pdf/Makefile
===================================================================
--- graphics/py-img2pdf/Makefile
+++ graphics/py-img2pdf/Makefile
@@ -13,7 +13,8 @@
 LICENSE=	LGPL3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PY_ENUM34}
+RUN_DEPENDS=	${PY_ENUM34} \
+		${PY_PILLOW}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pdfrw>0:textproc/py-pdfrw@${PY_FLAVOR}
 
 USES=		python
@@ -21,17 +22,9 @@
 
 NO_ARCH=	yes
 
-.include <bsd.port.pre.mk>
-
-.if ${PYTHON_REL} < 3500
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR}
-.else
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR}
-.endif
-
 # Note: The tests only work with Python 3, see also:
 # https://gitlab.mister-muffin.de/josch/img2pdf/issues/60
 do-test:
 	@(cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test)
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: graphics/py-nwdiag/Makefile
===================================================================
--- graphics/py-nwdiag/Makefile
+++ graphics/py-nwdiag/Makefile
@@ -17,7 +17,7 @@
 DEPRECATED=	Uses deprecated version of python
 EXPIRATION_DATE=	2020-08-15
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow6>=2.2.1:graphics/py-pillow6@${PY_FLAVOR} \
+RUN_DEPENDS=	${PY_PILLOW} \
 		${PYTHON_PKGNAMEPREFIX}funcparserlib>=0.3.6:devel/py-funcparserlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}blockdiag>=1.5.0:graphics/py-blockdiag@${PY_FLAVOR}
 
Index: graphics/py-photocollage/Makefile
===================================================================
--- graphics/py-photocollage/Makefile
+++ graphics/py-photocollage/Makefile
@@ -14,20 +14,13 @@
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cairo>0:graphics/py-cairo@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}six>:devel/py-six@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}six>:devel/py-six@${PY_FLAVOR} \
+		${PY_PILLOW}
 
 USES=		gettext-tools python
 USE_PYTHON=	autoplist concurrent distutils
 NO_ARCH=	yes
 
-.include <bsd.port.pre.mk>
-
-.if ${PYTHON_REL} < 3500
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR}
-.else
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR}
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e ' \
 		s|${PORTNAME}|${PORTNAME}-${PYTHON_VER}| ; \
@@ -39,4 +32,4 @@
 		${MV} $$f $$(${ECHO} $$f | ${SED} -E 's|photocollage\.([[:alpha:].]*)|photocollage-${PYTHON_VER}.\1|'); \
 	done
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: graphics/py-pyinsane2/Makefile
===================================================================
--- graphics/py-pyinsane2/Makefile
+++ graphics/py-pyinsane2/Makefile
@@ -14,17 +14,10 @@
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>=1.0:devel/py-nose@${PY_FLAVOR}
+RUN_DEPENDS=	${PY_PILLOW}
 
 USES=		gmake python
 USE_PYTHON=	distutils autoplist
 NO_ARCH=	yes
 
-.include <bsd.port.pre.mk>
-
-.if ${PYTHON_REL} < 3500
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR}
-.else
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR}
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: graphics/py-pyocr/Makefile
===================================================================
--- graphics/py-pyocr/Makefile
+++ graphics/py-pyocr/Makefile
@@ -13,7 +13,7 @@
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}setuptools_scm_git_archive>0:devel/py-setuptools_scm_git_archive@${PY_FLAVOR}
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR}
+RUN_DEPENDS=	${PY_PILLOW}
 
 USES=		gmake python:3.4+
 USE_PYTHON=	distutils autoplist
Index: graphics/py-pypillowfight/Makefile
===================================================================
--- graphics/py-pypillowfight/Makefile
+++ graphics/py-pypillowfight/Makefile
@@ -14,16 +14,9 @@
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>=1.0:devel/py-nose@${PY_FLAVOR}
+RUN_DEPENDS=	${PY_PILLOW}
 
 USES=		python
 USE_PYTHON=	distutils autoplist
 
-.include <bsd.port.pre.mk>
-
-.if ${PYTHON_REL} < 3500
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR}
-.else
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR}
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: graphics/py-sane/Makefile
===================================================================
--- graphics/py-sane/Makefile
+++ graphics/py-sane/Makefile
@@ -17,7 +17,7 @@
 EXPIRATION_DATE=	2020-08-15
 
 LIB_DEPENDS=	libsane.so:graphics/sane-backends
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR}
+RUN_DEPENDS=	${PY_PILLOW}
 
 DIST_SUBDIR=	python
 USES=		python:2.7
Index: graphics/py-scikit-image/Makefile
===================================================================
--- graphics/py-scikit-image/Makefile
+++ graphics/py-scikit-image/Makefile
@@ -18,6 +18,7 @@
 		${PYTHON_PKGNAMEPREFIX}scipy>=0.9:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numpydoc>=0.6:textproc/py-numpydoc@${PY_FLAVOR}
 RUN_DEPENDS=	${PYNUMPY} \
+		${PY_PILLOW} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=0.9:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numpydoc>=0.6:textproc/py-numpydoc@${PY_FLAVOR} \
@@ -33,14 +34,6 @@
 PYDISTUTILS_BUILD_TARGET=	build build_ext
 PYDISTUTILS_BUILDARGS+=		saveopts
 
-.include <bsd.port.pre.mk>
-
-.if ${PYTHON_REL} < 3500
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pillow6>=1.7:graphics/py-pillow6@${PY_FLAVOR}
-.else
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pillow>=1.7:graphics/py-pillow@${PY_FLAVOR}
-.endif
-
 post-install:
 	@${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR}/skimage -name "*.so" -exec ${STRIP_CMD} {} \;
 
@@ -50,4 +43,4 @@
 	${PYTHON_CMD} selftest.py && \
 	${PYTHON_CMD} -m nose -vx Tests/test_*.py
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: graphics/py-seqdiag/Makefile
===================================================================
--- graphics/py-seqdiag/Makefile
+++ graphics/py-seqdiag/Makefile
@@ -17,7 +17,7 @@
 DEPRECATED=	Uses deprecated version of python
 EXPIRATION_DATE=	2020-08-15
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow6>=2.2.1:graphics/py-pillow6@${PY_FLAVOR} \
+RUN_DEPENDS=	${PY_PILLOW} \
 		${PYTHON_PKGNAMEPREFIX}funcparserlib>=0.3.6:devel/py-funcparserlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}blockdiag>=1.5.0:graphics/py-blockdiag@${PY_FLAVOR}
 
Index: graphics/py-sorl-thumbnail/Makefile
===================================================================
--- graphics/py-sorl-thumbnail/Makefile
+++ graphics/py-sorl-thumbnail/Makefile
@@ -34,6 +34,7 @@
 
 GRAPHICSMAGICK_RUN_DEPENDS=	${LOCALBASE}/bin/gm:graphics/GraphicsMagick
 IMAGEMAGICK_RUN_DEPENDS=	${LOCALBASE}/bin/convert:graphics/ImageMagick6
+PILLOW_RUN_DEPENDS=		${PY_PILLOW}
 REDIS_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}redis>0:databases/py-redis@${PY_FLAVOR}
 WAND_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}Wand>0:graphics/py-wand@${PY_FLAVOR}
 
@@ -43,20 +44,10 @@
 REDIS_DESC=		Use REDIS as Key Value Store
 WAND_DESC=		Use Wand with ImageMagick
 
-.include <bsd.port.pre.mk>
-
-.if ${PORT_OPTIONS:MPILLOW}
-.if ${PYTHON_REL} < 3500
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR}
-.else
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR}
-.endif
-.endif
-
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC}/build/sphinx/html && \
 		${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} \
 			"! -name .buildinfo -and ! -name objects.inv")
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: graphics/py-soya3d/Makefile
===================================================================
--- graphics/py-soya3d/Makefile
+++ graphics/py-soya3d/Makefile
@@ -17,7 +17,7 @@
 DEPRECATED=	Unmaintained, uses EOLed python27
 EXPIRATION_DATE=	2020-03-19
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR}
+BUILD_DEPENDS=	${PY_PILLOW}
 LIB_DEPENDS=	libode.so:devel/ode \
 		libcal3d.so:graphics/cal3d \
 		libfreetype.so:print/freetype2
Index: graphics/py-willow/Makefile
===================================================================
--- graphics/py-willow/Makefile
+++ graphics/py-willow/Makefile
@@ -27,7 +27,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=	${PY_PILLOW}
 WAND_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}wand>=0:graphics/py-wand@${PY_FLAVOR}
 
 .include <bsd.port.mk>
Index: graphics/qgis-ltr/Makefile
===================================================================
--- graphics/qgis-ltr/Makefile
+++ graphics/qgis-ltr/Makefile
@@ -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} \
+		${PY_PILLOW} \
 		${PYTHON_PKGNAMEPREFIX}pip>=9.0.3:devel/py-pip@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}plotly>=3.0.2:graphics/py-plotly@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psycopg2>=2.8.3:databases/py-psycopg2@${PY_FLAVOR} \
Index: graphics/qgis/Makefile
===================================================================
--- graphics/qgis/Makefile
+++ graphics/qgis/Makefile
@@ -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} \
+		${PY_PILLOW} \
 		${PYTHON_PKGNAMEPREFIX}pip>=9.0.3:devel/py-pip@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}plotly>=3.0.2:graphics/py-plotly@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psutil>=5.6.3:sysutils/py-psutil@${PY_FLAVOR} \
Index: graphics/sk1/Makefile
===================================================================
--- graphics/sk1/Makefile
+++ graphics/sk1/Makefile
@@ -20,7 +20,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}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} \
+		${PY_PILLOW} \
 		${PYTHON_PKGNAMEPREFIX}pycups>0:print/py-pycups@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}reportlab>0:print/py-reportlab@${PY_FLAVOR}
 
Index: graphics/variety/Makefile
===================================================================
--- graphics/variety/Makefile
+++ graphics/variety/Makefile
@@ -19,7 +19,7 @@
 		${PYTHON_PKGNAMEPREFIX}configobj>=5.0.6:devel/py-configobj@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dbus>=1.1.1_1:devel/py-dbus@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}httplib2>=0.9:www/py-httplib2@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pillow>=2.6.0:graphics/py-pillow@${PY_FLAVOR} \
+		${PY_PILLOW} \
 		${PYTHON_PKGNAMEPREFIX}lxml>=3.4.1_1:devel/py-lxml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
 		ImageMagick6>=6.9.0.4,1:graphics/ImageMagick6 \
Index: lang/mono/Makefile
===================================================================
--- lang/mono/Makefile
+++ lang/mono/Makefile
@@ -20,7 +20,8 @@
 		bash:shells/bash \
 		cmake>0:devel/cmake
 LIB_DEPENDS=	libinotify.so:devel/libinotify
-RUN_DEPENDS=	ca_root_nss>=0:security/ca_root_nss
+RUN_DEPENDS=	${PY_PILLOW} \
+		ca_root_nss>=0:security/ca_root_nss
 
 CONFLICTS_INSTALL=	czmq-3*
 
@@ -63,14 +64,6 @@
 OPTIONS_SLAVE=	MONOLITE
 .endif
 
-.include <bsd.port.pre.mk>
-
-.if ${PYTHON_REL} < 3500
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pillow6>=0:graphics/py-pillow6@${PY_FLAVOR}
-.else
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR}
-.endif
-
 post-extract-MONOLITE-on:
 	${MKDIR} ${WRKSRC}/mcs/class/lib/monolite-linux
 	${MV} ${WRKDIR}/monolite-linux-${MONOLITE_VERSION}-latest ${WRKSRC}/mcs/class/lib/monolite-linux/${MONOLITE_VERSION}
@@ -99,4 +92,4 @@
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/mono
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: math/asymptote/Makefile
===================================================================
--- math/asymptote/Makefile
+++ math/asymptote/Makefile
@@ -19,7 +19,8 @@
 LIB_DEPENDS=	libsigsegv.so:devel/libsigsegv
 RUN_DEPENDS=	animate:graphics/ImageMagick6 \
 		gv:print/gv \
-		${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${PY_FLAVOR} \
+		${PY_PILLOW}
 
 USES=		compiler:c++14-lang gettext-runtime ghostscript gl gmake ncurses perl5 python \
 		shebangfix tar:tgz
@@ -72,14 +73,6 @@
 READLINE_CONFIGURE_ENABLE=	readline
 READLINE_USES=	readline:port
 
-.include <bsd.port.pre.mk>
-
-.if ${PYTHON_REL} < 3500
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR}
-.else
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR}
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} 's/-lgc/-lgc-threaded/' ${WRKSRC}/configure
 	@${REINPLACE_CMD} 's,/usr/lib/libgs.so,${LOCALBASE}/lib/libgs.so,' \
@@ -93,4 +86,4 @@
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/asy
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: math/py-PyWavelets/Makefile
===================================================================
--- math/py-PyWavelets/Makefile
+++ math/py-PyWavelets/Makefile
@@ -14,7 +14,8 @@
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${PYNUMPY}
-RUN_DEPENDS=	${PYNUMPY}
+RUN_DEPENDS=	${PYNUMPY} \
+		${PY_PILLOW}
 
 USE_GITHUB=	yes
 GH_PROJECT=	pywt
@@ -25,12 +26,4 @@
 PYDISTUTILS_BUILD_TARGET=	build build_ext
 PYDISTUTILS_BUILDARGS+=		saveopts
 
-.include <bsd.port.pre.mk>
-
-.if ${PYTHON_REL} < 3500
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pillow6>=1.7:graphics/py-pillow6@${PY_FLAVOR}
-.else
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pillow>=1.7:graphics/py-pillow@${PY_FLAVOR}
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: math/py-plastex/Makefile
===================================================================
--- math/py-plastex/Makefile
+++ math/py-plastex/Makefile
@@ -13,7 +13,7 @@
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR}
+RUN_DEPENDS=	${PY_PILLOW}
 
 USES=		python:3.5+
 USE_PYTHON=	autoplist distutils
Index: misc/cs/Makefile
===================================================================
--- misc/cs/Makefile
+++ misc/cs/Makefile
@@ -12,6 +12,8 @@
 
 LICENSE=	GPLv2+
 
+RUN_DEPENDS=	${PY_PILLOW}
+
 NO_BUILD=	yes
 
 USES=		python:run shebangfix tar:tgz
@@ -19,15 +21,7 @@
 
 PLIST_FILES=	bin/xs
 
-.include <bsd.port.pre.mk>
-
-.if ${PYTHON_REL} < 3500
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR}
-.else
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR}
-.endif
-
 do-install:
 	(cd ${WRKSRC} && ${INSTALL_SCRIPT} xs.py ${STAGEDIR}${PREFIX}/bin/xs)
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: misc/ironscanner/Makefile
===================================================================
--- misc/ironscanner/Makefile
+++ misc/ironscanner/Makefile
@@ -10,7 +10,7 @@
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \
+RUN_DEPENDS=	${PY_PILLOW} \
 		${PYTHON_PKGNAMEPREFIX}pyinsane2>0:graphics/py-pyinsane2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR}
 
Index: misc/mmdnn/Makefile
===================================================================
--- misc/mmdnn/Makefile
+++ misc/mmdnn/Makefile
@@ -13,6 +13,7 @@
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYNUMPY} \
+		${PY_PILLLOW} \
 		${PYTHON_PKGNAMEPREFIX}protobuf>=3.6.0:devel/py-protobuf@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR}
 
@@ -24,12 +25,4 @@
 
 NO_ARCH=	yes
 
-.include <bsd.port.pre.mk>
-
-.if ${PYTHON_REL} < 3500
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pillow6>=3.1.0:graphics/py-pillow6@${PY_FLAVOR}
-.else
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pillow>=3.1.0:graphics/py-pillow@${PY_FLAVOR}
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: misc/py-gluoncv/Makefile
===================================================================
--- misc/py-gluoncv/Makefile
+++ misc/py-gluoncv/Makefile
@@ -14,6 +14,7 @@
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 PY_DEPENDS=	${PYNUMPY} \
+		${PY_PILLOW} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mxnet>0:misc/py-mxnet@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}portalocker>0:devel/py-portalocker@${PY_FLAVOR} \
@@ -32,18 +33,10 @@
 PYDISTUTILS_BUILDARGS=		--with-cython
 PYDISTUTILS_INSTALLARGS=	--with-cython
 
-.include <bsd.port.pre.mk>
-
-.if ${PYTHON_REL} < 3500
-PY_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR}
-.else
-PY_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR}
-.endif
-
 post-patch: # https://github.com/dmlc/gluon-cv/issues/1095
 	@truncate -s 0 ${WRKSRC}/README.md
 
 post-install:
 	@${FIND} ${STAGEDIR}${PREFIX} -name "*.so" | ${XARGS} ${STRIP_CMD}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: misc/py-tflearn/Makefile
===================================================================
--- misc/py-tflearn/Makefile
+++ misc/py-tflearn/Makefile
@@ -13,7 +13,7 @@
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYNUMPY} \
-		${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \
+		${PY_PILLOW} \
 		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tensorflow>0:science/py-tensorflow@${PY_FLAVOR}
 
Index: misc/wotsap/Makefile
===================================================================
--- misc/wotsap/Makefile
+++ misc/wotsap/Makefile
@@ -11,7 +11,7 @@
 MAINTAINER=	danilo@FreeBSD.org
 COMMENT=	Web of trust statistics and pathfinder
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR}
+RUN_DEPENDS=	${PY_PILLOW}
 
 USES=		python:2.7,run shebangfix
 NO_BUILD=	yes
Index: multimedia/freevo/Makefile
===================================================================
--- multimedia/freevo/Makefile
+++ multimedia/freevo/Makefile
@@ -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}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} \
+		${PY_PILLOW} \
 		${PYTHON_SITELIBDIR}/Numeric/Numeric_headers/__init__.py:math/py-numeric@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${PY_FLAVOR}
 
Index: net-im/py-matrix-synapse/Makefile
===================================================================
--- net-im/py-matrix-synapse/Makefile
+++ net-im/py-matrix-synapse/Makefile
@@ -30,7 +30,7 @@
 		${PYTHON_PKGNAMEPREFIX}pyasn1-modules>=0.0.7:devel/py-pyasn1-modules@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}daemonize>=2.4.2:devel/py-daemonize@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}bcrypt>=3.1.0:security/py-bcrypt@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pillow>=4.3.0:graphics/py-pillow@${PY_FLAVOR} \
+		${PY_PILLOW} \
 		${PYTHON_PKGNAMEPREFIX}sortedcontainers>=1.4.4:devel/py-sortedcontainers@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pysaml2>=4.5.2:security/py-pysaml2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pymacaroons>=0.13.0:security/py-pymacaroons@${PY_FLAVOR} \
Index: net-mgmt/netbox/Makefile
===================================================================
--- net-mgmt/netbox/Makefile
+++ net-mgmt/netbox/Makefile
@@ -31,7 +31,7 @@
 		${PYTHON_PKGNAMEPREFIX}markdown>=2.6.11:textproc/py-markdown@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}netaddr>=0.7.19:net/py-netaddr@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pycryptodome>=3.8.2:security/py-pycryptodome@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \
+		${PY_PILLOW} \
 		${PYTHON_PKGNAMEPREFIX}psycopg2>=2.8.4:databases/py-psycopg2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}redis>=3.3.11:databases/py-redis@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}svgwrite>=1.3.1:graphics/py-svgwrite@${PY_FLAVOR} \
Index: net-p2p/deluge-cli/Makefile
===================================================================
--- net-p2p/deluge-cli/Makefile
+++ net-p2p/deluge-cli/Makefile
@@ -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}pillow6>0:graphics/py-pillow6@${PY_FLAVOR}
+		${PY_PILLOW}
 
 USES=		gettext python:2.7
 USE_PYTHON=	autoplist distutils
Index: net/py-rainbowstream/Makefile
===================================================================
--- net/py-rainbowstream/Makefile
+++ net/py-rainbowstream/Makefile
@@ -22,7 +22,8 @@
 		${PYTHON_PKGNAMEPREFIX}requests>=2.5.3:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyfiglet>0:misc/py-pyfiglet@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}twitter-tools>0:net/py-twitter-tools@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pysocks>0:net/py-pysocks@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pysocks>0:net/py-pysocks@${PY_FLAVOR} \
+		${PY_PILLOW}
 
 # Actually 2.7,3.2-
 # Limited to -3.6 because of pyfiglet.
@@ -31,12 +32,4 @@
 
 NO_ARCH=	yes
 
-.include <bsd.port.pre.mk>
-
-.if ${PYTHON_REL} < 3500
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR}
-.else
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR}
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: print/hplip/Makefile
===================================================================
--- print/hplip/Makefile
+++ print/hplip/Makefile
@@ -53,6 +53,7 @@
 FAX_CONFIGURE_ENABLE=	fax-build
 
 SCAN_DESC=		Scanning support
+SCAN_RUN_DEPENDS=	${PY_PILLOW}
 SCAN_LIB_DEPENDS=	libsane.so:graphics/sane-backends
 SCAN_CONFIGURE_ENABLE=	scan-build
 
@@ -82,16 +83,6 @@
 BROKEN=			The X11 option requires the QT5 option
 .endif
 
-.include <bsd.port.pre.mk>
-
-.if ${PORT_OPTIONS:MSCAN}
-.if ${PYTHON_REL} < 3500
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR}
-.else
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR}
-.endif
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|-ldld||g;' \
 		-e 's|-ldl||g' \
@@ -153,4 +144,4 @@
 	${MV} ${STAGEDIR}${PREFIX}/etc/sane.d/dll.conf \
 		${STAGEDIR}${PREFIX}/etc/sane.d/dll.d/hpaio
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: print/py-reportlab/Makefile
===================================================================
--- print/py-reportlab/Makefile
+++ print/py-reportlab/Makefile
@@ -17,6 +17,8 @@
 
 LICENSE=	BSD3CLAUSE
 
+RUN_DEPENDS=	${PY_PILLOW}
+
 USES=		python
 USE_PYTHON=	distutils autoplist
 
@@ -41,14 +43,6 @@
 CJK_RUN_DEPENDS=	${LOCALBASE}/share/fonts/adobe-cmaps/ac15/cid2code.txt:print/adobe-cmaps
 FREETYPE_LIB_DEPENDS=	libfreetype.so:print/freetype2
 
-.include <bsd.port.pre.mk>
-
-.if ${PYTHON_REL} < 3500
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR}
-.else
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR}
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%DISTDIR%%|${DISTDIR}|' \
 			  -e 's|%%PFBFER%%|${PFBFER}|' \
@@ -71,4 +65,4 @@
 	${INSTALL_DATA} ${WRKSRC}/docs/${i} ${STAGEDIR}${DOCSDIR}
 .endfor
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: print/py-trml2pdf/Makefile
===================================================================
--- print/py-trml2pdf/Makefile
+++ print/py-trml2pdf/Makefile
@@ -16,7 +16,7 @@
 DEPRECATED=	Uses deprecated version of python
 EXPIRATION_DATE=	2020-08-15
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} \
+RUN_DEPENDS=	${PY_PILLOW} \
 		${PYTHON_PKGNAMEPREFIX}reportlab>=0:print/py-reportlab@${PY_FLAVOR}
 
 USES=		python:2.7 shebangfix tar:bzip2
Index: science/gramps/Makefile
===================================================================
--- science/gramps/Makefile
+++ science/gramps/Makefile
@@ -41,7 +41,7 @@
 
 GEXIV_LIB_DEPENDS=	libgexiv2.so:graphics/gexiv2
 GTKSPELL_LIB_DEPENDS=	libgtkspell3-3.so:textproc/gtkspell3
-PIL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR}
+PIL_RUN_DEPENDS=	${PY_PILLOW}
 RCS_RUN_DEPENDS=	rcsdiff:devel/rcs
 TTFFREEFONT_RUN_DEPENDS=${LOCALBASE}/share/fonts/freefont-ttf/FreeMono.ttf:x11-fonts/freefont-ttf
 
Index: security/py-volatility/Makefile
===================================================================
--- security/py-volatility/Makefile
+++ security/py-volatility/Makefile
@@ -19,7 +19,7 @@
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}distorm>=0:devel/py-distorm@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pillow6>=0:graphics/py-pillow6@${PY_FLAVOR} \
+		${PY_PILLOW} \
 		${PYTHON_PKGNAMEPREFIX}pycrypto>=0:security/py-pycrypto@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yara>=0:security/py-yara@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}openpyxl>=0:textproc/py-openpyxl@${PY_FLAVOR}
Index: security/vinetto/Makefile
===================================================================
--- security/vinetto/Makefile
+++ security/vinetto/Makefile
@@ -14,22 +14,16 @@
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+RUN_DEPENDS=	${PY_PILLOW}
+
 USES=		python
 USE_PYTHON=	autoplist distutils concurrent optsuffix
 PYDISTUTILS_PKGVERSION=	0.06alpha
 NO_ARCH=	yes
 
-.include <bsd.port.pre.mk>
-
-.if ${PYTHON_REL} < 3500
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR}
-.else
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR}
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e "s|/usr/share/vinetto|${DATADIR}|g" ${WRKSRC}/setup.py
 	@${REINPLACE_CMD} -e "s|/usr/share/vinetto|${DATADIR}|g" ${WRKSRC}/vinreport.py
 	@${REINPLACE_CMD} -e "s|/usr/share/vinetto|${DATADIR}|g" ${WRKSRC}/vinetto
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: textproc/py-ocrmypdf/Makefile
===================================================================
--- textproc/py-ocrmypdf/Makefile
+++ textproc/py-ocrmypdf/Makefile
@@ -19,7 +19,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} \
+		${PY_PILLOW} \
 		${PYTHON_PKGNAMEPREFIX}tqdm>=4:misc/py-tqdm@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}reportlab>=3.3.0:print/py-reportlab@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}chardet>=3.0.4,<4:textproc/py-chardet@${PY_FLAVOR} \
Index: textproc/py-pikepdf/Makefile
===================================================================
--- textproc/py-pikepdf/Makefile
+++ textproc/py-pikepdf/Makefile
@@ -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} \
+		${PY_PILLOW} \
 		${PYTHON_PKGNAMEPREFIX}python-xmp-toolkit>=2.0.1:textproc/py-python-xmp-toolkit@${PY_FLAVOR}
 
 USES=		compiler:c++14-lang python:3.5+
Index: textproc/py-qrcode/Makefile
===================================================================
--- textproc/py-qrcode/Makefile
+++ textproc/py-qrcode/Makefile
@@ -13,20 +13,13 @@
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.8:devel/py-six@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.8:devel/py-six@${PY_FLAVOR} \
+		${PY_PILLOW}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent distutils
 
-.include <bsd.port.pre.mk>
-
-.if ${PYTHON_REL} < 3500
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pillow6>=2.6:graphics/py-pillow6@${PY_FLAVOR}
-.else
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pillow>=2.6:graphics/py-pillow@${PY_FLAVOR}
-.endif
-
 post-patch:
 	${REINPLACE_CMD} -e 's|share/\(man/man1\)|\1|' ${WRKSRC}/setup.py
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: textproc/py-xhtml2pdf/Makefile
===================================================================
--- textproc/py-xhtml2pdf/Makefile
+++ textproc/py-xhtml2pdf/Makefile
@@ -17,7 +17,8 @@
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}html5lib>=1.0:www/py-html5lib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pdf2>=0:print/py-pdf2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}reportlab>=3.0:print/py-reportlab@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR} \
+		${PY_PILLOW}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>=1.0:devel/py-nose@${PY_FLAVOR}
 
 USES=		python
@@ -25,12 +26,4 @@
 
 NO_ARCH=	yes
 
-.include <bsd.port.pre.mk>
-
-.if ${PYTHON_REL} < 3500
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pillow6>=0:graphics/py-pillow6@${PY_FLAVOR}
-.else
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR}
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: www/go-appengine-sdk/Makefile
===================================================================
--- www/go-appengine-sdk/Makefile
+++ www/go-appengine-sdk/Makefile
@@ -19,7 +19,7 @@
 ONLY_FOR_ARCHS=	amd64 i386
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>=${PYTHON_VER}:databases/py-sqlite3@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} \
+		${PY_PILLOW} \
 		${PYTHON_PKGNAMEPREFIX}pycrypto>=2.6:security/py-pycrypto@${PY_FLAVOR}
 
 USES=		gettext go python:2.7 shebangfix zip
Index: www/google-appengine/Makefile
===================================================================
--- www/google-appengine/Makefile
+++ www/google-appengine/Makefile
@@ -15,7 +15,7 @@
 LICENSE_COMB=	multi
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>=${PYTHON_VER}:databases/py-sqlite3@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} \
+		${PY_PILLOW} \
 		${PYTHON_PKGNAMEPREFIX}pycrypto>=2.6:security/py-pycrypto@${PY_FLAVOR}
 
 WRKSRC=	${WRKDIR}/${PORTNAME:S,-,_,}
Index: www/py-bokeh/Makefile
===================================================================
--- www/py-bokeh/Makefile
+++ www/py-bokeh/Makefile
@@ -18,7 +18,7 @@
 		${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}packaging>=16.8:devel/py-packaging@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dateutil>=2.1:devel/py-dateutil@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pillow>=4.0:graphics/py-pillow@${PY_FLAVOR} \
+		${PY_PILLOW} \
 		${PYTHON_PKGNAMEPREFIX}yaml>=3.10:devel/py-yaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.5.2:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tornado>=4.3:www/py-tornado@${PY_FLAVOR}
Index: www/py-django-filer/Makefile
===================================================================
--- www/py-django-filer/Makefile
+++ www/py-django-filer/Makefile
@@ -18,18 +18,11 @@
 		${PYTHON_PKGNAMEPREFIX}django-easy-thumbnails>=2:graphics/py-django-easy-thumbnails@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}django-mptt>=0.6:www/py-django-mptt@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}django_polymorphic>=0.7:www/py-django_polymorphic@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}unidecode>=0:converters/py-unidecode@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}unidecode>=0:converters/py-unidecode@${PY_FLAVOR} \
+		${PY_PILLOW}
 
 USES=		python
 USE_PYTHON=	autoplist distutils
 NO_ARCH=	yes
 
-.include <bsd.port.pre.mk>
-
-.if ${PYTHON_REL} < 3500
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pillow6>=2.3.0:graphics/py-pillow6@${PY_FLAVOR}
-.else
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pillow>=2.3.0:graphics/py-pillow@${PY_FLAVOR}
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: www/py-django-markdownx/Makefile
===================================================================
--- www/py-django-markdownx/Makefile
+++ www/py-django-markdownx/Makefile
@@ -15,18 +15,11 @@
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django111>=1.11:www/py-django111@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}markdown>0:textproc/py-markdown@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}markdown>0:textproc/py-markdown@${PY_FLAVOR} \
+		${PY_PILLOW}
 
 USES=		python
 USE_PYTHON=	autoplist distutils
 NO_ARCH=	yes
 
-.include <bsd.port.pre.mk>
-
-.if ${PYTHON_REL} < 3500
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR}
-.else
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR}
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: www/py-django-mezzanine/Makefile
===================================================================
--- www/py-django-mezzanine/Makefile
+++ www/py-django-mezzanine/Makefile
@@ -23,7 +23,8 @@
 		${PYTHON_PKGNAMEPREFIX}requests>=2.1.0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests-oauthlib>=0.4:www/py-requests-oauthlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}future>=0.9.0:devel/py-future@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}chardet>0:textproc/py-chardet@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}chardet>0:textproc/py-chardet@${PY_FLAVOR} \
+		${PY_PILLOW}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pep8>=1.4.1:devel/pep8@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyflakes>=0.6.1:devel/py-pyflakes@${PY_FLAVOR}
 
@@ -39,15 +40,7 @@
 SUB_FILES=	pkg-message
 SUB_LIST=	PYTHON_VER=${PYTHON_VER}
 
-.include <bsd.port.pre.mk>
-
-.if ${PYTHON_REL} < 3500
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR}
-.else
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR}
-.endif
-
 do-test:
 	@cd ${WRKSRC} && ${SETENV} TZ=UTC LC_ALL=en_US.UTF-8 ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: www/py-django-photologue/Makefile
===================================================================
--- www/py-django-photologue/Makefile
+++ www/py-django-photologue/Makefile
@@ -16,18 +16,11 @@
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django111>=1.11:www/py-django111@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}django-sortedm2m>=1.5.0:www/py-django-sortedm2m@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}ExifRead>=2.1.2:graphics/py-exifread@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}ExifRead>=2.1.2:graphics/py-exifread@${PY_FLAVOR} \
+		${PY_PILLOW}
 
 NO_ARCH=	yes
 USES=		python
 USE_PYTHON=	autoplist distutils
 
-.include <bsd.port.pre.mk>
-
-.if ${PYTHON_REL} < 3500
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pillow6>=4.3.0:graphics/py-pillow6@${PY_FLAVOR}
-.else
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pillow>=4.3.0:graphics/py-pillow@${PY_FLAVOR}
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: www/py-django-simple-captcha/Makefile
===================================================================
--- www/py-django-simple-captcha/Makefile
+++ www/py-django-simple-captcha/Makefile
@@ -16,7 +16,8 @@
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django111>=1.7.0:www/py-django111@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}django-ranged-response>=0.2.0:www/py-django-ranged-response@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}six>=1.2.0:devel/py-six@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}six>=1.2.0:devel/py-six@${PY_FLAVOR} \
+		${PY_PILLOW}
 
 USES=		python zip
 USE_PYTHON=	autoplist concurrent distutils
@@ -31,16 +32,8 @@
 MIGRATIONS_DESC=	Schema and data migration support (via south)
 MIGRATIONS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}south>0:databases/py-south@${PY_FLAVOR}
 
-.include <bsd.port.pre.mk>
-
-.if ${PYTHON_REL} < 3500
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pillow6>=2.2.2:graphics/py-pillow6@${PY_FLAVOR}
-.else
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pillow>=2.2.2:graphics/py-pillow@${PY_FLAVOR}
-.endif
-
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC}/build/sphinx/html && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} "! -name .buildinfo -and ! -name objects.inv")
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: www/py-instabot/Makefile
===================================================================
--- www/py-instabot/Makefile
+++ www/py-instabot/Makefile
@@ -22,19 +22,12 @@
 		${PYTHON_PKGNAMEPREFIX}responses>=0.10.5:devel/py-responses@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}schedule>=0.6.0:devel/py-schedule@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.12.0:devel/py-six@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}tqdm>=4.30.0:misc/py-tqdm@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}tqdm>=4.30.0:misc/py-tqdm@${PY_FLAVOR} \
+		${PY_PILLOW}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
-.include <bsd.port.pre.mk>
-
-.if ${PYTHON_REL} < 3500
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pillow6>=0:graphics/py-pillow6@${PY_FLAVOR}
-.else
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR}
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: www/py-pywikibot/Makefile
===================================================================
--- www/py-pywikibot/Makefile
+++ www/py-pywikibot/Makefile
@@ -38,6 +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=		${PY_PILLOW}
 MWOAUTH_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}mwoauth>0:www/py-mwoauth@${PY_FLAVOR}
 HTML_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}beautifulsoup>0:www/py-beautifulsoup@${PY_FLAVOR}
 
@@ -45,14 +46,6 @@
 
 .if ${PYTHON_REL} < 3000
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}ipaddr>0:devel/py-ipaddr@${PY_FLAVOR}
-.endif
-
-.if ${PORT_OPTIONS:MPILLOW}
-.if ${PYTHON_REL} < 3500
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR}
-.else
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR}
-.endif
 .endif
 
 .include <bsd.port.post.mk>
Index: www/py-wagtail/Makefile
===================================================================
--- www/py-wagtail/Makefile
+++ www/py-wagtail/Makefile
@@ -22,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:graphics/py-pillow@${PY_FLAVOR} \
+		${PY_PILLOW} \
 		${PYTHON_PKGNAMEPREFIX}pytz>=2016.6:devel/py-pytz@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.11.1<3.0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.11<2.0:devel/py-six@${PY_FLAVOR} \
Index: www/py-weboob/Makefile
===================================================================
--- www/py-weboob/Makefile
+++ www/py-weboob/Makefile
@@ -18,7 +18,7 @@
 		${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR} \
+		${PY_PILLOW} \
 		${PYTHON_PKGNAMEPREFIX}html2text>=3.200:textproc/py-html2text@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cssselect>0:www/py-cssselect@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.0.0:www/py-requests@${PY_FLAVOR}
Index: www/seahub/Makefile
===================================================================
--- www/seahub/Makefile
+++ www/seahub/Makefile
@@ -31,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}pillow6>=0:graphics/py-pillow6@${PY_FLAVOR} \
+		${PY_PILLOW} \
 		${PYTHON_PKGNAMEPREFIX}MySQLdb>0:databases/py-MySQLdb@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}qrcode>0:textproc/py-qrcode@${PY_FLAVOR} \
 		${PY_FUTURES}
Index: www/twms/Makefile
===================================================================
--- www/twms/Makefile
+++ www/twms/Makefile
@@ -14,7 +14,7 @@
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyproj>0:graphics/py-pyproj@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}webpy>0:www/webpy@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} \
+		${PY_PILLOW} \
 		${PYTHON_PKGNAMEPREFIX}cairo>0:graphics/py-cairo@${PY_FLAVOR} \
 		${FREESANS}:x11-fonts/freefont-ttf
 
Index: www/xist/Makefile
===================================================================
--- www/xist/Makefile
+++ www/xist/Makefile
@@ -16,7 +16,7 @@
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cssutils>=1.0,1:www/py-cssutils@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}lxml>=3.4:devel/py-lxml@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pillow>=2.6:graphics/py-pillow@${PY_FLAVOR}
+		${PY_PILLOW}
 
 USES=		python:3.6+ tar:bzip2
 USE_PYTHON=	autoplist distutils
Index: x11-toolkits/py-easygui/Makefile
===================================================================
--- x11-toolkits/py-easygui/Makefile
+++ x11-toolkits/py-easygui/Makefile
@@ -12,19 +12,12 @@
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${PY_FLAVOR} \
+		${PY_PILLOW}
 
 USES=		python
 USE_PYTHON=	distutils autoplist
 
 NO_ARCH=	yes
 
-.include <bsd.port.pre.mk>
-
-.if ${PYTHON_REL} < 3500
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR}
-.else
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR}
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: x11/cinnamon/Makefile
===================================================================
--- x11/cinnamon/Makefile
+++ x11/cinnamon/Makefile
@@ -43,7 +43,7 @@
 		cinnamon-translations>=0:misc/cinnamon-translations \
 		cinnamon-screensaver:x11/cinnamon-screensaver \
 		nemo:x11-fm/nemo \
-		${PYTHON_PKGNAMEPREFIX}pillow6>=0:graphics/py-pillow6@${PY_FLAVOR} \
+		${PY_PILLOW} \
 		${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR}
 
 USES=		autoreconf compiler:c11 gettext gmake gnome gl libtool \
Index: x11/py-pyscreenshot/Makefile
===================================================================
--- x11/py-pyscreenshot/Makefile
+++ x11/py-pyscreenshot/Makefile
@@ -15,6 +15,7 @@
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}easyprocess>0:devel/py-easyprocess@${PY_FLAVOR} \
+		${PY_PILLOW} \
 		import:graphics/ImageMagick6
 
 USES=		python
@@ -22,12 +23,4 @@
 NO_ARCH=	yes
 USE_PYTHON=	autoplist distutils
 
-.include <bsd.port.pre.mk>
-
-.if ${PYTHON_REL} < 3500
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR}
-.else
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR}
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: x11/py-pyvirtualdisplay/Makefile
===================================================================
--- x11/py-pyvirtualdisplay/Makefile
+++ x11/py-pyvirtualdisplay/Makefile
@@ -19,6 +19,7 @@
 		${PYTHON_PKGNAMEPREFIX}paver>0:devel/py-paver@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyscreenshot>0:x11/py-pyscreenshot@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR} \
+		${PY_PILLOW} \
 		xauth>0:x11/xauth
 
 USES=		python
@@ -38,12 +39,4 @@
 
 NO_ARCH=	yes
 
-.include <bsd.port.pre.mk>
-
-.if ${PYTHON_REL} < 3500
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR}
-.else
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR}
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>