# HG changeset patch
# User boris
# Date 1391522091 18000
# Node ID eca882dd63932f6e6438a0173ee062f4cf8c3767
# Parent  7fb1a5b1b6ba02f637088eef59f4a3031be6f91a
Uploaded updated xml

diff -r 7fb1a5b1b6ba -r eca882dd6393 tool_dependencies.xml
--- a/tool_dependencies.xml	Mon Feb 03 11:17:39 2014 -0500
+++ b/tool_dependencies.xml	Tue Feb 04 08:54:51 2014 -0500
@@ -1,30 +1,40 @@
 <?xml version="1.0"?>
 <tool_dependency>
-  <package name="readline" version="6.2">
-      <repository changeset_revision="ff20613e6fee" name="package_readline_6_2" owner="boris" prior_installation_required="True" toolshed="http://toolshed.g2.bx.psu.edu" />
+    <package name="readline" version="6.2">
+        <repository changeset_revision="ff20613e6fee" name="package_readline_6_2" owner="boris" prior_installation_required="True" toolshed="http://toolshed.g2.bx.psu.edu" />
     </package>
     <package name="libpng" version="1.6.7">
-      <repository changeset_revision="7de5acbf6c85" name="package_libpng_1_6_7" owner="boris" prior_installation_required="True" toolshed="http://toolshed.g2.bx.psu.edu" />
+        <repository changeset_revision="7de5acbf6c85" name="package_libpng_1_6_7" owner="boris" prior_installation_required="True" toolshed="http://toolshed.g2.bx.psu.edu" />
     </package>
     <package name="cairo" version="1.12.14">
-      <repository changeset_revision="0e7e9b619f24" name="package_cairo_1_12_14" owner="boris" prior_installation_required="True" toolshed="http://toolshed.g2.bx.psu.edu" />
+        <repository changeset_revision="0e7e9b619f24" name="package_cairo_1_12_14" owner="boris" prior_installation_required="True" toolshed="http://toolshed.g2.bx.psu.edu" />
     </package>
     <package name="pixman" version="0.32.4">
-      <repository changeset_revision="32b797e460d8" name="package_pixman_0_32_4" owner="boris" prior_installation_required="True" toolshed="http://toolshed.g2.bx.psu.edu" />
+        <repository changeset_revision="32b797e460d8" name="package_pixman_0_32_4" owner="boris" prior_installation_required="True" toolshed="http://toolshed.g2.bx.psu.edu" />
     </package>
     <package name="freetype" version="2.5.2">
-      <repository changeset_revision="261854cf7ae9" name="package_freetype_2_5_2" owner="boris" prior_installation_required="True" toolshed="http://toolshed.g2.bx.psu.edu" />
+        <repository changeset_revision="261854cf7ae9" name="package_freetype_2_5_2" owner="boris" prior_installation_required="True" toolshed="http://toolshed.g2.bx.psu.edu" />
     </package>
     <package name="R" version="2.15.0">
-      <install version="1.0">
-          <actions>
-              <action type="download_by_url">http://cran.rstudio.com/src/base/R-2/R-2.15.0.tar.gz</action>
+        <install version="1.0">
+            <actions>
+                <action type="download_by_url">http://cran.rstudio.com/src/base/R-2/R-2.15.0.tar.gz</action>
                 <action type="set_environment_for_install">
-                  <repository changeset_revision="ff20613e6fee" name="package_readline_6_2" owner="boris" prior_installation_required="True" toolshed="http://toolshed.g2.bx.psu.edu" />
-                    <repository changeset_revision="7de5acbf6c85" name="package_libpng_1_6_7" owner="boris" prior_installation_required="True" toolshed="http://toolshed.g2.bx.psu.edu" />
-                    <repository changeset_revision="0e7e9b619f24" name="package_cairo_1_12_14" owner="boris" prior_installation_required="True" toolshed="http://toolshed.g2.bx.psu.edu" />
-                    <repository changeset_revision="32b797e460d8" name="package_pixman_0_32_4" owner="boris" prior_installation_required="True" toolshed="http://toolshed.g2.bx.psu.edu" />
-                    <repository changeset_revision="261854cf7ae9" name="package_freetype_2_5_2" owner="boris" prior_installation_required="True" toolshed="http://toolshed.g2.bx.psu.edu" />
+                    <repository changeset_revision="ff20613e6fee" name="package_readline_6_2" owner="boris" prior_installation_required="True" toolshed="http://toolshed.g2.bx.psu.edu">
+                        <package name="readline" version="6.2" />
+                    </repository>
+                    <repository changeset_revision="7de5acbf6c85" name="package_libpng_1_6_7" owner="boris" prior_installation_required="True" toolshed="http://toolshed.g2.bx.psu.edu">
+                        <package name="libpng" version="1.6.7" />
+                    </repository>
+                    <repository changeset_revision="0e7e9b619f24" name="package_cairo_1_12_14" owner="boris" prior_installation_required="True" toolshed="http://toolshed.g2.bx.psu.edu">
+                        <package name="cairo" version="1.12.14" />
+                    </repository>
+                    <repository changeset_revision="32b797e460d8" name="package_pixman_0_32_4" owner="boris" prior_installation_required="True" toolshed="http://toolshed.g2.bx.psu.edu">
+                        <package name="pixman" version="0.32.4" />
+                    </repository>
+                    <repository changeset_revision="261854cf7ae9" name="package_freetype_2_5_2" owner="boris" prior_installation_required="True" toolshed="http://toolshed.g2.bx.psu.edu">
+                        <package name="freetype" version="2.5.2" />
+                    </repository>
                 </action>
                 <action type="shell_command">
                     export LDFLAGS="-L$PNG_LIBS -L$READLINE_LIBS" &amp;&amp; \
@@ -38,11 +48,12 @@
                                 --with-libpng \
                                 --without-x \
                                 --enable-R-shlib \
+                                --disable-R-framework \
                                 --prefix=$INSTALL_DIR 
                 </action>
                 <action type="make_install" />
                 <action type="set_environment">
-                  <environment_variable action="set_to" name="R_HOME">$INSTALL_DIR/lib/R</environment_variable>
+                    <environment_variable action="set_to" name="R_HOME">$INSTALL_DIR/lib/R</environment_variable>
                     <environment_variable action="set_to" name="R_LIBS">$INSTALL_DIR/lib/R/library</environment_variable>
                     <environment_variable action="prepend_to" name="PATH">$INSTALL_DIR/lib/R/bin</environment_variable>
                 </action>