[86460] trunk/dports/graphics

[ryandesign at macports.org]

Revision: 86460
          http://trac.macports.org/changeset/86460
Author:   ryandesign at macports.org
Date:     2011-10-26 01:32:21 -0700 (Wed, 26 Oct 2011)
Log Message:
-----------
poppler, xpdf-tools: fix syntax of conflicts line

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

Modified: trunk/dports/graphics/poppler/Portfile
===================================================================
--- trunk/dports/graphics/poppler/Portfile	2011-10-26 08:11:13 UTC (rev 86459)
+++ trunk/dports/graphics/poppler/Portfile	2011-10-26 08:32:21 UTC (rev 86460)
@@ -5,6 +5,7 @@
 PortGroup  muniversal 1.0
 
 name        poppler
+conflicts   xpdf-tools
 version     0.18.0
 license     GPL-2
 maintainers devans openmaintainer
@@ -30,8 +31,6 @@
     port:openjpeg \
     port:poppler-data
 
-conflicts   port:xpdf-tools
-
 post-patch {
     reinplace "s|\$includedir|${prefix}/include|g" \
         ${worksrcpath}/configure

Modified: trunk/dports/graphics/xpdf-tools/Portfile
===================================================================
--- trunk/dports/graphics/xpdf-tools/Portfile	2011-10-26 08:11:13 UTC (rev 86459)
+++ trunk/dports/graphics/xpdf-tools/Portfile	2011-10-26 08:32:21 UTC (rev 86460)
@@ -14,7 +14,7 @@
 
 ## conflicts with poppler until poppler renames its CLI tools
 ##  (then conflicts w/ poppler-tools if it gets created)
-conflicts       port:poppler
+conflicts       poppler
 
 supported_archs noarch
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20111026/bbda5c5f/attachment.html>