# HG changeset patch
# User brenninc
# Date 1443690412 14400
# Node ID 5e362fc1499bc8879a3268b561eb0ac4e2d50555
# Parent  b8860d234ee8643cb1aa1eef1fc2e0622f4f25f2
Uploaded

diff -r b8860d234ee8 -r 5e362fc1499b tool_dependencies.xml
--- a/tool_dependencies.xml	Wed Sep 30 10:45:51 2015 -0400
+++ b/tool_dependencies.xml	Thu Oct 01 05:06:52 2015 -0400
@@ -1,34 +1,36 @@
 <?xml version="1.0"?>
 <tool_dependency>
-    <package name="R" version="3.2.1">
+    <package name="atlas" version="3.10.2">
+        <repository changeset_revision="86b7c19454fa" name="package_atlas_3_10" owner="iuc" prior_installation_required="True" toolshed="https://testtoolshed.g2.bx.psu.edu" />
+    </package>
+    <package name="readline" version="6.3">
+        <repository changeset_revision="40f8ebe365e9" name="package_readline_6_3" owner="iuc" prior_installation_required="True" toolshed="https://testtoolshed.g2.bx.psu.edu" />
+    </package>
+    <package name="libpng" version="1.6.7">
+        <repository changeset_revision="ac6ef08bf0e6" name="package_libpng_1_6_7" owner="iuc" prior_installation_required="True" toolshed="https://testtoolshed.g2.bx.psu.edu" />
+    </package>
+    <package name="cairo" version="1.14.2">
+        <repository changeset_revision="9fe5875b0ede" name="package_cairo_1_14_2" owner="iuc" prior_installation_required="True" toolshed="https://testtoolshed.g2.bx.psu.edu" />
+    </package>
+    <package name="pixman" version="0.32.6">
+        <repository changeset_revision="2db67636b074" name="package_pixman_0_32_6" owner="iuc" prior_installation_required="True" toolshed="https://testtoolshed.g2.bx.psu.edu" />
+    </package>
+    <package name="freetype" version="2.5.2">
+        <repository changeset_revision="55f81025bcb0" name="package_freetype_2_5_2" owner="iuc" prior_installation_required="True" toolshed="https://testtoolshed.g2.bx.psu.edu" />
+    </package>
+    <package name="ncurses" version="6.0">
+        <repository changeset_revision="9331b44bf167" name="package_ncurses_6_0" owner="iuc" prior_installation_required="True" toolshed="https://testtoolshed.g2.bx.psu.edu" />
+    </package>
+    <package name="fontconfig" version="2.11.1">
+        <repository changeset_revision="e1df54930f90" name="package_fontconfig_2_11_1" owner="iuc" prior_installation_required="True" toolshed="https://testtoolshed.g2.bx.psu.edu" />
+    </package>
+    <package name="R" version="3.2.1" >
+        <repository name="brenninc_r_sept32105" owner="brenninc" changeset_revision="3ab867976871" toolshed="https://testtoolshed.g2.bx.psu.edu/"/>
+    </package>  
+    <package name="R_cairo" version="0.0.3">
         <install version="1.0">
             <actions>
-                <action type="download_by_url">http://cran.rstudio.com/src/base/R-3/R-3.2.1.tar.gz</action>
-                <package name="atlas" version="3.10.2">
-                    <repository changeset_revision="86b7c19454fa" name="package_atlas_3_10" owner="iuc" prior_installation_required="True" toolshed="https://testtoolshed.g2.bx.psu.edu" />
-                </package>
-                <package name="readline" version="6.3">
-                    <repository changeset_revision="40f8ebe365e9" name="package_readline_6_3" owner="iuc" prior_installation_required="True" toolshed="https://testtoolshed.g2.bx.psu.edu" />
-                </package>
-                <package name="libpng" version="1.6.7">
-                    <repository changeset_revision="ac6ef08bf0e6" name="package_libpng_1_6_7" owner="iuc" prior_installation_required="True" toolshed="https://testtoolshed.g2.bx.psu.edu" />
-                </package>
-                <package name="cairo" version="1.14.2">
-                    <repository changeset_revision="9fe5875b0ede" name="package_cairo_1_14_2" owner="iuc" prior_installation_required="True" toolshed="https://testtoolshed.g2.bx.psu.edu" />
-                </package>
-                <package name="pixman" version="0.32.6">
-                    <repository changeset_revision="2db67636b074" name="package_pixman_0_32_6" owner="iuc" prior_installation_required="True" toolshed="https://testtoolshed.g2.bx.psu.edu" />
-                </package>
-                <package name="freetype" version="2.5.2">
-                    <repository changeset_revision="55f81025bcb0" name="package_freetype_2_5_2" owner="iuc" prior_installation_required="True" toolshed="https://testtoolshed.g2.bx.psu.edu" />
-                </package>
-                <package name="ncurses" version="6.0">
-                    <repository changeset_revision="9331b44bf167" name="package_ncurses_6_0" owner="iuc" prior_installation_required="True" toolshed="https://testtoolshed.g2.bx.psu.edu" />
-                </package>
-                <package name="fontconfig" version="2.11.1">
-                    <repository changeset_revision="e1df54930f90" name="package_fontconfig_2_11_1" owner="iuc" prior_installation_required="True" toolshed="https://testtoolshed.g2.bx.psu.edu" />
-                </package>
-                <action type="set_environment_for_install">
+                <action type="setup_r_environment">
                     <repository changeset_revision="40f8ebe365e9" name="package_readline_6_3" owner="iuc" prior_installation_required="True" toolshed="https://testtoolshed.g2.bx.psu.edu">
                         <package name="readline" version="6.3" />
                     </repository>
@@ -50,53 +52,15 @@
                     <repository changeset_revision="e1df54930f90" name="package_fontconfig_2_11_1" owner="iuc" prior_installation_required="True" toolshed="https://testtoolshed.g2.bx.psu.edu">
                         <package name="fontconfig" version="2.11.1" />
                     </repository>
-                </action>
-                <action type="shell_command">
-                    export LDFLAGS="-L$LIBPNG_LIB_PATH -L$PNG_LIBS -L$NCURSES_LIB_PATH -L$READLINE_LIB_PATH" &amp;&amp;
-                    export LDFLAGS="$LDFLAGS -Wl,-rpath,$NCURSES_LIB_PATH" &amp;&amp; 
-                    export LDFLAGS="$LDFLAGS -Wl,-rpath,$READLINE_LIB_PATH" &amp;&amp;
-                    export LDFLAGS="$LDFLAGS -Wl,-rpath,$PIXMAN_LIB_PATH" &amp;&amp;
-                    export LDFLAGS="$LDFLAGS -Wl,-rpath,$LIBPNG_LIB_PATH" &amp;&amp;
-                    export LDFLAGS="$LDFLAGS -Wl,-rpath,$FREETYPE_LIB_PATH" &amp;&amp;
-                    export LDFLAGS="$LDFLAGS -Wl,-rpath,$FONTCONFIG_LIB_PATH" &amp;&amp;
-                    export LDFLAGS="$LDFLAGS -Wl,-rpath,$CAIRO_LIB_PATH" &amp;&amp;
-                    export# CFLAGS="-I$PNG_INCLUDES -I$NCURSES_INCLUDE_PATH -I$READLINE_INCLUDE_PATH -I$LIBPNG_INCLUDE_PATH -I$FONTCONFIG_INCLUDE_PATH -I$CAIRO_INCLUDE_PATH" &amp;&amp;
-                    export CXXFLAGS="-I$PNG_INCLUDES -I$NCURSES_INCLUDE_PATH -I$READLINE_INCLUDE_PATH -I$LIBPNG_INCLUDE_PATH -I$FONTCONFIG_INCLUDE_PATH -I$CAIRO_INCLUDE_PATH" &amp;&amp;
-                    export CPPFLAGS="-I$PNG_INCLUDES -I$NCURSES_INCLUDE_PATH -I$READLINE_INCLUDE_PATH -I$LIBPNG_INCLUDE_PATH -I$FONTCONFIG_INCLUDE_PATH -I$CAIRO_INCLUDE_PATH" &amp;&amp;
-                    ./configure --with-tcltk \
-                                --with-blas \
-                                --with-lapack \
-                                --with-readline \
-                                --with-cairo \
-                                --with-libpng \
-                                --without-x \
-                                --enable-R-shlib \
-                                --disable-R-framework \
-                                --libdir=$INSTALL_DIR/lib \
-                                --prefix=$INSTALL_DIR 
-                </action>
-                <action type="make_install" />
-                <action type="shell_command">sed -i.bak -e 's;$INSTALL_DIR;\${R_ROOT_DIR};g' $INSTALL_DIR/bin/R</action>
-                <action type="shell_command">sed -i.bak -e 's;$INSTALL_DIR;\${R_ROOT_DIR};g' $INSTALL_DIR/lib/R/bin/R</action>
-                <action type="set_environment">
-                    <environment_variable action="set_to" name="R_DOC_DIR">$INSTALL_DIR/lib/R/doc</environment_variable>
-                    <environment_variable action="set_to" name="R_HOME_DIR">$INSTALL_DIR/lib/R</environment_variable>
-                    <environment_variable action="set_to" name="R_INCLUDE_DIR">$INSTALL_DIR/lib/R/include</environment_variable>
-                    <environment_variable action="set_to" name="R_SHARE_DIR">$INSTALL_DIR/lib/R/share</environment_variable>
-                    <environment_variable action="set_to" name="R_ROOT_DIR">$INSTALL_DIR</environment_variable>
-                    <environment_variable action="set_to" name="R_HOME">$INSTALL_DIR/lib/R</environment_variable>
-                    <environment_variable action="set_to" name="RHOME">$INSTALL_DIR/lib/R</environment_variable>
-                    <environment_variable action="set_to" name="R_LIBS">$INSTALL_DIR/lib/R/library</environment_variable>
-                    <environment_variable action="set_to" name="PKG_CONFIG_DIR">$INSTALL_DIR/lib/pkgconfig:$INSTALL_DIR/share/pkgconfig</environment_variable>
-                    <environment_variable action="set_to" name="PKG_CONFIG_PATH">$INSTALL_DIR/lib/pkgconfig:$INSTALL_DIR/share/pkgconfig</environment_variable>
-                    <environment_variable action="prepend_to" name="PATH">$INSTALL_DIR/bin</environment_variable>
-                </action>
+                    <repository name="brenninc_r_sept32105" owner="brenninc" 
+                                changeset_revision="3ab867976871" toolshed="https://testtoolshed.g2.bx.psu.edu/">
+                        <package name="R" version="3.2.1" />
+                    </repository>  
+                    <package>https://cran.r-project.org/src/contrib/Cairo_1.5-8.tar.gz</package>
+                </action>            
             </actions>
         </install>
-        <readme>
-                The precompiled versions of this package were built 2015-07-27.
-                R is a free software environment for statistical computing and graphics.
-                NOTE: See custom compilation options above.
-        </readme>
     </package>
 </tool_dependency>
+
+