Ticket #31513: R-Portfile.diff

Portfile

@@ -3 +3 @@
 PortSystem 1.0
 
 name             R
-version          2.13.1
-revision        1
+conflicts        R-framework
+version          2.14.0
 categories       math science
 maintainers      epfl.ch:kjell.konis
+license          GPL-2 GPL-3
 platforms        darwin
 
 description      R is GNU S - an interpreted language for statistical computing
@@ -25 +26 @@
                  http://cran.hu.r-project.org/src/base/R-2/ \
                  http://cran.r-project.org/src/base/R-2/
 
-checksums        sha1    8b9d48c7a654186064f369652ea34a085eff239b \
-                 rmd160  3d83b907f6c81980a7e65bdf942936d6ce02a850
+checksums        rmd160  f2f2805c8660d58050be1d11abf376843dbb40ea \
+                 sha256  036204f56f8128e633a5d2fe56ebe0ba5a5e8501abe2056736d12a99bf69b910
+
+depends_build    port:pkgconfig
 
 depends_lib      port:gettext \
                  port:icu \
                  path:lib/pkgconfig/glib-2.0.pc:glib2 \
                  port:jpeg \
                  port:libiconv \
+                 path:lib/pkgconfig/cairo.pc:cairo \
                  path:lib/pkgconfig/pango.pc:pango \
                  port:readline \
                  port:tcl \
@@ -68 +72 @@
     depends_lib-append port:gcc45
 }
 
-platform darwin 10 {
-    variant aqua description {Enable quartz graphics device} {
+variant aqua description {Enable quartz graphics device} {
+    if {${os.platform} == "darwin" && ${os.major} == 10} {
         # This variant uses a hack in "CFString.h" that does not define the problematic CF_FORMAT_FUNCTION
         # and CF_FORMAT_ARGUMENT macros if __INTEL_COMPILER is defined. Currently, that is the ONLY place
         # in the 10.6 SDK where the __INTEL_COMPILER macro is checked, but that may change in the future.
@@ -78 +82 @@
         configure.args-append   --with-aqua
         patchfiles-append       patch-QuartzDevice_h.diff
         configure.objc          /usr/bin/gcc-4.2
+    } else {
+        ui_error "The +aqua variant is for Snow Leopard (Mac OS X 10.6) only - for Aqua support on Lion (Mac OS X 10.7) use the R-framework port"
+        return -code error
     }
 }
 
@@ -87 +94 @@
     default_variants-append +gcc44
 }
 
-post-extract {
+post-patch {
   reinplace "s|R_HOME|\"${prefix}/lib/R\"|" "${worksrcpath}/src/unix/Rscript.c"
 }
 
@@ -97 +104 @@
                  --enable-BLAS-shlib \
                  --enable-R-shlib \
                  --disable-nls \
-                 --without-libintl-prefix \
                  --disable-R-framework \
                  --without-aqua \
                  --with-tcl-config=${prefix}/lib/tclConfig.sh \