[113998] trunk/dports/graphics

[ryandesign at macports.org]

Revision: 113998
          https://trac.macports.org/changeset/113998
Author:   ryandesign at macports.org
Date:     2013-11-27 00:06:30 -0800 (Wed, 27 Nov 2013)
Log Message:
-----------
cairo, cairo-devel: use -replace where possible

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

Modified: trunk/dports/graphics/cairo/Portfile
===================================================================
--- trunk/dports/graphics/cairo/Portfile	2013-11-27 07:57:47 UTC (rev 113997)
+++ trunk/dports/graphics/cairo/Portfile	2013-11-27 08:06:30 UTC (rev 113998)
@@ -53,7 +53,7 @@
 compiler.blacklist-append   {clang < 318.0.61}
 
 # https://trac.macports.org/ticket/27011
-if {${build_arch} == "x86_64" || ([variant_isset universal] && [lsearch ${universal_archs} x86_64] != -1)} {
+if {${build_arch} eq "x86_64" || ([variant_isset universal] && [lsearch ${universal_archs} x86_64] != -1)} {
     compiler.blacklist-append gcc-4.0
 }
 
@@ -94,34 +94,29 @@
 
 variant opengl requires x11 description {Add OpenGL graphics interface} {
     depends_lib-append      port:mesa
-    configure.args-delete   --disable-gl
-    configure.args-append   --enable-gl --enable-glx
+
+    configure.args-replace  --disable-gl --enable-gl
+    configure.args-append   --enable-glx
 }
 
 platform macosx {
-variant quartz {
-    configure.args-delete   --disable-quartz \
-                            --disable-quartz-font \
-                            --disable-quartz-image
-    configure.args-append   --enable-quartz \
-                            --enable-quartz-font \
-                            --enable-quartz-image
+    variant quartz {
+        configure.args-replace  --disable-quartz --enable-quartz
+        configure.args-replace  --disable-quartz-font --enable-quartz-font
+        configure.args-replace  --disable-quartz-image --enable-quartz-image
+    }
 }
-}
 
 variant x11 {
     depends_lib-append      port:xrender \
                             port:xorg-libXext \
                             port:xorg-xcb-util
-    configure.args-delete   --disable-xlib \
-                            --without-x \
-                            --disable-xlib-xcb \
-                            --disable-xcb
-    configure.args-append   --enable-xlib \
-                            --enable-xlib-xrender \
-                            --enable-xlib-xcb \
-                            --enable-xcb \
-                            --with-x \
+
+    configure.args-replace  --disable-xcb --enable-xcb
+    configure.args-replace  --disable-xlib --enable-xlib
+    configure.args-replace  --disable-xlib-xcb --enable-xlib-xcb
+    configure.args-replace  --without-x --with-x
+    configure.args-append   --enable-xlib-xrender \
                             --x-include=${prefix}/include \
                             --x-lib=${prefix}/lib
 }

Modified: trunk/dports/graphics/cairo-devel/Portfile
===================================================================
--- trunk/dports/graphics/cairo-devel/Portfile	2013-11-27 07:57:47 UTC (rev 113997)
+++ trunk/dports/graphics/cairo-devel/Portfile	2013-11-27 08:06:30 UTC (rev 113998)
@@ -54,7 +54,7 @@
 compiler.blacklist-append   {clang < 318.0.61}
 
 # https://trac.macports.org/ticket/27011
-if {${build_arch} == "x86_64" || ([variant_isset universal] && [lsearch ${universal_archs} x86_64] != -1)} {
+if {${build_arch} eq "x86_64" || ([variant_isset universal] && [lsearch ${universal_archs} x86_64] != -1)} {
     compiler.blacklist-append gcc-4.0
 }
 
@@ -95,34 +95,29 @@
 
 variant opengl requires x11 description {Add OpenGL graphics interface} {
     depends_lib-append      port:mesa
-    configure.args-delete   --disable-gl
-    configure.args-append   --enable-gl --enable-glx
+
+    configure.args-replace  --disable-gl --enable-gl
+    configure.args-append   --enable-glx
 }
 
 platform macosx {
-variant quartz {
-    configure.args-delete   --disable-quartz \
-                            --disable-quartz-font \
-                            --disable-quartz-image
-    configure.args-append   --enable-quartz \
-                            --enable-quartz-font \
-                            --enable-quartz-image
+    variant quartz {
+        configure.args-replace  --disable-quartz --enable-quartz
+        configure.args-replace  --disable-quartz-font --enable-quartz-font
+        configure.args-replace  --disable-quartz-image --enable-quartz-image
+    }
 }
-}
 
 variant x11 {
     depends_lib-append      port:xrender \
                             port:xorg-libXext \
                             port:xorg-xcb-util
-    configure.args-delete   --disable-xlib \
-                            --without-x \
-                            --disable-xlib-xcb \
-                            --disable-xcb
-    configure.args-append   --enable-xlib \
-                            --enable-xlib-xrender \
-                            --enable-xlib-xcb \
-                            --enable-xcb \
-                            --with-x \
+
+    configure.args-replace  --disable-xcb --enable-xcb
+    configure.args-replace  --disable-xlib --enable-xlib
+    configure.args-replace  --disable-xlib-xcb --enable-xlib-xcb
+    configure.args-replace  --without-x --with-x
+    configure.args-append   --enable-xlib-xrender \
                             --x-include=${prefix}/include \
                             --x-lib=${prefix}/lib
 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20131127/83425933/attachment-0001.html>