[43802] trunk/dports/graphics/poppler/Portfile

[jeremyhu at macports.org]

Revision: 43802
          http://trac.macports.org/changeset/43802
Author:   jeremyhu at macports.org
Date:     2008-12-15 00:42:34 -0800 (Mon, 15 Dec 2008)
Log Message:
-----------
poppler: Simlified variant scheme.  We don't need an x11 variant.  Just default to whatever gtk2 wants.

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

Modified: trunk/dports/graphics/poppler/Portfile
===================================================================
--- trunk/dports/graphics/poppler/Portfile	2008-12-15 08:36:06 UTC (rev 43801)
+++ trunk/dports/graphics/poppler/Portfile	2008-12-15 08:42:34 UTC (rev 43802)
@@ -21,7 +21,6 @@
                 rmd160  5157486d79b218c7183ad281694ee27f3782812a
 
 depends_lib \
-    port:cairo \
     port:gtk2 \
     port:openjpeg \
     port:poppler-data
@@ -41,30 +40,10 @@
     --enable-zlib \
     --mandir=${prefix}/share/man
 
-if {[variant_isset no_x11]} {
-    default_variants    +quartz
-}
-
-if {![variant_isset quartz]} {
-    default_variants    +x11
-}
-
-pre-fetch {
-    if {![variant_isset quartz] && ![variant_isset x11]} {
-        error "Either +x11 or +quartz is required"
-    }
-}
-
-variant quartz conflicts x11 description { Support for the native Mac OS X interface } {
+variant quartz description { Support for the native Mac OS X interface instead of X11 } {
     configure.args-append --disable-gtk-test --without-x
 }
 
-variant x11 conflicts quartz description { Support for the X11 user interface } {
-    depends_lib-append	\
-        lib:libX11.6:XFree86 \
-	port:xrender
-}
-
 variant qt4 description { Support for the QT toolkit } {
     configure.args-delete --disable-poppler-qt4
     if ([variant_isset quartz]) {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20081215/80802b2a/attachment.html>