# HG changeset patch
# User brenninc
# Date 1441368652 14400
# Node ID 980c02545efc203d274b1962f6e777c8812f7a9a
# Parent  f4d982f2f976f911d824a3325c0bd61caab271b8
Uploaded

diff -r f4d982f2f976 -r 980c02545efc tool_dependencies.xml
--- a/tool_dependencies.xml	Fri Sep 04 07:03:54 2015 -0400
+++ b/tool_dependencies.xml	Fri Sep 04 08:10:52 2015 -0400
@@ -1,51 +1,46 @@
 <?xml version="1.0"?>
 <tool_dependency>
-    <package name="pixman" version="0.32.4">
-        <repository changeset_revision="bcf53d429118" name="package_pixman_0_32_4" owner="devteam" prior_installation_required="True" 
-                    toolshed="http://testtoolshed.g2.bx.psu.edu" />
+  <package name="pixman" version="0.32.4">
+      <repository changeset_revision="873f53f1abcd" name="package_pixman_0_32_4" owner="iuc" prior_installation_required="True" toolshed="https://testtoolshed.g2.bx.psu.edu" />
     </package>
     <package name="libpng" version="1.6.7">
-        <repository changeset_revision="833849e0ddfc" name="package_libpng_1_6_7" owner="devteam" prior_installation_required="True" 
-                    toolshed="http://testtoolshed.g2.bx.psu.edu" />
+      <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="freetype" version="2.5.2">
-        <repository changeset_revision="34ebf47e4941" name="package_freetype_2_5_2" owner="devteam" prior_installation_required="True" 
-                    toolshed="http://testtoolshed.g2.bx.psu.edu" />
+      <repository changeset_revision="8999860ddf69" name="package_freetype_2_5_2" owner="iuc" prior_installation_required="True" toolshed="https://testtoolshed.g2.bx.psu.edu" />
     </package>
     <package name="cairo" version="1.12.14">
-        <install version="1.0">
-            <actions>
-                <action type="download_by_url">http://depot.galaxyproject.org/package/source/cairo/cairo-1.12.14.tar.bz2</action>
+      <install version="1.0">
+          <actions>
+              <action type="download_by_url">http://depot.galaxyproject.org/package/source/cairo/cairo-1.12.14.tar.bz2</action>
                 <action type="set_environment_for_install">
-                    <repository changeset_revision="bcf53d429118" name="package_pixman_0_32_4" owner="devteam" prior_installation_required="True" 
-                                toolshed="http://testtoolshed.g2.bx.psu.edu">
-                        <package name="pixman" version="0.32.4" />
+                  <repository changeset_revision="873f53f1abcd" name="package_pixman_0_32_4" owner="iuc" prior_installation_required="True" toolshed="https://testtoolshed.g2.bx.psu.edu">
+                      <package name="pixman" version="0.32.4" />
                     </repository>
-                    <repository changeset_revision="833849e0ddfc" name="package_libpng_1_6_7" owner="devteam" prior_installation_required="True" 
-                                toolshed="http://testtoolshed.g2.bx.psu.edu">
-                        <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 name="libpng" version="1.6.7" />
                     </repository>
-                    <repository changeset_revision="34ebf47e4941" name="package_freetype_2_5_2" owner="devteam" prior_installation_required="True" 
-                                toolshed="http://testtoolshed.g2.bx.psu.edu">
-                        <package name="freetype" version="2.5.2" />
+                    <repository changeset_revision="8999860ddf69" name="package_freetype_2_5_2" owner="iuc" prior_installation_required="True" toolshed="https://testtoolshed.g2.bx.psu.edu">
+                      <package name="freetype" version="2.5.2" />
                     </repository>
                 </action>
                 <action type="shell_command">
                     export LDFLAGS="-Wl,-rpath,$PIXMAN_LIB_PATH -Wl,-rpath,$LIBPNG_ROOT/lib -Wl,-rpath,$FREETYPE_LIB_PATH" &amp;&amp; \ 
                     ./configure --prefix=$INSTALL_DIR \
                         --with-x=no \
+                        --enable-ft=yes \
                         --enable-xcb-shm=no \
                         --enable-xlib-xcb=no \
                         --enable-xcb=no \
-                        --enable-ft=yes \
                         --enable-xlib-xrender=no
                 </action>
                 <action type="make_install" />
                 <!-- Create an empty cairo-xlib.h file, because R's configure script explicitly includes it even if X is disabled. -->
                 <action type="shell_command">touch $INSTALL_DIR/include/cairo/cairo-xlib.h</action>
                 <action type="set_environment">
-                    <environment_variable action="prepend_to" name="PATH">$INSTALL_DIR/bin</environment_variable>
+                  <environment_variable action="prepend_to" name="PATH">$INSTALL_DIR/bin</environment_variable>
                     <environment_variable action="prepend_to" name="CAIRO_LIB_PATH">$INSTALL_DIR/lib</environment_variable>
+                    <environment_variable action="prepend_to" name="CAIRO_INCLUDE_PATH">$INSTALL_DIR/include</environment_variable>
                     <environment_variable action="prepend_to" name="PKG_CONFIG_PATH">$INSTALL_DIR/lib/pkgconfig</environment_variable>
                 </action>
             </actions>