Revision
118503
Author
mojca@macports.org
Date
2014-04-03 06:44:44 -0700 (Thu, 03 Apr 2014)

Log Message

gtk2: remove no_x11 (#39383)

Modified Paths

Diff

Modified: trunk/dports/gnome/gtk2/Portfile (118502 => 118503)


--- trunk/dports/gnome/gtk2/Portfile	2014-04-03 13:40:50 UTC (rev 118502)
+++ trunk/dports/gnome/gtk2/Portfile	2014-04-03 13:44:44 UTC (rev 118503)
@@ -131,9 +131,7 @@
     build.cmd               ${prefix}/bin/gmake
 }
 
-if {[variant_isset no_x11]} {
-    default_variants +quartz
-} elseif {![variant_isset quartz]} {
+if {![variant_isset quartz]} {
     default_variants +x11
 }
 
@@ -215,7 +213,7 @@
     configure.args-append   --with-gdktarget=quartz
 }
 
-variant x11 conflicts quartz no_x11 {
+variant x11 conflicts quartz {
     require_active_variants path:lib/pkgconfig/cairo.pc:cairo x11
     require_active_variants path:lib/pkgconfig/pango.pc:pango x11
 
@@ -232,8 +230,6 @@
                                --x-include=${prefix}/include --x-lib=${prefix}/lib
 }
 
-variant no_x11 conflicts x11 description {Legacy compatibility variant} {}
-
 livecheck.type  regex
 livecheck.url   ftp://ftp.gnome.org/pub/gnome/sources/gtk+/${branch}/
 livecheck.regex {LATEST-IS-(\d+(?:\.\d+)*)}