Revision: 139554 https://trac.macports.org/changeset/139554 Author: devans@macports.org Date: 2015-08-20 02:26:26 -0700 (Thu, 20 Aug 2015) Log Message: ----------- gtksourceview2: reintroduce +quartz variant removed in r139437 and only depend on gtk-osx-application-gtk2 if it is set, fixes possible build failures when building with gtk2 +x11, check variant of the active gtk2 to make sure it matches the intended build, see comments for rationale, increment revision to correctly tag archived binaries. Revision Links: -------------- https://trac.macports.org/changeset/139437 Modified Paths: -------------- trunk/dports/gnome/gtksourceview2/Portfile Modified: trunk/dports/gnome/gtksourceview2/Portfile =================================================================== --- trunk/dports/gnome/gtksourceview2/Portfile 2015-08-20 08:54:59 UTC (rev 139553) +++ trunk/dports/gnome/gtksourceview2/Portfile 2015-08-20 09:26:26 UTC (rev 139554) @@ -2,11 +2,12 @@ # $Id$ PortSystem 1.0 +PortGroup active_variants 1.1 name gtksourceview2 set my_name gtksourceview version 2.10.5 -revision 8 +revision 9 license LGPL-2.1+ # respository indicates they were in process of shift # from LGPL-2+ to LGPL-2.1+ @@ -45,11 +46,8 @@ path:lib/pkgconfig/glib-2.0.pc:glib2 \ port:gettext \ port:gtk2 \ - port:libxml2 \ - port:gtk-osx-application-gtk2 + port:libxml2 - - patchfiles patch-configure.ac.diff \ patch-gtkosxapplication.diff @@ -80,6 +78,23 @@ } } +# although this port correctly senses the installed variant of gtk2 and configures accordingly, +# gtk-osx-application-gtk2 only builds with gtk2 +quartz and will fail to build if gtk2 +x11 +# is active. Since this can break the x11 build of this port, only depend on it if +quartz +# is set. It's not used when building with gtk2 +x11 anyway. + +variant quartz { + depends_lib-append port:gtk-osx-application-gtk2 +} + +# make sure the right variant of gtk2 is installed for the intended build + +if {[variant_isset quartz]} { + require_active_variants gtk2 quartz +} else { + require_active_variants gtk2 x11 +} + variant glade description {Build glade catalog} { depends_lib-append port:glade3 configure.args-append --enable-glade-catalog