[65698] trunk/dports

[ryandesign at macports.org]

Revision: 65698
          http://trac.macports.org/changeset/65698
Author:   ryandesign at macports.org
Date:     2010-03-30 04:02:55 -0700 (Tue, 30 Mar 2010)
Log Message:
-----------
bahamut and whois conflict on mkpasswd

Modified Paths:
--------------
    trunk/dports/irc/bahamut/Portfile
    trunk/dports/net/whois/Portfile

Modified: trunk/dports/irc/bahamut/Portfile
===================================================================
--- trunk/dports/irc/bahamut/Portfile	2010-03-30 11:01:48 UTC (rev 65697)
+++ trunk/dports/irc/bahamut/Portfile	2010-03-30 11:02:55 UTC (rev 65698)
@@ -1,6 +1,7 @@
 # $Id$
 PortSystem 1.0
 name		bahamut
+conflicts	whois
 version		1.8.6
 description	Bahamut is an Internet Relay Chat Daemon (IRCd) designed for DALnet.
 long_description	${description}

Modified: trunk/dports/net/whois/Portfile
===================================================================
--- trunk/dports/net/whois/Portfile	2010-03-30 11:01:48 UTC (rev 65697)
+++ trunk/dports/net/whois/Portfile	2010-03-30 11:02:55 UTC (rev 65698)
@@ -12,6 +12,7 @@
 PortGroup                   archcheck 1.0
 
 name                        whois
+conflicts                   bahamut
 version                     5.0.1
 categories                  net
 maintainers                 ryandesign
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100330/147f1572/attachment.html>