[78848] trunk/dports/graphics/cairo-devel/Portfile

[ryandesign at macports.org]

Revision: 78848
          http://trac.macports.org/changeset/78848
Author:   ryandesign at macports.org
Date:     2011-05-24 05:33:18 -0700 (Tue, 24 May 2011)
Log Message:
-----------
cairo-devel: merge r78840 and r78842 from cairo; see #23483

Revision Links:
--------------
    http://trac.macports.org/changeset/78840
    http://trac.macports.org/changeset/78842

Modified Paths:
--------------
    trunk/dports/graphics/cairo-devel/Portfile

Modified: trunk/dports/graphics/cairo-devel/Portfile
===================================================================
--- trunk/dports/graphics/cairo-devel/Portfile	2011-05-24 12:30:12 UTC (rev 78847)
+++ trunk/dports/graphics/cairo-devel/Portfile	2011-05-24 12:33:18 UTC (rev 78848)
@@ -35,7 +35,6 @@
 
 depends_lib                 path:lib/pkgconfig/pixman-1.pc:libpixman \
                             path:lib/pkgconfig/glib-2.0.pc:glib2 \
-                            port:xrender \
                             port:fontconfig \
                             port:freetype \
                             port:libpng \
@@ -44,7 +43,6 @@
 
 archcheck.files             lib/libpixman-1.dylib \
                             lib/libglib-2.0.dylib \
-                            lib/libXrender.dylib \
                             lib/libfontconfig.dylib \
                             lib/libfreetype.dylib \
                             lib/libpng.dylib \
@@ -66,7 +64,9 @@
                             --disable-quartz \
                             --disable-quartz-font \
                             --disable-quartz-image \
+                            --disable-xlib \
                             --disable-xcb \
+                            --without-x \
                             --enable-ft \
                             --enable-pdf \
                             --enable-png \
@@ -74,22 +74,16 @@
                             --enable-script \
                             --enable-svg \
                             --enable-tee \
-                            --enable-xml \
-                            --enable-xlib \
-                            --enable-xlib-xrender \
-                            --with-x \
-                            --x-include=${prefix}/include \
-                            --x-lib=${prefix}/lib
+                            --enable-xml
 
-variant opengl conflicts no_x11 description {Add OpenGL graphics interface} {
+variant opengl requires x11 conflicts no_x11 description {Add OpenGL graphics interface} {
     depends_lib-append      port:mesa
     archcheck.files-append  lib/libGL.dylib
     configure.args-delete   --disable-gl
     configure.args-append   --enable-gl --enable-glx
 }
 
-platform macosx {}
-if {([variant_isset macosx] || ([info exists os.subplatform] && ${os.subplatform} == "macosx"))} {
+platform macosx {
 variant quartz {
     configure.args-delete   --disable-quartz \
                             --disable-quartz-font \
@@ -104,24 +98,28 @@
     configure.compiler      gcc-4.2
 }
 
-variant no_x11 conflicts opengl x11_xcb {
-    depends_lib-delete      port:xrender
-    archcheck.files-delete  lib/libXrender.dylib
-    configure.args-delete   --enable-xlib \
+variant no_x11 conflicts opengl x11_xcb x11 description {Legacy compatibility variant} {}
+variant x11 conflicts no_x11 description {Enable X11 support} {
+    depends_lib-append      port:xrender port:xorg-xcb-util
+    configure.args-delete   --disable-xlib \
+                            --without-x \
+                            --disable-xcb
+    configure.args-append   --enable-xlib \
                             --enable-xlib-xrender \
-                            --with-x
-    configure.args-append   --disable-xlib \
-                            --disable-xlib-xrender \
-                            --without-x
+                            --enable-xcb \
+                            --enable-xcb-shm \
+                            --enable-xlib-xcb \
+                            --with-x \
+                            --x-include=${prefix}/include \
+                            --x-lib=${prefix}/lib
 }
 
-variant x11_xcb conflicts no_x11 description {Use libxcb for X11 protocol communication} {
-    configure.args-delete   --disable-xcb
-    configure.args-append   --enable-xcb \
-                            --enable-xcb-shm \
-                            --enable-xlib-xcb
-    depends_lib-append      port:xorg-xcb-util
-    archcheck.files-append  lib/libxcb-render-util.dylib
+variant x11_xcb requires x11 conflicts no_x11 description {Legacy compatibility variant} {}
+
+if {[variant_isset no_x11]} {
+    default_variants -x11
+} else {
+    default_variants +x11
 }
 
 test.run                    yes
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110524/c37f56b0/attachment.html>