<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/22c49a3c91e08db1b66c2b08ec1455061161bfe3">https://github.com/macports/macports-ports/commit/22c49a3c91e08db1b66c2b08ec1455061161bfe3</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 22c49a3c91e08db1b66c2b08ec1455061161bfe3
</span>Author: aeiouaeiouaeiouaeiouaeiouaeiou <aeioudev@outlook.com>
AuthorDate: Thu Mar 27 09:55:23 2025 +0300

<span style='display:block; white-space:pre;color:#404040;'>    putty, pssh-lilydjwg: mark conflicts
</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/63171
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    [skip ci]
</span>---
 security/putty/Portfile         | 1 +
 sysutils/pssh-lilydjwg/Portfile | 1 +
 2 files changed, 2 insertions(+)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/putty/Portfile b/security/putty/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 39b05cea8bf..a40e0ae4496 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/putty/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/putty/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,6 +7,7 @@ PortGroup           cmake 1.1
</span> name                putty
 version             0.83
 categories          security net
<span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts           pssh-lilydjwg
</span> maintainers         nomaintainer
 license             MIT
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/pssh-lilydjwg/Portfile b/sysutils/pssh-lilydjwg/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c57565c041e..36c96524142 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/pssh-lilydjwg/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/pssh-lilydjwg/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,6 +16,7 @@ description         Fork of pssh (Parallel SSH) with Python 3 support and \
</span> long_description    {*}${description}
 
 categories          sysutils net
<span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts           putty
</span> platforms           {darwin any}
 supported_archs     noarch
 license             BSD
</pre><pre style='margin:0'>

</pre>