[107000] trunk/dports

[devans at macports.org]

Revision: 107000
          https://trac.macports.org/changeset/107000
Author:   devans at macports.org
Date:     2013-06-13 15:56:41 -0700 (Thu, 13 Jun 2013)
Log Message:
-----------
cairomm, pangomm, gtkmm: fix variant checking to allow both +x11 +quartz for cairo pango and only check direct dependencies. (#39320, #39397)

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-13 20:45:49 UTC (rev 106999)
+++ trunk/dports/graphics/cairomm/Portfile	2013-06-13 22:56:41 UTC (rev 107000)
@@ -38,14 +38,10 @@
 
 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

Modified: trunk/dports/x11/gtkmm/Portfile
===================================================================
--- trunk/dports/x11/gtkmm/Portfile	2013-06-13 20:45:49 UTC (rev 106999)
+++ trunk/dports/x11/gtkmm/Portfile	2013-06-13 22:56:41 UTC (rev 107000)
@@ -63,30 +63,18 @@
 }
 
 if {[variant_isset quartz]} {
-    require_active_variants path:lib/pkgconfig/cairo.pc:cairo quartz
-    require_active_variants cairomm quartz
-    require_active_variants pango quartz
+    require_active_variants path:lib/pkgconfig/cairomm-1.0.pc:cairomm quartz
     require_active_variants pangomm quartz
     require_active_variants gtk2 quartz
 } else {
-    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 x11
-    require_active_variants cairomm x11
-    require_active_variants pango x11
+    require_active_variants path:lib/pkgconfig/cairomm-1.0.pc:cairomm x11
     require_active_variants pangomm x11
     require_active_variants gtk2 x11
 } else {
-    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
 }
 

Modified: trunk/dports/x11/pangomm/Portfile
===================================================================
--- trunk/dports/x11/pangomm/Portfile	2013-06-13 20:45:49 UTC (rev 106999)
+++ trunk/dports/x11/pangomm/Portfile	2013-06-13 22:56:41 UTC (rev 107000)
@@ -41,23 +41,13 @@
 default_variants +x11
 
 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 "" x11
-    require_active_variants cairomm "" x11
-    require_active_variants pango "" x11
+    require_active_variants path:lib/pkgconfig/cairomm-1.0.pc:cairomm x11
+    require_active_variants path:lib/pkgconfig/pango.pc: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 "" quartz
-    require_active_variants cairomm "" quartz
-    require_active_variants pango "" quartz
+    require_active_variants path:lib/pkgconfig/cairomm-1.0.pc:cairomm quartz
+    require_active_variants ath:lib/pkgconfig/pango.pc:pango quartz
 }
 
 livecheck.type  gnome
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130613/aa5bcb20/attachment.html>