Update of /cvsroot/fink/experimental/babayoshihiko/finkinfo
In directory vz-cvs-3.sog:/tmp/cvs-serv22108

Added Files:
        rstudio-desktop.info rstudio-server.info rstudio.info 
        rstudio.patch 
Log Message:
RStudio

--- NEW FILE: rstudio.patch ---
diff -ruN rstudio-rstudio-a250b30/CMakeGlobals.txt 
rstudio-rstudio-a250b30-new/CMakeGlobals.txt
--- rstudio-rstudio-a250b30/CMakeGlobals.txt    2011-06-12 00:09:57.000000000 
+0900
+++ rstudio-rstudio-a250b30-new/CMakeGlobals.txt        2011-07-12 
12:31:08.000000000 +0900
@@ -13,17 +13,17 @@
 
 # version info
 if ("$ENV{RSTUDIO_VERSION_MAJOR}" STREQUAL "")
-  set(CPACK_PACKAGE_VERSION_MAJOR "99")
+  set(CPACK_PACKAGE_VERSION_MAJOR "0")
 else()
   set(CPACK_PACKAGE_VERSION_MAJOR $ENV{RSTUDIO_VERSION_MAJOR})
 endif()
 if ("$ENV{RSTUDIO_VERSION_MINOR}" STREQUAL "")
-  set(CPACK_PACKAGE_VERSION_MINOR "9")
+  set(CPACK_PACKAGE_VERSION_MINOR "94")
 else()
   set(CPACK_PACKAGE_VERSION_MINOR $ENV{RSTUDIO_VERSION_MINOR})
 endif()
 if ("$ENV{RSTUDIO_VERSION_PATCH}" STREQUAL "")
-  set(CPACK_PACKAGE_VERSION_PATCH "9")
+  set(CPACK_PACKAGE_VERSION_PATCH "82")
 else()
   set(CPACK_PACKAGE_VERSION_PATCH $ENV{RSTUDIO_VERSION_PATCH})
 endif()
diff -ruN rstudio-rstudio-a250b30/cmake/modules/FindLibR.cmake 
rstudio-rstudio-a250b30-new/cmake/modules/FindLibR.cmake
--- rstudio-rstudio-a250b30/cmake/modules/FindLibR.cmake        2011-06-12 
00:09:57.000000000 +0900
+++ rstudio-rstudio-a250b30-new/cmake/modules/FindLibR.cmake    2011-07-11 
07:35:12.000000000 +0900
@@ -22,9 +22,9 @@
 
    find_library(LIBR_LIBRARIES R)
    if(LIBR_LIBRARIES)
-      set(LIBR_HOME "${LIBR_LIBRARIES}/Resources" CACHE PATH "R home 
directory")
-      set(LIBR_INCLUDE_DIRS "${LIBR_HOME}/include" CACHE PATH "R include 
directory")
-      set(LIBR_DOC_DIR "${LIBR_HOME}/doc" CACHE PATH "R doc directory")
+      set(LIBR_HOME "@PREFIX@/Library/Frameworks/R.framework/Resources" CACHE 
PATH "R home directory")
+      set(LIBR_INCLUDE_DIRS "@PREFIX@/Library/Frameworks/R.framework/Headers" 
CACHE PATH "R include directory")
+      set(LIBR_DOC_DIR "@PREFIX@/Library/Frameworks/R.framework/Resources/doc" 
CACHE PATH "R doc directory")
    endif()
 
 # detection for UNIX & Win32
Binary files rstudio-rstudio-a250b30/dependencies/.DS_Store and 
rstudio-rstudio-a250b30-new/dependencies/.DS_Store differ
diff -ruN rstudio-rstudio-a250b30/dependencies/common/install-gwt 
rstudio-rstudio-a250b30-new/dependencies/common/install-gwt
--- rstudio-rstudio-a250b30/dependencies/common/install-gwt     2011-06-12 
00:09:57.000000000 +0900
+++ rstudio-rstudio-a250b30-new/dependencies/common/install-gwt 2011-07-11 
07:36:22.000000000 +0900
@@ -46,7 +46,7 @@
 then
    echo "$GIN_ZIP already installed"
 else
-   download $GIN_ZIP
+   # download $GIN_ZIP
    mkdir -p "$LIB_DIR/gin/$GIN_VER"
    unzip -qd "$LIB_DIR/gin/$GIN_VER" "$GIN_ZIP"
    rm $GIN_ZIP
@@ -60,7 +60,7 @@
 then
    echo "$GWT_SDK_ZIP already installed"
 else
-   download $GWT_SDK_ZIP
+   # download $GWT_SDK_ZIP
    mkdir -p "$LIB_DIR/gwt"
    unzip -qd "$LIB_DIR" "$GWT_SDK_ZIP"
    mv "$LIB_DIR/$GWT_SDK" "$LIB_DIR/gwt/$GWT_SDK_VER"
diff -ruN rstudio-rstudio-a250b30/dependencies/osx/install-dependencies-osx 
rstudio-rstudio-a250b30-new/dependencies/osx/install-dependencies-osx
--- rstudio-rstudio-a250b30/dependencies/osx/install-dependencies-osx   
2011-06-12 00:09:57.000000000 +0900
+++ rstudio-rstudio-a250b30-new/dependencies/osx/install-dependencies-osx       
2011-07-11 07:37:31.000000000 +0900
@@ -21,9 +21,9 @@
 ./install-gwt
 
 # boost
-./install-boost
+# ./install-boost
 
 cd ../osx
 
 # enable PAM
-sudo cp /etc/pam.d/ftpd /etc/pam.d/rstudio
+# sudo cp /etc/pam.d/ftpd /etc/pam.d/rstudio
diff -ruN rstudio-rstudio-a250b30/src/cpp/core/r_util/REnvironmentPosix.cpp 
rstudio-rstudio-a250b30-new/src/cpp/core/r_util/REnvironmentPosix.cpp
--- rstudio-rstudio-a250b30/src/cpp/core/r_util/REnvironmentPosix.cpp   
2011-06-12 00:09:57.000000000 +0900
+++ rstudio-rstudio-a250b30-new/src/cpp/core/r_util/REnvironmentPosix.cpp       
2011-07-12 13:48:39.000000000 +0900
@@ -81,6 +81,7 @@
    rScriptPaths.push_back("/usr/bin/R");
    rScriptPaths.push_back("/usr/local/bin/R");
    rScriptPaths.push_back("/opt/local/bin/R");
+   rScriptPaths.push_back("@PREFIX@/Library/Frameworks/R.framework/R");
    return scanForRScript(rScriptPaths, pErrMsg);
 }
 
@@ -140,7 +141,7 @@
                                     std::string* pErrMsg)
 {
    // home path
-   *pHomePath = FilePath("/Library/Frameworks/R.framework/Resources");
+   *pHomePath = FilePath("@PREFIX@/Library/Frameworks/R.framework/Resources");
 
    // lib path
    std::string rLibPath;
@@ -597,7 +598,7 @@
       rLibPath = FilePath();
       scriptVars.clear();
       std::string scriptErrMsg;
-      rScriptPath = "/Library/Frameworks/R.framework/Resources/bin/R";
+      rScriptPath = "@PREFIX@/Library/Frameworks/R.framework/Resources/bin/R";
       if (!detectRLocationsUsingFramework(&rHomePath,
                                           &rLibPath,
                                           &scriptVars,
Binary files rstudio-rstudio-a250b30/src/cpp/server/.DS_Store and 
rstudio-rstudio-a250b30-new/src/cpp/server/.DS_Store differ

--- NEW FILE: rstudio-desktop.info ---
Package: rstudio-desktop
Version: 0.94.82
Revision: 0.3
Description: IDE for R
License: GPL
Homepage: http://rstudio.org
Maintainer: BABA Yoshihiko <babayoshih...@mac.com>
Depends: <<
  r-base, 
  qt4-base-mac-core-shlibs
<<
BuildDepends: << 
  fink (>= 0.28), cmake, boost1.46.nopython,
  qt4-base-mac
<<
Source: 
http://homepage.mac.com/babayoshihiko/fink/rstudio-rstudio-v%v-0-ga250b30.tar.gz
Source-MD5: 43754f89fe079700c5d3a181968133e3
SourceDirectory: rstudio-rstudio-a250b30
# Source: 
https://github.com/rstudio/rstudio/zipball/rstudio-rstudio-v0.93.91-1-g12cb413.tar.gz
# Source-MD5: 989e64f2e29ab447c1955a35c71a868a
# SourceDirectory: rstudio-rstudio-12cb413
Source2: https://s3.amazonaws.com/rstudio-buildtools/gin-1.5.zip
Source2-MD5: 2409168cc18bf5f341e107e6887fe359
Source3: https://s3.amazonaws.com/rstudio-buildtools/gwt-2.3.0.zip
Source3-MD5: 785cac54f4c359a98e8f5898d5a43dfa
PatchFile: rstudio.patch
PatchFile-MD5: bb192dbfbfa4aa88859ba9b9bda77cb3
PatchScript: sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p1

SetLDFLAGS: %p/Library/Frameworks/R.framework/Libraries/libR.dylib
CompileScript: <<
#!/bin/bash -ev
  export QTDIR=%p/lib/qt4-mac
  mkdir -p src/gwt/lib/gin/1.5
  mv ../LICENSE   src/gwt/lib/gin/1.5/
  mv ../README   src/gwt/lib/gin/1.5/  
  mv  ../javadoc   src/gwt/lib/gin/1.5/
  mv  ../*.jar         src/gwt/lib/gin/1.5/
  mkdir -p src/gwt/lib/gwt
  mv ../gwt-2.3.0 src/gwt/lib/gwt/2.3.0
  # pushd ./dependencies/osx  &&  ./install-dependencies-osx  && popd
 
  mkdir -p build
  cd build
  cmake -DRSTUDIO_TARGET=Desktop \
         -DCMAKE_BUILD_TYPE=Release \
         -DCMAKE_INSTALL_PREFIX=%b/Applications \
         -DCMAKE_INSTALL_LOCAL_ONLY=TRUE \
         -DCMAKE_VERBOSE_MAKEFILE=TRUE \
         -DLIBR_LIBRARIES=%p/Library/Frameworks/R.framework/Libraries \
         -DBoost_INCLUDE_DIR=%p/include \
         ..
  perl -pi -e 's|include|# include|'                       
src/cpp/desktop/cmake_install.cmake
  perl -pi -e 's|fixup_bundle|# fixup_bundle|'   
src/cpp/desktop/cmake_install.cmake
  make VERBOSE=0  
  make install CMAKE_INSTALL_PREFIX=%p/Applications
<<
# Install Phase.
InstallScript: <<
#!/bin/bash -ev
  echo "test"
<<
AppBundles: Applications/RStudio.app

DescPackaging: <<
  Requires Boost
<<
--- NEW FILE: rstudio-server.info ---
Package: rstudio-server
Version: 0.94.82
Revision: 0.3
Description: IDE for R
License: GPL
Homepage: http://rstudio.org
Maintainer: BABA Yoshihiko <babayoshih...@mac.com>
Depends: r-base
BuildDepends: fink (>= 0.28), cmake, boost1.46.nopython
Source: 
http://homepage.mac.com/babayoshihiko/fink/rstudio-rstudio-v%v-0-ga250b30.tar.gz
Source-MD5: 43754f89fe079700c5d3a181968133e3
SourceDirectory: rstudio-rstudio-a250b30
# Source: 
https://github.com/rstudio/rstudio/zipball/rstudio-rstudio-v0.93.91-1-g12cb413.tar.gz
# Source-MD5: 989e64f2e29ab447c1955a35c71a868a
# SourceDirectory: rstudio-rstudio-12cb413
Source2: https://s3.amazonaws.com/rstudio-buildtools/gin-1.5.zip
Source2-MD5: 2409168cc18bf5f341e107e6887fe359
Source3: https://s3.amazonaws.com/rstudio-buildtools/gwt-2.3.0.zip
Source3-MD5: 785cac54f4c359a98e8f5898d5a43dfa
PatchFile: rstudio.patch
PatchFile-MD5: bb192dbfbfa4aa88859ba9b9bda77cb3
PatchScript: sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p1

SetLDFLAGS: %p/Library/Frameworks/R.framework/Libraries/libR.dylib
CompileScript: <<
#!/bin/bash -ev
  # export QTDIR=%p/lib/qt4-mac
  mkdir -p src/gwt/lib/gin/1.5
  mv ../LICENSE   src/gwt/lib/gin/1.5/
  mv ../README   src/gwt/lib/gin/1.5/  
  mv  ../javadoc   src/gwt/lib/gin/1.5/
  mv  ../*.jar         src/gwt/lib/gin/1.5/
  mkdir -p src/gwt/lib/gwt
  mv ../gwt-2.3.0 src/gwt/lib/gwt/2.3.0
  # pushd ./dependencies/osx  &&  ./install-dependencies-osx  && popd
 
  mkdir -p build
  cd build
  cmake -DRSTUDIO_TARGET=Server \
         -DCMAKE_BUILD_TYPE=Release \
         -DCMAKE_INSTALL_PREFIX=%i \
         -DCMAKE_INSTALL_LOCAL_ONLY=TRUE \
         -DCMAKE_VERBOSE_MAKEFILE=TRUE \
         -DLIBR_LIBRARIES=%p/Library/Frameworks/R.framework/Libraries \
         -DBoost_INCLUDE_DIR=%p/include \
         ..
  make VERBOSE=0  
<<
# Install Phase.
InstallScript: <<
#!/bin/bash -ev
  cd build
  make install CMAKE_INSTALL_PREFIX=%i
<<
DocFiles: COPYING NOTICE README.md INSTALL

DescPackaging: <<
  Requires Boost
<<
--- NEW FILE: rstudio.info ---
Package: rstudio
Version: 0.94.82
Revision: 0.2
Description: IDE for R
License: GPL
Homepage: http://rstudio.org
Maintainer: BABA Yoshihiko <babayoshih...@mac.com>
Depends: r-base
BuildDepends: fink (>= 0.28), cmake, boost1.46.nopython
Source: 
https://github.com/rstudio/rstudio/zipball/rstudio-rstudio-v%v-0-ga250b30.tar.gz
Source-MD5: 43754f89fe079700c5d3a181968133e3
SourceDirectory: rstudio-rstudio-a250b30
# Source: 
https://github.com/rstudio/rstudio/zipball/rstudio-rstudio-v0.93.91-1-g12cb413.tar.gz
# Source-MD5: 989e64f2e29ab447c1955a35c71a868a
# SourceDirectory: rstudio-rstudio-12cb413
Source2: https://s3.amazonaws.com/rstudio-buildtools/gin-1.5.zip
Source2-MD5: 2409168cc18bf5f341e107e6887fe359
Source3: https://s3.amazonaws.com/rstudio-buildtools/gwt-2.3.0.zip
Source3-MD5: 785cac54f4c359a98e8f5898d5a43dfa
PatchFile: %n.patch
PatchFile-MD5: bb192dbfbfa4aa88859ba9b9bda77cb3
PatchScript: sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p1

SetLDFLAGS: %p/Library/Frameworks/R.framework/Libraries/libR.dylib
CompileScript: <<
#!/bin/bash -ev
  export QTDIR=%p/lib/qt4-mac
  mkdir -p src/gwt/lib/gin/1.5
  mv ../LICENSE   src/gwt/lib/gin/1.5/
  mv ../README   src/gwt/lib/gin/1.5/  
  mv  ../javadoc   src/gwt/lib/gin/1.5/
  mv  ../*.jar         src/gwt/lib/gin/1.5/
  mkdir -p src/gwt/lib/gwt
  mv ../gwt-2.3.0 src/gwt/lib/gwt/2.3.0
  # pushd ./dependencies/osx  &&  ./install-dependencies-osx  && popd
 
  mkdir -p build
  cd build
  cmake -DRSTUDIO_TARGET=Desktop \
         -DCMAKE_BUILD_TYPE=Release \
         -DCMAKE_INSTALL_PREFIX=%b/Applications \
         -DCMAKE_INSTALL_LOCAL_ONLY=TRUE \
         -DCMAKE_VERBOSE_MAKEFILE=TRUE \
         -DLIBR_LIBRARIES=%p/Library/Frameworks/R.framework/Libraries \
         -DBoost_INCLUDE_DIR=%p/include \
         ..
  perl -pi -e 's|include|# include|'                       
src/cpp/desktop/cmake_install.cmake
  perl -pi -e 's|fixup_bundle|# fixup_bundle|'   
src/cpp/desktop/cmake_install.cmake
  make VERBOSE=0  
  make install CMAKE_INSTALL_PREFIX=%p/Applications
<<
# Install Phase.
InstallScript: <<
#!/bin/bash -ev
  echo "test"
<<
AppBundles: Applications/RStudio.app

DescPackaging: <<
  Requires Boost
<<

------------------------------------------------------------------------------
AppSumo Presents a FREE Video for the SourceForge Community by Eric 
Ries, the creator of the Lean Startup Methodology on "Lean Startup 
Secrets Revealed." This video shows you how to validate your ideas, 
optimize your ideas and identify your business strategy.
http://p.sf.net/sfu/appsumosfdev2dev
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to