<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/f3c06ccd547fa97b2209fe8533097152c52f810d">https://github.com/macports/macports-ports/commit/f3c06ccd547fa97b2209fe8533097152c52f810d</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'>     new f3c06ccd547 py-pyproj: update to 3.0.0.post1
</span>f3c06ccd547 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit f3c06ccd547fa97b2209fe8533097152c52f810d
</span>Author: Andrey Stromnov <stromnov@macports.org>
AuthorDate: Wed Dec 2 20:52:25 2020 +0300

<span style='display:block; white-space:pre;color:#404040;'>    py-pyproj: update to 3.0.0.post1
</span>---
 python/py-pyproj/Portfile                          | 107 ++++++++++++++-------
 .../py-pyproj/files/patch-pyproj_datadir.py.diff   |  14 ++-
 ...dir.py.diff => patch-pyproj_datadir.py.v2.diff} |   0
 3 files changed, 76 insertions(+), 45 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 c2d9c576cda..9db86bd2a55 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,13 +4,13 @@ PortSystem          1.0
</span> PortGroup           python 1.0
 
 name                py-pyproj
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version             2.6.1.post1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version             3.0.0.post1
</span> revision            0
 categories-append   devel
 platforms           darwin
 license             MIT
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-python.versions     27 35 36 37 38
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+python.versions     27 35 36 37 38 39
</span> 
 maintainers         {stromnov @stromnov} openmaintainer
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,53 +21,86 @@ long_description    Pyrex wrapper to provide python interfaces to PROJ.4 \
</span> 
 homepage            https://pyproj4.github.io/pyproj
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums           rmd160  f7ab40847df75a601a72794ab2be52de1e839b68 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  4f5b02b4abbd41610397c635b275a8ee4a2b5bc72a75572b98ac6ae7befa471e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    size    545482
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums           rmd160  c96a3415efa8e60254d6a748aafbf21c0fc70192 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  a49581629cadd29e61fc061d153a4d62ff28b4063c71fe8ca881eeb98cd22017 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    663801
</span> 
 if {${name} ne ${subport}} {
     depends_build-append \
                         port:py${python.version}-setuptools \
                         port:py${python.version}-cython
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    if {${python.version} eq 27} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        version             2.2.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        revision            0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        distname            ${python.rootname}-${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        checksums           rmd160  39ea00d64f1b85f55c254fc4ee75ef37d879fc2d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            sha256  6f129a00afdd817dbb331af5709221f35012bcc11a23b8c83fa09197c1190786 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            size    7220807
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    if {${python.version} < 36} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        if {${python.version} eq 27} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            version             2.2.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            revision            1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            distname            ${python.rootname}-${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            checksums           rmd160  39ea00d64f1b85f55c254fc4ee75ef37d879fc2d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                sha256  6f129a00afdd817dbb331af5709221f35012bcc11a23b8c83fa09197c1190786 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                size    7220807
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            depends_lib-append  port:py${python.version}-aenum
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        } elseif {${python.version} < 36} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            version             2.6.1.post1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            revision            1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            distname            ${python.rootname}-${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            checksums           rmd160  f7ab40847df75a601a72794ab2be52de1e839b68 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                sha256  4f5b02b4abbd41610397c635b275a8ee4a2b5bc72a75572b98ac6ae7befa471e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                size    545482
</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;'>+        variant proj6 conflicts proj7 {
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        variant proj7 conflicts proj6 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            depends_lib-append      port:proj7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            configure.env-append    PROJ_DIR=${prefix}/lib/proj7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            build.env-append        PROJ_DIR=${prefix}/lib/proj7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            destroot.env-append     PROJ_DIR=${prefix}/lib/proj7
</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;'>+        if {![variant_isset proj6] && ![variant_isset proj7]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            default_variants +proj7
</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;'>+        patchfiles-append   patch-pyproj_datadir.py.v2.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            if {[variant_isset proj6]} {
</span><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;'>+            } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                reinplace "s|%%INTERNAL_DATADIR%%|${prefix}/lib/proj7/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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            # force cython usage
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            foreach f [glob ${worksrcpath}/pyproj/*.c] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                file delete $f
</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;'>+    } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        depends_lib-append  port:py${python.version}-certifi \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            port:proj7
</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><span style='display:block; white-space:pre;background:#e0ffe0;'>+        post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            reinplace "s|%%INTERNAL_DATADIR%%|${prefix}/lib/proj7/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><span style='display:block; white-space:pre;background:#e0ffe0;'>+            foreach f [glob ${worksrcpath}/pyproj/*.c] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                file delete $f
</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:#ffe0e0;'>-        depends_lib-append  port:py${python.version}-aenum
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    variant proj6 conflicts proj7 {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        depends_lib-append      port:proj6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        configure.env-append    PROJ_DIR=${prefix}/lib/proj6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        build.env-append        PROJ_DIR=${prefix}/lib/proj6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        destroot.env-append     PROJ_DIR=${prefix}/lib/proj6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    variant proj7 conflicts proj6 {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        depends_lib-append      port:proj7
</span>         configure.env-append    PROJ_DIR=${prefix}/lib/proj7
         build.env-append        PROJ_DIR=${prefix}/lib/proj7
         destroot.env-append     PROJ_DIR=${prefix}/lib/proj7
     }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    if {![variant_isset proj6] && ![variant_isset proj7]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        default_variants +proj7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    patchfiles-append   patch-pyproj_datadir.py.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        reinplace "s|%%INTERNAL_DATADIR%%|${prefix}/lib/proj6/share/proj|" ${worksrcpath}/pyproj/datadir.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        # force cython usage
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        file delete ${worksrcpath}/_proj.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span>     post-destroot {
         xinstall -m 644 -W ${worksrcpath} \
             README.md PKG-INFO \
<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><span style='display:block; white-space:pre;color:#808080;'>index 6563c1b5682..1201b2de6c8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-pyproj/files/patch-pyproj_datadir.py.diff
</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;'>@@ -1,13 +1,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- pyproj/datadir.py.orig 2019-03-23 20:55:14.000000000 +0300
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ pyproj/datadir.py      2019-03-24 23:33:38.000000000 +0300
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -58,9 +58,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- pyproj/datadir.py.orig 2020-12-02 18:32:44.000000000 +0300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ pyproj/datadir.py      2020-12-02 18:33:06.000000000 +0300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -70,7 +70,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     if _VALIDATED_PROJ_DATA is not None:
</span>          return _VALIDATED_PROJ_DATA
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span>      global _USER_PROJ_DATA
<span style='display:block; white-space:pre;background:#ffe0e0;'>--    internal_datadir = os.path.join(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--        os.path.dirname(os.path.abspath(__file__)), "proj_dir", "share", "proj"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--    )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    internal_datadir = Path(__file__).absolute().parent / "proj_dir" / "share" / "proj"
</span> +    internal_datadir = "%%INTERNAL_DATADIR%%"
      proj_lib_dirs = os.environ.get("PROJ_LIB", "")
<span style='display:block; white-space:pre;background:#e0ffe0;'>+     prefix_datadir = Path(sys.prefix, "share", "proj")
</span>  
<span style='display:block; white-space:pre;background:#ffe0e0;'>-     def valid_data_dir(potential_data_dir):
</span><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.v2.diff
</span>similarity index 100%
copy from python/py-pyproj/files/patch-pyproj_datadir.py.diff
copy to python/py-pyproj/files/patch-pyproj_datadir.py.v2.diff
</pre><pre style='margin:0'>

</pre>