[103230] trunk/dports

[larryv at macports.org]

Revision: 103230
          https://trac.macports.org/changeset/103230
Author:   larryv at macports.org
Date:     2013-02-18 22:41:29 -0800 (Mon, 18 Feb 2013)
Log Message:
-----------
openssh, ssh-copy-id: Mark as conflicting (#38122).

Modified Paths:
--------------
    trunk/dports/devel/ssh-copy-id/Portfile
    trunk/dports/net/openssh/Portfile

Modified: trunk/dports/devel/ssh-copy-id/Portfile
===================================================================
--- trunk/dports/devel/ssh-copy-id/Portfile	2013-02-19 06:20:50 UTC (rev 103229)
+++ trunk/dports/devel/ssh-copy-id/Portfile	2013-02-19 06:41:29 UTC (rev 103230)
@@ -6,6 +6,7 @@
 
 github.setup        Zhann ssh-copy-id 406bdb7fc4c04fb8515188cb2ef5a6ff3a9b319a
 version             0.1
+conflicts           openssh
 
 categories          devel
 license             public-domain

Modified: trunk/dports/net/openssh/Portfile
===================================================================
--- trunk/dports/net/openssh/Portfile	2013-02-19 06:20:50 UTC (rev 103229)
+++ trunk/dports/net/openssh/Portfile	2013-02-19 06:41:29 UTC (rev 103230)
@@ -6,6 +6,7 @@
 name                openssh
 version             6.1p1
 revision            1
+conflicts           ssh-copy-id
 
 categories          net
 platforms           darwin
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130218/6128d9e6/attachment.html>