[72519] trunk/dports/graphics/xpdf/Portfile

[devans at macports.org]

Revision: 72519
          http://trac.macports.org/changeset/72519
Author:   devans at macports.org
Date:     2010-10-19 09:37:52 -0700 (Tue, 19 Oct 2010)
Log Message:
-----------
xpdf: to ensure that xpdf and poppler can co-exist, make the functionality in the
+with_poppler variant the default behavior and remove the variant.  Remove
conflicts poppler.  See #17540, #26852, http://lists.macosforge.org/pipermail/macports-users/2010-October/022356.html.

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

Modified: trunk/dports/graphics/xpdf/Portfile
===================================================================
--- trunk/dports/graphics/xpdf/Portfile	2010-10-19 15:59:23 UTC (rev 72518)
+++ trunk/dports/graphics/xpdf/Portfile	2010-10-19 16:37:52 UTC (rev 72519)
@@ -3,9 +3,8 @@
 PortSystem 1.0
 
 name         xpdf
-conflicts    poppler
 version      3.02
-revision     6
+revision     7
 description  Xpdf is a viewer for PDF files.
 long_description \
     Xpdf is a viewer for Portable Document Format \
@@ -61,7 +60,7 @@
 
 depends_lib \
 	port:xorg-libXp port:xpm port:xorg-libXt port:freetype \
-	port:libpaper lib:libXm:openmotif port:t1lib
+	port:poppler port:libpaper lib:libXm:openmotif port:t1lib
 
 depends_run  path:share/ghostscript/fonts:ghostscript
 
@@ -106,16 +105,6 @@
     configure.args-append --enable-a4-paper
 }
 
-variant with_poppler description {Add Poppler support} {
-	depends_run-append port:poppler
-	post-destroot {
-		foreach i { pdffonts pdfimages pdfinfo pdftoppm pdftops pdftotext } {
-			delete ${destroot}${prefix}/bin/${i}
-			delete ${destroot}${prefix}/share/man/man1/${i}.1
-		}
-	}
-}
-
 platform puredarwin {
     depends_lib-delete lib:libXm:openmotif
     depends_lib-append port:lesstif
@@ -132,6 +121,13 @@
     patchfiles-delete xpdf-${version}-salvage-your-eye.patch
 }
 
+post-destroot {
+    foreach i { pdffonts pdfimages pdfinfo pdftoppm pdftops pdftotext } {
+        delete ${destroot}${prefix}/bin/${i}
+        delete ${destroot}${prefix}/share/man/man1/${i}.1
+    }
+}
+
 post-install {
     ui_msg " \
         Xpdf language support packages are also available at \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20101019/21a1994f/attachment-0001.html>