<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/0d683fca3e73bd257aa49bb77320dc771ac14c2f">https://github.com/macports/macports-ports/commit/0d683fca3e73bd257aa49bb77320dc771ac14c2f</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 0d683fca3e73bd257aa49bb77320dc771ac14c2f
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Tue Dec 20 15:35:16 2022 -0700

<span style='display:block; white-space:pre;color:#404040;'>    rust PG: only apply patches if necessary
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    The patches have been merged and released upstream.
</span><span style='display:block; white-space:pre;color:#404040;'>    However, some ports still use old versions.
</span>---
 _resources/port1.0/group/rust-1.0.tcl | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/rust-1.0.tcl b/_resources/port1.0/group/rust-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index c8c9a4dcee8..508c60e3ec5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/rust-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/rust-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -521,7 +521,7 @@ proc rust::old_macos_compatibility {cname cversion} {
</span> 
     switch ${cname} {
         "kqueue" {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            if { "i386" in [option muniversal.architectures] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            if { [vercmp ${cversion} < 1.0.5] && "i386" in [option muniversal.architectures] } {
</span>                 # see https://gitlab.com/worr/rust-kqueue/-/merge_requests/10
                 reinplace {s|all(target_os = "freebsd", target_arch = "x86")|all(any(target_os = "freebsd", target_os = "macos"), any(target_arch = "x86", target_arch = "powerpc"))|g} \
                     ${cargo.home}/macports/${cname}-${cversion}/src/time.rs
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -529,6 +529,7 @@ proc rust::old_macos_compatibility {cname cversion} {
</span>             }
         }
         "curl-sys" {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+            if { [vercmp ${cversion} < 0.4.56] } {
</span>                 # on Mac OS X 10.6, clang exists, but `clang --print-search-dirs` returns an empty library directory
                 # see https://github.com/alexcrichton/curl-rust/commit/b3a3ce876921f2e82a145d9abd539cd8f9b7ab7b
                 # see https://trac.macports.org/ticket/64146#comment:16
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -542,6 +543,7 @@ proc rust::old_macos_compatibility {cname cversion} {
</span>                 reinplace "s|Command::new(\"clang\")|cc::Build::new().get_compiler().to_command()|g" \
                     ${cargo.home}/macports/${cname}-${cversion}/build.rs
             }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+        }
</span>     }
 
     # rust-bootstrap requires `macosx_deployment_target` instead of `os.major`
</pre><pre style='margin:0'>

</pre>