[84706] trunk/dports/kde

[snc at macports.org]

Revision: 84706
          http://trac.macports.org/changeset/84706
Author:   snc at macports.org
Date:     2011-09-29 19:52:17 -0700 (Thu, 29 Sep 2011)
Log Message:
-----------
kcolorchooser, okular: don't conflict with kdegraphics4, #31296

Modified Paths:
--------------
    trunk/dports/kde/kcolorchooser/Portfile
    trunk/dports/kde/okular/Portfile

Modified: trunk/dports/kde/kcolorchooser/Portfile
===================================================================
--- trunk/dports/kde/kcolorchooser/Portfile	2011-09-30 00:01:27 UTC (rev 84705)
+++ trunk/dports/kde/kcolorchooser/Portfile	2011-09-30 02:52:17 UTC (rev 84706)
@@ -18,7 +18,5 @@
 checksums           rmd160  e8263e21d5d550f3ff04ba020baa98b8ac82c561 \
                     sha256  de67107d0bdb6e66f6bc1ae2b4549447df41a4c11f3a6910233f0eed1d7092bb
 
-conflicts           kdegraphics4
-
 livecheck.url       http://kde.mirrors.hoobly.com/stable/latest/src/
 livecheck.regex     kcolorchooser-(\\d+\\.\\d+\\.\\d+)${extract.suffix}

Modified: trunk/dports/kde/okular/Portfile
===================================================================
--- trunk/dports/kde/okular/Portfile	2011-09-30 00:01:27 UTC (rev 84705)
+++ trunk/dports/kde/okular/Portfile	2011-09-30 02:52:17 UTC (rev 84706)
@@ -20,8 +20,6 @@
 checksums           rmd160  53a80326b42d6459324c4c7b6f0c29255a360f8e \
                     sha256  d669e7f55c47ebc99ea40cce0c7a7ef167de3bf6251c1468651a4e0d414e843b
 
-conflicts           kdegraphics4
-
 depends_lib-append  port:kdelibs4 \
                     port:poppler port:libspectre \
                     port:djvulibre port:chmlib \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110929/feb4e05e/attachment.html>