Revision
89354
Author
ryandesign@macports.org
Date
2012-01-26 01:43:13 -0800 (Thu, 26 Jan 2012)

Log Message

tor and tor-devel conflict

Modified Paths

Diff

Modified: trunk/dports/security/tor/Portfile (89353 => 89354)


--- trunk/dports/security/tor/Portfile	2012-01-26 09:42:09 UTC (rev 89353)
+++ trunk/dports/security/tor/Portfile	2012-01-26 09:43:13 UTC (rev 89354)
@@ -4,6 +4,7 @@
 PortSystem          1.0
 
 name                tor
+conflicts           tor-devel
 version             0.2.2.35
 categories          security
 platforms           darwin

Modified: trunk/dports/security/tor-devel/Portfile (89353 => 89354)


--- trunk/dports/security/tor-devel/Portfile	2012-01-26 09:42:09 UTC (rev 89353)
+++ trunk/dports/security/tor-devel/Portfile	2012-01-26 09:43:13 UTC (rev 89354)
@@ -4,6 +4,7 @@
 PortSystem          1.0
 
 name                tor-devel
+conflicts           tor
 version             0.2.3.11-alpha
 categories          security
 platforms           darwin