From 1bf9457272318a99eb550ee7603ef85903c36cea Mon Sep 17 00:00:00 2001
From: Antoine Brodin <antoine@FreeBSD.org>
Date: Tue, 24 Mar 2020 19:54:57 +0000
Subject: Convert the tree to use PY_PILLOW

With hat:	portmgr
Originally submitted by:	kai
---
 graphics/py-scikit-image/Makefile | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

(limited to 'graphics/py-scikit-image/Makefile')

diff --git a/graphics/py-scikit-image/Makefile b/graphics/py-scikit-image/Makefile
index d8120655f2b1..01abf85e37f5 100644
--- a/graphics/py-scikit-image/Makefile
+++ b/graphics/py-scikit-image/Makefile
@@ -18,6 +18,7 @@ BUILD_DEPENDS=	${PYNUMPY} \
 		${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 @@ USE_PYTHON=	autoplist concurrent distutils cython cython_run
 PYDISTUTILS_BUILD_TARGET=	build build_ext
 PYDISTUTILS_BUILDARGS+=		saveopts
 
-.include <bsd.port.pre.mk>
-
-.if ${PYTHON_REL} < 3500
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pillow6>=1.7:graphics/py-pillow6@${PY_FLAVOR}
-.else
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pillow>=1.7:graphics/py-pillow@${PY_FLAVOR}
-.endif
-
 post-install:
 	@${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR}/skimage -name "*.so" -exec ${STRIP_CMD} {} \;
 
@@ -50,4 +43,4 @@ do-test:
 	${PYTHON_CMD} selftest.py && \
 	${PYTHON_CMD} -m nose -vx Tests/test_*.py
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
-- 
cgit v1.2.3