Revision: 107460 https://trac.macports.org/changeset/107460 Author: devans@macports.org Date: 2013-06-29 14:25:32 -0700 (Sat, 29 Jun 2013) Log Message: ----------- gconf: make +x11 default, check gtk2 variant matches ours, dependencies. Modified Paths: -------------- trunk/dports/gnome/gconf/Portfile Modified: trunk/dports/gnome/gconf/Portfile =================================================================== --- trunk/dports/gnome/gconf/Portfile 2013-06-29 21:19:29 UTC (rev 107459) +++ trunk/dports/gnome/gconf/Portfile 2013-06-29 21:25:32 UTC (rev 107460) @@ -3,12 +3,14 @@ PortSystem 1.0 PortGroup muniversal 1.0 +PortGroup active_variants 1.1 name gconf set my_name GConf epoch 1 # Issues in https://trac.macports.org/ticket/28077 are now resolved version 2.32.4 +revision 1 set branch [join [lrange [split ${version} .] 0 1] .] maintainers nomaintainer categories gnome @@ -35,10 +37,9 @@ port:intltool depends_lib port:gtk2 \ + port:libxml2 \ port:gobject-introspection \ port:dbus-glib \ - port:libffi \ - port:libpng \ port:policykit \ port:orbit2 @@ -69,6 +70,13 @@ variant quartz conflicts x11 {} variant x11 conflicts quartz {} +if {![variant_isset quartz]} { + require_active_variants gtk2 x11 quartz + default_variants +x11 +} else { + require_active_variants gtk2 quartz x11 +} + # The rules enabled by gobject-introspection require GNU make 3.81+ platform darwin 8 { depends_build-append port:gmake