Ticket #40602: R-Portfile.diff

Portfile

@@ +1 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
 # $Id: Portfile 110575 2013-09-02 12:01:43Z cal@macports.org $
 
 PortSystem 1.0
@@ -5 +6 @@
 
 set major 3
 set minor 0
-set point 1
+set point 2
 
 name                        R
 version                     ${major}.${minor}.${point}
-revision                    3
 categories                  math science
 maintainers                 me.com:kjell.konis
 license                     {GPL-2 GPL-3}
@@ -32 +32 @@
                             http://cran.hu.r-project.org/src/base/R-3/ \
                             http://cran.r-project.org/src/base/R-3/
 
-checksums                   rmd160  09910626891c2962b5c05d204b14d59444da0c3b \
-                            sha256  af90488af3141103b211dc81b6f17d1f0faf4f17684c579a32dfeb25d0d87134
+checksums                   rmd160  8e91603754c965b402bb201c4e5f5a2043262537 \
+                            sha256  956e05ad60447955049285420b5a48e0526aa4db676fd9eadb4bcfb7ccdc024b
 
 depends_build               port:pkgconfig
 
@@ -75 +75 @@
                             --with-lapack="-framework vecLib"
 }
 
+variant atlas conflicts accelerate builtin_lapack description {build using the BLAS in the atlas port} {
+    configure.args-append   --with-blas="-L/MacPorts/lib -lptf77blas -latlas"
+    #See A.3.2 in R Installation and Administration for why atlas LAPACK not used
+}
+
 variant builtin_lapack conflicts accelerate description {build using reference BLAS and Lapack} {
     configure.args-append   --without-blas --without-lapack
 }
 
-variant cairo requires x11 description {Include cairo support in R's x11 graphics device} {
+variant cairo requires x11 description {include cairo support in R's x11 graphics device} {
     depends_lib-append      path:lib/pkgconfig/cairo.pc:cairo \
                             path:lib/pkgconfig/pango.pc:pango \
                             path:lib/pkgconfig/glib-2.0.pc:glib2 \
@@ -140 +145 @@
     }
 }
 
-variant recommended description {Install recommended R packages} {
+variant recommended description {install recommended R packages} {
     configure.args-delete   --without-recommended-packages
     configure.args-append   --with-recommended-packages
 }
 
-variant tcltk requires x11 description {Use tcltk} {
+variant tcltk requires x11 description {enable use of tcltk} {
     depends_lib-append      port:tcl \
                             port:tk \
                             port:xorg-libXScrnSaver \
@@ -157 +162 @@
                             --with-tk-config=${prefix}/lib/tkConfig.sh
 }
 
-variant x11 description {
+variant tests description {include tests of R installation} {
+    destroot.target-append install-tests
+}
+
+variant x11 description {enable use of x11} {
     depends_lib-append      port:xorg-libsm \
                             port:xorg-libice \
                             port:xorg-libX11 \
@@ -180 +189 @@
     default_variants-append +cairo
 }
 
-if {![variant_isset accelerate] && ![variant_isset builtin_lapack]} {
+if {![variant_isset accelerate] && ![variant_isset atlas] && ![variant_isset builtin_lapack]} {
     default_variants-append +accelerate
 }
 
+test.run                    yes
+test.target                 check
+
 destroot.destdir prefix=${destroot}${frameworks_dir}
 
 post-destroot {
@@ -235 +247 @@
 livecheck.type      regex
 livecheck.url       [lindex ${master_sites} 0]
 livecheck.regex     >${name}-(\[0-9.\]+)${extract.suffix}<
+
+
+