<pre style='margin:0'>
Rainer Müller (raimue) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/085e656c9a1a681e981940dc04008e804b0e5618">https://github.com/macports/macports-ports/commit/085e656c9a1a681e981940dc04008e804b0e5618</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 085e656 openssh, ssh-copy-id: depends instead of conflicts
</span>085e656 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 085e656c9a1a681e981940dc04008e804b0e5618
</span>Author: Zero King <l2dy@macports.org>
AuthorDate: Mon Sep 4 13:15:34 2017 +0000
<span style='display:block; white-space:pre;color:#404040;'> openssh, ssh-copy-id: depends instead of conflicts
</span>---
net/openssh/Portfile | 7 ++-----
net/ssh-copy-id/Portfile | 3 +--
2 files changed, 3 insertions(+), 7 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/openssh/Portfile b/net/openssh/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 604ad3b..85757c3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/openssh/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/openssh/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span>
name openssh
version 7.3p1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories net
platforms darwin
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,6 +41,7 @@ depends_lib path:lib/libssl.dylib:openssl \
</span> port:libedit \
port:ncurses \
port:zlib
<span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_run port:ssh-copy-id
</span>
# the HPN patch needs this, so rewrite all other patches to support it, too
patch.args -p1
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -100,10 +101,6 @@ post-destroot {
</span> # switch default port to avoid conflict with system sshd
reinplace "s|#Port 22|Port 2222|g" ${destroot}${prefix}/etc/ssh/sshd_config
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # provide ssh-copy-id
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 ${worksrcpath}/contrib/ssh-copy-id ${destroot}${prefix}/bin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 ${worksrcpath}/contrib/ssh-copy-id.1 ${destroot}${prefix}/share/man/man1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # install sandbox definition
xinstall -m 755 -d ${destroot}${prefix}/share/${name}
xinstall -m 644 ${filespath}/org.openssh.sshd.sb ${destroot}${prefix}/share/${name}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/ssh-copy-id/Portfile b/net/ssh-copy-id/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 306b6d0..3792738 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/ssh-copy-id/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/ssh-copy-id/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,6 +4,7 @@ PortSystem 1.0
</span>
name ssh-copy-id
version 7.5p1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories net
platforms darwin freebsd
supported_archs noarch
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,8 +14,6 @@ description Shell script to install your public key(s) on a remote machi
</span> long_description ${description}
homepage https://www.openssh.com/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts openssh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> master_sites openbsd:OpenSSH/portable
distname openssh-${version}
dist_subdir openssh
</pre><pre style='margin:0'>
</pre>