[68975] trunk/dports

[ryandesign at macports.org]

Revision: 68975
          http://trac.macports.org/changeset/68975
Author:   ryandesign at macports.org
Date:     2010-06-18 21:27:08 -0700 (Fri, 18 Jun 2010)
Log Message:
-----------
talloc and samba3 conflict

Modified Paths:
--------------
    trunk/dports/devel/talloc/Portfile
    trunk/dports/net/samba3/Portfile

Modified: trunk/dports/devel/talloc/Portfile
===================================================================
--- trunk/dports/devel/talloc/Portfile	2010-06-19 03:31:55 UTC (rev 68974)
+++ trunk/dports/devel/talloc/Portfile	2010-06-19 04:27:08 UTC (rev 68975)
@@ -4,6 +4,7 @@
 PortSystem          1.0
 
 name                talloc
+conflicts           samba3
 version             2.0.1
 categories          devel
 platforms           darwin

Modified: trunk/dports/net/samba3/Portfile
===================================================================
--- trunk/dports/net/samba3/Portfile	2010-06-19 03:31:55 UTC (rev 68974)
+++ trunk/dports/net/samba3/Portfile	2010-06-19 04:27:08 UTC (rev 68975)
@@ -4,6 +4,7 @@
 PortGroup               muniversal 1.0
 
 name			samba3
+conflicts		talloc
 version			3.2.15
 categories		net
 platforms		darwin
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100618/2703a2b5/attachment.html>