[58052] trunk/dports/net

[jmr at macports.org]

Revision: 58052
          http://trac.macports.org/changeset/58052
Author:   jmr at macports.org
Date:     2009-09-21 03:39:23 -0700 (Mon, 21 Sep 2009)
Log Message:
-----------
squid, squid3: conflicts

Modified Paths:
--------------
    trunk/dports/net/squid/Portfile
    trunk/dports/net/squid3/Portfile

Modified: trunk/dports/net/squid/Portfile
===================================================================
--- trunk/dports/net/squid/Portfile	2009-09-21 10:13:57 UTC (rev 58051)
+++ trunk/dports/net/squid/Portfile	2009-09-21 10:39:23 UTC (rev 58052)
@@ -39,6 +39,8 @@
 
 depends_lib     port:openssl port:zlib
 
+conflicts       squid3
+
 configure.args  --with-pthreads \
                 --mandir=${prefix}/share/man \
                 --sysconfdir=${prefix}/etc/squid \

Modified: trunk/dports/net/squid3/Portfile
===================================================================
--- trunk/dports/net/squid3/Portfile	2009-09-21 10:13:57 UTC (rev 58051)
+++ trunk/dports/net/squid3/Portfile	2009-09-21 10:39:23 UTC (rev 58052)
@@ -40,6 +40,8 @@
 
 depends_lib     port:openssl port:zlib
 
+conflicts       squid
+
 configure.args  --with-pthreads \
                 --enable-shared \
                 --mandir=${prefix}/share/man \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090921/b9485b31/attachment.html>