Ticket #27001: Portfile-R.diff

File Portfile-R.diff, 2.7 KB (added by kjell.konis@…, 14 years ago)

  • Portfile

    old new  
    33PortSystem 1.0
    44
    55name             R
    6 version          2.11.1
    7 revision         2
     6version          2.12.0
    87categories       math science
    98maintainers      epfl.ch:kjell.konis
    109platforms        darwin
    … …  
    2524                 http://cran.hu.r-project.org/src/base/R-2/ \
    2625                 http://cran.r-project.org/src/base/R-2/
    2726
    28 checksums        md5     7421108ade3e9223263394b9bbe277ce \
    29                  sha1    0b36780627f3cc5cea3f41e0b717ed7ee92ba086 \
    30                  rmd160  a5223a3f784ad0f808d893d82a4e0a130c9a9b3a
     27checksums        md5     aa003654d238d70bf5bc7433b8257aac \
     28                 sha1    07b90a728e36585742603beccdee30b6864ef5af \
     29                 rmd160  e10511bc360284d3876b147a0351b662d80d22a4
    3130
    3231depends_lib      port:gettext \
    3332                 port:icu \
    … …  
    4948    configure.args-append --with-recommended-packages
    5049}
    5150
    52 variant gcc42 conflicts gcc43 gcc44 description {Build with gcc42} {
     51variant gcc42 conflicts gcc43 gcc44 gcc45 description {Build with gcc42} {
    5352    configure.compiler macports-gcc-4.2
    5453    depends_lib-append port:gcc42
    5554}
    5655
    57 variant gcc43 conflicts gcc42 gcc44 description {Build with gcc43} {
     56variant gcc43 conflicts gcc42 gcc44 gcc45 description {Build with gcc43} {
    5857    configure.compiler macports-gcc-4.3
    5958    depends_lib-append port:gcc43
    6059}
    6160
    62 variant gcc44 conflicts gcc42 gcc43 description {Build with gcc44} {
     61variant gcc44 conflicts gcc42 gcc43 gcc45 description {Build with gcc44} {
    6362    configure.compiler macports-gcc-4.4
    6463    depends_lib-append port:gcc44
    6564}
    6665
     66variant gcc45 conflicts gcc42 gcc43 gcc44 description {Build with gcc45} {
     67    configure.compiler macports-gcc-4.5
     68    depends_lib-append port:gcc45
     69}
     70
    6771default_variants +recommended
    6872
    69 if {![variant_isset gcc42] && ![variant_isset gcc43] && ![variant_isset gcc44]} {
     73if {![variant_isset gcc42] && ![variant_isset gcc43] && ![variant_isset gcc44] && ![variant_isset gcc45]} {
    7074    default_variants-append +gcc44
    7175}
    7276
    … …  
    104108    reinplace "s|${v}=${destroot}|${v}=|" "${destroot}${prefix}/lib/pkgconfig/libR.pc"
    105109  }
    106110
    107   reinplace "s|rlibdir=\$\{rhome\}/lib|rlibdir=\$\{rhome\}/lib/${build_arch}|" \
    108             "${destroot}${prefix}/lib/pkgconfig/libR.pc"
    109   reinplace "s|Cflags: -I\$\{rincludedir\}|Cflags: -I\$\{rincludedir\} -I\$\{rincludedir\}/${build_arch}|" \
    110             "${destroot}${prefix}/lib/pkgconfig/libR.pc"
    111 
    112111  foreach dylib [ exec find ${destroot}${prefix}/lib/R/lib/${build_arch} -name "\*.dylib" ] {
    113112    regsub ":$" ${dylib} "" destroot_dylib_path
    114113    regsub ${destroot} ${destroot_dylib_path} "" dylib_path