[67391] trunk/dports/x11

[ryandesign at macports.org]

Revision: 67391
          http://trac.macports.org/changeset/67391
Author:   ryandesign at macports.org
Date:     2010-05-07 00:19:38 -0700 (Fri, 07 May 2010)
Log Message:
-----------
tightvnc and vnc conflict on vncpasswd; see #24735

Modified Paths:
--------------
    trunk/dports/x11/tightvnc/Portfile
    trunk/dports/x11/vnc/Portfile

Modified: trunk/dports/x11/tightvnc/Portfile
===================================================================
--- trunk/dports/x11/tightvnc/Portfile	2010-05-07 07:16:47 UTC (rev 67390)
+++ trunk/dports/x11/tightvnc/Portfile	2010-05-07 07:19:38 UTC (rev 67391)
@@ -3,6 +3,7 @@
 PortSystem              1.0
 
 name                    tightvnc
+conflicts               vnc
 version                 1.3.10
 categories              x11 vnc
 maintainers             nomaintainer

Modified: trunk/dports/x11/vnc/Portfile
===================================================================
--- trunk/dports/x11/vnc/Portfile	2010-05-07 07:16:47 UTC (rev 67390)
+++ trunk/dports/x11/vnc/Portfile	2010-05-07 07:19:38 UTC (rev 67391)
@@ -3,6 +3,7 @@
 PortSystem 1.0
 
 name			vnc
+conflicts		tightvnc
 version			4.1.3
 categories		x11 vnc
 maintainers		nomaintainer
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100507/285e4e6c/attachment-0001.html>