Revision: 105543 https://trac.macports.org/changeset/105543 Author: larryv@macports.org Date: 2013-04-24 09:06:17 -0700 (Wed, 24 Apr 2013) Log Message: ----------- R: Update to 3.0.0 and obsolete R-framework (#38735). Technically, the R-framework port is becoming the new R port (maintaining its history, I hope). Modified Paths: -------------- trunk/dports/math/R/Portfile Added Paths: ----------- trunk/dports/math/R/ trunk/dports/math/R-framework/ trunk/dports/math/R-framework/Portfile Removed Paths: ------------- trunk/dports/math/R/ trunk/dports/math/R-framework/ Modified: trunk/dports/math/R/Portfile =================================================================== --- trunk/dports/math/R-framework/Portfile 2013-04-24 01:43:14 UTC (rev 105538) +++ trunk/dports/math/R/Portfile 2013-04-24 16:06:17 UTC (rev 105543) @@ -2,12 +2,11 @@ PortSystem 1.0 -set major 2 -set minor 15 -set point 3 +set major 3 +set minor 0 +set point 0 -name R-framework -conflicts R +name R version ${major}.${minor}.${point} categories math science maintainers me.com:kjell.konis @@ -25,18 +24,15 @@ homepage http://www.r-project.org/ -master_sites http://cran.us.r-project.org/src/base/R-2/ \ - http://cran.ms.unimelb.edu.au/src/base/R-2/ \ - http://cran.at.r-project.org/src/base/R-2/ \ - http://cran.hu.r-project.org/src/base/R-2/ \ - http://cran.r-project.org/src/base/R-2/ +master_sites http://cran.us.r-project.org/src/base/R-3/ \ + http://cran.ms.unimelb.edu.au/src/base/R-3/ \ + http://cran.at.r-project.org/src/base/R-3/ \ + http://cran.hu.r-project.org/src/base/R-3/ \ + http://cran.r-project.org/src/base/R-3/ -distname R-${version} -dist_subdir R +checksums rmd160 a2ad8818298cf29db4fe69df64d895769170694d \ + sha256 dd65c24f1497610f3ff16008da99b4f52286d6424fbd61f08037c4f10f57ff16 -checksums rmd160 d588100f075e3a370a2cd6400e3c61dcc5b7a09e \ - sha256 c583a38f8dad3bc012c08116f4ba1eb2182cadfad4b0f8d7bd3cdba24bc255d6 - depends_build port:pkgconfig depends_lib port:readline \ @@ -51,8 +47,6 @@ reinplace "s|R_HOME|\"${resources}\"|" "${worksrcpath}/src/unix/Rscript.c" } -configure.env-append r_arch=${build_arch} - configure.pre_args --prefix=${frameworks_dir} configure.cflags-append -DOS_OBJECT_USE_OBJC=0 @@ -83,20 +77,15 @@ configure.args-append --with-cairo } -variant accelerate conflicts atlas builtin_lapack description {build using the BLAS and Lapack in Apple's Accelerate framework} { +variant accelerate conflicts 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 +variant builtin_lapack conflicts accelerate description {build using reference BLAS and Lapack} { 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 } @@ -105,21 +94,21 @@ depends_lib-append port:gcc45 configure.compiler macports-gcc-4.5 configure.objc /usr/bin/gcc - configure.env-append "OBJCXX=${configure.objc}" + configure.env-append "OBJCXX=/usr/bin/g++" } variant gcc46 conflicts gcc45 gcc47 description {build with gcc46} { depends_lib-append port:gcc46 configure.compiler macports-gcc-4.6 configure.objc /usr/bin/gcc - configure.env-append "OBJCXX=${configure.objc}" + configure.env-append "OBJCXX=/usr/bin/g++" } variant gcc47 conflicts gcc45 gcc46 description {build with gcc47} { depends_lib-append port:gcc47 configure.compiler macports-gcc-4.7 configure.objc /usr/bin/gcc - configure.env-append "OBJCXX=${configure.objc}" + configure.env-append "OBJCXX=/usr/bin/g++" } variant recommended description {Install recommended R packages} { @@ -157,7 +146,7 @@ default_variants +cairo +recommended +x11 -if {![variant_isset accelerate] && ![variant_isset atlas] && ![variant_isset builtin_lapack]} { +if {![variant_isset accelerate] && ![variant_isset builtin_lapack]} { default_variants-append +accelerate } @@ -178,24 +167,17 @@ reinplace "s|${dir}=${destroot}|${dir}=|" "${destroot}${resources}/bin/R" } - reinplace "s|R_ARCH=/`arch`|R_ARCH=/${build_arch}|" "${destroot}${resources}/bin/R" - reinplace "s|-F${destroot}|-F|" "${destroot}${resources}/etc/${build_arch}/Makeconf" - reinplace "s|OBJCXX = |OBJCXX = /usr/bin/g++|" "${destroot}${resources}/etc/${build_arch}/Makeconf" - reinplace "s|OBJC_LIBS = none |OBJC_LIBS = -lobjc |" "${destroot}${resources}/etc/${build_arch}/Makeconf" + reinplace "s|-F${destroot}|-F|" "${destroot}${resources}/etc/Makeconf" - file delete ${destroot}${resources}/lib/libR.dylib - file delete ${destroot}${resources}/lib/libRblas.dylib - file delete ${destroot}${resources}/lib/libRlapack.dylib - foreach dylib [ exec find ${destroot}${frameworks_dir}/R.framework -name "\*.dylib" ] { regsub ":$" ${dylib} "" destroot_dylib_path regsub ${destroot} ${destroot_dylib_path} "" dylib_path system "install_name_tool -id ${dylib_path} ${destroot_dylib_path}" - system "install_name_tool -change ${destroot}${resources}/lib/libR.dylib ${resources}/lib/${build_arch}/libR.dylib \ + system "install_name_tool -change ${destroot}${resources}/lib/libR.dylib ${resources}/lib/libR.dylib \ ${destroot_dylib_path}" - system "install_name_tool -change ${destroot}${resources}/lib/libRblas.dylib ${resources}/lib/${build_arch}/libRblas.dylib \ + system "install_name_tool -change ${destroot}${resources}/lib/libRblas.dylib ${resources}/lib/libRblas.dylib \ ${destroot_dylib_path}" - system "install_name_tool -change ${destroot}${resources}/lib/libRlapack.dylib ${resources}/lib/${build_arch}/libRlapack.dylib \ + system "install_name_tool -change ${destroot}${resources}/lib/libRlapack.dylib ${resources}/lib/libRlapack.dylib \ ${destroot_dylib_path}" } @@ -203,40 +185,23 @@ regsub ":$" ${so} "" destroot_so_path regsub ${destroot} ${destroot_so_path} "" so_path system "install_name_tool -id ${so_path} ${destroot_so_path}" - system "install_name_tool -change ${destroot}${resources}/lib/libR.dylib ${resources}/lib/${build_arch}/libR.dylib \ + system "install_name_tool -change ${destroot}${resources}/lib/libR.dylib ${resources}/lib/libR.dylib \ ${destroot_so_path}" - system "install_name_tool -change ${destroot}${resources}/lib/libRblas.dylib ${resources}/lib/${build_arch}/libRblas.dylib \ + system "install_name_tool -change ${destroot}${resources}/lib/libRblas.dylib ${resources}/lib/libRblas.dylib \ ${destroot_so_path}" - system "install_name_tool -change ${destroot}${resources}/lib/libRlapack.dylib ${resources}/lib/${build_arch}/libRlapack.dylib \ + system "install_name_tool -change ${destroot}${resources}/lib/libRlapack.dylib ${resources}/lib/libRlapack.dylib \ ${destroot_so_path}" } - system "install_name_tool -change ${destroot}${resources}/lib/libR.dylib ${resources}/lib/${build_arch}/libR.dylib \ - ${destroot}${resources}/bin/exec/${build_arch}/R" - system "install_name_tool -change ${destroot}${resources}/lib/libRblas.dylib ${resources}/lib/${build_arch}/libRblas.dylib \ - ${destroot}${resources}/bin/exec/${build_arch}/R" + system "install_name_tool -change ${destroot}${resources}/lib/libR.dylib ${resources}/lib/libR.dylib \ + ${destroot}${resources}/bin/exec/R" + system "install_name_tool -change ${destroot}${resources}/lib/libRblas.dylib ${resources}/lib/libRblas.dylib \ + ${destroot}${resources}/bin/exec/R" - ln -s ${build_arch}/libR.dylib ${destroot}${resources}/lib/libR.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 } livecheck.type regex livecheck.url [lindex ${master_sites} 0] -livecheck.regex >R-(\[0-9.\]+)${extract.suffix}< - - - +livecheck.regex >${name}-(\[0-9.\]+)${extract.suffix}< Added: trunk/dports/math/R-framework/Portfile =================================================================== --- trunk/dports/math/R-framework/Portfile (rev 0) +++ trunk/dports/math/R-framework/Portfile 2013-04-24 16:06:17 UTC (rev 105543) @@ -0,0 +1,24 @@ +# $Id$ + +PortSystem 1.0 + +name R-framework +replaced_by R +PortGroup obsolete 1.0 + +version 3.0.0 +categories math science +maintainers me.com:kjell.konis +license {GPL-2 GPL-3} +platforms macosx + +description \ + R is GNU S - an interpreted language for statistical computing + +long_description \ + R is a language and environment for statistical computing and graphics. \ + R provides a wide variety of statistical (linear and nonlinear modeling, \ + classical statistical tests, time-series analysis, classification, \ + clustering, ...) and graphical techniques, and is highly extensible. + +homepage http://www.r-project.org/ Property changes on: trunk/dports/math/R-framework/Portfile ___________________________________________________________________ Added: svn:keywords + Id Added: svn:eol-style + native