Convert the tree to use PY_PILLOW

With hat:	portmgr
Originally submitted by:	kai

6 files changed, 10 insertions, 30 deletions

diff --git a/misc/cs/Makefile b/misc/cs/Makefile
index 985db38c75ed..0f81a0c752eb 100644
--- a/misc/cs/Makefile
+++ b/misc/cs/Makefile
@@ -12,6 +12,8 @@ COMMENT=	Cross Stitch software
 
 LICENSE=	GPLv2+
 
+RUN_DEPENDS=	${PY_PILLOW}
+
 NO_BUILD=	yes
 
 USES=		python:run shebangfix tar:tgz
@@ -19,15 +21,7 @@ SHEBANG_FILES=	xs.py
 
 PLIST_FILES=	bin/xs
 
-.include <bsd.port.pre.mk>
-
-.if ${PYTHON_REL} < 3500
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR}
-.else
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR}
-.endif
-
 do-install:
 	(cd ${WRKSRC} && ${INSTALL_SCRIPT} xs.py ${STAGEDIR}${PREFIX}/bin/xs)
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/misc/ironscanner/Makefile b/misc/ironscanner/Makefile
index 50ead669bce2..39f49cbadfe3 100644
--- a/misc/ironscanner/Makefile
+++ b/misc/ironscanner/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Collect as much information as possible on image scanners
 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}
 
diff --git a/misc/mmdnn/Makefile b/misc/mmdnn/Makefile
index 036a3c7bca4d..dfde7ed8cb86 100644
--- a/misc/mmdnn/Makefile
+++ b/misc/mmdnn/Makefile
@@ -13,6 +13,7 @@ LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYNUMPY} \
+		${PY_PILLOW} \
 		${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 @@ USE_PYTHON=	distutils noflavors autoplist
 
 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>
diff --git a/misc/py-gluoncv/Makefile b/misc/py-gluoncv/Makefile
index 0edab3279e99..be7c918cfb1f 100644
--- a/misc/py-gluoncv/Makefile
+++ b/misc/py-gluoncv/Makefile
@@ -14,6 +14,7 @@ LICENSE=	APACHE20
 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 @@ USE_PYTHON=	distutils cython autoplist
 PYDISTUTILS_BUILDARGS=		--with-cython
 PYDISTUTILS_INSTALLARGS=	--with-cython
 
-.include <bsd.port.pre.mk>
-
-.if ${PYTHON_REL} < 3500
-PY_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR}
-.else
-PY_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR}
-.endif
-
 post-patch: # https://github.com/dmlc/gluon-cv/issues/1095
 	@truncate -s 0 ${WRKSRC}/README.md
 
 post-install:
 	@${FIND} ${STAGEDIR}${PREFIX} -name "*.so" | ${XARGS} ${STRIP_CMD}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/misc/py-tflearn/Makefile b/misc/py-tflearn/Makefile
index d0fff514d9f2..d5404f36f180 100644
--- a/misc/py-tflearn/Makefile
+++ b/misc/py-tflearn/Makefile
@@ -13,7 +13,7 @@ LICENSE=	MIT
 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}
 
diff --git a/misc/wotsap/Makefile b/misc/wotsap/Makefile
index 8167809575ea..66901ba5999f 100644
--- a/misc/wotsap/Makefile
+++ b/misc/wotsap/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Web of trust statistics and pathfinder
 DEPRECATED=	Uses deprecated version of python
 EXPIRATION_DATE=	2020-09-15
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR}
+RUN_DEPENDS=	${PY_PILLOW}
 
 USES=		python:2.7,run shebangfix
 NO_BUILD=	yes