<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/3079a45d022b0d1976c8ec9df0e230432b435046">https://github.com/macports/macports-ports/commit/3079a45d022b0d1976c8ec9df0e230432b435046</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 3079a45d022 gimp2/gimp2-devel: fix nm issues on 10.5 Fixes: https://trac.macports.org/ticket/58834
</span>3079a45d022 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 3079a45d022b0d1976c8ec9df0e230432b435046
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Sat Jul 30 13:54:18 2022 -0400

<span style='display:block; white-space:pre;color:#404040;'>    gimp2/gimp2-devel: fix nm issues on 10.5
</span><span style='display:block; white-space:pre;color:#404040;'>    Fixes: https://trac.macports.org/ticket/58834
</span>---
 graphics/gimp2-devel/Portfile | 17 +++++++++++------
 graphics/gimp2/Portfile       | 17 +++++++++++------
 2 files changed, 22 insertions(+), 12 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/gimp2-devel/Portfile b/graphics/gimp2-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 24b53022c83..1ba6e5a05c2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/gimp2-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/gimp2-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -95,12 +95,14 @@ patchfiles          patch-etc-gimprc.in.diff \
</span>                     patch-quartz-32bit.diff \
                     MYPAINT_BRUSHES_DIR.patch
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.platform} eq "darwin" && ${os.major} < 11} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    # avoid Cursor type conflict between X11 and Quickdraw
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    # error: typedef redefinition with different types ('struct Cursor' vs 'XID' (aka 'unsigned long'))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    # not an issue on 10.7 and later
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platform darwin {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    if {${os.major} < 11} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        # avoid Cursor type conflict between X11 and Quickdraw
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        # error: typedef redefinition with different types ('struct Cursor' vs 'XID' (aka 'unsigned long'))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        # not an issue on 10.7 and later
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        patchfiles-append \
</span>                     patch-x11-widgets-fix.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span> }
 
 use_autoreconf      yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -131,7 +133,10 @@ if {[vercmp $xcodeversion 4.3] < 0 && [string match "*macports*" ${configure.com
</span> 
     configure.env-append \
         AR=${prefix}/bin/ar \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        RANLIB=${prefix}/bin/ranlib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        RANLIB=${prefix}/bin/ranlib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        NM=${prefix}/bin/nm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        lt_cv_path_NM=${prefix}/bin/nm
</span> }
 
 configure.args      --build=${configure.build_arch}-apple-${os.platform}${os.version} \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/gimp2/Portfile b/graphics/gimp2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f1f14d5e7bf..942ac88cb03 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/gimp2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/gimp2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -95,12 +95,14 @@ patchfiles          patch-etc-gimprc.in.diff \
</span>                     patch-quartz-32bit.diff \
                     MYPAINT_BRUSHES_DIR.patch
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.platform} eq "darwin" && ${os.major} < 11} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    # avoid Cursor type conflict between X11 and Quickdraw
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    # error: typedef redefinition with different types ('struct Cursor' vs 'XID' (aka 'unsigned long'))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    # not an issue on 10.7 and later
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platform darwin {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    if {${os.major} < 11} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        # avoid Cursor type conflict between X11 and Quickdraw
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        # error: typedef redefinition with different types ('struct Cursor' vs 'XID' (aka 'unsigned long'))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        # not an issue on 10.7 and later
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        patchfiles-append \
</span>                     patch-x11-widgets-fix.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span> }
 
 use_autoreconf      yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -131,7 +133,10 @@ if {[vercmp $xcodeversion 4.3] < 0 && [string match "*macports*" ${configure.com
</span> 
     configure.env-append \
         AR=${prefix}/bin/ar \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        RANLIB=${prefix}/bin/ranlib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        RANLIB=${prefix}/bin/ranlib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        NM=${prefix}/bin/nm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        lt_cv_path_NM=${prefix}/bin/nm
</span> }
 
 configure.args      --build=${configure.build_arch}-apple-${os.platform}${os.version} \
</pre><pre style='margin:0'>

</pre>