svn commit: r563660 - head/graphics/py-cartopy

[Sunpoet Po-Chuan Hsieh]

Author: sunpoet
Date: Mon Feb  1 19:35:09 2021
New Revision: 563660
URL: https://svnweb.freebsd.org/changeset/ports/563660

Log:
  Remove PYNUMPY and PY_PILLOW

Modified:
  head/graphics/py-cartopy/Makefile

Modified: head/graphics/py-cartopy/Makefile
==============================================================================
--- head/graphics/py-cartopy/Makefile	Mon Feb  1 19:35:03 2021	(r563659)
+++ head/graphics/py-cartopy/Makefile	Mon Feb  1 19:35:09 2021	(r563660)
@@ -17,10 +17,10 @@ LICENSE_FILE=	${WRKSRC}/COPYING.LESSER
 
 BUILD_DEPENDS=	geos>=3.3.3:graphics/geos \
 		proj>=4.9.0,1:graphics/proj \
-		${PYNUMPY}
+		${PYTHON_PKGNAMEPREFIX}numpy>=1.10,1:math/py-numpy@${PY_FLAVOR}
 LIB_DEPENDS=	libgeos.so:graphics/geos \
 		libproj.so:graphics/proj
-RUN_DEPENDS=	${PYNUMPY} \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>=1.10,1:math/py-numpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyshp>=1.1.4:devel/py-pyshp@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Shapely>=1.5.6:devel/py-shapely@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.3.0:devel/py-six@${PY_FLAVOR}
@@ -37,10 +37,10 @@ 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} \
-			${PY_PILLOW}
+			${PYTHON_PKGNAMEPREFIX}pillow>=1.7.8:graphics/py-pillow@${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} \
-			${PY_PILLOW} \
+			${PYTHON_PKGNAMEPREFIX}pillow>=1.7.8:graphics/py-pillow@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}scipy>=0.10:science/py-scipy@${PY_FLAVOR}
 
 .include <bsd.port.mk>