Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci
In directory vz-cvs-3.sog:/tmp/cvs-serv3898

Modified Files:
        rpy2-py.info 
Added Files:
        r-base214.info r-base214.patch 
Log Message:
New upstream version of R

Index: rpy2-py.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci/rpy2-py.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- rpy2-py.info        30 Nov 2010 21:54:49 -0000      1.1
+++ rpy2-py.info        5 Nov 2011 04:55:06 -0000       1.2
@@ -1,30 +1,34 @@
 Info2: <<
 
 Package: rpy2-py%type_pkg[python]
-Version: 2.1.4
-Revision: 1
+Version: 2.2.2
+Revision: 3
 Description: Python module to access R functions
 License: OSI-Approved
 Homepage: http://rpy.sourceforge.net/rpy2.html
-Maintainer: Monic Polynomial <[email protected]>
+Maintainer: BABA Yoshihiko <[email protected]>
 
-Type: python (2.4 2.5 2.6 2.7)
-Distribution: <<
-(%type_pkg[python] = 24) 10.4, 
-<<
+Type: python (2.6 2.7)
+Distribution: 10.7, 10.6, 10.5, 10.4 
 
-BuildDepends: fink (>= 0.24.12-1)
-Depends: python%type_pkg[python], r-base (>= 2.7.0), numpy-py%type_pkg[python] 
(>= 1.3.0-7)
+BuildDepends: fink (>= 0.24.12-1), r-base214-dev
+Depends: python%type_pkg[python], r-base214-shlibs, numpy-py%type_pkg[python] 
(>= 1.3.0-7)
 
 Source: http://pypi.python.org/packages/source/r/rpy2/rpy2-%v.tar.gz
-Source-MD5: cf4e0d80ba498a6d76f107531966478d
+Source-MD5: 7690d8fa747e62cd27cfacfa45f4a07b
 PatchFile: %{ni}.patch
-PatchFile-MD5: 011d3974f5ba8a1c0daafe1b0ed5717c
+PatchFile-MD5: 6c378419172db1aeaea29d6c821b8421
+PatchScript: sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p1
 
-CompileScript: %p/bin/python%type_raw[python] setup.py build
+SetLDFLAGS: -L%p/Library/Frameworks/R.framework/Versions/2.14/Resources/lib 
-undefined dynamic_lookup
+
+CompileScript: <<
+#!/bin/bash -ev
+  %p/bin/python%type_raw[python] setup.py build 
--r-home=%p/Library/Frameworks/R.framework/Versions/2.14/Resources
+<<
 InstallScript: <<
- export RHOMES='%p/Library/Frameworks/R.framework/Resources'
- %p/bin/python%type_raw[python] setup.py install --root %d
+#!/bin/bash -ev
+  %p/bin/python%type_raw[python] setup.py install --prefix=%p --exec-prefix=%i 
--install-data=%i/lib/python%type_raw[python] --no-compile 
 <<
 
 DocFiles: AUTHORS GPL_LICENSE LGPL_LICENSE MPL_LICENSE NEWS PKG-INFO README

--- NEW FILE: r-base214.patch ---
diff -ruN R-2.14.0-orig/Makeconf.in R-2.14.0/Makeconf.in
--- R-2.14.0-orig/Makeconf.in   2011-11-02 08:47:48.000000000 +0900
+++ R-2.14.0/Makeconf.in        2011-11-02 21:03:21.000000000 +0900
@@ -85,7 +85,7 @@
 READLINE_LIBS = @READLINE_LIBS@
 SED = @SED@
 SHELL = @R_SHELL@
-SHLIB_EXT = @SHLIB_EXT@
+SHLIB_EXT = .dylib
 SHLIB_CFLAGS = @SHLIB_CFLAGS@
 SHLIB_FFLAGS = @SHLIB_FFLAGS@
 SHLIB_LD = @SHLIB_LD@
diff -ruN R-2.14.0-orig/Makefile.fw R-2.14.0/Makefile.fw
--- R-2.14.0-orig/Makefile.fw   2011-11-02 08:47:48.000000000 +0900
+++ R-2.14.0/Makefile.fw        2011-11-02 20:09:37.000000000 +0900
@@ -8,7 +8,7 @@
 
 install install-strip: install-R-framework
                @(sed 's|^LIBR =.*|LIBR = -F$(R_FRAMEWORK_DIR)/.. -framework 
R|' \
-                 $(top_builddir)/etc/Makeconf > 
"$(rhome)/etc${R_ARCH}/Makeconf")
+                 $(top_builddir)/etc/Makeconf > 
"$(DESTDIR)$(R_FRAMEWORK_DIR)/Resources/etc${R_ARCH}/Makeconf")
                @(sed 's/Versions\/$(FW_VERSION)\/Resources/Resources/' \
                  "$(DESTDIR)$(R_FRAMEWORK_DIR)/Resources/bin/R" > \
                  "$(DESTDIR)$(R_FRAMEWORK_DIR)/Resources/bin/RR")
@@ -37,7 +37,7 @@
          ln -f -s -n Versions/Current/Resources Resources)
        @## the resulting libR will point dyld to the fat libR regardless of 
its origin
        @(cd "$(DESTDIR)$(R_FRAMEWORK_DIR)/Resources/lib" && \
-         install_name_tool -id 
"$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/lib/libR.dylib" 
$(Rexeclibdir)/libR.dylib)
+         install_name_tool -id 
"$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/lib/libR.dylib" 
$(DESTDIR)$(Rexeclibdir)/libR.dylib)
        @( otool=otool ; if otool -D "$(DESTDIR)$(Rexeclibdir)/libR.dylib"|grep 
'not an object'>/dev/null; then otool=otool64; fi; \
           for lib in Rlapack Rblas R; do \
           if test -e "$(DESTDIR)$(Rexeclibdir)/lib$${lib}.dylib"; then $(ECHO) 
"  lib$${lib}"; \
diff -ruN R-2.14.0-orig/configure R-2.14.0/configure
--- R-2.14.0-orig/configure     2011-11-02 08:47:48.000000000 +0900
+++ R-2.14.0/configure  2011-11-02 21:40:35.000000000 +0900
@@ -25708,7 +25708,7 @@
 main_ld="${CC}"
 shlib_ld="${CC}"
 shlib_cxxld="${CXX}"
-SHLIB_EXT=".so"
+SHLIB_EXT=".dylib"
 SHLIB_LIBADD=
 use_exportfiles=no
 

--- NEW FILE: r-base214.info ---
Info2: <<
Package: r-base214
Version: 2.14.0
Revision: 1
Description: R Framework
Maintainer:  BABA Yoshihiko <[email protected]>
Depends: %N-shlibs (=%v-%r)
BuildDepends: fink (>= 0.28.1), gcc46, bzip2-dev, libgettext8-dev, 
libiconv-dev, libncurses5, libjpeg8, libpng14, pcre, readline5, tcltk-dev, 
x11-dev

Source: http://cran.r-project.org/src/base/R-2/R-%v.tar.gz
Source-MD5: 98cf8fe74e512e1061caf1ee0c2043a8
PatchFile: %n.patch
PatchFile-MD5: 12411f83aaad527430793b5cea47f17b
# PatchScript: sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p1
SourceDirectory: R-%v

ConfigureParams: <<
  --prefix=%p \
  --exec-prefix=%i \
  --mandir='${prefix}/share/man' \
  --with-blas="-framework vecLib -dylib_file 
/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libLAPACK.dylib:/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libLAPACK.dylib"
 \
  --with-lapack \
  --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 \
  --with-tcl-config=%p/lib/tclConfig.sh --with-tk-config=%p/lib/tkConfig.sh
<< 
CompileScript: <<
  #!/bin/sh -efv
  
  # Workaround for 10.7
  FW_VER=`echo %v | sed -e's/[\.][0-9]$//'`
  if [[ $( sw_vers -productVersion ) > 10.7 ]]; then
    # export CC=gcc-fsf-4.6
    # export CXX=g++-fsf-4.6
    export CC=/usr/bin/clang
    export CXX=/usr/bin/clang++
    export F77=%p/bin/gfortran-fsf-4.6
  fi
  
  unset R_HOME
  ./configure %c
  make
<<
InfoTest: <<
  TestScript: make -k check
<<
InstallScript: <<
  #!/bin/sh -ex
  FW_VER=`echo %v | sed -e's/[\.][0-9]$//'`
  
  # prefix=%i/Library/Frameworks
  make install DESTDIR=%d
  
  cd %i
  
  # Fix path
  perl -pi -e 's|%i|%p|g' Library/Frameworks/R.framework/Resources/bin/R
  if [[ $( sw_vers -productVersion ) > 10.5 ]]; then
    perl -pi -e 's|# export PATH|export PATH|' 
Library/Frameworks/R.framework/Resources/bin/R
  fi

  # Fix install_name in libR.dylib
  install_name_tool -id 
"%p/Library/Frameworks/R.framework/Versions/$FW_VER/Resources/lib/libR.dylib" 
Library/Frameworks/R.framework/Versions/$FW_VER/Resources/lib/libR.dylib

  # Move site-library out of R
  pushd Library/Frameworks/R.framework/Resources/
  ln -s %p/lib/R/site-library site-library
  popd
  
  # Make more version specific symlink 
  pushd Library/Frameworks/R.framework/Versions/
  ln -s $FW_VER %v
  popd
  
  # Fix install names in libs and modules
  pushd Library/Frameworks/R.framework/Versions/$FW_VER/Resources/library/
  LIBS="class cluster foreign grDevices grid KernSmooth lattice MASS Matrix 
methods mgcv nlme nnet rpart spatial splines stats survival tcltk tools "
  for LIB in $LIBS;
    do
        install_name_tool -id 
%p/Library/Frameworks/R.framework/Versions/$FW_VER/Resources/library/$LIB/libs/$LIB.dylib
 $LIB/libs/$LIB.dylib
    done
  popd
  
  pushd Library/Frameworks/R.framework/Versions/$FW_VER/Resources/modules
  install_name_tool -id 
%p/Library/Frameworks/R.framework/Versions/$FW_VER/Resources/modules/internet.dylib
 internet.dylib
  install_name_tool -id 
%p/Library/Frameworks/R.framework/Versions/$FW_VER/Resources/modules/lapack.dylib
 lapack.dylib
  install_name_tool -id 
%p/Library/Frameworks/R.framework/Versions/$FW_VER/Resources/modules/R_X11.dylib
 R_X11.dylib
  install_name_tool -id 
%p/Library/Frameworks/R.framework/Versions/$FW_VER/Resources/modules/vfonts.dylib
 vfonts.dylib
  popd
  
  mkdir -p bin
  pushd bin
  ln -s %p/Library/Frameworks/R.framework/Versions/$FW_VER/Resources/bin/R R
  popd
  
  mkdir -p share/man/man1
  pushd share/man/man1
  ln -s %p/Library/Frameworks/R.framework/Versions/$FW_VER/Resources/man1/R.1 
R.1
  popd
  
  # Keep the library folder safe. Users can install their libraries in 
$HOME/Library/R.
  chmod 555 Library/Frameworks/R.framework/Resources/library
  
  # Satisfy validation
  rm -rf 
Library/Frameworks/R.framework/Versions/2.14/Resources/library/Matrix/include
<<
RunTimeVars: <<
  R_HOME: %p/Library/Frameworks/R.framework/Resources
<<

SplitOff: <<
  Package: %N-shlibs
  Description: R Libraries
  Depends: gcc46, bzip2-shlibs, libgettext8-shlibs, libiconv, libjpeg8-shlibs, 
libpng14-shlibs, pcre-shlibs, readline5-shlibs, tcltk
  Files: <<
  Library/Frameworks/R.framework/Versions/2.14/Resources/lib
  Library/Frameworks/R.framework/Versions/2.14/Resources/library
  Library/Frameworks/R.framework/Versions/2.14/Resources/modules
  <<
  Shlibs: <<
  %p/Library/Frameworks/R.framework/Versions/2.14/Resources/lib/libR.dylib 
2.14.0 %n (>= 2.14.0-1)
  
!%p/Library/Frameworks/R.framework/Versions/2.14/Resources/library/class/libs/class.dylib
  
!%p/Library/Frameworks/R.framework/Versions/2.14/Resources/library/cluster/libs/cluster.dylib
  
!%p/Library/Frameworks/R.framework/Versions/2.14/Resources/library/foreign/libs/foreign.dylib
  
!%p/Library/Frameworks/R.framework/Versions/2.14/Resources/library/grDevices/libs/grDevices.dylib
  
!%p/Library/Frameworks/R.framework/Versions/2.14/Resources/library/grid/libs/grid.dylib
  
!%p/Library/Frameworks/R.framework/Versions/2.14/Resources/library/KernSmooth/libs/KernSmooth.dylib
  
!%p/Library/Frameworks/R.framework/Versions/2.14/Resources/library/lattice/libs/lattice.dylib
  
!%p/Library/Frameworks/R.framework/Versions/2.14/Resources/library/MASS/libs/MASS.dylib
  
!%p/Library/Frameworks/R.framework/Versions/2.14/Resources/library/Matrix/libs/Matrix.dylib
  
!%p/Library/Frameworks/R.framework/Versions/2.14/Resources/library/methods/libs/methods.dylib
  
!%p/Library/Frameworks/R.framework/Versions/2.14/Resources/library/mgcv/libs/mgcv.dylib
  
!%p/Library/Frameworks/R.framework/Versions/2.14/Resources/library/nlme/libs/nlme.dylib
  
!%p/Library/Frameworks/R.framework/Versions/2.14/Resources/library/nnet/libs/nnet.dylib
  
!%p/Library/Frameworks/R.framework/Versions/2.14/Resources/library/rpart/libs/rpart.dylib
  
!%p/Library/Frameworks/R.framework/Versions/2.14/Resources/library/spatial/libs/spatial.dylib
  
!%p/Library/Frameworks/R.framework/Versions/2.14/Resources/library/splines/libs/splines.dylib
  
!%p/Library/Frameworks/R.framework/Versions/2.14/Resources/library/stats/libs/stats.dylib
  
!%p/Library/Frameworks/R.framework/Versions/2.14/Resources/library/survival/libs/survival.dylib
  
!%p/Library/Frameworks/R.framework/Versions/2.14/Resources/library/tcltk/libs/tcltk.dylib
  
!%p/Library/Frameworks/R.framework/Versions/2.14/Resources/library/tools/libs/tools.dylib
  
!%p/Library/Frameworks/R.framework/Versions/2.14/Resources/modules/internet.dylib
  
!%p/Library/Frameworks/R.framework/Versions/2.14/Resources/modules/lapack.dylib
  !%p/Library/Frameworks/R.framework/Versions/2.14/Resources/modules/R_X11.dylib
  
!%p/Library/Frameworks/R.framework/Versions/2.14/Resources/modules/vfonts.dylib
  <<
<<

SplitOff2: <<
  Package: %N-dev
  Description: R Headers
  Depends: %N-shlibs (=%v-%r)
  BuildDependsOnly: True
  Files: <<
  Library/Frameworks/R.framework/Versions/2.14/Resources/include
  Library/Frameworks/R.framework/Versions/2.14/Headers
  <<
<<
SplitOff3: <<
  Package: r-base
  Description: Language and environment for statistical computing and graphics
  Depends: %N (=%v-%r)
  Files: <<
  Library/Frameworks/R.framework/R
  Library/Frameworks/R.framework/Headers
  Library/Frameworks/R.framework/Libraries
  Library/Frameworks/R.framework/PrivateHeaders
  Library/Frameworks/R.framework/Resources
  Library/Frameworks/R.framework/Versions/Current
  bin
  share
  <<
<<


DescDetail: <<
R is similar to S, which was developed at Bell Laboratories by John
Chambers et al. It provides a wide variety of statistical and
graphical techniques (linear and nonlinear modelling, statistical
tests, time series analysis, classification, clustering, ...).  R is
designed as a true computer language with control-flow constructions
for iteration and alternation, and it allows users to add additional
functionality by defining new functions. For computationally intensive
tasks, C and Fortran code can be linked and called at run time.

The "recommended" R packages are now included in the distribution, so
there is no longer a need for a r-recommended package.  If you already
have installed an earlier version of r-recommended, remove it before
installing this package.

Builds R Framework, installs in %p/Library/Frameworks.

R.app no longer included in the R source distribution.  To install, go 
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).
<<
DescPackaging: 'pdflatex' is needed to make NEWS.pdf
License: GPL
Homepage: http://cran.R-project.org/
<<


------------------------------------------------------------------------------
RSA(R) Conference 2012
Save $700 by Nov 18
Register now
http://p.sf.net/sfu/rsa-sfdev2dev1
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to