[72435] trunk/dports/graphics

[ryandesign at macports.org]

Revision: 72435
          http://trac.macports.org/changeset/72435
Author:   ryandesign at macports.org
Date:     2010-10-14 18:07:30 -0700 (Thu, 14 Oct 2010)
Log Message:
-----------
poppler and xpdf conflict; see #17540

Modified Paths:
--------------
    trunk/dports/graphics/poppler/Portfile
    trunk/dports/graphics/xpdf/Portfile

Modified: trunk/dports/graphics/poppler/Portfile
===================================================================
--- trunk/dports/graphics/poppler/Portfile	2010-10-15 00:27:13 UTC (rev 72434)
+++ trunk/dports/graphics/poppler/Portfile	2010-10-15 01:07:30 UTC (rev 72435)
@@ -5,6 +5,7 @@
 PortGroup  muniversal 1.0
 
 name        poppler
+conflicts   xpdf
 version     0.14.4
 maintainers devans openmaintainer
 categories  graphics

Modified: trunk/dports/graphics/xpdf/Portfile
===================================================================
--- trunk/dports/graphics/xpdf/Portfile	2010-10-15 00:27:13 UTC (rev 72434)
+++ trunk/dports/graphics/xpdf/Portfile	2010-10-15 01:07:30 UTC (rev 72435)
@@ -3,6 +3,7 @@
 PortSystem 1.0
 
 name         xpdf
+conflicts    poppler
 version      3.02
 revision     6
 description  Xpdf is a viewer for PDF files.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20101014/1fa2b774/attachment.html>