[74793] trunk/dports/math/R
adfernandes at macports.org
adfernandes at macports.org
Sun Jan 2 12:59:28 PST 2011
Revision: 74793
http://trac.macports.org/changeset/74793
Author: adfernandes at macports.org
Date: 2011-01-02 12:59:21 -0800 (Sun, 02 Jan 2011)
Log Message:
-----------
math/R - update to 2.12.1 and add aqua variant
Modified Paths:
--------------
trunk/dports/math/R/Portfile
Added Paths:
-----------
trunk/dports/math/R/files/
trunk/dports/math/R/files/patch-QuartzDevice_h.diff
Modified: trunk/dports/math/R/Portfile
===================================================================
--- trunk/dports/math/R/Portfile 2011-01-02 20:40:17 UTC (rev 74792)
+++ trunk/dports/math/R/Portfile 2011-01-02 20:59:21 UTC (rev 74793)
@@ -3,8 +3,7 @@
PortSystem 1.0
name R
-version 2.12.0
-revision 2
+version 2.12.1
categories math science
maintainers epfl.ch:kjell.konis
platforms darwin
@@ -25,9 +24,9 @@
http://cran.hu.r-project.org/src/base/R-2/ \
http://cran.r-project.org/src/base/R-2/
-checksums md5 aa003654d238d70bf5bc7433b8257aac \
- sha1 07b90a728e36585742603beccdee30b6864ef5af \
- rmd160 e10511bc360284d3876b147a0351b662d80d22a4
+checksums md5 078e8d1179fc9a762e326e6da2725468 \
+ sha1 41f443cd646f7773bd824c41ea53cac3102b428d \
+ rmd160 a083689dc6785cd8072461f30ce4a7969fc7ec91
depends_lib port:gettext \
port:icu \
@@ -69,6 +68,32 @@
depends_lib-append port:gcc45
}
+platform darwin 10 {
+ variant aqua description {Build with the Quartz graphics driver} {
+ # This variant uses a hack in "CFString.h" that does not define the problematic CF_FORMAT_FUNCTION
+ # and CF_FORMAT_ARGUMENT macros if __INTEL_COMPILER is defined. Currently, that is the ONLY place
+ # in the 10.6 SDK where the __INTEL_COMPILER macro is checked, but that may change in the future.
+ # We also need to use Apple's ObjC compiler for the single "qdCocoa.m" file.
+ configure.args-delete --without-aqua
+ configure.args-append --with-aqua
+ patchfiles-append patch-QuartzDevice_h.diff
+ configure.objc /usr/bin/gcc-4.2
+ }
+}
+
+platform darwin 10 {
+ variant aqua description {Enable quartz graphics device} {
+ # This variant uses a hack in "CFString.h" that does not define the problematic CF_FORMAT_FUNCTION
+ # and CF_FORMAT_ARGUMENT macros if __INTEL_COMPILER is defined. Currently, that is the ONLY place
+ # in the 10.6 SDK where the __INTEL_COMPILER macro is checked, but that may change in the future.
+ # We also need to use Apple's ObjC compiler for the single "qdCocoa.m" file.
+ configure.args-delete --without-aqua
+ configure.args-append --with-aqua
+ patchfiles-append patch-QuartzDevice_h.diff
+ configure.objc /usr/bin/gcc-4.2
+ }
+}
+
default_variants +recommended
if {![variant_isset gcc42] && ![variant_isset gcc43] && ![variant_isset gcc44] && ![variant_isset gcc45]} {
Added: trunk/dports/math/R/files/patch-QuartzDevice_h.diff
===================================================================
--- trunk/dports/math/R/files/patch-QuartzDevice_h.diff (rev 0)
+++ trunk/dports/math/R/files/patch-QuartzDevice_h.diff 2011-01-02 20:59:21 UTC (rev 74793)
@@ -0,0 +1,12 @@
+--- src/include/R_ext/QuartzDevice.h 2010-09-16 18:02:11.000000000 -0400
++++ src/include/R_ext/QuartzDevice.h 2010-12-15 11:12:40.000000000 -0500
+@@ -98,7 +98,9 @@
+ #endif
+
+ #if HAVE_AQUA
++#define __INTEL_COMPILER
+ #include <ApplicationServices/ApplicationServices.h>
++#undef __INTEL_COMPILER
+ #else
+ typedef void* CGContextRef;
+ #endif
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110102/34a41868/attachment-0001.html>
More information about the macports-changes
mailing list