Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv5067
Modified Files:
r-base215.info r-base30.info
Log Message:
mv site-library
Index: r-base30.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci/r-base30.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- r-base30.info 20 May 2013 20:22:37 -0000 1.3
+++ r-base30.info 26 May 2013 07:27:20 -0000 1.4
@@ -1,11 +1,11 @@
Info2: <<
Package: r-base30
Version: 3.0.1
-Revision: 3
+Revision: 2
Description: R Framework
Maintainer: BABA Yoshihiko <babayoshih...@mac.com>
Depends: %N-shlibs (=%v-%r)
-BuildDepends: bzip2-dev, cairo, glib2-dev, gcc48-compiler, libgettext8-dev,
libiconv-dev, libncurses5, libjpeg9, liblzma5, libpng15, pango1-xft2-ft219-dev,
pcre, pkgconfig, readline6, tcltk-dev, x11-dev, fink (>= 0.28.1),
fink-package-precedence, flag-sort (>= 0.5), glitz
+BuildDepends: bzip2-dev, cairo, glib2-dev, gcc48-compiler, libgettext8-dev,
libiconv-dev, libncurses5, libjpeg9, libpng15, pango1-xft2-ft219-dev, pcre,
pkgconfig, readline6, tcltk-dev, x11-dev, fink (>= 0.28.1),
fink-package-precedence, flag-sort (>= 0.5), glitz
Source: http://cran.r-project.org/src/base/R-3/R-%v.tar.gz
Source-MD5: 36d51544b007fff26c7fbf36b02ea5ad
@@ -13,7 +13,7 @@
PatchFile-MD5: 1307e3f8ea068e3a30bce0511369a511
# PatchScript: sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p1
SourceDirectory: R-%v
-SetCC: flag-sort -r gcc
+SetCC: flag-sort -r gcc -ffor-scope
SetCXX: flag-sort -r g++
ConfigureParams: <<
@@ -68,7 +68,7 @@
# Move site-library out of R
pushd Library/Frameworks/R.framework/Resources/
- ln -s %p/lib/R/site-library site-library
+ ln -s %p/lib/R/$FW_VER/site-library site-library
popd
# Make more version specific symlink
@@ -107,22 +107,27 @@
chmod 755 Library/Frameworks/R.framework/Resources/library
# Satisfy validation
- rm -rf
Library/Frameworks/R.framework/Versions/3.0/Resources/library/Matrix/include
+ rm -rf
Library/Frameworks/R.framework/Versions/$FW_VER/Resources/library/Matrix/include
# AKH: fix install_names
- cd %i/Library/Frameworks/R.framework/Versions/3.0/Resources/library
+ cd %i/Library/Frameworks/R.framework/Versions/$FW_VER/Resources/library
install_name_tool -id \
-
%p/Library/Frameworks/R.framework/Versions/3.0/Resources/library/grDevices/libs/cairo.dylib
\
+
%p/Library/Frameworks/R.framework/Versions/$FW_VER/Resources/library/grDevices/libs/cairo.dylib
\
grDevices/libs/cairo.dylib
+
+ # Fix the framework path
+ perl -pi -e "s|LIBR =|LIBR =
-L%p/Library/Frameworks/R.framework/Versions/$FW_VER/Resources/lib -lR #|"
%i/Library/Frameworks/R.framework/Versions/$FW_VER/Resources/etc/Makeconf
+
+
<<
RunTimeVars: <<
- R_HOME: %p/Library/Frameworks/R.framework/Resources
+ R_HOME: %p/Library/Frameworks/R.framework/Versions/3.0/Resources
<<
SplitOff: <<
Package: %N-shlibs
Description: R Libraries
- Depends: bzip2-shlibs, cairo-shlibs, gcc48-shlibs, glib2-shlibs,
libgettext8-shlibs, libiconv, libjpeg9-shlibs, liblzma5-shlibs,
libpng15-shlibs, libtiff-shlibs, pango1-xft2-ft219-shlibs, pcre-shlibs,
readline6-shlibs, tcltk
+ Depends: bzip2-shlibs, cairo-shlibs, gcc48-shlibs, glib2-shlibs,
libgettext8-shlibs, libiconv, libjpeg9-shlibs, libpng15-shlibs, libtiff-shlibs,
pango1-xft2-ft219-shlibs, pcre-shlibs, readline6-shlibs, tcltk
Files: <<
Library/Frameworks/R.framework/Versions/3.0/Resources/lib
Library/Frameworks/R.framework/Versions/3.0/Resources/library
@@ -166,17 +171,8 @@
Package: %N-dev
Description: R Headers
Depends: %N-shlibs (=%v-%r)
- Replaces: <<
- r-base,
- r-base214-dev,
- r-base215-dev,
- r-base30-dev
- <<
- Conflicts: <<
- r-base214-dev,
- r-base215-dev,
- r-base30-dev
- <<
+ Conflicts: r-base215-dev
+ Replaces: %N, r-base, r-base215-dev
BuildDependsOnly: True
Files: <<
Library/Frameworks/R.framework/Versions/3.0/Resources/include
Index: r-base215.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci/r-base215.info,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- r-base215.info 20 May 2013 20:22:48 -0000 1.10
+++ r-base215.info 26 May 2013 07:27:20 -0000 1.11
@@ -1,7 +1,7 @@
Info2: <<
Package: r-base215
Version: 2.15.3
-Revision: 103
+Revision: 4
Description: R Framework
Maintainer: BABA Yoshihiko <babayoshih...@mac.com>
Depends: %N-shlibs (=%v-%r)
@@ -13,13 +13,13 @@
PatchFile-MD5: 81f9fc3bc5834d89b1472b71ce799f9f
# PatchScript: sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p1
SourceDirectory: R-%v
-SetCC: flag-sort -r gcc
+SetCC: flag-sort -r gcc -ffor-scope
SetCXX: flag-sort -r g++
ConfigureParams: <<
--libdir='%p/lib' --mandir='${prefix}/share/man' \
- --without-blas \
- --without-lapack \
+ --with-blas="-framework Accelerate" \
+ --with-lapack="-framework Accelerate" \
--with-aqua --enable-R-framework=%p/Library/Frameworks \
--with-system-bzlib --with-system-pcre --with-system-zlib \
--with-x --x-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/lib \
@@ -68,7 +68,7 @@
# Move site-library out of R
pushd Library/Frameworks/R.framework/Resources/
- ln -s %p/lib/R/site-library site-library
+ ln -s %p/lib/R/$FW_VER/site-library site-library
popd
# Make more version specific symlink
@@ -106,19 +106,23 @@
chmod 755 Library/Frameworks/R.framework/Resources/library
# Satisfy validation
- rm -rf
Library/Frameworks/R.framework/Versions/2.15/Resources/library/Matrix/include
+ rm -rf
Library/Frameworks/R.framework/Versions/$FW_VER/Resources/library/Matrix/include
# AKH: fix install_names
- cd %i/Library/Frameworks/R.framework/Versions/2.15/Resources/library
+ cd %i/Library/Frameworks/R.framework/Versions/$FW_VER/Resources/library
install_name_tool -id \
-
%p/Library/Frameworks/R.framework/Versions/2.15/Resources/library/grDevices/libs/cairo.dylib
\
+
%p/Library/Frameworks/R.framework/Versions/$FW_VER/Resources/library/grDevices/libs/cairo.dylib
\
grDevices/libs/cairo.dylib
install_name_tool -id \
-
%p/Library/Frameworks/R.framework/Versions/2.15/Resources/library/parallel/libs/parallel.dylib
\
+
%p/Library/Frameworks/R.framework/Versions/$FW_VER/Resources/library/parallel/libs/parallel.dylib
\
parallel/libs/parallel.dylib
+
+ # Fix the framework path
+ perl -pi -e "s|LIBR =|LIBR =
-L%p/Library/Frameworks/R.framework/Versions/$FW_VER/Resources/lib -lR #|"
%i/Library/Frameworks/R.framework/Versions/$FW_VER/Resources/etc/Makeconf
+
<<
RunTimeVars: <<
- R_HOME: %p/Library/Frameworks/R.framework/Resources
+ R_HOME: %p/Library/Frameworks/R.framework/Versions/2.15/Resources
<<
SplitOff: <<
@@ -132,8 +136,6 @@
<<
Shlibs: <<
%p/Library/Frameworks/R.framework/Versions/2.15/Resources/lib/libR.dylib
2.15.0 %n (>= 2.15.0-1)
- %p/Library/Frameworks/R.framework/Versions/2.15/Resources/lib/libRblas.dylib
0.0.0 %n (>= 2.15.2-1)
-
%p/Library/Frameworks/R.framework/Versions/2.15/Resources/lib/libRlapack.dylib
2.15.0 %n (>= 2.15.2-1)
!%p/Library/Frameworks/R.framework/Versions/2.15/Resources/library/class/libs/class.dylib
!%p/Library/Frameworks/R.framework/Versions/2.15/Resources/library/cluster/libs/cluster.dylib
!%p/Library/Frameworks/R.framework/Versions/2.15/Resources/library/foreign/libs/foreign.dylib
@@ -223,10 +225,6 @@
to http://cran.r-project.org/bin/macosx/, download and install R-GUI.dmg.
You will then need to edit Info.plist inside the app bundle to point
to %p/Library/R.Framework (instead of /Library/R.Framework).
-
-R as of 2.15.2 requires dpstrf_ in -llapack which is only present in Accelerate
-framework in 10.7 or later so libRlapack and libRblas must be used in
-on 10.6 and earlier - jhowarth.
<<
DescPackaging: 'pdflatex' is needed to make NEWS.pdf
License: GPL
------------------------------------------------------------------------------
Try New Relic Now & We'll Send You this Cool Shirt
New Relic is the only SaaS-based application performance monitoring service
that delivers powerful full stack analytics. Optimize and monitor your
browser, app, & servers with just a few lines of code. Try New Relic
and get this awesome Nerd Life shirt! http://p.sf.net/sfu/newrelic_d2d_may
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
