[78854] trunk/dports/x11

[ryandesign at macports.org]

Revision: 78854
          http://trac.macports.org/changeset/78854
Author:   ryandesign at macports.org
Date:     2011-05-24 07:44:05 -0700 (Tue, 24 May 2011)
Log Message:
-----------
pango, pango-devel: adapt to cairo's new use of x11 variant instead of no_x11 variant

Modified Paths:
--------------
    trunk/dports/x11/pango/Portfile
    trunk/dports/x11/pango-devel/Portfile

Modified: trunk/dports/x11/pango/Portfile
===================================================================
--- trunk/dports/x11/pango/Portfile	2011-05-24 14:17:32 UTC (rev 78853)
+++ trunk/dports/x11/pango/Portfile	2011-05-24 14:44:05 UTC (rev 78854)
@@ -34,11 +34,9 @@
 
 depends_lib \
     path:lib/pkgconfig/glib-2.0.pc:glib2 \
-    port:Xft2 \
     path:lib/pkgconfig/cairo.pc:cairo
 
 archcheck.files         lib/libglib-2.0.dylib \
-                        lib/libXft.dylib \
                         lib/libcairo.dylib
 
 patchfiles \
@@ -84,14 +82,14 @@
     }
     
     set cairo_xlib_pc ${prefix}/lib/pkgconfig/cairo-xlib.pc
-    if {[variant_isset no_x11]} {
-        if {[file exists ${cairo_xlib_pc}]} {
-            ui_error "To install pango with the no_x11 variant, cairo must be installed with the no_x11 variant."
+    if {[variant_isset x11]} {
+        if {![file exists ${cairo_xlib_pc}]} {
+            ui_error "To install pango with the x11 variant, cairo must be installed with the x11 variant."
             return -code error "incompatible cairo installation"
         }
     } else {
-        if {![file exists ${cairo_xlib_pc}]} {
-            ui_error "To install pango without the no_x11 variant, cairo must be installed without the no_x11 variant."
+        if {[file exists ${cairo_xlib_pc}]} {
+            ui_error "To install pango without the x11 variant, cairo must be installed without the x11 variant."
             return -code error "incompatible cairo installation"
         }
     }
@@ -104,18 +102,25 @@
 configure.args \
     --enable-static \
     --disable-introspection \
-    --x-include=${prefix}/include --x-lib=${prefix}/lib
+    --without-x
 
-variant no_x11 {
-    depends_lib-delete \
-        port:Xft2
-    archcheck.files-delete  lib/libXft.dylib
-    configure.args-append \
-        --without-x
+variant no_x11 conflicts x11 description {Legacy compatibility variant} {}
+variant x11 {
+    depends_lib-append      port:Xft2
+    archcheck.files-append  lib/libXft.dylib
+    configure.args-delete   --without-x
+    configure.args-append   --x-include=${prefix}/include \
+                            --x-lib=${prefix}/lib
 }
 
+if {[variant_isset no_x11]} {
+    default_variants -x11
+} else {
+    default_variants +x11
+}
+
 post-destroot {
-    if {[variant_isset no_x11]} {
+    if {![variant_isset x11]} {
         xinstall -d ${destroot}${prefix}/etc/pango
     }
     xinstall -m 0644 ${worksrcpath}/modules/pangorc \

Modified: trunk/dports/x11/pango-devel/Portfile
===================================================================
--- trunk/dports/x11/pango-devel/Portfile	2011-05-24 14:17:32 UTC (rev 78853)
+++ trunk/dports/x11/pango-devel/Portfile	2011-05-24 14:44:05 UTC (rev 78854)
@@ -39,11 +39,9 @@
 
 depends_lib \
     path:lib/pkgconfig/glib-2.0.pc:glib2 \
-    port:Xft2 \
     path:lib/pkgconfig/cairo.pc:cairo
 
 archcheck.files         lib/libglib-2.0.dylib \
-                        lib/libXft.dylib \
                         lib/libcairo.dylib
 
 patchfiles \
@@ -101,14 +99,14 @@
     }
     
     set cairo_xlib_pc ${prefix}/lib/pkgconfig/cairo-xlib.pc
-    if {[variant_isset no_x11]} {
-        if {[file exists ${cairo_xlib_pc}]} {
-            ui_error "To install pango with the no_x11 variant, cairo must be installed with the no_x11 variant."
+    if {[variant_isset x11]} {
+        if {![file exists ${cairo_xlib_pc}]} {
+            ui_error "To install pango with the x11 variant, cairo must be installed with the x11 variant."
             return -code error "incompatible cairo installation"
         }
     } else {
-        if {![file exists ${cairo_xlib_pc}]} {
-            ui_error "To install pango without the no_x11 variant, cairo must be installed without the no_x11 variant."
+        if {[file exists ${cairo_xlib_pc}]} {
+            ui_error "To install pango without the x11 variant, cairo must be installed without the x11 variant."
             return -code error "incompatible cairo installation"
         }
     }
@@ -126,18 +124,25 @@
 
 configure.args \
     --enable-static \
-    --x-include=${prefix}/include --x-lib=${prefix}/lib
+    --without-x
 
-variant no_x11 {
-    depends_lib-delete \
-        port:Xft2
-    archcheck.files-delete  lib/libXft.dylib
-    configure.args-append \
-        --without-x
+variant no_x11 conflicts x11 description {Legacy compatibility variant} {}
+variant x11 {
+    depends_lib-append      port:Xft2
+    archcheck.files-append  lib/libXft.dylib
+    configure.args-delete   --without-x
+    configure.args-append   --x-include=${prefix}/include \
+                            --x-lib=${prefix}/lib
 }
 
+if {[variant_isset no_x11]} {
+    default_variants -x11
+} else {
+    default_variants +x11
+}
+
 post-destroot {
-    if {[variant_isset no_x11]} {
+    if {![variant_isset x11]} {
         xinstall -d ${destroot}${prefix}/etc/pango
     }
     xinstall -m 0644 ${worksrcpath}/modules/pangorc \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110524/e766c5d5/attachment.html>