[103160] trunk/dports/gnome/gtk3/Portfile

cal at macports.org cal at macports.org
Sat Feb 16 09:06:26 PST 2013


Revision: 103160
          https://trac.macports.org/changeset/103160
Author:   cal at macports.org
Date:     2013-02-16 09:06:26 -0800 (Sat, 16 Feb 2013)
Log Message:
-----------
gtk3: deprecate +no_x11 in favor of -x11, don't require pango -x11 for +quartz and vice-versa, closes #38083

Modified Paths:
--------------
    trunk/dports/gnome/gtk3/Portfile

Modified: trunk/dports/gnome/gtk3/Portfile
===================================================================
--- trunk/dports/gnome/gtk3/Portfile	2013-02-16 16:21:12 UTC (rev 103159)
+++ trunk/dports/gnome/gtk3/Portfile	2013-02-16 17:06:26 UTC (rev 103160)
@@ -100,7 +100,7 @@
 }
 
 platform darwin 8 {
-    if {[variant_isset quartz] || [variant_isset no_x11]} {
+    if {[variant_isset quartz] || ![variant_isset x11]} {
         configure.ldflags-append  -framework Cocoa -framework Carbon
     }
 }
@@ -192,15 +192,17 @@
     configure.cc "${configure.cc} ${configure.cc_archflags}"
 }
 
-variant no_x11 {}
+variant quartz conflicts x11 {
+    require_active_variants cairo quartz
+    require_active_variants pango quartz
 
-variant quartz requires no_x11 conflicts x11 {
     configure.args-append   --enable-quartz-backend
-    require_active_variants cairo quartz
-    require_active_variants pango {} x11
 }
 
-variant x11 conflicts quartz description {Enable rendering in X11} {
+variant x11 conflicts quartz no_x11 {
+    require_active_variants cairo x11
+    require_active_variants pango x11
+
     depends_lib-append \
         port:xorg-libXi \
         port:xorg-libXrandr \
@@ -213,10 +215,9 @@
 
     configure.args-append      --enable-xinerama \
                                --x-include=${prefix}/include --x-lib=${prefix}/lib
-
-    require_active_variants cairo x11 no_x11
 }
 
+variant no_x11 conflicts x11 description {Legacy compatibility variant} {}
 
 livecheck.type  regex
 livecheck.url   ftp://ftp.gnome.org/pub/gnome/sources/${real_name}/cache.json
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130216/1c819161/attachment.html>


More information about the macports-changes mailing list