[99503] trunk/dports/graphics/cairo

[ryandesign at macports.org]

Revision: 99503
          http://trac.macports.org//changeset/99503
Author:   ryandesign at macports.org
Date:     2012-11-07 16:17:04 -0800 (Wed, 07 Nov 2012)
Log Message:
-----------
cairo: update to 1.12.8; only blacklist old clang (#34137); remove legacy no_x11 and x11_xcb compatibility variants

Modified Paths:
--------------
    trunk/dports/graphics/cairo/Portfile
    trunk/dports/graphics/cairo/files/patch-configure.diff

Modified: trunk/dports/graphics/cairo/Portfile
===================================================================
--- trunk/dports/graphics/cairo/Portfile	2012-11-08 00:07:48 UTC (rev 99502)
+++ trunk/dports/graphics/cairo/Portfile	2012-11-08 00:17:04 UTC (rev 99503)
@@ -9,8 +9,7 @@
 name                        cairo
 conflicts                   cairo-devel
 set my_name                 cairo
-version                     1.12.2
-revision                    1
+version                     1.12.8
 categories                  graphics
 maintainers                 ryandesign
 license                     {LGPL-2.1 MPL-1.1}
@@ -29,9 +28,12 @@
                             advantage of display hardware acceleration when \
                             available (e.g. through the X Render Extension).
 
-checksums                   rmd160  0174a5110f5f4c9ff15da984e0602dfd04643a63 \
-                            sha256  b786bc4a70542bcb09f2d9d13e5e6a0c86408cbf6d1edde5f0de807eecf93f96
+checksums                   rmd160  b27be3ba3262bdd3a5ca08c037c5df3fa1c11756 \
+                            sha256  8fbb6fc66117ab4100bad830cb4479497e53c6f3facb98bf05c8d298554ebdd9
 
+# freedesktop is down at the moment...
+master_sites-append         ftp://distfiles.pld-linux.org/distfiles/by-md5/8/b/8b3dcade859c44fb7e56fc68edfe9a45
+
 depends_build               port:pkgconfig
 
 depends_lib                 path:lib/pkgconfig/pixman-1.pc:libpixman \
@@ -55,6 +57,15 @@
 # Prevent cairo from using librsvg, libspectre, poppler.
 patchfiles-append           patch-configure.diff
 
+if {${configure.compiler} == "clang" && [file exists ${configure.cc}]} {
+    # https://trac.macports.org/ticket/34137
+    set clang_minimum_version 318.0.61
+    regexp {/clang-([0-9.]+)} [exec ${configure.cc} -v 2>@1] -> clang_installed_version
+    if {[vercmp ${clang_installed_version} ${clang_minimum_version}] < 0} {
+        compiler.blacklist  clang
+    }
+}
+
 pre-configure {
     set pixman_minimum_version 0.20.2
     set pixman_installed_version [exec ${prefix}/bin/pkg-config pixman-1 --modversion]
@@ -84,7 +95,7 @@
 # Prevent cairo from using ghostscript.
 configure.args-append       ac_cv_prog_GS=""
 
-variant opengl requires x11 conflicts no_x11 description {Add OpenGL graphics interface} {
+variant opengl requires x11 description {Add OpenGL graphics interface} {
     depends_lib-append      port:mesa
     archcheck.files-append  lib/libGL.dylib
     configure.args-delete   --disable-gl
@@ -102,17 +113,11 @@
 }
 }
 
-# https://trac.macports.org/ticket/34137
-if {${configure.compiler}=="clang"} {
-    configure.compiler  llvm-gcc-4.2
-}
-
 platform darwin 9 {
     configure.compiler      gcc-4.2
 }
 
-variant no_x11 conflicts opengl x11_xcb x11 description {Legacy compatibility variant} {}
-variant x11 conflicts no_x11 description {Enable X11 support} {
+variant x11 {
     depends_lib-append      port:xrender port:xorg-xcb-util
     configure.args-delete   --disable-xlib \
                             --without-x \
@@ -127,14 +132,6 @@
                             --x-lib=${prefix}/lib
 }
 
-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
 test.target                 check
 

Modified: trunk/dports/graphics/cairo/files/patch-configure.diff
===================================================================
--- trunk/dports/graphics/cairo/files/patch-configure.diff	2012-11-08 00:07:48 UTC (rev 99502)
+++ trunk/dports/graphics/cairo/files/patch-configure.diff	2012-11-08 00:17:04 UTC (rev 99503)
@@ -1,6 +1,6 @@
---- configure.orig	2012-03-23 14:35:31.000000000 -0500
-+++ configure	2012-04-12 06:11:54.000000000 -0500
-@@ -30131,7 +30131,7 @@
+--- configure.orig	2012-11-04 08:23:41.000000000 -0600
++++ configure	2012-11-06 13:41:24.000000000 -0600
+@@ -30512,7 +30512,7 @@
  
  
  
@@ -9,7 +9,7 @@
  test_ps=no
  any2ppm_ps=no
  if test "x$use_ps" = "xyes"; then
-@@ -30528,7 +30528,7 @@
+@@ -30909,7 +30909,7 @@
  
  
  # poppler-0.17.4 fixes text-pattern and text-transform
@@ -18,7 +18,7 @@
  test_pdf=no
  any2ppm_pdf=no
  if test "x$use_pdf" = "xyes"; then
-@@ -30898,7 +30898,7 @@
+@@ -31279,7 +31279,7 @@
  
  
  
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20121107/09ecf93f/attachment-0001.html>