Revision: 133466 https://trac.macports.org/changeset/133466 Author: snc@macports.org Date: 2015-03-02 15:15:43 -0800 (Mon, 02 Mar 2015) Log Message: ----------- pspp{-devel}: gtk2 now rigidly respects x11/quartz variants Modified Paths: -------------- trunk/dports/math/pspp/Portfile trunk/dports/math/pspp-devel/Portfile Modified: trunk/dports/math/pspp/Portfile =================================================================== --- trunk/dports/math/pspp/Portfile 2015-03-02 20:17:04 UTC (rev 133465) +++ trunk/dports/math/pspp/Portfile 2015-03-02 23:15:43 UTC (rev 133466) @@ -95,17 +95,13 @@ } variant quartz requires gui { - require_active_variants cairo quartz require_active_variants gtk2 quartz - require_active_variants pango quartz require_active_variants gtksourceview2 quartz require_active_variants libglade2 quartz } variant x11 requires gui { - require_active_variants cairo x11 require_active_variants gtk2 x11 - require_active_variants pango x11 depends_lib-append port:xorg-libX11 \ port:xorg-libXau \ port:xorg-libXcomposite \ @@ -127,7 +123,7 @@ # check for x11-poisoned dependencies set x11 no -set depspecs {cairo gtk2 pango libglade2} +set depspecs {gtk2 libglade2} foreach depspec depspecs { if {![catch {set result [active_variants $depspec x11]}]} { if {$result} { Modified: trunk/dports/math/pspp-devel/Portfile =================================================================== --- trunk/dports/math/pspp-devel/Portfile 2015-03-02 20:17:04 UTC (rev 133465) +++ trunk/dports/math/pspp-devel/Portfile 2015-03-02 23:15:43 UTC (rev 133466) @@ -100,15 +100,11 @@ } variant quartz requires gui { - require_active_variants cairo quartz require_active_variants gtk2 quartz - require_active_variants pango quartz require_active_variants gtksourceview2 quartz } variant x11 requires gui { - require_active_variants cairo x11 require_active_variants gtk2 x11 - require_active_variants pango x11 } if {![variant_isset x11] && ![variant_isset quartz]} { @@ -117,7 +113,7 @@ # check for x11-poisoned dependencies set x11 no -set depspecs {cairo gtk2 pango} +set depspecs {gtk2} foreach depspec depspecs { if {![catch {set result [active_variants $depspec x11]}]} { if {$result} {