Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv15150
Modified Files:
r-base.info r-base.patch
Log Message:
new upstream version.
Index: r-base.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/r-base.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- r-base.patch 15 May 2006 16:28:24 -0000 1.3
+++ r-base.patch 11 Dec 2006 13:01:40 -0000 1.4
@@ -1,26 +1,25 @@
---- R/configure.orig Tue Jul 12 10:20:37 2005
-+++ R/configure Tue Jul 12 10:21:54 2005
-@@ -29634,7 +29634,7 @@
+--- r-base/r-base.csh Thu May 9 05:55:35 2002
++++ r-base/r-base.csh Thu May 9 05:50:37 2002
+@@ -0,0 +1,3 @@
++# r-base.csh
++
++setenv R_HOME @PREFIX@/Library/Frameworks/R.framework/Resources
+--- r-base/r-base.sh Thu May 9 05:55:35 2002
++++ r-base/r-base.sh Thu May 9 05:50:37 2002
+@@ -0,0 +1,4 @@
++# r-base.sh
++
[EMAIL PROTECTED]@/Library/Frameworks/R.framework/Resources
++export R_HOME
+--- r-base/configure.orig 2006-12-10 09:32:31.000000000 -0700
++++ r-base/configure 2006-12-10 09:34:35.000000000 -0700
+@@ -30141,7 +30141,8 @@
DYLIB_EXT=".dylib"
- dylib_ldflags="-dynamiclib"
+ dylib_ldflags="${darwin_dylib_ldflags}"
MAJR_VERSION=`echo "${PACKAGE_VERSION}" | sed -e "s/[\.][1-9]$/.0/"`
-- LIBR_LDFLAGS="-dynamiclib -install_name libR.dylib -compatibility_version
${MAJR_VERSION} -current_version ${PACKAGE_VERSION}
-headerpad_max_install_names"
+- LIBR_LDFLAGS="-install_name libR.dylib -compatibility_version
${MAJR_VERSION} -current_version ${PACKAGE_VERSION}
-headerpad_max_install_names"
++ #LIBR_LDFLAGS="-install_name libR.dylib -compatibility_version
${MAJR_VERSION} -current_version ${PACKAGE_VERSION}
-headerpad_max_install_names"
+ LIBR_LDFLAGS="-dynamiclib -single_module -install_name
${prefix}/R.framework/Versions/${PACKAGE_VERSION}/Resources/lib/libR.dylib
-compatibility_version ${MAJR_VERSION} -current_version ${PACKAGE_VERSION}
-headerpad_max_install_names"
- 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@
-
+ RLAPACK_LDFLAGS="-install_name libRlapack.dylib -compatibility_version
${MAJR_VERSION} -current_version ${PACKAGE_VERSION}
-headerpad_max_install_names"
+ ## don't use version in libRblas so we can replace it with any BLAS
implementation
+ RBLAS_LDFLAGS="-install_name libRblas.dylib -headerpad_max_install_names"
Index: r-base.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/r-base.info,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- r-base.info 27 Jun 2006 17:06:19 -0000 1.10
+++ r-base.info 11 Dec 2006 13:01:40 -0000 1.11
@@ -1,11 +1,11 @@
Package: r-base
-Version: 2.3.1
-Revision: 2001
+Version: 2.4.0
+Revision: 1
Maintainer: Jeffrey Whitaker <[EMAIL PROTECTED]>
# for 10.4 tree
-Depends: tcltk, tcltk-shlibs, readline-shlibs (>= 4.3-1028), libjpeg-shlibs,
libpng3-shlibs, pcre-shlibs, libgettext3-shlibs, libiconv
-BuildDepends: readline (>= 4.3-1028), libjpeg, libpng3, tcltk-dev, g95 (>=
0.50-20060512), texinfo, pcre, bzip2-dev, libncurses5 (>= 5.4-20041023-1006),
tetex-base, libgettext3-dev, libiconv-dev
+Depends: bzip2-shlibs, g95, libgettext3-shlibs, libiconv, libjpeg-shlibs,
libpng3-shlibs, pcre-shlibs, readline5-shlibs, tcltk
+BuildDepends: bzip2-dev, g95, libgettext3-dev, libiconv-dev, libjpeg,
libncurses5, libpng3, pcre, readline5, tcltk-dev, tetex-base, texinfo, x11-dev
GCC: 4.0
# for 10.4-transitional, 10.3 trees
#Depends: tcltk, tcltk-shlibs, readline5-shlibs, libjpeg-shlibs,
libpng3-shlibs, pcre-shlibs, libgettext3-shlibs, libiconv
@@ -13,23 +13,20 @@
#GCC: 3.3
Source: http://cran.r-project.org/src/base/R-2/R-%v.tar.gz
-Source-MD5: a1d6d8081af4c71006a6e5a3ed54e4da
-Patch: %n.patch
+Source-MD5: f32379469d8712e9f5dd6435d30127d3
+PatchScript: sed 's|@PREFIX@|%p|g' < %a/%n.patch | patch -p1
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
+ConfigureParams: <<
+ --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 \
+ --with-x --with-system-bzlib --with-system-pcre --with-system-zlib
+<<
Conflicts: r-recommended
CompileScript: <<
#!/bin/sh -ev
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
<<
@@ -45,7 +42,10 @@
# 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.3
%i/Library/Frameworks/R.framework/Versions/%v
+ ln -s %p/Library/Frameworks/R.framework/Versions/2.4
%i/Library/Frameworks/R.framework/Versions/%v
+ mkdir -p %i/etc/profile.d
+ install -m 755 r-base.sh %i/etc/profile.d/
+ install -m 755 r-base.csh %i/etc/profile.d/
<<
Description: Environment for statistical computing
DescDetail: <<
@@ -70,11 +70,5 @@
You will then need to edit Info.plist inside the app bundle to point
to %p/Library/R.Framework (instead of /Library/R.Framework).
<<
-DescPort: <<
- 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/
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
