Revision: 108564 https://trac.macports.org/changeset/108564 Author: snc@macports.org Date: 2013-07-26 11:26:30 -0700 (Fri, 26 Jul 2013) Log Message: ----------- pspp: * further fixing of dependencies * try to auto-detect x11 poison in cairo/gtk2/pango/gtksourceview2/libglade2 Modified Paths: -------------- trunk/dports/math/pspp/Portfile Modified: trunk/dports/math/pspp/Portfile =================================================================== --- trunk/dports/math/pspp/Portfile 2013-07-26 16:37:37 UTC (rev 108563) +++ trunk/dports/math/pspp/Portfile 2013-07-26 18:26:30 UTC (rev 108564) @@ -29,6 +29,8 @@ depends_lib-append port:cairo \ port:fontconfig \ port:freetype \ + port:gettext \ + port:glib2 \ port:gsl \ port:libiconv \ port:libxml2 \ @@ -75,26 +77,26 @@ variant gui description {Build PSPPIRE, the graphical interface} { depends_lib-append port:atk \ port:gdk-pixbuf2 \ - port:glib2 \ port:gtk2 \ port:gtksourceview2 configure.args-delete --without-gui } -variant quartz requires gui conflicts x11 { - require_active_variants cairo quartz x11 - require_active_variants gtk2 quartz x11 - require_active_variants pango quartz x11 - require_active_variants gtksourceview2 quartz x11 +variant quartz requires gui { + depends_build-append port:libglade2 + 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 conflicts quartz { - require_active_variants cairo x11 quartz - require_active_variants gtk2 x11 quartz - require_active_variants pango x11 quartz - require_active_variants gtksourceview2 x11 quartz - require_active_variants libglade2 {} x11 + +variant x11 requires gui { + require_active_variants cairo x11 + require_active_variants gtk2 x11 + require_active_variants pango x11 + require_active_variants gtksourceview2 x11 depends_lib-append port:xorg-libX11 \ port:xorg-libXau \ port:xorg-libXcomposite \ @@ -109,6 +111,7 @@ port:xorg-libxcb \ port:xrender } + if {![variant_isset x11] && ![variant_isset quartz]} { if {${os.major} < 11} { default_variants +x11 @@ -117,6 +120,23 @@ } } +# check for x11-poisoned dependencies +set x11 no +set depspecs {cairo gtk2 pango gtksourceview2 libglade2} +foreach depspec depspecs { + if {![catch {set result [active_variants $depspec x11]}]} { + if {$result} { + $x11 yes + break + } + } +} + +# if x11 poison, depend on x11 +if {[string is true -strict $x11]} { + default_variants +x11 +} + post-destroot { if {[variant_isset doc]} { xinstall -d -m 0755 ${destroot}${prefix}/share/doc/${name}