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

Added Files:
        r-base213.info r-base213.patch r-cran-maptools.info 
        r-cran-proj4.info r-cran-rgdal.info r-cran-sp.info 
        r-cran-sp.patch 
Log Message:
to 10.7

--- NEW FILE: r-cran-proj4.info ---
Package: r-cran-proj4
Version: 1.0-7
Revision: 3
Description: PROJ.4 cartographic projections library for R
Homepage: http://www.rforge.net/proj4/
License: GPL
Maintainer:  BABA Yoshihiko <[email protected]>
Source: http://www.rforge.net/proj4/snapshot/proj4_%v.tar.gz
Source-MD5: 4518912befcc3138b38a4f3fcfe47caf
SourceDirectory: proj4
Depends: r-base, proj-shlibs
BuildDepends: proj
CompileScript: <<
  #!/bin/sh -ev
  export TMPDIR=%b/tmp
  pushd ..
  %p/bin/R --verbose CMD build --no-vignettes proj4
<<
InstallScript: <<
  #!/bin/sh -ev
  mkdir -p %i/lib/R/site-library
  pushd %b/.. && %p/bin/R --verbose CMD install --library=%i/lib/R/site-library 
proj4
  install_name_tool -id %p/lib/R/site-library/proj4/libs/proj4.dylib 
%i/lib/R/site-library/proj4/libs/proj4.dylib
<<
Shlibs: <<
  %p/lib/R/site-library/proj4/libs/proj4.dylib 0.0.0 %n (>=0.9-70-1)
<<

--- NEW FILE: r-cran-rgdal.info ---
Package: r-cran-rgdal
Version: 0.7-1
Revision: 1
Description: GNU R Bindings for GDAL
Homepage: http://sourceforge.net/projects/rgdal/
License: GPL
Maintainer:  BABA Yoshihiko <[email protected]>
Source: http://cran.r-project.org/src/contrib/rgdal_%v.tar.gz
Source-MD5: a51dcd59cbc4ca5008beb7ee4fb5e5d8
SourceDirectory: rgdal
Depends: r-base, r-cran-sp, gdal-shlibs, libspatialite1-shlibs (>=2.3.1-14)
BuildDepends: r-base, gdal-dev, r-cran-sp-dev
CompileScript: <<
  #!/bin/sh -ev
  export TMPDIR=%b/tmp
  pushd ..
  %p/bin/R --verbose CMD build --no-vignettes rgdal
<<
InstallScript: <<
  #!/bin/sh -ev
  mkdir -p %i/lib/R/site-library
  pushd %b/.. && %p/bin/R --verbose CMD install --library=%i/lib/R/site-library 
rgdal
  install_name_tool -id %p/lib/R/site-library/rgdal/libs/rgdal.dylib 
%i/lib/R/site-library/rgdal/libs/rgdal.dylib
<<
Shlibs: <<
  %p/lib/R/site-library/rgdal/libs/rgdal.dylib 0.0.0 %n (>=0.6-28-1)
<<
DescPackaging: <<
  libspatialite1-shlibs (>=2.3.1-14) for libiconv problem
<<
--- NEW FILE: r-cran-sp.patch ---
diff -ruN sp-orig/src/surfaceArea.c sp/src/surfaceArea.c
--- sp-orig/src/surfaceArea.c   2011-08-16 14:54:42.000000000 +0900
+++ sp/src/surfaceArea.c        2011-08-16 14:55:24.000000000 +0900
@@ -63,12 +63,15 @@
   }else{
     cellI=0; /* saves us computing 2-d array indices */
   }
-  for(int j=1;j<(*ny-1);j++){
-    for(int i=1;i<(*nx-1);i++){
+  int j;
+  int i;
+  int tri;
+  for(j=1;j<(*ny-1);j++){
+    for(i=1;i<(*nx-1);i++){
       z1 = height(heights,nx,i,j);
       cellArea=0;
       if(!ISNA(z1)){
-       for(int tri=0;tri<8;tri++){
+       for(tri=0;tri<8;tri++){
          z2=height(heights,nx,i+dxv[tri],j+dyv[tri]);
          /* replace missing adjacent values with the current cell value */
          if(ISNA(z2))z2=z1;

--- NEW FILE: r-base213.info ---
Info2: <<
Package: r-base213
Version: 2.13.1
Revision: 1
Description: R Framework
Maintainer:  BABA Yoshihiko <[email protected]>
Depends: %N-shlibs (=%v-%r)
BuildDepends: fink (>= 0.28.1), gcc46-compiler, 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: 28dd0d68ac3a0eab93fe7035565a1c30
PatchFile: %n.patch
PatchFile-MD5: 0b80e77b4dc51597ffd8d7ea20168ebb
PatchScript: sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p1
SourceDirectory: R-%v

ConfigureParams: <<
  --libdir='%i/lib' --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
<< 
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 F77=%p/bin/gfortran-fsf-4.6
  fi
  
  unset R_HOME
  ./configure %c --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
  make
<<
InfoTest: <<
  TestScript: make -k check
<<
InstallScript: <<
  #!/bin/sh -ex
  FW_VER=`echo %v | sed -e's/[\.][0-9]$//'`

  make install prefix=%i/Library/Frameworks
  
  cd %i
  
  # Fix path
  perl -pi -e 's|%i|%p|g' Library/Frameworks/R.framework/Resources/bin/R
  perl -pi -e 's|%i|%p|g' Library/Frameworks/R.framework/Resources/etc/Makeconf
  # perl -pi -e 's|%i|%p|g' lib/pkgconfig/libR.pc
  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.13/Resources/library/Matrix/include
<<
RunTimeVars: <<
  R_HOME: %p/Library/Frameworks/R.framework/Resources
<<

SplitOff: <<
  Package: %N-shlibs
  Conflicts: r-base (<< 2.13.1)
  Replaces: r-base (<< 2.13.1)
  Description: R Libraries
  Depends: gcc46-shlibs, bzip2-shlibs, gcc46-shlibs, libgettext8-shlibs, 
libiconv, libjpeg8-shlibs, libpng14-shlibs, pcre-shlibs, readline5-shlibs, tcltk
  Files: <<
  Library/Frameworks/R.framework/Versions/2.13/Resources/lib
  Library/Frameworks/R.framework/Versions/2.13/Resources/library
  Library/Frameworks/R.framework/Versions/2.13/Resources/modules
  <<
  Shlibs: <<
  %p/Library/Frameworks/R.framework/Versions/2.13/Resources/lib/libR.dylib 
2.13.0 %n (>= 2.13.0-1)
  
!%p/Library/Frameworks/R.framework/Versions/2.13/Resources/library/class/libs/class.dylib
  
!%p/Library/Frameworks/R.framework/Versions/2.13/Resources/library/cluster/libs/cluster.dylib
  
!%p/Library/Frameworks/R.framework/Versions/2.13/Resources/library/foreign/libs/foreign.dylib
  
!%p/Library/Frameworks/R.framework/Versions/2.13/Resources/library/grDevices/libs/grDevices.dylib
  
!%p/Library/Frameworks/R.framework/Versions/2.13/Resources/library/grid/libs/grid.dylib
  
!%p/Library/Frameworks/R.framework/Versions/2.13/Resources/library/KernSmooth/libs/KernSmooth.dylib
  
!%p/Library/Frameworks/R.framework/Versions/2.13/Resources/library/lattice/libs/lattice.dylib
  
!%p/Library/Frameworks/R.framework/Versions/2.13/Resources/library/MASS/libs/MASS.dylib
  
!%p/Library/Frameworks/R.framework/Versions/2.13/Resources/library/Matrix/libs/Matrix.dylib
  
!%p/Library/Frameworks/R.framework/Versions/2.13/Resources/library/methods/libs/methods.dylib
  
!%p/Library/Frameworks/R.framework/Versions/2.13/Resources/library/mgcv/libs/mgcv.dylib
  
!%p/Library/Frameworks/R.framework/Versions/2.13/Resources/library/nlme/libs/nlme.dylib
  
!%p/Library/Frameworks/R.framework/Versions/2.13/Resources/library/nnet/libs/nnet.dylib
  
!%p/Library/Frameworks/R.framework/Versions/2.13/Resources/library/rpart/libs/rpart.dylib
  
!%p/Library/Frameworks/R.framework/Versions/2.13/Resources/library/spatial/libs/spatial.dylib
  
!%p/Library/Frameworks/R.framework/Versions/2.13/Resources/library/splines/libs/splines.dylib
  
!%p/Library/Frameworks/R.framework/Versions/2.13/Resources/library/stats/libs/stats.dylib
  
!%p/Library/Frameworks/R.framework/Versions/2.13/Resources/library/survival/libs/survival.dylib
  
!%p/Library/Frameworks/R.framework/Versions/2.13/Resources/library/tcltk/libs/tcltk.dylib
  
!%p/Library/Frameworks/R.framework/Versions/2.13/Resources/library/tools/libs/tools.dylib
  
!%p/Library/Frameworks/R.framework/Versions/2.13/Resources/modules/internet.dylib
  
!%p/Library/Frameworks/R.framework/Versions/2.13/Resources/modules/lapack.dylib
  !%p/Library/Frameworks/R.framework/Versions/2.13/Resources/modules/R_X11.dylib
  
!%p/Library/Frameworks/R.framework/Versions/2.13/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.13/Resources/include
  Library/Frameworks/R.framework/Versions/2.13/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
  lib
  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/
<<

--- NEW FILE: r-cran-maptools.info ---
Package: r-cran-maptools
Version: 0.8-10
Revision: 1
Description: GNU R Tools for handling spatial objects
Homepage: http://r-spatial.sourceforge.net/
License: GPL
Maintainer:  BABA Yoshihiko <[email protected]>
Source: http://cran.r-project.org/src/contrib/maptools_%v.tar.gz
Source-MD5: 9b5568c2f1a4ecb0f152e1ca73285be7
SourceDirectory: maptools
Depends: r-base, r-cran-sp
BuildDepends: r-framework-2.13
CompileScript: <<
  #!/bin/sh -ev
  export TMPDIR=%b/tmp
  pushd ..
  %p/bin/R --verbose CMD build --no-vignettes maptools
<<
InstallScript: <<
  #!/bin/sh -ev
  mkdir -p %i/lib/R/site-library
  pushd %b/.. && %p/bin/R --verbose CMD install --library=%i/lib/R/site-library 
maptools
  install_name_tool -id %p/lib/R/site-library/maptools/libs/maptools.dylib 
%i/lib/R/site-library/maptools/libs/maptools.dylib
<<
Shlibs: <<
  %p/lib/R/site-library/maptools/libs/maptools.dylib 0.0.0 %n (>=0.7-38-1)
<<

--- NEW FILE: r-cran-sp.info ---
Package: r-cran-sp
Version: 0.9-85
Revision: 1
Description: GNU R classes and methods for spatial data
Homepage: http://r-spatial.sourceforge.net/
License: GPL
Maintainer:  BABA Yoshihiko <[email protected]>
Source: http://cran.r-project.org/src/contrib/sp_%v.tar.gz
Source-MD5: a2bc57536084782b4d47c54d106cfc2c
SourceDirectory: sp
PatchFile: %n.patch
PatchFile-MD5: 3b497f44efaa66cfd91cd14248fc3a39
Depends: r-base
BuildDepends: fink (>= 0.24.12)
CompileScript: <<
  #!/bin/sh -ev
  export TMPDIR=%b/tmp
  pushd ..
  %p/bin/R --verbose CMD build --no-vignettes sp
<<
InstallScript: <<
  #!/bin/sh -ev
  mkdir -p %i/lib/R/site-library
  pushd %b/.. && %p/bin/R --verbose CMD install --library=%i/lib/R/site-library 
sp
  install_name_tool -id %p/lib/R/site-library/sp/libs/sp.dylib 
%i/lib/R/site-library/sp/libs/sp.dylib
<<
Shlibs: <<
  %p/lib/R/site-library/sp/libs/sp.dylib 0.0.0 %n (>=0.9-70-1)
<<

SplitOff: <<
  Package: %N-dev
  Description: Headers for CRAN sp
  BuildDependsOnly: true
  Depends: %N (=%v-%r)
  Files: lib/R/site-library/sp/include
<<
--- NEW FILE: r-base213.patch ---
diff -ruN R-2.12.0-orig/Makeconf.in R-2.12.0/Makeconf.in
--- R-2.12.0-orig/Makeconf.in   2010-10-30 15:40:06.000000000 +0900
+++ R-2.12.0/Makeconf.in        2010-10-30 15:41:20.000000000 +0900
@@ -83,7 +83,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.12.0-orig/Makefile.fw R-2.12.0/Makefile.fw
--- R-2.12.0-orig/Makefile.fw   2010-10-30 15:40:06.000000000 +0900
+++ R-2.12.0/Makefile.fw        2010-10-30 16:05:35.000000000 +0900
@@ -37,27 +37,27 @@
          ln -f -s -n Versions/Current/Resources Resources)
        @## the resulting libR will point dyld to the fat libR regardless of 
its origin
        @(cd "$(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 
"@PREFIX@/Library/Frameworks/R.framework/Versions/$(FW_VERSION)/Resources/lib/libR.dylib"
 $(Rexeclibdir)/libR.dylib)
        @( otool=otool ; if otool -D "$(Rexeclibdir)/libR.dylib"|grep 'not an 
object'>/dev/null; then otool=otool64; fi; \
           for lib in Rlapack Rblas R; do \
           if test -e "$(Rexeclibdir)/lib$${lib}.dylib"; then $(ECHO) "  
lib$${lib}"; \
            find "$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/" -name 
'*.so' -or -name '*.dylib' | \
            xargs -n 1 install_name_tool -change \
            `$${otool} -L $(Rexeclibdir)/lib$${lib}.dylib |sed -n -e '2 
s/.\(.*\) (compat.*/\1/p'` \
-           
"$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/lib/lib$${lib}.dylib" ; \
+           
"@PREFIX@/Library/Frameworks/R.framework/Versions/$(FW_VERSION)/Resources/lib/lib$${lib}.dylib"
 ; \
            find "$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/" -name 
'*.so' -or -name '*.dylib' | \
            xargs -n 1 install_name_tool -change lib$${lib}.dylib \
-           
"$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/lib/lib$${lib}.dylib" ; \
-           install_name_tool -id 
"$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/lib/lib$${lib}.dylib" \
+           
"@PREFIX@/Library/Frameworks/R.framework/Versions/$(FW_VERSION)/Resources/lib/lib$${lib}.dylib"
 ; \
+           install_name_tool -id 
"@PREFIX@/Library/Frameworks/R.framework/Versions/$(FW_VERSION)/Resources/lib/lib$${lib}.dylib"
 \
            "$(Rexeclibdir)/lib$${lib}.dylib"; \
            if [ "$(Rexeclibdir)" != 
"$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/lib" ]; then \
-             $(top_srcdir)/tools/updatefat 
"$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/lib/lib$${lib}.dylib" 
"$(Rexeclibdir)/lib$${lib}.dylib"; \
-             install_name_tool -id 
"$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/lib/lib$${lib}.dylib" \
+             $(top_srcdir)/tools/updatefat 
"@PREFIX@/Library/Frameworks/R.framework/Versions/$(FW_VERSION)/Resources/lib/lib$${lib}.dylib"
 "$(Rexeclibdir)/lib$${lib}.dylib"; \
+             install_name_tool -id 
"@PREFIX@/Library/Frameworks/R.framework//Versions/$(FW_VERSION)/Resources/lib/lib$${lib}.dylib"
 \
              
"$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/lib/lib$${lib}.dylib"; \
            fi; \
            for rexe in `ls 
"$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)"/Resources/bin/exec/*/R 
"$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/bin/exec/R" 2>/dev/null`; 
do \
             install_name_tool -change lib$${lib}.dylib \
-            
"$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/lib/lib$${lib}.dylib" 
"$$rexe" ; \
+            
"@PREFIX@/Library/Frameworks/R.framework/Versions/$(FW_VERSION)/Resources/lib/lib$${lib}.dylib"
 "$$rexe" ; \
            done; \
            fi; \
           done)
@@ -66,7 +66,7 @@
          chmod a+r 
$(R_FRAMEWORK_DIR)/Versions/Current/PrivateHeaders/config.h; \
          find $(R_FRAMEWORK_DIR)/Versions/Current/PrivateHeaders -name .svn | 
xargs rm -rf)
        @(install_name_tool -change libR.dylib \
-           
"$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/lib/libR.dylib" \
+           
"@PREFIX@/Library/Frameworks/R.framework/Versions/$(FW_VERSION)/Resources/lib/libR.dylib"
 \
            $(Rexecbindir2)/R)
        @(if [ -n "${R_ARCH}" ]; then \
          rm -rf $(R_FRAMEWORK_DIR)/Versions/Current/PrivateHeaders${R_ARCH} && 
\
diff -ruN R-2.12.0-orig/configure R-2.12.0/configure
--- R-2.12.0-orig/configure     2010-10-30 15:40:06.000000000 +0900
+++ R-2.12.0/configure  2010-10-30 15:53:48.000000000 +0900
@@ -25402,7 +25402,7 @@
 main_ld="${CC}"
 shlib_ld="${CC}"
 shlib_cxxld="${CXX}"
-SHLIB_EXT=".so"
+SHLIB_EXT=".dylib"
 SHLIB_LIBADD=
 use_exportfiles=no
 
@@ -25952,7 +25952,8 @@
     DYLIB_EXT=".dylib"
     dylib_ldflags="${darwin_dylib_ldflags}"
     MAJR_VERSION=`echo "${PACKAGE_VERSION}" | sed  -e "s/[\.][1-9]$/.0/"`
-    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 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"
diff -ruN R-2.12.0-orig/src/nmath/standalone/Makefile.in 
R-2.12.0/src/nmath/standalone/Makefile.in
--- R-2.12.0-orig/src/nmath/standalone/Makefile.in      2010-10-30 
15:40:11.000000000 +0900
+++ R-2.12.0/src/nmath/standalone/Makefile.in   2010-10-30 16:08:55.000000000 
+0900
@@ -125,7 +125,7 @@
 install: installdirs install-header @WANT_R_FRAMEWORK_FALSE@ install-pc
 @WANT_R_FRAMEWORK_FALSE@       @!(test -f $(libRmath_la)) || $(SHELL) 
$(top_srcdir)/tools/copy-if-change $(libRmath_la) 
$(DESTDIR)$(libdir)/$(libRmath_la)
 @WANT_R_FRAMEWORK_FALSE@       @!(test -f libRmath.a) || $(SHELL) 
$(top_srcdir)/tools/copy-if-change libRmath.a $(DESTDIR)$(libdir)/libRmath.a
-@WANT_R_FRAMEWORK_TRUE@        @!(test -f $(libRmath_la)) || cp $(libRmath_la) 
$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/lib/$(libRmath_la) && 
install_name_tool -id 
$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/lib/$(libRmath_la) 
$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/lib/$(libRmath_la)
+@WANT_R_FRAMEWORK_TRUE@        @!(test -f $(libRmath_la)) || cp $(libRmath_la) 
$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/lib/$(libRmath_la) && 
install_name_tool -id 
@PREFIX@/Library/Frameworks/R.framework/Versions/$(FW_VERSION)/Resources/lib/$(libRmath_la)
 $(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/lib/$(libRmath_la)
 @WANT_R_FRAMEWORK_TRUE@        @!(test -f libRmath.a) || $(SHELL) 
$(top_srcdir)/tools/copy-if-change libRmath.a 
$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/lib/libRmath.a
 
 install-strip: installdirs install-header install-pc
@@ -149,12 +149,12 @@
 @WANT_R_FRAMEWORK_TRUE@        @$(MKINSTALLDIRS) 
$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/lib
 
 ## ?= is not portable make syntax, so we conditionalize this.
-@WANT_R_FRAMEWORK_TRUE@RMATH_FRAMEWORK_DIR ?= 
/Library/Frameworks/Rmath.framework
+@WANT_R_FRAMEWORK_TRUE@RMATH_FRAMEWORK_DIR ?= 
$(DESTDIR)/Library/Frameworks/Rmath.framework
 install-Rmath-framework: $(libRmath_la)
        @(cd ../../include; $(MAKE) Rmath.h)
        @$(MKINSTALLDIRS) $(RMATH_FRAMEWORK_DIR)/Versions/$(VERSION)/Headers
        @cp $(libRmath_la) $(RMATH_FRAMEWORK_DIR)/Versions/$(VERSION)/Rmath
-       @install_name_tool -id $(RMATH_FRAMEWORK_DIR)/Versions/$(VERSION)/Rmath 
$(RMATH_FRAMEWORK_DIR)/Versions/$(VERSION)/Rmath
+       @install_name_tool -id 
@PREFIX@/Library/Frameworks/Rmath.framework/Versions/$(VERSION)/Rmath 
$(RMATH_FRAMEWORK_DIR)/Versions/$(VERSION)/Rmath
        @$(SHELL) $(top_srcdir)/tools/copy-if-change ../../include/Rmath.h 
$(RMATH_FRAMEWORK_DIR)/Versions/$(VERSION)/Headers/Rmath.h
        @rm -f $(RMATH_FRAMEWORK_DIR)/Versions/Current 
$(RMATH_FRAMEWORK_DIR)/Headers $(RMATH_FRAMEWORK_DIR)/Rmath
        @ln -sf $(VERSION) $(RMATH_FRAMEWORK_DIR)/Versions/Current
diff -ruN R-2.12.0-orig/src/scripts/R.sh.in R-2.12.0/src/scripts/R.sh.in
--- R-2.12.0-orig/src/scripts/R.sh.in   2010-10-30 15:40:11.000000000 +0900
+++ R-2.12.0/src/scripts/R.sh.in        2010-10-30 15:57:53.000000000 +0900
@@ -1,6 +1,8 @@
 #!@R_SHELL@
 # Shell wrapper for R executable.
 
+# export PATH=@PREFIX@/var/lib/fink/path-prefix-10.6:$PATH
+
 R_HOME_DIR=
 if test "${R_HOME_DIR}" = "@prefix@/@LIBnn@/R"; then
    case "@R_OS@" in


------------------------------------------------------------------------------
Special Offer -- Download ArcSight Logger for FREE!
Finally, a world-class log management solution at an even better 
price-free! And you'll get a free "Love Thy Logs" t-shirt when you
download Logger. Secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsisghtdev2dev
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to