Ticket #27685: R2121-Port.diff

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

    diff -u -r -N /MacPorts/var/macports/sources/rsync.macports.org/release/ports/math/R/Portfile ./Portfile
    old new  
    33PortSystem 1.0
    44
    55name             R
    6 version          2.12.0
    7 revision         2
     6version          2.12.1
    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     aa003654d238d70bf5bc7433b8257aac \
    29                  sha1    07b90a728e36585742603beccdee30b6864ef5af \
    30                  rmd160  e10511bc360284d3876b147a0351b662d80d22a4
     27checksums        md5     078e8d1179fc9a762e326e6da2725468 \
     28                 sha1    41f443cd646f7773bd824c41ea53cac3102b428d \
     29                 rmd160  a083689dc6785cd8072461f30ce4a7969fc7ec91
    3130
    3231depends_lib      port:gettext \
    3332                 port:icu \
     
    6968    depends_lib-append port:gcc45
    7069}
    7170
     71platform darwin 10 {
     72    variant aqua description {Enable quartz graphics device} {
     73        # This variant uses a hack in "CFString.h" that does not define the problematic CF_FORMAT_FUNCTION
     74        # and CF_FORMAT_ARGUMENT macros if __INTEL_COMPILER is defined. Currently, that is the ONLY place
     75        # in the 10.6 SDK where the __INTEL_COMPILER macro is checked, but that may change in the future.
     76        # We also need to use Apple's ObjC compiler for the single "qdCocoa.m" file.
     77        configure.args-delete   --without-aqua
     78        configure.args-append   --with-aqua
     79        patchfiles-append       patch-QuartzDevice_h.diff
     80        configure.objc          /usr/bin/gcc-4.2
     81    }
     82}
     83
    7284default_variants +recommended
    7385
    7486if {![variant_isset gcc42] && ![variant_isset gcc43] && ![variant_isset gcc44] && ![variant_isset gcc45]} {
  • files/patch-QuartzDevice_h.diff

    diff -u -r -N /MacPorts/var/macports/sources/rsync.macports.org/release/ports/math/R/files/patch-QuartzDevice_h.diff ./files/patch-QuartzDevice_h.diff
    old new  
     1--- src/include/R_ext/QuartzDevice.h    2010-09-16 18:02:11.000000000 -0400
     2+++ src/include/R_ext/QuartzDevice.h    2010-12-15 11:12:40.000000000 -0500
     3@@ -98,7 +98,9 @@
     4 #endif   
     5 
     6 #if HAVE_AQUA
     7+#define __INTEL_COMPILER
     8 #include <ApplicationServices/ApplicationServices.h>
     9+#undef __INTEL_COMPILER
     10 #else
     11     typedef void* CGContextRef;
     12 #endif