[145380] trunk/dports/www

[jeremyhu at macports.org]

Revision: 145380
          https://trac.macports.org/changeset/145380
Author:   jeremyhu at macports.org
Date:     2016-02-03 11:24:08 -0800 (Wed, 03 Feb 2016)
Log Message:
-----------
webkit2-gtk: Use active_variants PortGroup (#50504)

Modified Paths:
--------------
    trunk/dports/www/webkit2-gtk/Portfile
    trunk/dports/www/webkit2-gtk-devel/Portfile

Modified: trunk/dports/www/webkit2-gtk/Portfile
===================================================================
--- trunk/dports/www/webkit2-gtk/Portfile	2016-02-03 19:17:18 UTC (rev 145379)
+++ trunk/dports/www/webkit2-gtk/Portfile	2016-02-03 19:24:08 UTC (rev 145380)
@@ -6,8 +6,9 @@
 # http://bugs.webkit.org/show_bug.cgi?id=126492
 
 PortSystem          1.0
+PortGroup           active_variants 1.1
+PortGroup           cmake 1.0
 PortGroup           compiler_blacklist_versions 1.0
-PortGroup           cmake 1.0
 PortGroup           cxx11 1.0
 
 name                webkit2-gtk
@@ -156,6 +157,8 @@
 configure.cxxflags-append   -ftemplate-depth=256
 
 variant quartz conflicts x11 gtk2 {
+    require_active_variants port:gtk3 quartz
+
     configure.args-append \
         -DENABLE_QUARTZ_TARGET=ON \
         -DENABLE_X11_TARGET=OFF \
@@ -163,6 +166,8 @@
 }
 
 variant x11 conflicts quartz {
+    require_active_variants port:gtk3 x11
+
     configure.args-append \
         -DENABLE_QUARTZ_TARGET=OFF \
         -DENABLE_X11_TARGET=ON \
@@ -179,6 +184,8 @@
 }
 
 variant gtk2 conflicts quartz description {Enable support for GTK+2 plugins} {
+    require_active_variants port:gtk2 x11
+
     depends_lib-append      port:gtk2
     configure.args-delete   -DENABLE_PLUGIN_PROCESS_GTK2=OFF
     configure.args-append   -DENABLE_PLUGIN_PROCESS_GTK2=ON

Modified: trunk/dports/www/webkit2-gtk-devel/Portfile
===================================================================
--- trunk/dports/www/webkit2-gtk-devel/Portfile	2016-02-03 19:17:18 UTC (rev 145379)
+++ trunk/dports/www/webkit2-gtk-devel/Portfile	2016-02-03 19:24:08 UTC (rev 145380)
@@ -6,8 +6,9 @@
 # http://bugs.webkit.org/show_bug.cgi?id=126492
 
 PortSystem          1.0
+PortGroup           active_variants 1.1
+PortGroup           cmake 1.0
 PortGroup           compiler_blacklist_versions 1.0
-PortGroup           cmake 1.0
 PortGroup           cxx11 1.0
 
 name                webkit2-gtk-devel
@@ -148,6 +149,8 @@
 configure.cxxflags-append   -ftemplate-depth=256
 
 variant quartz conflicts x11 gtk2 {
+    require_active_variants port:gtk3 quartz
+
     configure.args-append \
         -DENABLE_QUARTZ_TARGET=ON \
         -DENABLE_X11_TARGET=OFF \
@@ -155,6 +158,8 @@
 }
 
 variant x11 conflicts quartz {
+    require_active_variants port:gtk3 x11
+
     configure.args-append \
         -DENABLE_QUARTZ_TARGET=OFF \
         -DENABLE_X11_TARGET=ON \
@@ -171,6 +176,8 @@
 }
 
 variant gtk2 conflicts quartz description {Enable support for GTK+2 plugins} {
+    require_active_variants port:gtk2 x11
+
     depends_lib-append      port:gtk2
     configure.args-delete   -DENABLE_PLUGIN_PROCESS_GTK2=OFF
     configure.args-append   -DENABLE_PLUGIN_PROCESS_GTK2=ON
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160203/40dd1214/attachment.html>