Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/sci
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv21247
Modified Files:
r-base.info r-base.patch
Log Message:
New upstream version.
Index: r-base.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/sci/r-base.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- r-base.patch 10 Apr 2006 18:04:33 -0000 1.7
+++ r-base.patch 9 Jun 2006 11:58:58 -0000 1.8
@@ -9,3 +9,18 @@
RLAPACK_LDFLAGS="-install_name \$(Rexeclibdir)/libRlapack.dylib"
;;
hpux*)
+--- R-2.3.0/src/library/grDevices/src/Makefile.in.orig 2006-05-14
14:44:17.000000000 -0600
++++ R-2.3.0/src/library/grDevices/src/Makefile.in 2006-05-14
14:44:29.000000000 -0600
+@@ -13,10 +13,10 @@
+ R_SHARE_DIR = $(R_HOME)/share
+ R_INCLUDE_DIR = $(R_HOME)/include
+
+-SOURCES_C = chull.c devNull.c devPicTeX.c devPS.c devQuartz.c init.c
++SOURCES_C = chull.c devNull.c devPicTeX.c devPS.c init.c
+
+ DEPENDS = $(SOURCES_C:.c=.d)
+-OBJECTS = $(SOURCES_C:.c=.o)
++OBJECTS = chull.o devNull.o devPicTeX.o devPS.o devQuartz.o init.o
+
+ SHLIB = $(pkg)@SHLIB_EXT@
+
Index: r-base.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/sci/r-base.info,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- r-base.info 1 Jun 2006 16:33:25 -0000 1.17
+++ r-base.info 9 Jun 2006 11:58:58 -0000 1.18
@@ -1,28 +1,37 @@
Package: r-base
-Version: 2.2.1
-Revision: 5
+Version: 2.3.0
+Revision: 1003
Maintainer: Jeffrey Whitaker <[EMAIL PROTECTED]>
# for 10.4 tree
#Depends: tcltk, tcltk-shlibs, readline-shlibs (>= 4.3-1028), libjpeg-shlibs,
libpng3-shlibs, pcre-shlibs
-#BuildDepends: readline (>= 4.3-1028), libjpeg, libpng3, tcltk-dev, g95 (>=
0.50-20060321), texinfo, pcre, bzip2-dev, libncurses5 (>= 5.4-20041023-1006),
tetex-base
+#BuildDepends: readline (>= 4.3-1028), libjpeg, libpng3, tcltk-dev, g95 (>=
0.50-20060512), texinfo, pcre, bzip2-dev, libncurses5 (>= 5.4-20041023-1006),
tetex-base
#GCC: 4.0.1
# for 10.4-transitional, 10.3 trees
Depends: tcltk, tcltk-shlibs, readline5-shlibs, libjpeg-shlibs,
libpng3-shlibs, pcre-shlibs, libgettext3-shlibs, libiconv
-BuildDepends: readline5, libjpeg, libpng3, tcltk-dev, g77, texinfo, pcre,
bzip2-dev, libncurses5, tetex-base, libgettext3-dev, libiconv-dev
+BuildDepends: readline5, libjpeg, libpng3, tcltk-dev, g95 (>= 0.50-20060321),
texinfo, pcre, bzip2-dev, libncurses5, tetex-base, libgettext3-dev, libiconv-dev
GCC: 3.3
Source: http://cran.r-project.org/src/base/R-2/R-%v.tar.gz
-Source-MD5: 42542290c6d1585af7ded330f811385c
+Source-MD5: 11cc1e9df640ab52e608cf9e695f7354
Patch: %n.patch
SourceDirectory: R-%v
ConfigureParams: --without-gnome --mandir='${prefix}/share/man'
--with-tcl-config=%p/lib/tclConfig.sh --with-tk-config=%p/lib/tkConfig.sh
--with-blas="-framework vecLib" --with-lapack --with-aqua
--enable-R-framework=%p/Library/Frameworks
Conflicts: r-recommended
CompileScript: <<
#!/bin/sh -e
- export F77=%p/bin/g77
+ export F77=%p/bin/g95
+ g95gcclib=`%p/bin/g95 -print-libgcc-file-name`
+ # use FSF c compiler from g95 package (r-base won't
+ # pass self tests with apple's gcc).
+ export CC=`dirname $g95gcclib`/bin/gcc
./configure %c
+ cd src/library/grDevices/src
+ # compile devQuartz.c with apple's gcc (won't work with FSF gcc).
+ gcc -I../../../../include -I../../../../include -I../../../include
-I../../../../src/include -DHAVE_CONFIG_H -I%p/include -D__NO_MATH_INLINES
-fPIC -fno-common -g -O2 -std=gnu99 -c devQuartz.c -o devQuartz.o
+ cd ../../../../
make
+ #make check-all
<<
InstallScript: <<
#!/bin/sh -e
@@ -36,7 +45,7 @@
# fix install_name in libR.dylib
FW_VER=`echo %v | sed -e's/[\.][0-9]$//'`
install_name_tool -id
"%p/Library/Frameworks/R.framework/Versions/$FW_VER/Resources/lib/libR.dylib"
%i/Library/Frameworks/R.framework/Versions/$FW_VER/Resources/lib/libR.dylib
- ln -s %p/Library/Frameworks/R.framework/Versions/2.2
%i/Library/Frameworks/R.framework/Versions/%v
+ ln -s %p/Library/Frameworks/R.framework/Versions/2.3
%i/Library/Frameworks/R.framework/Versions/%v
<<
Description: Environment for statistical computing
DescDetail: <<
@@ -65,6 +74,7 @@
R_HOME_DIR variable in wrapper scripts must be re-set to installation
directory after make install.
Patch to Makefile.in to add %p to framework path when building extensions.
+ Uses FSF gcc from g95 package, since apple's gcc miscompiles R.
<<
License: GPL
Homepage: http://cran.R-project.org/
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
