[106771] trunk/dports/x11

[Ryan Schmidt]

On Jun 7, 2013, at 11:14, devans at macports.org wrote:

> Revision: 106771
>          https://trac.macports.org/changeset/106771
> Author:   devans at macports.org
> Date:     2013-06-07 09:14:43 -0700 (Fri, 07 Jun 2013)
> Log Message:
> -----------
> pangomm, gtkmm: fix variant checking.
> 
> Modified Paths:
> --------------
>    trunk/dports/x11/gtkmm/Portfile
>    trunk/dports/x11/pangomm/Portfile
> 
> Modified: trunk/dports/x11/gtkmm/Portfile
> ===================================================================
> --- trunk/dports/x11/gtkmm/Portfile	2013-06-07 16:10:37 UTC (rev 106770)
> +++ trunk/dports/x11/gtkmm/Portfile	2013-06-07 16:14:43 UTC (rev 106771)
> @@ -63,15 +63,31 @@
> }
> 
> if {[variant_isset quartz]} {
> -    require_active_variants "path:lib/pkgconfig/cairo.pc:cairo cairomm pango pangomm gtk2" quartz
> +    require_active_variants path:lib/pkgconfig/cairo.pc:cairo quartz
> +    require_active_variants cairomm quartz
> +    require_active_variants pango quartz
> +    require_active_variants pangomm quartz
> +    require_active_variants gtk2 quartz
> } else {
> -    require_active_variants "path:lib/pkgconfig/cairo.pc:cairo cairomm pango pangomm gtk2" "" quartz
> +    require_active_variants path:lib/pkgconfig/cairo.pc:cairo "" quartz
> +    require_active_variants cairomm "" quartz
> +    require_active_variants pango "" quartz
> +    require_active_variants pangomm "" quartz
> +    require_active_variants gtk2 "" quartz
> }
> 
> if {[variant_isset x11]} {
> -    require_active_variants "path:lib/pkgconfig/cairo.pc:cairo cairomm pango pangomm gtk2" x11
> +    require_active_variants path:lib/pkgconfig/cairo.pc:cairo x11
> +    require_active_variants cairomm x11
> +    require_active_variants pango x11
> +    require_active_variants pangomm x11
> +    require_active_variants gtk2 x11
> } else {
> -    require_active_variants "path:lib/pkgconfig/cairo.pc:cairo cairomm pango pangomm gtk2" "" x11
> +    require_active_variants path:lib/pkgconfig/cairo.pc:cairo "" x11
> +    require_active_variants cairomm "" x11
> +    require_active_variants pango "" x11
> +    require_active_variants pangomm "" x11
> +    require_active_variants gtk2 "" x11
> }
> 
> livecheck.type  gnome
> 
> Modified: trunk/dports/x11/pangomm/Portfile
> ===================================================================
> --- trunk/dports/x11/pangomm/Portfile	2013-06-07 16:10:37 UTC (rev 106770)
> +++ trunk/dports/x11/pangomm/Portfile	2013-06-07 16:14:43 UTC (rev 106771)
> @@ -40,16 +40,24 @@
> variant quartz {}
> default_variants +x11
> 
> -if {[variant_isset quartz]} {
> -    require_active_variants "path:lib/pkgconfig/cairo.pc:cairo cairomm pango" quartz
> +if {[variant_isset x11]} {
> +    require_active_variants path:lib/pkgconfig/cairo.pc:cairo x11
> +    require_active_variants cairomm x11
> +    require_active_variants pango x11
> } else {
> -    require_active_variants "path:lib/pkgconfig/cairo.pc:cairo cairomm pango" "" quartz
> +    require_active_variants path:lib/pkgconfig/cairo.pc:cairo "" x11
> +    require_active_variants cairomm "" x11
> +    require_active_variants pango "" x11
> }
> 
> -if {[variant_isset x11]} {
> -    require_active_variants "path:lib/pkgconfig/cairo.pc:cairo cairomm pango" x11
> +if {[variant_isset quartz]} {
> +    require_active_variants path:lib/pkgconfig/cairo.pc:cairo quartz
> +    require_active_variants cairomm quartz
> +    require_active_variants pango quartz
> } else {
> -    require_active_variants "path:lib/pkgconfig/cairo.pc:cairo cairomm pango" "" x11
> +    require_active_variants path:lib/pkgconfig/cairo.pc:cairo "" quartz
> +    require_active_variants cairomm "" quartz
> +    require_active_variants pango "" quartz
> }

To me it's unexpected that a port would require specific variants of a port that is not a dependency. For example gtkmm requiring a specific variant of pango when pango is not a dependency.

Remember to specify the variant requirements using the path:-style depspec, for ports that have -devel versions (which includes pango and cairomm).