Ticket #38249: R-framework.Portfile.diff

Portfile

@@ -4 +4 @@
 
 set major 2
 set minor 15
-set point 2
+set point 3
 
 name                        R-framework
 conflicts                   R
 version                     ${major}.${minor}.${point}
-revision                    2
 categories                  math science
 maintainers                 me.com:kjell.konis
 license                     {GPL-2 GPL-3}
@@ -35 +34 @@
 distname                    R-${version}
 dist_subdir                 R
 
-checksums                   rmd160  ca20ed9d794df53906802eee2ca32e634f8e8708 \
-                            sha256  292837ae259b7668509b8a5d4ec8be0aa50c327cfe7a534bac419b4ca766d66d
+checksums                   rmd160  d588100f075e3a370a2cd6400e3c61dcc5b7a09e \
+                            sha256  c583a38f8dad3bc012c08116f4ba1eb2182cadfad4b0f8d7bd3cdba24bc255d6
 
 depends_build               port:pkgconfig
 
@@ -56 +55 @@
 
 configure.pre_args          --prefix=${frameworks_dir}
 
+configure.cflags-append     -DOS_OBJECT_USE_OBJC=0
+
 configure.args              --enable-R-framework \
                             --enable-R-shlib \
                             --enable-BLAS-shlib \
@@ -100 +101 @@
     configure.optflags-append -g
 }
 
-variant gcc45 conflicts gcc46 gcc47 llvm_gcc42 description {build with gcc45} {
+variant gcc45 conflicts gcc46 gcc47 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 conflicts gcc45 gcc47 llvm_gcc42 description {build with gcc46} {
+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}"
 }
 
-variant gcc47 conflicts gcc45 gcc46 llvm_gcc42 description {build with gcc47} {
+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}"
 }
 
-variant llvm_gcc42 conflicts gcc45 gcc46 gcc47 description {build with llvm-gcc42} {
-    depends_lib-append          port:llvm-gcc42
-    configure.compiler          macports-llvm-gcc-4.2
-    configure.ldflags-append    -L${prefix}/lib/llvm-gcc42 -lgfortran
-}
-
 variant recommended description {Install recommended R packages} {
     configure.args-delete   --without-recommended-packages
     configure.args-append   --with-recommended-packages
@@ -160 +155 @@
                             --x-lib=${prefix}/lib
 }
 
-default_variants +cairo +recommended +tcltk +x11
+default_variants +cairo +recommended +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
+if {![variant_isset gcc45] && ![variant_isset gcc46] && ![variant_isset gcc47]} {
+    default_variants-append +gcc47
 }
 
 destroot.destdir prefix=${destroot}${frameworks_dir}
@@ -185 +180 @@
 
     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"
 
     file delete ${destroot}${resources}/lib/libR.dylib
     file delete ${destroot}${resources}/lib/libRblas.dylib