# HG changeset patch
# User iuc
# Date 1427574492 14400
# Node ID a03ee94316b5ec32741407de478424a34a621570
# Parent  fe60617380df105d5810e018c541e70ff0cf8493
Updated tool dependency definition

diff -r fe60617380df -r a03ee94316b5 tool_dependencies.xml
--- a/tool_dependencies.xml	Sun Apr 27 18:20:34 2014 -0400
+++ b/tool_dependencies.xml	Sat Mar 28 16:28:12 2015 -0400
@@ -1,13 +1,22 @@
 <?xml version="1.0"?>
 <tool_dependency>
     <package name="numpy" version="1.7.1">
-       <repository changeset_revision="ef12a3a11d5b" name="package_numpy_1_7" owner="iuc" prior_installation_required="True" toolshed="http://toolshed.g2.bx.psu.edu" />
+       <repository changeset_revision="c7ae57300a77" name="package_numpy_1_7" owner="iuc" prior_installation_required="True" toolshed="https://toolshed.g2.bx.psu.edu" />
     </package>
     <package name="freetype" version="2.4.11">
-        <repository changeset_revision="8761091302c4" name="package_freetype_2_4" owner="iuc" prior_installation_required="True" toolshed="http://toolshed.g2.bx.psu.edu" />
+        <repository changeset_revision="022adf7d6195" name="package_freetype_2_4" owner="iuc" prior_installation_required="True" toolshed="https://toolshed.g2.bx.psu.edu" />
     </package>
     <package name="libpng" version="1.6.7">
-        <repository changeset_revision="db14a391648d" name="package_libpng_1_6_7" owner="devteam" prior_installation_required="True" toolshed="http://toolshed.g2.bx.psu.edu" />
+        <repository changeset_revision="db14a391648d" name="package_libpng_1_6_7" owner="devteam" prior_installation_required="True" toolshed="https://toolshed.g2.bx.psu.edu" />
+    </package>
+    <package name="tiff" version="4.0.3">
+        <repository changeset_revision="e35a4a8b7e33" name="package_tiff_4_0_3" owner="iuc" prior_installation_required="True" toolshed="https://toolshed.g2.bx.psu.edu" />
+    </package>
+    <package name="zlib" version="1.2.8">
+        <repository changeset_revision="63a4a902cda2" name="package_zlib_1_2_8" owner="iuc" prior_installation_required="True" toolshed="https://toolshed.g2.bx.psu.edu" />
+    </package>
+    <package name="imaging" version="1.1.7">
+        <repository changeset_revision="d5f2627f4cfd" name="package_imaging_1_1_7" owner="iuc" prior_installation_required="True" toolshed="https://toolshed.g2.bx.psu.edu" />
     </package>
     <package name="matplotlib" version="1.2.1">
         <install version="1.0">
@@ -15,37 +24,45 @@
                 <!-- first action is always downloading -->
                 <action type="download_by_url">http://downloads.sourceforge.net/project/matplotlib/matplotlib/matplotlib-1.2.1/matplotlib-1.2.1.tar.gz</action>
 
-                <!-- populate the environment variables from the dependend repos -->
+                <!-- populate the environment variables from the dependent repos -->
                 <action type="set_environment_for_install">
-                    <repository changeset_revision="ef12a3a11d5b" name="package_numpy_1_7" owner="iuc" toolshed="http://toolshed.g2.bx.psu.edu">
+                   <repository changeset_revision="63a4a902cda2" name="package_zlib_1_2_8" owner="iuc" toolshed="https://toolshed.g2.bx.psu.edu">
+                        <package name="zlib" version="1.2.8" />
+                    </repository>
+                    <repository changeset_revision="c7ae57300a77" name="package_numpy_1_7" owner="iuc" toolshed="https://toolshed.g2.bx.psu.edu">
                         <package name="numpy" version="1.7.1" />
                     </repository>
-                    <repository changeset_revision="8761091302c4" name="package_freetype_2_4" owner="iuc" toolshed="http://toolshed.g2.bx.psu.edu">
+                    <repository changeset_revision="022adf7d6195" name="package_freetype_2_4" owner="iuc" toolshed="https://toolshed.g2.bx.psu.edu">
                         <package name="freetype" version="2.4.11" />
                     </repository>
-                    <repository changeset_revision="db14a391648d" name="package_libpng_1_6_7" owner="devteam" toolshed="http://toolshed.g2.bx.psu.edu">
+                    <repository changeset_revision="db14a391648d" name="package_libpng_1_6_7" owner="devteam" toolshed="https://toolshed.g2.bx.psu.edu">
                         <package name="libpng" version="1.6.7" />
                     </repository>
+                    <repository changeset_revision="e35a4a8b7e33" name="package_tiff_4_0_3" owner="iuc" toolshed="https://toolshed.g2.bx.psu.edu">
+                        <package name="tiff" version="4.0.3" />
+                    </repository>
+                    <repository changeset_revision="d5f2627f4cfd" name="package_imaging_1_1_7" owner="iuc" toolshed="https://toolshed.g2.bx.psu.edu">
+                        <package name="imaging" version="1.1.7" />
+                    </repository>
                 </action>
 
                 <!-- install matplotlib -->
                 <action type="make_directory">$INSTALL_DIR/lib/python</action>
                 <action type="shell_command">
-                    export PYTHONPATH=$PYTHONPATH:$INSTALL_DIR/lib/python:$PYTHONPATH_NUMPY &amp;&amp; 
-                    export CPLUS_INCLUDE_PATH=$FREETYPE_INCLUDE_DIR:$FREETYPE_INCLUDE_DIR/freetype2/:${LIBPNG_ROOT}/include &amp;&amp; 
-                    export LIBRARY_PATH=$FREETYPE_LIB_DIR:${LIBPNG_ROOT}/lib &amp;&amp;
+                    export PYTHONPATH=$PYTHONPATH:$INSTALL_DIR/lib/python &amp;&amp;
                     python setup.py install --install-lib $INSTALL_DIR/lib/python --install-scripts $INSTALL_DIR/bin
                 </action>
                 <action type="set_environment">
                     <environment_variable action="prepend_to" name="PYTHONPATH">$INSTALL_DIR/lib/python</environment_variable>
                     <environment_variable action="prepend_to" name="PYTHONPATH">$ENV[PYTHONPATH_NUMPY]</environment_variable>
+                    <environment_variable action="prepend_to" name="PYTHONPATH">$ENV[PYTHONPATH_IMAGING]</environment_variable>
+                    <environment_variable action="prepend_to" name="PATH">$ENV[PATH_NUMPY]</environment_variable>
                     <environment_variable action="prepend_to" name="LD_LIBRARY_PATH">$ENV[LIBPNG_ROOT]/lib</environment_variable>
-                    <environment_variable action="prepend_to" name="LD_LIBRARY_PATH">$ENV[FREETYPE_LIB_DIR]</environment_variable>
-                    <environment_variable action="prepend_to" name="PATH">$ENV[PATH_NUMPY]</environment_variable>
+                    <environment_variable action="set_to" name="MATPLOTLIB_LIB_PATH">$ENV[LIBPNG_ROOT]/lib</environment_variable>
                     <environment_variable action="set_to" name="PYTHONPATH_MATPLOTLIB">$INSTALL_DIR/lib/python</environment_variable>
                 </action>
             </actions>
         </install>
-        <readme>Compiling matplotlib requires a C compiler (typically gcc). To gain addidtiona performance pleae make sure you have ATLAS and BLAS installed.</readme>
+        <readme>Compiling matplotlib requires a C compiler (typically gcc) and libpng.</readme>
     </package>
 </tool_dependency>