[99230] trunk/dports/math
ryandesign at macports.org
ryandesign at macports.org
Mon Oct 29 16:50:07 PDT 2012
Revision: 99230
http://trac.macports.org//changeset/99230
Author: ryandesign at macports.org
Date: 2012-10-29 16:50:07 -0700 (Mon, 29 Oct 2012)
Log Message:
-----------
R: update to 2.15.2
R-framework: update to 2.15.2; add accelerate, atlas and builtin_lapack variants
R-app: update to 1.53
See #36803
Modified Paths:
--------------
trunk/dports/math/R/Portfile
trunk/dports/math/R-app/Portfile
trunk/dports/math/R-framework/Portfile
Modified: trunk/dports/math/R/Portfile
===================================================================
--- trunk/dports/math/R/Portfile 2012-10-29 23:45:03 UTC (rev 99229)
+++ trunk/dports/math/R/Portfile 2012-10-29 23:50:07 UTC (rev 99230)
@@ -5,8 +5,7 @@
name R
conflicts R-framework
-version 2.15.1
-revision 2
+version 2.15.2
categories math science
maintainers me.com:kjell.konis
license {GPL-2 GPL-3}
@@ -28,8 +27,8 @@
http://cran.hu.r-project.org/src/base/R-2/ \
http://cran.r-project.org/src/base/R-2/
-checksums rmd160 84a010906424f3e84b84a71236424a8f2bf1df08 \
- sha256 96e4baea9dc7653b9160d7f2e1d321d0f252fee37ceb4273d4c94f0d4d815485
+checksums rmd160 ca20ed9d794df53906802eee2ca32e634f8e8708 \
+ sha256 292837ae259b7668509b8a5d4ec8be0aa50c327cfe7a534bac419b4ca766d66d
depends_build port:pkgconfig
Modified: trunk/dports/math/R-app/Portfile
===================================================================
--- trunk/dports/math/R-app/Portfile 2012-10-29 23:45:03 UTC (rev 99229)
+++ trunk/dports/math/R-app/Portfile 2012-10-29 23:50:07 UTC (rev 99230)
@@ -5,7 +5,7 @@
PortGroup xcode 1.0
name R-app
-version 1.52
+version 1.53
categories math science aqua
maintainers me.com:kjell.konis
license GPL-2+
@@ -19,7 +19,7 @@
fetch.type svn
svn.url https://svn.r-project.org/R-packages/trunk/Mac-GUI
svn.method checkout
-svn.revision 6188
+svn.revision 6335
post-patch {
reinplace "s|/Library/Frameworks/R.framework|${frameworks_dir}/R.framework|g" \
Modified: trunk/dports/math/R-framework/Portfile
===================================================================
--- trunk/dports/math/R-framework/Portfile 2012-10-29 23:45:03 UTC (rev 99229)
+++ trunk/dports/math/R-framework/Portfile 2012-10-29 23:50:07 UTC (rev 99230)
@@ -4,12 +4,11 @@
set major 2
set minor 15
-set point 1
+set point 2
name R-framework
conflicts R
version ${major}.${minor}.${point}
-revision 4
categories math science
maintainers me.com:kjell.konis
license {GPL-2 GPL-3}
@@ -35,8 +34,8 @@
distname R-${version}
dist_subdir R
-checksums rmd160 84a010906424f3e84b84a71236424a8f2bf1df08 \
- sha256 96e4baea9dc7653b9160d7f2e1d321d0f252fee37ceb4273d4c94f0d4d815485
+checksums rmd160 ca20ed9d794df53906802eee2ca32e634f8e8708 \
+ sha256 292837ae259b7668509b8a5d4ec8be0aa50c327cfe7a534bac419b4ca766d66d
depends_build port:pkgconfig
@@ -60,8 +59,6 @@
--enable-R-shlib \
--enable-BLAS-shlib \
--enable-openmp \
- --with-blas="-framework vecLib" \
- --with-lapack="-framework vecLib" \
--with-readline \
--with-aqua \
--without-tcltk \
@@ -84,7 +81,21 @@
configure.args-append --with-cairo
}
-variant debug description {Build with debug symbols} {
+variant accelerate conflicts atlas builtin_lapack description {build using the BLAS and Lapack in Apple's Accelerate framework} {
+ configure.args-append --with-blas="-framework vecLib" \
+ --with-lapack="-framework vecLib"
+}
+
+variant atlas conflicts accelerate builtin_lapack description {build using the BLAS and Lapack provided by the atlas port} {
+ #more in post-destroot phase
+ configure.args-append --without-blas --without-lapack
+}
+
+variant builtin_lapack conflicts accelerate atlas description {build using reference BLAS and Lapack} {
+ configure.args-append --without-blas --without-lapack
+}
+
+variant debug description {build with debug symbols} {
configure.optflags-append -g
}
@@ -150,6 +161,10 @@
default_variants +cairo +recommended +tcltk +x11
+if {![variant_isset accelerate] && ![variant_isset atlas] && ![variant_isset builtin_lapack]} {
+ default_variants-append +accelerate
+}
+
if {![variant_isset gcc45] && ![variant_isset gcc46] && ![variant_isset gcc47] && ![variant_isset llvm_gcc42]} {
default_variants-append +llvm_gcc42
}
@@ -204,9 +219,19 @@
${destroot}${resources}/bin/exec/${build_arch}/R"
ln -s ${build_arch}/libR.dylib ${destroot}${resources}/lib/libR.dylib
- ln -s ${build_arch}/libRblas.dylib ${destroot}${resources}/lib/libRblas.dylib
- ln -s ${build_arch}/libRlapack.dylib ${destroot}${resources}/lib/libRlapack.dylib
+ if {[variant_isset atlas]} {
+ file delete ${destroot}${resources}/lib/${build_arch}/libRblas.dylib
+ file delete ${destroot}${resources}/lib/${build_arch}/libRlapack.dylib
+ ln -s ${prefix}/lib/libtatlas.dylib ${destroot}${resources}/lib/${build_arch}/libRblas.dylib
+ ln -s ${prefix}/lib/libtatlas.dylib ${destroot}${resources}/lib/${build_arch}/libRlapack.dylib
+ ln -s ${prefix}/lib/libtatlas.dylib ${destroot}${resources}/lib/libRblas.dylib
+ ln -s ${prefix}/lib/libtatlas.dylib ${destroot}${resources}/lib/libRlapack.dylib
+ } else {
+ ln -s ${build_arch}/libRblas.dylib ${destroot}${resources}/lib/libRblas.dylib
+ ln -s ${build_arch}/libRlapack.dylib ${destroot}${resources}/lib/libRlapack.dylib
+ }
+
ln -s ${resources}/bin/R ${destroot}${prefix}/bin/R
ln -s ${resources}/bin/Rscript ${destroot}${prefix}/bin/Rscript
}
@@ -217,21 +242,3 @@
-# Hopefully can get rid of this soon
-
-platform darwin 12 {
- configure.args-delete --with-blas="-framework vecLib" --with-lapack="-framework vecLib"
- configure.args-append --without-blas --without-lapack
- pre-configure {
- ui_msg "Temporary Mountain Lion issue: using builtin lapack"
- }
-}
-
-if {[variant_isset gcc45] || [variant_isset gcc46]} {
- if {${os.platform} == "darwin" && ${os.major} == 12} {
- ui_error "This version of the R-framework port does not compile with gcc45 or gcc46 on Mountain Lion"
- return -code error "incompatible variant"
- }
-}
-
-
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20121029/704c5738/attachment.html>
More information about the macports-changes
mailing list