[70017] trunk/dports

[ryandesign at macports.org]

Revision: 70017
          http://trac.macports.org/changeset/70017
Author:   ryandesign at macports.org
Date:     2010-07-26 13:53:28 -0700 (Mon, 26 Jul 2010)
Log Message:
-----------
fbopenssl and kerberos5 conflict on include/gssapi.h; see #25600

Modified Paths:
--------------
    trunk/dports/devel/fbopenssl/Portfile
    trunk/dports/net/kerberos5/Portfile

Modified: trunk/dports/devel/fbopenssl/Portfile
===================================================================
--- trunk/dports/devel/fbopenssl/Portfile	2010-07-26 20:25:12 UTC (rev 70016)
+++ trunk/dports/devel/fbopenssl/Portfile	2010-07-26 20:53:28 UTC (rev 70017)
@@ -1,7 +1,9 @@
 # $Id$
 
 PortSystem 1.0
+
 name             fbopenssl
+conflicts        kerberos5
 version          0.0.4
 revision         3
 categories       devel

Modified: trunk/dports/net/kerberos5/Portfile
===================================================================
--- trunk/dports/net/kerberos5/Portfile	2010-07-26 20:25:12 UTC (rev 70016)
+++ trunk/dports/net/kerberos5/Portfile	2010-07-26 20:53:28 UTC (rev 70017)
@@ -3,7 +3,7 @@
 PortSystem                  1.0
 
 name                        kerberos5
-conflicts                   e2fsprogs
+conflicts                   e2fsprogs fbopenssl
 version                     1.7.1
 set branch                  [join [lrange [split ${version} .] 0 1] .]
 categories                  net security
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100726/aee7b4fd/attachment.html>