[110411] trunk/dports

[mojca at macports.org]

Revision: 110411
          https://trac.macports.org/changeset/110411
Author:   mojca at macports.org
Date:     2013-08-30 15:36:53 -0700 (Fri, 30 Aug 2013)
Log Message:
-----------
wxWidgets-2.8/3.0, py-wxpython-2.8: allow cairo-devel to satisfy cairo dependency, fix typo from r110402

Revision Links:
--------------
    https://trac.macports.org/changeset/110402

Modified Paths:
--------------
    trunk/dports/graphics/wxWidgets-2.8/Portfile
    trunk/dports/graphics/wxWidgets-3.0/Portfile
    trunk/dports/python/py-wxpython-2.8/Portfile

Modified: trunk/dports/graphics/wxWidgets-2.8/Portfile
===================================================================
--- trunk/dports/graphics/wxWidgets-2.8/Portfile	2013-08-30 22:34:17 UTC (rev 110410)
+++ trunk/dports/graphics/wxWidgets-2.8/Portfile	2013-08-30 22:36:53 UTC (rev 110411)
@@ -120,14 +120,14 @@
 # wxgtk-2.8 (it doesn't work with Quartz)
 if {$subport != $name} {
     depends_build-append    path:bin/pkg-config:pkgconfig
-    depends_lib-append      port:cairo \
+    depends_lib-append      path:lib/pkgconfig/cairo.pc:cairo \
                             port:gtk2 \
                             port:mesa \
                             path:lib/pkgconfig/sdl.pc:libsdl \
                             port:libsdl_mixer
 
-    require_active_variants cairo x11
-    require_active_variants gtk2  x11
+    require_active_variants path:lib/pkgconfig/cairo.pc:cairo x11
+    require_active_variants gtk2 x11
 
     configure.args-delete   --with-mac \
                             --without-sdl

Modified: trunk/dports/graphics/wxWidgets-3.0/Portfile
===================================================================
--- trunk/dports/graphics/wxWidgets-3.0/Portfile	2013-08-30 22:34:17 UTC (rev 110410)
+++ trunk/dports/graphics/wxWidgets-3.0/Portfile	2013-08-30 22:36:53 UTC (rev 110411)
@@ -135,7 +135,7 @@
                             patch-upstream-psn.diff
 
     depends_build-append    path:bin/pkg-config:pkgconfig
-    depends_lib-append      port:cairo \
+    depends_lib-append      path:lib/pkgconfig/cairo.pc:cairo \
                             path:lib/pkgconfig/sdl.pc:libsdl \
                             port:libsdl_mixer
 
@@ -153,13 +153,13 @@
         configure.args-append   --with-gtk=3
     #}
     #variant quartz conflicts x11 {
-    #    require_active_variants cairo quartz
+    #    require_active_variants path:lib/pkgconfig/cairo.pc:cairo quartz
     #    require_active_variants gtk3 quartz
     #}
     #variant x11 conflicts quartz {
         depends_lib-append  port:mesa
-        require_active_variants cairo x11
-        require_active_variants gtk3  x11
+        require_active_variants path:lib/pkgconfig/cairo.pc:cairo x11
+        require_active_variants gtk3 x11
     #}
     #if{![variant_isset gtk2] && ![variant_isset gtk3]} {
     #    default_variants-append +gtk3

Modified: trunk/dports/python/py-wxpython-2.8/Portfile
===================================================================
--- trunk/dports/python/py-wxpython-2.8/Portfile	2013-08-30 22:34:17 UTC (rev 110410)
+++ trunk/dports/python/py-wxpython-2.8/Portfile	2013-08-30 22:36:53 UTC (rev 110411)
@@ -71,7 +71,7 @@
     variant gtk conflicts carbon description {use wxGTK} {
         wxWidgets.use       wxGTK-2.8
         # not sure if/what other dependencies should be listed here
-        depends_lib-append  port:path:lib/pkgconfig/cairo.pc:cairo \
+        depends_lib-append  path:lib/pkgconfig/cairo.pc:cairo \
                             port:gtk2 \
                             port:${wxWidgets.port}
         require_active_variants path:lib/pkgconfig/cairo.pc:cairo x11
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130830/7787fef4/attachment.html>