[106728] trunk/dports

[devans at macports.org]

Revision: 106728
          https://trac.macports.org/changeset/106728
Author:   devans at macports.org
Date:     2013-06-06 13:24:25 -0700 (Thu, 06 Jun 2013)
Log Message:
-----------
cairomm, pangomm, gtkmm: add dummy variants +quartz +x11 and require variants of dependencies to match, addresses variant mismatch issues, #39320.

Modified Paths:
--------------
    trunk/dports/graphics/cairomm/Portfile
    trunk/dports/x11/gtkmm/Portfile
    trunk/dports/x11/pangomm/Portfile

Modified: trunk/dports/graphics/cairomm/Portfile
===================================================================
--- trunk/dports/graphics/cairomm/Portfile	2013-06-06 20:13:26 UTC (rev 106727)
+++ trunk/dports/graphics/cairomm/Portfile	2013-06-06 20:24:25 UTC (rev 106728)
@@ -1,11 +1,12 @@
 # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
 # $Id$
 
-PortSystem 1.0
+PortSystem      1.0
+PortGroup       active_variants 1.1
 
 name            cairomm
 version         1.10.0
-revision        1
+revision        2
 categories      graphics
 license         LGPL-2+
 maintainers     devans openmaintainer
@@ -26,6 +27,27 @@
 depends_lib     path:lib/pkgconfig/cairo.pc:cairo \
                 port:libsigcxx2
 
+#
+# dummy variants to ensure that this port gets rebuilt if
+# the corresponding variants for cairo change
+#
+
+variant x11 {}
+variant quartz {}
+default_variants +x11
+
+if {[variant_isset quartz]} {
+    require_active_variants path:lib/pkgconfig/cairo.pc:cairo quartz
+} else {
+    require_active_variants path:lib/pkgconfig/cairo.pc:cairo "" quartz
+}
+
+if {[variant_isset x11]} {
+    require_active_variants path:lib/pkgconfig/cairo.pc:cairo x11
+} else {
+    require_active_variants path:lib/pkgconfig/cairo.pc:cairo "" x11
+}
+
 livecheck.type  regex
 livecheck.url   http://cairographics.org/releases/
 livecheck.regex ${name}-(\[0-9\]+\\.\[0-9\]*\[02468\]\\.\[0-9\]+)

Modified: trunk/dports/x11/gtkmm/Portfile
===================================================================
--- trunk/dports/x11/gtkmm/Portfile	2013-06-06 20:13:26 UTC (rev 106727)
+++ trunk/dports/x11/gtkmm/Portfile	2013-06-06 20:24:25 UTC (rev 106728)
@@ -1,11 +1,12 @@
 # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
 # $Id$
 
-PortSystem 1.0
+PortSystem      1.0
+PortGroup       active_variants 1.1
 
 name            gtkmm
 version         2.24.3
-revision        2
+revision        3
 set branch      [join [lrange [split ${version} .] 0 1] .]
 description     C++ interface to GTK+ version 2.
 long_description \
@@ -49,5 +50,29 @@
 configure.cmd   ./autogen.sh
 configure.perl  ${prefix}/bin/perl5.12
 
+#
+# dummy variants to ensure that this port gets rebuilt if
+# the corresponding variants for gtk2 change
+#
+
+variant x11 conflicts quartz {}
+variant quartz conflicts x11 {}
+
+if {![variant_isset quartz]} {
+    default_variants +x11
+}
+
+if {[variant_isset quartz]} {
+    require_active_variants "path:lib/pkgconfig/cairo.pc:cairo cairomm pango pangomm gtk2" quartz
+} else {
+    require_active_variants "path:lib/pkgconfig/cairo.pc:cairo cairomm pango pangomm gtk2" "" quartz
+}
+
+if {[variant_isset x11]} {
+    require_active_variants "path:lib/pkgconfig/cairo.pc:cairo cairomm pango pangomm gtk2" x11
+} else {
+    require_active_variants "path:lib/pkgconfig/cairo.pc:cairo cairomm pango pangomm gtk2" "" x11
+}
+
 livecheck.type  gnome
 livecheck.regex {LATEST-IS-(2\.[0-8]*[02468](?:\.\d+)*)}

Modified: trunk/dports/x11/pangomm/Portfile
===================================================================
--- trunk/dports/x11/pangomm/Portfile	2013-06-06 20:13:26 UTC (rev 106727)
+++ trunk/dports/x11/pangomm/Portfile	2013-06-06 20:24:25 UTC (rev 106728)
@@ -1,10 +1,12 @@
 # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
 # $Id$
 
-PortSystem 1.0
+PortSystem      1.0
+PortGroup       active_variants 1.1
 
 name            pangomm
 version         2.34.0
+revision        1
 # some build files are GPL-2+ but they are not installed
 license         LGPL-2.1+
 set branch      [join [lrange [split ${version} .] 0 1] .]
@@ -29,4 +31,25 @@
                 port:glibmm \
                 port:libsigcxx2
 
+#
+# dummy variants to ensure that this port gets rebuilt if
+# the corresponding variants for pango change
+#
+
+variant x11 {}
+variant quartz {}
+default_variants +x11
+
+if {[variant_isset quartz]} {
+    require_active_variants "path:lib/pkgconfig/cairo.pc:cairo cairomm pango" quartz
+} else {
+    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 cairomm pango" x11
+} else {
+    require_active_variants "path:lib/pkgconfig/cairo.pc:cairo cairomm pango" "" x11
+}
+
 livecheck.type  gnome
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130606/114320f0/attachment.html>