<pre style='margin:0'>
Andrew Stromnov (stromnov) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/ff573b8926fab65f06471627822851fec1fe6ff6">https://github.com/macports/macports-ports/commit/ff573b8926fab65f06471627822851fec1fe6ff6</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit ff573b8926fab65f06471627822851fec1fe6ff6
</span>Author: Andrew Stromnov <stromnov@macports.org>
AuthorDate: Wed Mar 20 17:29:42 2019 +0300

<span style='display:block; white-space:pre;color:#404040;'>    py-pyproj: update to 2.1.1
</span>---
 python/py-pyproj/Portfile                          | 34 ++++++++++------------
 .../py-pyproj/files/patch-pyproj_datadir.py.diff   | 13 +++++++++
 2 files changed, 28 insertions(+), 19 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-pyproj/Portfile b/python/py-pyproj/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c3bd62d..aa7b01f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-pyproj/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-pyproj/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem          1.0
</span> PortGroup           python 1.0
 
 name                py-pyproj
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version             1.9.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version             2.1.1
</span> revision            0
 categories-append   devel
 platforms           darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,35 +19,31 @@ long_description    Pyrex wrapper to provide python interfaces to PROJ.4 \
</span>                     (http://proj.maptools.org) functions.  Performs \
                     cartographic transformations and geodetic computations.
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage            https://github.com/jswhit/pyproj
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage            https://pyproj4.github.io/pyproj
</span> master_sites        pypi:[string index ${python.rootname} 0]/${python.rootname}
 
 distname            ${python.rootname}-${version}
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums           rmd160  925a0ca512c85ec215696e0e3c89d92dfc38cf51 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  e0c02b1554b20c710d16d673817b2a89ff94738b0b537aead8ecb2edc4c4487b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    size    2797999
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums           rmd160  6f61eb03117de66bfd262673e55353eabbe09f5d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  ac6176ba67e9184bb77748f2b31650d9a72ddf45beb1575555abe8160935964d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    461296
</span> 
 if {${name} ne ${subport}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    variant proj4 description {Uses proj4 4.9} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        depends_lib-append      port:proj4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        configure.env-append    PROJ_DIR=${prefix}/lib/proj49
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        build.env-append        PROJ_DIR=${prefix}/lib/proj49
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        destroot.env-append     PROJ_DIR=${prefix}/lib/proj49
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    if {![variant_isset proj4]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        depends_lib-append      port:proj
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        configure.env-append    PROJ_DIR=${prefix}/lib/proj5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        build.env-append        PROJ_DIR=${prefix}/lib/proj5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        destroot.env-append     PROJ_DIR=${prefix}/lib/proj5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span>     depends_build-append \
                         port:py${python.version}-setuptools \
                         port:py${python.version}-cython
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    # force cython usage
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    depends_lib-append      port:proj6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    configure.env-append    PROJ_DIR=${prefix}/lib/proj6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    build.env-append        PROJ_DIR=${prefix}/lib/proj6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    destroot.env-append     PROJ_DIR=${prefix}/lib/proj6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    patchfiles-append   patch-pyproj_datadir.py.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>     post-patch {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+        reinplace "s|%%INTERNAL_DATADIR%%|${prefix}/lib/proj6/share/proj|" ${worksrcpath}/pyproj/datadir.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        # force cython usage
</span>         file delete ${worksrcpath}/_proj.c
     }
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-pyproj/files/patch-pyproj_datadir.py.diff b/python/py-pyproj/files/patch-pyproj_datadir.py.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..cd4fc19
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-pyproj/files/patch-pyproj_datadir.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- pyproj/datadir.py.orig 2019-03-20 12:42:52.000000000 +0300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ pyproj/datadir.py      2019-03-20 12:46:37.000000000 +0300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -35,9 +35,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     """
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     global _USER_PROJ_DATA
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    internal_datadir = os.path.join(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-        os.path.dirname(os.path.abspath(__file__)), "proj_dir", "share", "proj"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    internal_datadir = "%%INTERNAL_DATADIR%%"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     def valid_data_dir(potential_data_dir):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         if potential_data_dir is not None and os.path.exists(
</span></pre><pre style='margin:0'>

</pre>