[cvs] dists/10.7/stable/main/finkinfo/sci r-base215.info, 1.11, 1.12 r-base30.info, 1.1, 1.2

Sun, 26 May 2013 00:17:17 -0700 

Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv4549

Modified Files:
        r-base215.info r-base30.info 
Log Message:
mv site-library

Index: r-base30.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/r-base30.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- r-base30.info       20 May 2013 18:50:16 -0000      1.1
+++ r-base30.info       26 May 2013 07:17:02 -0000      1.2
@@ -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,
-               -base214-dev,bs 
(=%v-%r)k/Versions/3.0/Resources/library, libgettext8-shlibs, libiconv, 
libjpeg9-shlibs, libpng15-shlibs, libtiff-shlibs, pango1-xft2-ft219-shlibs, 
pcre-shlibs, readline6-shlibs, tcltk6-shlibs, tcltkcedence, flag-sort (>= 
0.5), glitz), glitzèè!è!°‰€:ÿ 
Š€:ÿxäà&+€€:ÿ’Ä&+†0Ä&+°‰€:ÿ`Ä&+:ÿÀßD
 &+uÄ&+ÐD &+ØÔD &+¨ÙD 
&+€:Å&+xäà&+€€:ÿà~€:ÿk0Ä&+à!à!°‰€:ÿ
 
Š€:ÿH®À&+ð€€:ÿ’Ä&+†0Ä&+°‰€:ÿ`Ä&+:ÿà‰€:ÿ؉€:ÿ8;å&+Œp˜
 
Š€:ÿuÄ&+€:Å&+ð€€:ÿÀ€:ÿk0Ä&+GHIJKMNOP°‰€:ÿ
 
Š€:ÿHe—&+‚€:ÿ’Ä&+†0Ä&+°‰€:ÿ0ßD
 &+uÄ&+ðà&+ ™t&+ÐD &+ØÔD &+¨ÙD 
&+€:Å&+He—&+‚€:ÿЀ€:ÿk0Ä&+8e—&+‚€:ÿ€:ÿk0Ä&+(e—&+‚€:ÿ0€:ÿk0Ä&+e—&+‚€:ÿ`€:ÿk0Ä&+
    ¨ÞD      &+uÄ&+¨ÙD 
&+à{€:ÿŠèt&+eÄ&+ØÔD 
&+‚€:ÿyèt&+eÄ&+ÐD 
&+0‚€:ÿZèt&+eÄ&+ؔt&+ðà&+ ™t&+ÐD &+Øôà&+ØÔD 
&+¨ÙD &+€:Å&+8;å&+]@&+ 
Š€:ÿp+t&+àƒ€:ÿ°‚€:ÿk0Ä&+5678:<=>?@BD°‰€:ÿ
 Š€:ÿ a=&+ 
Š€:ÿuÄ&+5å&+`‚€:ÿ]@&+eÄ&+5å&+Õ_@fÆS
 Qöl±íìs&+ Š€:ÿ 
a=&+ð„€:ÿÀƒ€:ÿk0Ä&+u]ÞÓ        4Q 
÷U^Qʉ§¶uª¹ñìò*ēv°‰€:ÿ Š€:ÿH®   
&+‡€:ÿ’Ä&+†0Ä&+°‰€:ÿ`Ä&+:ÿà‰€:ÿ؉€:ÿÿà&+uÄ&+Øôà&+
 ùà&+€:Å&+‡€:ÿ°„€:ÿk0Ä&+8® 
&+‡€:ÿà„€:ÿk0r-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.7/stable/main/finkinfo/sci/r-base215.info,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- r-base215.info      20 May 2013 18:49:13 -0000      1.11
+++ r-base215.info      26 May 2013 07:17:02 -0000      1.12
@@ -1,7 +1,7 @@
 Info2: <<
 Package: r-base215
 Version: 2.15.3
-Revision: 3
+Revision: 4
 Description: R Framework
 Maintainer:  BABA Yoshihiko <babayoshih...@mac.com>
 Depends: %N-shlibs (=%v-%r)
@@ -13,7 +13,7 @@
 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: <<
@@ -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: <<



------------------------------------------------------------------------------
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

Reply via email to