<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/c741d4edcf9de4585c6281103643d201f20c8efa">https://github.com/macports/macports-ports/commit/c741d4edcf9de4585c6281103643d201f20c8efa</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 c741d4edcf9 pkixssh: allow builds with gcc, move keychain in a variant
</span>c741d4edcf9 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit c741d4edcf9de4585c6281103643d201f20c8efa
</span>Author: Sergey Fedorov <barracuda@macos-powerpc.org>
AuthorDate: Tue Jun 4 23:57:01 2024 +0800

<span style='display:block; white-space:pre;color:#404040;'>    pkixssh: allow builds with gcc, move keychain in a variant
</span>---
 net/pkixssh/Portfile | 37 ++++++++++++++++---------------------
 1 file changed, 16 insertions(+), 21 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/pkixssh/Portfile b/net/pkixssh/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4732fa946f5..99fc8f15a9d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/pkixssh/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/pkixssh/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,9 +6,8 @@ PortGroup           compiler_blacklist_versions 1.0
</span> 
 name                pkixssh
 version             13.4.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision            1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision            2
</span> categories          net
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms           darwin
</span> maintainers         {@sstallion gmail.com:sstallion} openmaintainer
 license             BSD
 installs_libs       no
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -84,7 +83,8 @@ configure.cppflags-append   -D__APPLE_SANDBOX_NAMED_EXTERNAL__ \
</span> # Support Apple's launchd in ssh-agent
 configure.cppflags-append   -D__APPLE_LAUNCHD__
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.ldflags-append  -Wl,-search_paths_first
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.ldflags-append    -Wl,-search_paths_first
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args      --with-ssl-dir=${prefix} \
                     --sysconfdir=${prefix}/etc/ssh \
                     --with-privsep-path=/var/empty \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -98,27 +98,22 @@ configure.args      --with-ssl-dir=${prefix} \
</span>                     --with-pie \
                     --without-xauth \
                     --without-ldns \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    --with-audit=bsm \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    --with-keychain=apple
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    --with-audit=bsm
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-use_parallel_build  yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.blacklist-append   {clang < 421}
</span> 
 platform macosx {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    if {${os.major} < 10} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        # See: https://trac.macports.org/ticket/60385
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        configure.args-delete   --with-keychain=apple
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    } elseif {${os.major} <= 11} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        # clang is required to build the new Apple Keychain integration due
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        # to it using the Object Subscripting feature, c.f. #59397.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        # We'll keep it simple and just blacklist any gcc version, cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        # (which could be anything), system clang versions prior to those
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        # shipped with Xcode 4.4.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        # Regarding the macports-clang versions, any version in the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        # MacPorts tree should suit our needs, since the clang
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        # documentation lists FOSS clang/llvm 3.1 as the first version to
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        # support Object Subscripting and the oldest version in our tree is
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        # now 3.3.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        compiler.blacklist-append   *gcc* cc {clang < 421}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # See: https://trac.macports.org/ticket/60385
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    variant apple_keychain description "Enable Apple Keychain integration" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    --with-keychain=apple
</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 {${os.major} > 9 && [string match *clang* ${configure.compiler}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        # At the moment this variant requires clang due
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        # to its Object Subscripting feature, c.f. #59397.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        default_variants-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    +apple_keychain
</span>     }
 }
 
</pre><pre style='margin:0'>

</pre>