<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/0280ce303d85ed663d7b6a36dd4ee3f0b82a735f">https://github.com/macports/macports-ports/commit/0280ce303d85ed663d7b6a36dd4ee3f0b82a735f</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 0280ce303d85ed663d7b6a36dd4ee3f0b82a735f
</span>Author: Andrey Stromnov <stromnov@macports.org>
AuthorDate: Sun Nov 27 21:21:18 2022 +0300

<span style='display:block; white-space:pre;color:#404040;'>    py-pyproj: update to 3.4.0
</span>---
 python/py-pyproj/Portfile                          | 79 +++++++++++++++-------
 ...dir.py.diff => patch-pyproj_datadir.py.37.diff} |  2 +-
 .../py-pyproj/files/patch-pyproj_datadir.py.diff   | 10 +--
 .../files/patch-pyproj_datadir.py.v2.diff          | 13 ----
 4 files changed, 61 insertions(+), 43 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 22c76a97dca..224bb843de5 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,12 +4,14 @@ PortSystem          1.0
</span> PortGroup           python 1.0
 
 name                py-pyproj
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version             3.3.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version             3.4.0
</span> revision            0
 categories-append   devel
<span style='display:block; white-space:pre;background:#e0ffe0;'>+platforms           darwin
</span> license             MIT
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-python.versions     37 38 39 310
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+python.versions     37 38 39 310 311
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+python.pep517       yes
</span> 
 maintainers         {stromnov @stromnov} openmaintainer
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,36 +22,65 @@ 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  e020857a8792f66fada7666c7c8229831d9619a1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  b3d8e14d91cc95fb3dbc03a9d0588ac58326803eefa5bbb0978d109de3304fbe \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    size    219134
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums           rmd160  2fdef9c6cac05230d4f6c509e6217e4bf8c6da74 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  a708445927ace9857f52c3ba67d2915da7b41a8fdcd9b8f99a4c9ed60a75eb33 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    217338
</span> 
 if {${name} ne ${subport}} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>     if {${python.version} == 37} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        version     3.2.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        revision    0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        checksums   rmd160  42ab02d994e1ee4b83b5692ee8a5c2d94ea4c54d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  4a936093825ff55b24c1fc6cc093541fcf6d0f6d406589ed699e62048ebf3877 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    size    213342
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        version             3.2.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        revision            0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        checksums           rmd160  42ab02d994e1ee4b83b5692ee8a5c2d94ea4c54d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            sha256  4a936093825ff55b24c1fc6cc093541fcf6d0f6d406589ed699e62048ebf3877 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            size    213342
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        python.pep517       no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            port:py${python.version}-setuptools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        depends_lib-append  port:proj8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        configure.env-append    PROJ_DIR=${prefix}/lib/proj8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        build.env-append        PROJ_DIR=${prefix}/lib/proj8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        destroot.env-append     PROJ_DIR=${prefix}/lib/proj8
</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.37.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/proj8/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;'>+    } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        variant proj8 conflicts proj9 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            depends_lib-append      port:proj8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            configure.env-append    PROJ_DIR=${prefix}/lib/proj8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            build.env-append        PROJ_DIR=${prefix}/lib/proj8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            destroot.env-append     PROJ_DIR=${prefix}/lib/proj8
</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/proj8/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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        variant proj9 conflicts proj8 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            depends_lib-append      port:proj9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            configure.env-append    PROJ_DIR=${prefix}/lib/proj9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            build.env-append        PROJ_DIR=${prefix}/lib/proj9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            destroot.env-append     PROJ_DIR=${prefix}/lib/proj9
</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/proj9/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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        if {![variant_isset proj8] && ![variant_isset proj9]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            default_variants        +proj9
</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.diff
</span>     }
 
     depends_build-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                        port:py${python.version}-setuptools \
</span>                         port:py${python.version}-cython
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    depends_lib-append  port:py${python.version}-certifi \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        port:proj8
</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/proj8/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;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    configure.env-append    PROJ_DIR=${prefix}/lib/proj8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    build.env-append        PROJ_DIR=${prefix}/lib/proj8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    destroot.env-append     PROJ_DIR=${prefix}/lib/proj8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    depends_lib-append  port:py${python.version}-certifi
</span> 
     post-destroot {
         xinstall -m 0644 -W ${worksrcpath} \
<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.37.diff
</span>similarity index 89%
copy from python/py-pyproj/files/patch-pyproj_datadir.py.diff
copy to python/py-pyproj/files/patch-pyproj_datadir.py.37.diff
<span style='display:block; white-space:pre;color:#808080;'>index 7d2910b0e71..384bc77d12e 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.37.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@
</span>      if _VALIDATED_PROJ_DATA is not None:
          return _VALIDATED_PROJ_DATA
 -    internal_datadir = Path(__file__).absolute().parent / "proj_dir" / "share" / "proj"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+    internal_datadir = "%%INTERNAL_DATADIR%%"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    internal_datadir = Path("%%INTERNAL_DATADIR%%")
</span>      proj_lib_dirs = os.environ.get("PROJ_LIB", "")
      prefix_datadir = Path(sys.prefix, "share", "proj")
  
<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 7d2910b0e71..c9265564e99 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,11 +1,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- pyproj/datadir.py.orig 2021-09-18 03:47:50.000000000 +0300
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ pyproj/datadir.py      2021-09-20 13:29:55.000000000 +0300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- pyproj/datadir.py.orig 2022-11-27 19:04:46.000000000 +0300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ pyproj/datadir.py      2022-11-27 19:05:03.000000000 +0300
</span> @@ -70,7 +70,7 @@
      global _VALIDATED_PROJ_DATA
      if _VALIDATED_PROJ_DATA is not None:
          return _VALIDATED_PROJ_DATA
 -    internal_datadir = Path(__file__).absolute().parent / "proj_dir" / "share" / "proj"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+    internal_datadir = "%%INTERNAL_DATADIR%%"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     proj_lib_dirs = os.environ.get("PROJ_LIB", "")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    internal_datadir = Path("%%INTERNAL_DATADIR%%")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     proj_lib_dirs = os.environ.get("PROJ_DATA", os.environ.get("PROJ_LIB", ""))
</span>      prefix_datadir = Path(sys.prefix, "share", "proj")
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     conda_windows_prefix_datadir = Path(sys.prefix, "Library", "share", "proj")
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-pyproj/files/patch-pyproj_datadir.py.v2.diff b/python/py-pyproj/files/patch-pyproj_datadir.py.v2.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 6563c1b5682..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-pyproj/files/patch-pyproj_datadir.py.v2.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</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:#ffe0e0;'>-         return _VALIDATED_PROJ_DATA
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     global _USER_PROJ_DATA
</span><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:#ffe0e0;'>-+    internal_datadir = "%%INTERNAL_DATADIR%%"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     proj_lib_dirs = os.environ.get("PROJ_LIB", "")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     def valid_data_dir(potential_data_dir):
</span></pre><pre style='margin:0'>

</pre>