<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/0d33fb3b010274869e89b5c521e096a38513672a">https://github.com/macports/macports-ports/commit/0d33fb3b010274869e89b5c521e096a38513672a</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 0d33fb3b010274869e89b5c521e096a38513672a
</span>Author: nilason <n_larsson@yahoo.com>
AuthorDate: Wed May 31 10:55:38 2023 +0200

<span style='display:block; white-space:pre;color:#404040;'>    grass: fix bad reinplace on pre-11 macOS builds
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Closes https://trac.macports.org/ticket/67537
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    In addition, remove unnecessary 'platforms darwin' from the port gdal-grass.
</span>---
 gis/gdal-grass/Portfile                            |  2 --
 gis/grass/Portfile                                 | 10 ++-----
 ...atch-dyld-link.diff => 01_patch-dyld-link.diff} | 32 +++++++++++++++-------
 gis/grass/files/02_grass-python.diff               | 11 ++++++++
 4 files changed, 36 insertions(+), 19 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/gdal-grass/Portfile b/gis/gdal-grass/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 185f2462d9e..6a7cbc31b78 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/gdal-grass/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/gdal-grass/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,8 +19,6 @@ long_description    This plugin allows GDAL to read GRASS raster and vector file
</span> 
 license             MIT
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms           darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> depends_lib         port:gdal \
                     port:grass
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/grass/Portfile b/gis/grass/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7225f43613c..e799f0b8480 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/grass/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/grass/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,7 +10,7 @@ github.setup        OSGeo grass 8.2.1
</span> name                grass
 epoch               1
 set main_version    [join [lrange [split ${version} "."] 0 1] ""]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision            3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision            4
</span> set realVersion     ${version}
 distname            grass-${realVersion}
 maintainers         nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,7 +43,7 @@ depends_lib         port:bzip2 \
</span>                     port:zlib \
                     port:readline
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles          patch-dyld-link.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles          01_patch-dyld-link.diff 02_grass-python.diff
</span> 
 configure.cflags-append  -DGL_SILENCE_DEPRECATION
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -129,11 +129,7 @@ post-patch {
</span>             reinplace "s|^PYTHON.*|PYTHON = ${pybin}|" ${worksrcpath}/include/Make/Platform.make.in
         }
     }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    reinplace "s|MACOS = sys.platform.startswith(\"darwin\")|&\\nos.environ\[\"GRASS_PYTHON\"\] = \"${pybin}\"|" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        ${worksrcpath}/lib/init/grass.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    # Use LD_RUN_PATH instead of DYLD_LIBRARY_PATH to pass lib path to ctypesgen
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    reinplace "s|LD_LIBRARY_PATH_VAR = \".*|LD_LIBRARY_PATH_VAR = \"LD_RUN_PATH\"|" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        ${worksrcpath}/lib/init/grass.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    reinplace "s|@PYBIN@|${pybin}|" ${worksrcpath}/lib/init/grass.py
</span> }
 
 # Python default
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/grass/files/patch-dyld-link.diff b/gis/grass/files/01_patch-dyld-link.diff
</span>similarity index 64%
rename from gis/grass/files/patch-dyld-link.diff
rename to gis/grass/files/01_patch-dyld-link.diff
<span style='display:block; white-space:pre;color:#808080;'>index 875be48bd52..4e065ffdcc2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/grass/files/patch-dyld-link.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/grass/files/01_patch-dyld-link.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- aclocal.m4.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ aclocal.m4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -506,9 +506,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Use dynamic linking instead of hardcoded rpath. 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+lib/init/grass.py: Use LD_RUN_PATH instead of DYLD_LIBRARY_PATH to pass lib path to ctypesgen
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2023-01-21 18:40:37.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure      2023-05-31 23:25:26.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4045,9 +4045,9 @@
</span>          *-apple-darwin*)
              SHLIB_CFLAGS="-fno-common"
              SHLIB_SUFFIX=".dylib"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,11 +15,9 @@
</span>              ;;
        *-sun-solaris*)
            # Note: If _REENTRANT isn't defined, then Solaris
<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.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4045,9 +4045,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- aclocal.m4.orig        2023-01-21 18:40:37.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ aclocal.m4     2023-05-31 23:25:26.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -506,9 +506,9 @@
</span>          *-apple-darwin*)
              SHLIB_CFLAGS="-fno-common"
              SHLIB_SUFFIX=".dylib"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,5 +27,16 @@
</span> -            LD_LIBRARY_PATH_VAR="LD_RUN_PATH"
 +            LD_LIBRARY_PATH_VAR="DYLD_LIBRARY_PATH"
              ;;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-     *-sun-solaris*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         # Note: If _REENTRANT isn't defined, then Solaris
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   *-sun-solaris*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+       # Note: If _REENTRANT isn't defined, then Solaris
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/init/grass.py.orig 2023-01-21 18:40:37.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/init/grass.py      2023-05-31 23:30:37.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -98,7 +98,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GRASS_VERSION = "@GRASS_VERSION_NUMBER@"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GRASS_VERSION_MAJOR = "@GRASS_VERSION_MAJOR@"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GRASS_VERSION_MINOR = "@GRASS_VERSION_MINOR@"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-LD_LIBRARY_PATH_VAR = "@LD_LIBRARY_PATH_VAR@"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++LD_LIBRARY_PATH_VAR = "LD_RUN_PATH"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CONFIG_PROJSHARE = os.environ.get("GRASS_PROJSHARE", "@CONFIG_PROJSHARE@")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Get the system name
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/grass/files/02_grass-python.diff b/gis/grass/files/02_grass-python.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..266bd275572
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/grass/files/02_grass-python.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/init/grass.py.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/init/grass.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -105,7 +105,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ WINDOWS = sys.platform.startswith("win")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CYGWIN = sys.platform.startswith("cygwin")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MACOS = sys.platform.startswith("darwin")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++os.environ["GRASS_PYTHON"] = "@PYBIN@"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ def decode(bytes_, encoding=ENCODING):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     """Decode bytes with default locale and return (unicode) string
</span></pre><pre style='margin:0'>

</pre>