[71710] trunk/dports

[ryandesign at macports.org]

Revision: 71710
          http://trac.macports.org/changeset/71710
Author:   ryandesign at macports.org
Date:     2010-09-20 17:11:00 -0700 (Mon, 20 Sep 2010)
Log Message:
-----------
cln and puppet conflict on bin/pi

Modified Paths:
--------------
    trunk/dports/math/cln/Portfile
    trunk/dports/sysutils/puppet/Portfile

Modified: trunk/dports/math/cln/Portfile
===================================================================
--- trunk/dports/math/cln/Portfile	2010-09-21 00:08:59 UTC (rev 71709)
+++ trunk/dports/math/cln/Portfile	2010-09-21 00:11:00 UTC (rev 71710)
@@ -3,6 +3,7 @@
 PortSystem 1.0
 
 name		cln
+conflicts	puppet
 version		1.3.1
 categories	math
 platforms	darwin

Modified: trunk/dports/sysutils/puppet/Portfile
===================================================================
--- trunk/dports/sysutils/puppet/Portfile	2010-09-21 00:08:59 UTC (rev 71709)
+++ trunk/dports/sysutils/puppet/Portfile	2010-09-21 00:11:00 UTC (rev 71710)
@@ -4,6 +4,7 @@
 PortSystem          1.0
 
 name                puppet
+conflicts           cln
 version             2.6.1
 categories          sysutils
 platforms           darwin
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100920/bbdeb8fd/attachment.html>