[138596] trunk/dports/math/R/Portfile
adfernandes at macports.org
adfernandes at macports.org
Mon Jul 13 08:35:39 PDT 2015
Revision: 138596
https://trac.macports.org/changeset/138596
Author: adfernandes at macports.org
Date: 2015-07-13 08:35:39 -0700 (Mon, 13 Jul 2015)
Log Message:
-----------
update: R to 3.2.1, closes #48133, maintainer timeout.
Modified Paths:
--------------
trunk/dports/math/R/Portfile
Modified: trunk/dports/math/R/Portfile
===================================================================
--- trunk/dports/math/R/Portfile 2015-07-13 15:21:20 UTC (rev 138595)
+++ trunk/dports/math/R/Portfile 2015-07-13 15:35:39 UTC (rev 138596)
@@ -7,8 +7,8 @@
name R
set major 3
-set minor 1
-set point 2
+set minor 2
+set point 1
#Remember to remove revision line when bumping version
version ${major}.${minor}.${point}
@@ -33,14 +33,15 @@
master_sites http://cran.rstudio.com/src/base/R-3/ \
http://cran.r-project.org/src/base/R-3/
-checksums rmd160 b2aaa42daac1ae5d114995de514d211d78a4e0a6 \
- sha256 bcd150afcae0e02f6efb5f35a6ab72432be82e849ec52ce0bb89d8c342a8fa7a
+checksums rmd160 dea095b5c7b32189b6768d5949243bd869564e9f \
+ sha256 d59dbc3f04f4604a5cf0fb210b8ea703ef2438b3ee65fd5ab536ec5234f4c982
depends_build port:pkgconfig
depends_lib port:readline \
port:icu \
- port:libiconv
+ port:libiconv \
+ port:zlib
universal_variant no
@@ -52,29 +53,28 @@
configure.pre_args --prefix=${frameworks_dir}
-configure.args --enable-R-framework \
+configure.args --enable-memory-profiling \
--enable-R-shlib \
--enable-BLAS-shlib \
- --disable-openmp \
- --with-readline \
- --with-aqua \
--without-tcltk \
--without-cairo \
- --with-libpng \
- --without-jpeglib \
+ --with-system-zlib \
+ --without-internal-tzcode \
--without-recommended-packages \
- --with-ICU \
--without-x \
--with-included-gettext \
- --without-internal-tzcode
+ --without-system-xz #bug introduced in R-3.2.0, doesn't link to system copy, put port:xz back too
+if {${os.major} < 13} {
+ configure.args-append --disable-openmp
+}
+
platform darwin 13 {
configure.cflags-append -flax-vector-conversions
}
-variant accelerate conflicts builtin_lapack description {build using the BLAS and Lapack in Apple's Accelerate framework} {
- configure.args-append --with-blas="-framework Accelerate" \
- --with-lapack="-framework Accelerate"
+variant accelerate conflicts atlas builtin_lapack description {build using the BLAS and Lapack in Apple's Accelerate framework} {
+ configure.args-append --with-blas="-framework Accelerate" --with-lapack
}
variant atlas conflicts accelerate builtin_lapack description {build using the BLAS in the atlas port} {
@@ -83,7 +83,7 @@
#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} {
+variant builtin_lapack conflicts accelerate atlas description {build using reference BLAS and Lapack} {
configure.args-append --without-blas --without-lapack
}
@@ -93,7 +93,10 @@
path:lib/pkgconfig/glib-2.0.pc:glib2 \
port:freetype \
port:fontconfig \
- port:gettext
+ port:gettext \
+ port:libpng \
+ port:tiff \
+ port:jpeg
configure.args-delete --without-cairo
configure.args-append --with-cairo
}
@@ -174,8 +177,7 @@
port:xorg-libXt \
port:tiff \
port:jpeg \
- port:libpng \
- port:zlib
+ port:libpng
configure.args-delete --without-x \
--without-jpeglib
configure.args-append --with-x \
@@ -192,7 +194,7 @@
}
if {![variant_isset accelerate] && ![variant_isset atlas] && ![variant_isset builtin_lapack]} {
- default_variants-append +accelerate
+ default_variants-append +builtin_lapack
}
test.run yes
@@ -249,3 +251,6 @@
livecheck.type regex
livecheck.url [lindex ${master_sites} 0]
livecheck.regex >${name}-(\[0-9.\]+)${extract.suffix}<
+
+
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150713/9d9e9e3c/attachment.html>
More information about the macports-changes
mailing list