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

[jeremyhu at macports.org]

Revision: 43687
          http://trac.macports.org/changeset/43687
Author:   jeremyhu at macports.org
Date:     2008-12-13 14:46:10 -0800 (Sat, 13 Dec 2008)
Log Message:
-----------
cairo-devel: Added x11_xcb variant like the cairo port, removed --x-include and --x-libraries so configure will find the right X11 libs and headers if we want to use Macports-provided libs.

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

Modified: trunk/dports/graphics/cairo-devel/Portfile
===================================================================
--- trunk/dports/graphics/cairo-devel/Portfile	2008-12-13 22:44:36 UTC (rev 43686)
+++ trunk/dports/graphics/cairo-devel/Portfile	2008-12-13 22:46:10 UTC (rev 43687)
@@ -33,7 +33,7 @@
 
 depends_lib \
     path:lib/pkgconfig/pixman-1.pc:libpixman \
-    port:xrender \
+    lib:libXrender.1:xrender \
     port:fontconfig \
     port:freetype \
     port:libpng \
@@ -51,8 +51,6 @@
 # The +universal variant is written in such a way that the port's global
 # configure.args must not be empty!
 configure.args \
-    --x-includes=${x11prefix}/include \
-    --x-libraries=${x11prefix}/lib \
     --disable-glitz \
     --disable-quartz \
     --disable-quartz-font \
@@ -76,12 +74,10 @@
         --enable-glitz
 }
 
-variant no_x11 conflicts glitz description {Omit X11 support} {
+variant no_x11 conflicts glitz x11_xcb description {Omit X11 support} {
     depends_lib-delete \
-        port:xrender
+        lib:libXrender.1:xrender
     configure.args-delete \
-        --x-includes=${x11prefix}/include \
-        --x-libraries=${x11prefix}/lib \
         --enable-xlib \
         --enable-xlib-xrender \
         --with-x
@@ -91,6 +87,13 @@
         --without-x
 }
 
+variant x11_xcb conflicts no_x11 description {Use libxcb for X11 protocol communication} {
+    configure.args-delete --disable-xcb
+    configure.args-append --enable-xcb
+    depends_lib-append \
+        lib:libxcb-render-util.0:xorg-xcb-util
+}
+
 platform macosx {
     pre-fetch {
         if {${os.major} == 8} {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20081213/fefdc7e8/attachment.html>