Ticket #42836: patch.py-cartopy.diff

Portfile

@@ -5 +5 @@
 PortGroup           python 1.0
 PortGroup           github 1.0
 
-github.setup        SciTools cartopy 0.9.0 v
+github.setup        SciTools cartopy 0.10.0 v
 
-name                py-cartopy
-version             0.9.0
+name                py-${github.project}
+version             ${github.version}
 categories-append   science gis graphics
 platforms           darwin
+license             LGPL-3
 
 maintainers         bo.ingv.it:peter.danecek openmaintainer
 
-license             LGPL-3
-
 description         A library providing cartographic tools for python.
 
-long_description    Cartopy is a Python package designed to make drawing maps \
-                    for data analysis and visualisation as easy as possible. \
-                    It makes use of the powerful PROJ.4, numpy and shapely \
-                    libraries and has a simple and intuitive drawing interface \
-                    to matplotlib for creating publication quality maps.
+long_description    \
+    Cartopy is a Python package designed to make drawing maps for data \
+    analysis and visualisation as easy as possible. It makes use of the \
+    powerful PROJ.4, numpy and shapely libraries and has a simple and \
+    intuitive drawing interface to matplotlib for creating publication \
+    quality maps.
 
 homepage            http://scitools.org.uk/cartopy/
 
-checksums           md5     fcae31b7f7a322160da2dce6ae597d1c \
-                    rmd160  25f84a9fe68a3a0bdca433b2a0aecf04c189cee0 \
-                    sha256  14c21ad1f84f22d55a017180435f087264ef767ef27b24ccb0f3fa330a326ad4
+checksums           md5     85efc6a5b1542a2b6a52c8ca67ada127 \
+                    rmd160  899002e614241acb51a9b1ac8040eee4ab821b07 \
+                    sha256  c10dd63d3eed31f54cd3c48ce52d02a210a05357fc36c208bd067dbe65363b20
 
 python.versions     27
 
@@ -49 +49 @@
     # Required for post-installation testing only.
     depends_run-append      port:py${python.version}-nose \
                             port:py${python.version}-pep8 \
-                            port:py${python.version}-mock \
-                            port:py${python.version}-pil
+                            port:py${python.version}-mock
+
+    # PIL dependency: allow both PIL and Pillow to satisfy it.
+    depends_run-append      path:${python.pkgd}/PIL:py${python.version}-Pillow
+
+    livecheck.type  none
 }