Revision: 115474 https://trac.macports.org/changeset/115474 Author: devans@macports.org Date: 2014-01-02 15:09:43 -0800 (Thu, 02 Jan 2014) Log Message: ----------- libsoup, libopenraw: add +gnome default variant, retain +no_gnome as a legacy compatibility variant. Modified Paths: -------------- trunk/dports/gnome/libsoup/Portfile trunk/dports/graphics/libopenraw/Portfile Modified: trunk/dports/gnome/libsoup/Portfile =================================================================== --- trunk/dports/gnome/libsoup/Portfile 2014-01-02 22:36:21 UTC (rev 115473) +++ trunk/dports/gnome/libsoup/Portfile 2014-01-02 23:09:43 UTC (rev 115474) @@ -6,6 +6,7 @@ name libsoup version 2.44.2 +revision 1 set branch [join [lrange [split ${version} .] 0 1] .] categories gnome net platforms darwin @@ -44,6 +45,7 @@ configure.args \ --disable-more-warnings \ --disable-silent-rules \ + --without-gnome \ --enable-introspection # Don't do intltool's INTLTOOL_PERL dance @@ -56,11 +58,19 @@ test.run yes test.target check -variant no_gnome description "Disable GNOME support" { - configure.args-append \ - --without-gnome +variant gnome conflicts no_gnome description {Enable GNOME support} { + configure.args-delete --without-gnome } +# Legacy no_gnome variant to be removed after 20150102 +variant no_gnome conflicts gnome description {Legacy compatibility variant} {} + +if {[variant_isset no_gnome]} { + default_variants -gnome +} else { + default_variants +gnome +} + platform darwin 8 { # The rules enabled by gobject-introspection require GNU make 3.81+ depends_run-append port:gmake Modified: trunk/dports/graphics/libopenraw/Portfile =================================================================== --- trunk/dports/graphics/libopenraw/Portfile 2014-01-02 22:36:21 UTC (rev 115473) +++ trunk/dports/graphics/libopenraw/Portfile 2014-01-02 23:09:43 UTC (rev 115474) @@ -5,7 +5,7 @@ name libopenraw version 0.0.9 -revision 5 +revision 6 categories graphics license LGPL-3+ maintainers devans openmaintainer @@ -32,7 +32,6 @@ depends_build port:pkgconfig depends_lib port:libxml2 \ - port:gdk-pixbuf2 \ port:libffi \ port:boost \ port:jpeg @@ -41,15 +40,25 @@ use_autoreconf yes autoreconf.args -fvi -configure.args --with-boost=${prefix} +configure.args --with-boost=${prefix} \ + --disable-gnome -variant no_gnome description {Build without GNOME/GTK2 support} { - depends_lib-delete port:gdk-pixbuf2 - configure.args-append --disable-gnome +variant gnome conflicts no_gnome description {Build with GNOME/GTK+ support} { + depends_lib-append port:gdk-pixbuf2 + configure.args-delete --disable-gnome } +# Legacy no_gnome variant to be removed after 20150102. +variant no_gnome conflicts gnome description {Legacy compatibility variant} {} + +if {[variant_isset no_gnome]} { + default_variants -gnome +} else { + default_variants +gnome +} + post-activate { - if {![variant_isset no_gnome]} { + if {[variant_isset gnome]} { ui_debug "Updating gdk-pixbuf.loaders..." system "${prefix}/bin/gdk-pixbuf-query-loaders --update-cache" }