Modified: trunk/dports/math/R-framework/Portfile (91422 => 91423)
--- trunk/dports/math/R-framework/Portfile 2012-04-01 18:48:37 UTC (rev 91422)
+++ trunk/dports/math/R-framework/Portfile 2012-04-01 18:50:57 UTC (rev 91423)
@@ -3,8 +3,8 @@
PortSystem 1.0
set major 2
-set minor 14
-set point 1
+set minor 15
+set point 0
name R-framework
conflicts R
@@ -34,8 +34,8 @@
distname R-${version}
dist_subdir R
-checksums rmd160 9dcd1d135701e3c682585346e7c48ac2c62012fd \
- sha256 d8a18914005975f40ed8fb37e3532422f769fb454651a9ed75f73c2bee9c0c4c
+checksums rmd160 eef2b98441469b21aff9b013986c89c3c57908b0 \
+ sha256 6f26304773e92d8b61f150e1ccd21c153a32b89e8032b1ece45e5f4c34d9e397
depends_build port:pkgconfig
@@ -87,10 +87,17 @@
configure.optflags-append -g
}
+variant gcc45 description {build with gcc45} {
+ depends_lib-append port:gcc45
+ configure.compiler macports-gcc-4.5
+ configure.objc /usr/bin/gcc
+ configure.env-append "OBJCXX=${configure.objc}"
+}
+
variant gcc46 description {build with gcc46} {
depends_lib-append port:gcc46
configure.compiler macports-gcc-4.6
- configure.objc /usr/bin/clang
+ configure.objc /usr/bin/gcc
configure.env-append "OBJCXX=${configure.objc}"
}
@@ -135,7 +142,7 @@
default_variants +cairo +recommended +tcltk +x11
-if {![variant_isset gcc46] && ![variant_isset llvm_gcc42]} {
+if {![variant_isset gcc45] && ![variant_isset gcc46] && ![variant_isset llvm_gcc42]} {
default_variants-append +llvm_gcc42
}