Changeset 99503

Timestamp:

Nov 8, 2012, 12:17:04 AM (11 years ago)

Author:

ryandesign@…

Message:

cairo: update to 1.12.8; only blacklist old clang (#34137); remove legacy no_x11 and x11_xcb compatibility variants

Location:

trunk/dports/graphics/cairo

Files:

• Portfile (modified) (6 diffs)
• files/patch-configure.diff (modified) (3 diffs)

trunk/dports/graphics/cairo/Portfile

@@ -10 +10 @@
 conflicts                   cairo-devel
 set my_name                 cairo
-version                     1.12.2
-revision                    1
+version                     1.12.8
 categories                  graphics
 maintainers                 ryandesign
@@ -30 +29 @@
                             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
@@ -55 +57 @@
 # 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 {
@@ -85 +96 @@
 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
@@ -103 +114 @@
 }
 
-# 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 \
@@ -128 +133 @@
 }
 
-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

trunk/dports/graphics/cairo/files/patch-configure.diff

@@ -1 @@
---- 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 @@
  
  
@@ -10 +10 @@
  any2ppm_ps=no
  if test "x$use_ps" = "xyes"; then
-@@ -30528,7 +30528,7 @@
+@@ -30909,7 +30909,7 @@
  
  
@@ -19 +19 @@
  any2ppm_pdf=no
  if test "x$use_pdf" = "xyes"; then
-@@ -30898,7 +30898,7 @@
+@@ -31279,7 +31279,7 @@