Update to matplotlib-0.98.0

3 years worth of updates.

6 files changed, 592 insertions, 391 deletions

diff --git a/graphics/py-matplotlib/Makefile b/graphics/py-matplotlib/Makefile
index 985ad7ba653..e84f6407da0 100644
--- a/graphics/py-matplotlib/Makefile
+++ b/graphics/py-matplotlib/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2008/06/12 02:14:32 joerg Exp $
+# $NetBSD: Makefile,v 1.22 2008/12/19 22:35:41 markd Exp $
 #
 
-DISTNAME=		matplotlib-0.87.2
+DISTNAME=		matplotlib-0.98.0
 PKGNAME=		${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=		3
 CATEGORIES=		graphics python
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=matplotlib/}
 
@@ -11,23 +10,21 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://matplotlib.sourceforge.net/
 COMMENT=		Matlab-style plotting package for Python
 
+DEPENDS+=		${PYPKGPREFIX}-pytz>=2008b:../../time/py-pytz
+DEPENDS+=		${PYPKGPREFIX}-dateutil>=1.2:../../time/py-dateutil
+
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_LANGUAGES=		c c++
 USE_TOOLS+=		pkg-config
 PY_PATCHPLIST=		yes
 PYDISTUTILSPKG=		yes
+PYTHON_VERSIONS_ACCEPTED=	25 24
 
 .include "../../lang/python/extension.mk"
 
-PLIST_VARS+=		subprocess
-.if ${PYPACKAGE} == "python22" || ${PYPACKAGE} == "python23"
-PLIST.subprocess=	yes
-.endif
-
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
-.include "../../math/py-Numeric/buildlink3.mk"
-.include "../../math/py-numarray/buildlink3.mk"
+.include "../../math/py-numpy/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/py-matplotlib/PLIST b/graphics/py-matplotlib/PLIST
index d5ceeac02b9..845b9ab09c2 100644
--- a/graphics/py-matplotlib/PLIST
+++ b/graphics/py-matplotlib/PLIST
@@ -1,62 +1,327 @@
-@comment $NetBSD: PLIST,v 1.8 2008/04/12 22:43:01 jlam Exp $
-@comment $NetBSD: PLIST,v 1.8 2008/04/12 22:43:01 jlam Exp $
+@comment $NetBSD: PLIST,v 1.9 2008/12/19 22:35:41 markd Exp $
+${PYSITELIB}/configobj.py
+${PYSITELIB}/configobj.pyc
+${PYSITELIB}/configobj.pyo
+${PYSITELIB}/enthought/__init__.py
+${PYSITELIB}/enthought/__init__.pyc
+${PYSITELIB}/enthought/__init__.pyo
+${PYSITELIB}/enthought/etsconfig/__init__.py
+${PYSITELIB}/enthought/etsconfig/__init__.pyc
+${PYSITELIB}/enthought/etsconfig/__init__.pyo
+${PYSITELIB}/enthought/etsconfig/api.py
+${PYSITELIB}/enthought/etsconfig/api.pyc
+${PYSITELIB}/enthought/etsconfig/api.pyo
+${PYSITELIB}/enthought/etsconfig/etsconfig.py
+${PYSITELIB}/enthought/etsconfig/etsconfig.pyc
+${PYSITELIB}/enthought/etsconfig/etsconfig.pyo
+${PYSITELIB}/enthought/etsconfig/version.py
+${PYSITELIB}/enthought/etsconfig/version.pyc
+${PYSITELIB}/enthought/etsconfig/version.pyo
+${PYSITELIB}/enthought/traits/__init__.py
+${PYSITELIB}/enthought/traits/__init__.pyc
+${PYSITELIB}/enthought/traits/__init__.pyo
+${PYSITELIB}/enthought/traits/api.py
+${PYSITELIB}/enthought/traits/api.pyc
+${PYSITELIB}/enthought/traits/api.pyo
+${PYSITELIB}/enthought/traits/category.py
+${PYSITELIB}/enthought/traits/category.pyc
+${PYSITELIB}/enthought/traits/category.pyo
+${PYSITELIB}/enthought/traits/core.py
+${PYSITELIB}/enthought/traits/core.pyc
+${PYSITELIB}/enthought/traits/core.pyo
+${PYSITELIB}/enthought/traits/core_traits.py
+${PYSITELIB}/enthought/traits/core_traits.pyc
+${PYSITELIB}/enthought/traits/core_traits.pyo
+${PYSITELIB}/enthought/traits/ctraits.so
+${PYSITELIB}/enthought/traits/has_dynamic_views.py
+${PYSITELIB}/enthought/traits/has_dynamic_views.pyc
+${PYSITELIB}/enthought/traits/has_dynamic_views.pyo
+${PYSITELIB}/enthought/traits/has_traits.py
+${PYSITELIB}/enthought/traits/has_traits.pyc
+${PYSITELIB}/enthought/traits/has_traits.pyo
+${PYSITELIB}/enthought/traits/info_traits.py
+${PYSITELIB}/enthought/traits/info_traits.pyc
+${PYSITELIB}/enthought/traits/info_traits.pyo
+${PYSITELIB}/enthought/traits/standard.py
+${PYSITELIB}/enthought/traits/standard.pyc
+${PYSITELIB}/enthought/traits/standard.pyo
+${PYSITELIB}/enthought/traits/trait_base.py
+${PYSITELIB}/enthought/traits/trait_base.pyc
+${PYSITELIB}/enthought/traits/trait_base.pyo
+${PYSITELIB}/enthought/traits/trait_db.py
+${PYSITELIB}/enthought/traits/trait_db.pyc
+${PYSITELIB}/enthought/traits/trait_db.pyo
+${PYSITELIB}/enthought/traits/trait_errors.py
+${PYSITELIB}/enthought/traits/trait_errors.pyc
+${PYSITELIB}/enthought/traits/trait_errors.pyo
+${PYSITELIB}/enthought/traits/trait_handlers.py
+${PYSITELIB}/enthought/traits/trait_handlers.pyc
+${PYSITELIB}/enthought/traits/trait_handlers.pyo
+${PYSITELIB}/enthought/traits/trait_notifiers.py
+${PYSITELIB}/enthought/traits/trait_notifiers.pyc
+${PYSITELIB}/enthought/traits/trait_notifiers.pyo
+${PYSITELIB}/enthought/traits/trait_numeric.py
+${PYSITELIB}/enthought/traits/trait_numeric.pyc
+${PYSITELIB}/enthought/traits/trait_numeric.pyo
+${PYSITELIB}/enthought/traits/traits.py
+${PYSITELIB}/enthought/traits/traits.pyc
+${PYSITELIB}/enthought/traits/traits.pyo
+${PYSITELIB}/enthought/traits/ui/__init__.py
+${PYSITELIB}/enthought/traits/ui/__init__.pyc
+${PYSITELIB}/enthought/traits/ui/__init__.pyo
+${PYSITELIB}/enthought/traits/ui/api.py
+${PYSITELIB}/enthought/traits/ui/api.pyc
+${PYSITELIB}/enthought/traits/ui/api.pyo
+${PYSITELIB}/enthought/traits/ui/delegating_handler.py
+${PYSITELIB}/enthought/traits/ui/delegating_handler.pyc
+${PYSITELIB}/enthought/traits/ui/delegating_handler.pyo
+${PYSITELIB}/enthought/traits/ui/dockable_view_element.py
+${PYSITELIB}/enthought/traits/ui/dockable_view_element.pyc
+${PYSITELIB}/enthought/traits/ui/dockable_view_element.pyo
+${PYSITELIB}/enthought/traits/ui/editor.py
+${PYSITELIB}/enthought/traits/ui/editor.pyc
+${PYSITELIB}/enthought/traits/ui/editor.pyo
+${PYSITELIB}/enthought/traits/ui/editor_factory.py
+${PYSITELIB}/enthought/traits/ui/editor_factory.pyc
+${PYSITELIB}/enthought/traits/ui/editor_factory.pyo
+${PYSITELIB}/enthought/traits/ui/editors.py
+${PYSITELIB}/enthought/traits/ui/editors.pyc
+${PYSITELIB}/enthought/traits/ui/editors.pyo
+${PYSITELIB}/enthought/traits/ui/extras/__init__.py
+${PYSITELIB}/enthought/traits/ui/extras/__init__.pyc
+${PYSITELIB}/enthought/traits/ui/extras/__init__.pyo
+${PYSITELIB}/enthought/traits/ui/extras/checkbox_column.py
+${PYSITELIB}/enthought/traits/ui/extras/checkbox_column.pyc
+${PYSITELIB}/enthought/traits/ui/extras/checkbox_column.pyo
+${PYSITELIB}/enthought/traits/ui/extras/core.py
+${PYSITELIB}/enthought/traits/ui/extras/core.pyc
+${PYSITELIB}/enthought/traits/ui/extras/core.pyo
+${PYSITELIB}/enthought/traits/ui/group.py
+${PYSITELIB}/enthought/traits/ui/group.pyc
+${PYSITELIB}/enthought/traits/ui/group.pyo
+${PYSITELIB}/enthought/traits/ui/handler.py
+${PYSITELIB}/enthought/traits/ui/handler.pyc
+${PYSITELIB}/enthought/traits/ui/handler.pyo
+${PYSITELIB}/enthought/traits/ui/help.py
+${PYSITELIB}/enthought/traits/ui/help.pyc
+${PYSITELIB}/enthought/traits/ui/help.pyo
+${PYSITELIB}/enthought/traits/ui/help_template.py
+${PYSITELIB}/enthought/traits/ui/help_template.pyc
+${PYSITELIB}/enthought/traits/ui/help_template.pyo
+${PYSITELIB}/enthought/traits/ui/helper.py
+${PYSITELIB}/enthought/traits/ui/helper.pyc
+${PYSITELIB}/enthought/traits/ui/helper.pyo
+${PYSITELIB}/enthought/traits/ui/include.py
+${PYSITELIB}/enthought/traits/ui/include.pyc
+${PYSITELIB}/enthought/traits/ui/include.pyo
+${PYSITELIB}/enthought/traits/ui/instance_choice.py
+${PYSITELIB}/enthought/traits/ui/instance_choice.pyc
+${PYSITELIB}/enthought/traits/ui/instance_choice.pyo
+${PYSITELIB}/enthought/traits/ui/item.py
+${PYSITELIB}/enthought/traits/ui/item.pyc
+${PYSITELIB}/enthought/traits/ui/item.pyo
+${PYSITELIB}/enthought/traits/ui/key_bindings.py
+${PYSITELIB}/enthought/traits/ui/key_bindings.pyc
+${PYSITELIB}/enthought/traits/ui/key_bindings.pyo
+${PYSITELIB}/enthought/traits/ui/menu.py
+${PYSITELIB}/enthought/traits/ui/menu.pyc
+${PYSITELIB}/enthought/traits/ui/menu.pyo
+${PYSITELIB}/enthought/traits/ui/message.py
+${PYSITELIB}/enthought/traits/ui/message.pyc
+${PYSITELIB}/enthought/traits/ui/message.pyo
+${PYSITELIB}/enthought/traits/ui/null/__init__.py
+${PYSITELIB}/enthought/traits/ui/null/__init__.pyc
+${PYSITELIB}/enthought/traits/ui/null/__init__.pyo
+${PYSITELIB}/enthought/traits/ui/null/color_trait.py
+${PYSITELIB}/enthought/traits/ui/null/color_trait.pyc
+${PYSITELIB}/enthought/traits/ui/null/color_trait.pyo
+${PYSITELIB}/enthought/traits/ui/null/font_trait.py
+${PYSITELIB}/enthought/traits/ui/null/font_trait.pyc
+${PYSITELIB}/enthought/traits/ui/null/font_trait.pyo
+${PYSITELIB}/enthought/traits/ui/null/rgb_color_trait.py
+${PYSITELIB}/enthought/traits/ui/null/rgb_color_trait.pyc
+${PYSITELIB}/enthought/traits/ui/null/rgb_color_trait.pyo
+${PYSITELIB}/enthought/traits/ui/null/toolkit.py
+${PYSITELIB}/enthought/traits/ui/null/toolkit.pyc
+${PYSITELIB}/enthought/traits/ui/null/toolkit.pyo
+${PYSITELIB}/enthought/traits/ui/table_column.py
+${PYSITELIB}/enthought/traits/ui/table_column.pyc
+${PYSITELIB}/enthought/traits/ui/table_column.pyo
+${PYSITELIB}/enthought/traits/ui/table_filter.py
+${PYSITELIB}/enthought/traits/ui/table_filter.pyc
+${PYSITELIB}/enthought/traits/ui/table_filter.pyo
+${PYSITELIB}/enthought/traits/ui/tk/__init__.py
+${PYSITELIB}/enthought/traits/ui/tk/__init__.pyc
+${PYSITELIB}/enthought/traits/ui/tk/__init__.pyo
+${PYSITELIB}/enthought/traits/ui/tk/boolean_editor.py
+${PYSITELIB}/enthought/traits/ui/tk/boolean_editor.pyc
+${PYSITELIB}/enthought/traits/ui/tk/boolean_editor.pyo
+${PYSITELIB}/enthought/traits/ui/tk/button_editor.py
+${PYSITELIB}/enthought/traits/ui/tk/button_editor.pyc
+${PYSITELIB}/enthought/traits/ui/tk/button_editor.pyo
+${PYSITELIB}/enthought/traits/ui/tk/check_list_editor.py
+${PYSITELIB}/enthought/traits/ui/tk/check_list_editor.pyc
+${PYSITELIB}/enthought/traits/ui/tk/check_list_editor.pyo
+${PYSITELIB}/enthought/traits/ui/tk/color_editor.py
+${PYSITELIB}/enthought/traits/ui/tk/color_editor.pyc
+${PYSITELIB}/enthought/traits/ui/tk/color_editor.pyo
+${PYSITELIB}/enthought/traits/ui/tk/compound_editor.py
+${PYSITELIB}/enthought/traits/ui/tk/compound_editor.pyc
+${PYSITELIB}/enthought/traits/ui/tk/compound_editor.pyo
+${PYSITELIB}/enthought/traits/ui/tk/constants.py
+${PYSITELIB}/enthought/traits/ui/tk/constants.pyc
+${PYSITELIB}/enthought/traits/ui/tk/constants.pyo
+${PYSITELIB}/enthought/traits/ui/tk/directory_editor.py
+${PYSITELIB}/enthought/traits/ui/tk/directory_editor.pyc
+${PYSITELIB}/enthought/traits/ui/tk/directory_editor.pyo
+${PYSITELIB}/enthought/traits/ui/tk/editor.py
+${PYSITELIB}/enthought/traits/ui/tk/editor.pyc
+${PYSITELIB}/enthought/traits/ui/tk/editor.pyo
+${PYSITELIB}/enthought/traits/ui/tk/editor_factory.py
+${PYSITELIB}/enthought/traits/ui/tk/editor_factory.pyc
+${PYSITELIB}/enthought/traits/ui/tk/editor_factory.pyo
+${PYSITELIB}/enthought/traits/ui/tk/enum_editor.py
+${PYSITELIB}/enthought/traits/ui/tk/enum_editor.pyc
+${PYSITELIB}/enthought/traits/ui/tk/enum_editor.pyo
+${PYSITELIB}/enthought/traits/ui/tk/file_editor.py
+${PYSITELIB}/enthought/traits/ui/tk/file_editor.pyc
+${PYSITELIB}/enthought/traits/ui/tk/file_editor.pyo
+${PYSITELIB}/enthought/traits/ui/tk/font_editor.py
+${PYSITELIB}/enthought/traits/ui/tk/font_editor.pyc
+${PYSITELIB}/enthought/traits/ui/tk/font_editor.pyo
+${PYSITELIB}/enthought/traits/ui/tk/helper.py
+${PYSITELIB}/enthought/traits/ui/tk/helper.pyc
+${PYSITELIB}/enthought/traits/ui/tk/helper.pyo
+${PYSITELIB}/enthought/traits/ui/tk/image_control.py
+${PYSITELIB}/enthought/traits/ui/tk/image_control.pyc
+${PYSITELIB}/enthought/traits/ui/tk/image_control.pyo
+${PYSITELIB}/enthought/traits/ui/tk/image_enum_editor.py
+${PYSITELIB}/enthought/traits/ui/tk/image_enum_editor.pyc
+${PYSITELIB}/enthought/traits/ui/tk/image_enum_editor.pyo
+${PYSITELIB}/enthought/traits/ui/tk/instance_editor.py
+${PYSITELIB}/enthought/traits/ui/tk/instance_editor.pyc
+${PYSITELIB}/enthought/traits/ui/tk/instance_editor.pyo
+${PYSITELIB}/enthought/traits/ui/tk/list_editor.py
+${PYSITELIB}/enthought/traits/ui/tk/list_editor.pyc
+${PYSITELIB}/enthought/traits/ui/tk/list_editor.pyo
+${PYSITELIB}/enthought/traits/ui/tk/menu.py
+${PYSITELIB}/enthought/traits/ui/tk/menu.pyc
+${PYSITELIB}/enthought/traits/ui/tk/menu.pyo
+${PYSITELIB}/enthought/traits/ui/tk/range_editor.py
+${PYSITELIB}/enthought/traits/ui/tk/range_editor.pyc
+${PYSITELIB}/enthought/traits/ui/tk/range_editor.pyo
+${PYSITELIB}/enthought/traits/ui/tk/rgb_color_editor.py
+${PYSITELIB}/enthought/traits/ui/tk/rgb_color_editor.pyc
+${PYSITELIB}/enthought/traits/ui/tk/rgb_color_editor.pyo
+${PYSITELIB}/enthought/traits/ui/tk/text_editor.py
+${PYSITELIB}/enthought/traits/ui/tk/text_editor.pyc
+${PYSITELIB}/enthought/traits/ui/tk/text_editor.pyo
+${PYSITELIB}/enthought/traits/ui/tk/toolkit.py
+${PYSITELIB}/enthought/traits/ui/tk/toolkit.pyc
+${PYSITELIB}/enthought/traits/ui/tk/toolkit.pyo
+${PYSITELIB}/enthought/traits/ui/tk/ui_modal.py
+${PYSITELIB}/enthought/traits/ui/tk/ui_modal.pyc
+${PYSITELIB}/enthought/traits/ui/tk/ui_modal.pyo
+${PYSITELIB}/enthought/traits/ui/tk/ui_nonmodal.py
+${PYSITELIB}/enthought/traits/ui/tk/ui_nonmodal.pyc
+${PYSITELIB}/enthought/traits/ui/tk/ui_nonmodal.pyo
+${PYSITELIB}/enthought/traits/ui/tk/ui_panel.py
+${PYSITELIB}/enthought/traits/ui/tk/ui_panel.pyc
+${PYSITELIB}/enthought/traits/ui/tk/ui_panel.pyo
+${PYSITELIB}/enthought/traits/ui/tk/ui_wizard.py
+${PYSITELIB}/enthought/traits/ui/tk/ui_wizard.pyc
+${PYSITELIB}/enthought/traits/ui/tk/ui_wizard.pyo
+${PYSITELIB}/enthought/traits/ui/tk/view_application.py
+${PYSITELIB}/enthought/traits/ui/tk/view_application.pyc
+${PYSITELIB}/enthought/traits/ui/tk/view_application.pyo
+${PYSITELIB}/enthought/traits/ui/toolkit.py
+${PYSITELIB}/enthought/traits/ui/toolkit.pyc
+${PYSITELIB}/enthought/traits/ui/toolkit.pyo
+${PYSITELIB}/enthought/traits/ui/traits.py
+${PYSITELIB}/enthought/traits/ui/traits.pyc
+${PYSITELIB}/enthought/traits/ui/traits.pyo
+${PYSITELIB}/enthought/traits/ui/tree_node.py
+${PYSITELIB}/enthought/traits/ui/tree_node.pyc
+${PYSITELIB}/enthought/traits/ui/tree_node.pyo
+${PYSITELIB}/enthought/traits/ui/tuidb.py
+${PYSITELIB}/enthought/traits/ui/tuidb.pyc
+${PYSITELIB}/enthought/traits/ui/tuidb.pyo
+${PYSITELIB}/enthought/traits/ui/ui.py
+${PYSITELIB}/enthought/traits/ui/ui.pyc
+${PYSITELIB}/enthought/traits/ui/ui.pyo
+${PYSITELIB}/enthought/traits/ui/ui_info.py
+${PYSITELIB}/enthought/traits/ui/ui_info.pyc
+${PYSITELIB}/enthought/traits/ui/ui_info.pyo
+${PYSITELIB}/enthought/traits/ui/ui_traits.py
+${PYSITELIB}/enthought/traits/ui/ui_traits.pyc
+${PYSITELIB}/enthought/traits/ui/ui_traits.pyo
+${PYSITELIB}/enthought/traits/ui/undo.py
+${PYSITELIB}/enthought/traits/ui/undo.pyc
+${PYSITELIB}/enthought/traits/ui/undo.pyo
+${PYSITELIB}/enthought/traits/ui/value_tree.py
+${PYSITELIB}/enthought/traits/ui/value_tree.pyc
+${PYSITELIB}/enthought/traits/ui/value_tree.pyo
+${PYSITELIB}/enthought/traits/ui/view.py
+${PYSITELIB}/enthought/traits/ui/view.pyc
+${PYSITELIB}/enthought/traits/ui/view.pyo
+${PYSITELIB}/enthought/traits/ui/view_element.py
+${PYSITELIB}/enthought/traits/ui/view_element.pyc
+${PYSITELIB}/enthought/traits/ui/view_element.pyo
+${PYSITELIB}/enthought/traits/ui/view_elements.py
+${PYSITELIB}/enthought/traits/ui/view_elements.pyc
+${PYSITELIB}/enthought/traits/ui/view_elements.pyo
+${PYSITELIB}/enthought/traits/version.py
+${PYSITELIB}/enthought/traits/version.pyc
+${PYSITELIB}/enthought/traits/version.pyo
 ${PYSITELIB}/matplotlib/__init__.py
 ${PYSITELIB}/matplotlib/__init__.pyc
 ${PYSITELIB}/matplotlib/__init__.pyo
-${PYSITELIB}/matplotlib/_agg.so
 ${PYSITELIB}/matplotlib/_cm.py
 ${PYSITELIB}/matplotlib/_cm.pyc
 ${PYSITELIB}/matplotlib/_cm.pyo
-${PYSITELIB}/matplotlib/_contour.py
-${PYSITELIB}/matplotlib/_contour.pyc
-${PYSITELIB}/matplotlib/_contour.pyo
-${PYSITELIB}/matplotlib/_image.py
-${PYSITELIB}/matplotlib/_image.pyc
-${PYSITELIB}/matplotlib/_image.pyo
+${PYSITELIB}/matplotlib/_cntr.so
+${PYSITELIB}/matplotlib/_image.so
 ${PYSITELIB}/matplotlib/_mathtext_data.py
 ${PYSITELIB}/matplotlib/_mathtext_data.pyc
 ${PYSITELIB}/matplotlib/_mathtext_data.pyo
-${PYSITELIB}/matplotlib/_na_cntr.so
-${PYSITELIB}/matplotlib/_na_image.so
-${PYSITELIB}/matplotlib/_na_transforms.so
-${PYSITELIB}/matplotlib/_nc_cntr.so
-${PYSITELIB}/matplotlib/_nc_image.so
-${PYSITELIB}/matplotlib/_nc_transforms.so
+${PYSITELIB}/matplotlib/_path.so
 ${PYSITELIB}/matplotlib/_pylab_helpers.py
 ${PYSITELIB}/matplotlib/_pylab_helpers.pyc
 ${PYSITELIB}/matplotlib/_pylab_helpers.pyo
-${PYSITELIB}/matplotlib/_transforms.py
-${PYSITELIB}/matplotlib/_transforms.pyc
-${PYSITELIB}/matplotlib/_transforms.pyo
 ${PYSITELIB}/matplotlib/afm.py
 ${PYSITELIB}/matplotlib/afm.pyc
 ${PYSITELIB}/matplotlib/afm.pyo
-${PYSITELIB}/matplotlib/agg.py
-${PYSITELIB}/matplotlib/agg.pyc
-${PYSITELIB}/matplotlib/agg.pyo
+${PYSITELIB}/matplotlib/art3d.py
+${PYSITELIB}/matplotlib/art3d.pyc
+${PYSITELIB}/matplotlib/art3d.pyo
 ${PYSITELIB}/matplotlib/artist.py
 ${PYSITELIB}/matplotlib/artist.pyc
 ${PYSITELIB}/matplotlib/artist.pyo
 ${PYSITELIB}/matplotlib/axes.py
 ${PYSITELIB}/matplotlib/axes.pyc
 ${PYSITELIB}/matplotlib/axes.pyo
+${PYSITELIB}/matplotlib/axes3d.py
+${PYSITELIB}/matplotlib/axes3d.pyc
+${PYSITELIB}/matplotlib/axes3d.pyo
 ${PYSITELIB}/matplotlib/axis.py
 ${PYSITELIB}/matplotlib/axis.pyc
 ${PYSITELIB}/matplotlib/axis.pyo
+${PYSITELIB}/matplotlib/axis3d.py
+${PYSITELIB}/matplotlib/axis3d.pyc
+${PYSITELIB}/matplotlib/axis3d.pyo
 ${PYSITELIB}/matplotlib/backend_bases.py
 ${PYSITELIB}/matplotlib/backend_bases.pyc
 ${PYSITELIB}/matplotlib/backend_bases.pyo
+${PYSITELIB}/matplotlib/backends/Matplotlib.nib/classes.nib
+${PYSITELIB}/matplotlib/backends/Matplotlib.nib/info.nib
+${PYSITELIB}/matplotlib/backends/Matplotlib.nib/keyedobjects.nib
 ${PYSITELIB}/matplotlib/backends/__init__.py
 ${PYSITELIB}/matplotlib/backends/__init__.pyc
 ${PYSITELIB}/matplotlib/backends/__init__.pyo
-${PYSITELIB}/matplotlib/backends/_na_backend_agg.so
-${PYSITELIB}/matplotlib/backends/_nc_backend_agg.so
+${PYSITELIB}/matplotlib/backends/_backend_agg.so
 ${PYSITELIB}/matplotlib/backends/backend_agg.py
 ${PYSITELIB}/matplotlib/backends/backend_agg.pyc
 ${PYSITELIB}/matplotlib/backends/backend_agg.pyo
-${PYSITELIB}/matplotlib/backends/backend_agg2.py
-${PYSITELIB}/matplotlib/backends/backend_agg2.pyc
-${PYSITELIB}/matplotlib/backends/backend_agg2.pyo
 ${PYSITELIB}/matplotlib/backends/backend_cairo.py
 ${PYSITELIB}/matplotlib/backends/backend_cairo.pyc
 ${PYSITELIB}/matplotlib/backends/backend_cairo.pyo
@@ -69,9 +334,6 @@ ${PYSITELIB}/matplotlib/backends/backend_emf.pyo
 ${PYSITELIB}/matplotlib/backends/backend_fltkagg.py
 ${PYSITELIB}/matplotlib/backends/backend_fltkagg.pyc
 ${PYSITELIB}/matplotlib/backends/backend_fltkagg.pyo
-${PYSITELIB}/matplotlib/backends/backend_gd.py
-${PYSITELIB}/matplotlib/backends/backend_gd.pyc
-${PYSITELIB}/matplotlib/backends/backend_gd.pyo
 ${PYSITELIB}/matplotlib/backends/backend_gdk.py
 ${PYSITELIB}/matplotlib/backends/backend_gdk.pyc
 ${PYSITELIB}/matplotlib/backends/backend_gdk.pyo
@@ -84,15 +346,24 @@ ${PYSITELIB}/matplotlib/backends/backend_gtkagg.pyo
 ${PYSITELIB}/matplotlib/backends/backend_gtkcairo.py
 ${PYSITELIB}/matplotlib/backends/backend_gtkcairo.pyc
 ${PYSITELIB}/matplotlib/backends/backend_gtkcairo.pyo
-${PYSITELIB}/matplotlib/backends/backend_paint.py
-${PYSITELIB}/matplotlib/backends/backend_paint.pyc
-${PYSITELIB}/matplotlib/backends/backend_paint.pyo
+${PYSITELIB}/matplotlib/backends/backend_mixed.py
+${PYSITELIB}/matplotlib/backends/backend_mixed.pyc
+${PYSITELIB}/matplotlib/backends/backend_mixed.pyo
+${PYSITELIB}/matplotlib/backends/backend_pdf.py
+${PYSITELIB}/matplotlib/backends/backend_pdf.pyc
+${PYSITELIB}/matplotlib/backends/backend_pdf.pyo
 ${PYSITELIB}/matplotlib/backends/backend_ps.py
 ${PYSITELIB}/matplotlib/backends/backend_ps.pyc
 ${PYSITELIB}/matplotlib/backends/backend_ps.pyo
 ${PYSITELIB}/matplotlib/backends/backend_qt.py
 ${PYSITELIB}/matplotlib/backends/backend_qt.pyc
 ${PYSITELIB}/matplotlib/backends/backend_qt.pyo
+${PYSITELIB}/matplotlib/backends/backend_qt4.py
+${PYSITELIB}/matplotlib/backends/backend_qt4.pyc
+${PYSITELIB}/matplotlib/backends/backend_qt4.pyo
+${PYSITELIB}/matplotlib/backends/backend_qt4agg.py
+${PYSITELIB}/matplotlib/backends/backend_qt4agg.pyc
+${PYSITELIB}/matplotlib/backends/backend_qt4agg.pyo
 ${PYSITELIB}/matplotlib/backends/backend_qtagg.py
 ${PYSITELIB}/matplotlib/backends/backend_qtagg.pyc
 ${PYSITELIB}/matplotlib/backends/backend_qtagg.pyo
@@ -123,157 +394,48 @@ ${PYSITELIB}/matplotlib/cm.pyo
 ${PYSITELIB}/matplotlib/collections.py
 ${PYSITELIB}/matplotlib/collections.pyc
 ${PYSITELIB}/matplotlib/collections.pyo
+${PYSITELIB}/matplotlib/colorbar.py
+${PYSITELIB}/matplotlib/colorbar.pyc
+${PYSITELIB}/matplotlib/colorbar.pyo
 ${PYSITELIB}/matplotlib/colors.py
 ${PYSITELIB}/matplotlib/colors.pyc
 ${PYSITELIB}/matplotlib/colors.pyo
+${PYSITELIB}/matplotlib/config/__init__.py
+${PYSITELIB}/matplotlib/config/__init__.pyc
+${PYSITELIB}/matplotlib/config/__init__.pyo
+${PYSITELIB}/matplotlib/config/checkdep.py
+${PYSITELIB}/matplotlib/config/checkdep.pyc
+${PYSITELIB}/matplotlib/config/checkdep.pyo
+${PYSITELIB}/matplotlib/config/cutils.py
+${PYSITELIB}/matplotlib/config/cutils.pyc
+${PYSITELIB}/matplotlib/config/cutils.pyo
+${PYSITELIB}/matplotlib/config/mplconfig.py
+${PYSITELIB}/matplotlib/config/mplconfig.pyc
+${PYSITELIB}/matplotlib/config/mplconfig.pyo
+${PYSITELIB}/matplotlib/config/mpltraits.py
+${PYSITELIB}/matplotlib/config/mpltraits.pyc
+${PYSITELIB}/matplotlib/config/mpltraits.pyo
+${PYSITELIB}/matplotlib/config/rcparams.py
+${PYSITELIB}/matplotlib/config/rcparams.pyc
+${PYSITELIB}/matplotlib/config/rcparams.pyo
+${PYSITELIB}/matplotlib/config/rcsetup.py
+${PYSITELIB}/matplotlib/config/rcsetup.pyc
+${PYSITELIB}/matplotlib/config/rcsetup.pyo
+${PYSITELIB}/matplotlib/config/tconfig.py
+${PYSITELIB}/matplotlib/config/tconfig.pyc
+${PYSITELIB}/matplotlib/config/tconfig.pyo
+${PYSITELIB}/matplotlib/config/verbose.py
+${PYSITELIB}/matplotlib/config/verbose.pyc
+${PYSITELIB}/matplotlib/config/verbose.pyo
 ${PYSITELIB}/matplotlib/contour.py
 ${PYSITELIB}/matplotlib/contour.pyc
 ${PYSITELIB}/matplotlib/contour.pyo
 ${PYSITELIB}/matplotlib/dates.py
 ${PYSITELIB}/matplotlib/dates.pyc
 ${PYSITELIB}/matplotlib/dates.pyo
-${PYSITELIB}/matplotlib/enthought/__init__.py
-${PYSITELIB}/matplotlib/enthought/__init__.pyc
-${PYSITELIB}/matplotlib/enthought/__init__.pyo
-${PYSITELIB}/matplotlib/enthought/resource/__init__.py
-${PYSITELIB}/matplotlib/enthought/resource/__init__.pyc
-${PYSITELIB}/matplotlib/enthought/resource/__init__.pyo
-${PYSITELIB}/matplotlib/enthought/resource/resource_factory.py
-${PYSITELIB}/matplotlib/enthought/resource/resource_factory.pyc
-${PYSITELIB}/matplotlib/enthought/resource/resource_factory.pyo
-${PYSITELIB}/matplotlib/enthought/resource/resource_manager.py
-${PYSITELIB}/matplotlib/enthought/resource/resource_manager.pyc
-${PYSITELIB}/matplotlib/enthought/resource/resource_manager.pyo
-${PYSITELIB}/matplotlib/enthought/resource/resource_path.py
-${PYSITELIB}/matplotlib/enthought/resource/resource_path.pyc
-${PYSITELIB}/matplotlib/enthought/resource/resource_path.pyo
-${PYSITELIB}/matplotlib/enthought/resource/resource_reference.py
-${PYSITELIB}/matplotlib/enthought/resource/resource_reference.pyc
-${PYSITELIB}/matplotlib/enthought/resource/resource_reference.pyo
-${PYSITELIB}/matplotlib/enthought/traits/__init__.py
-${PYSITELIB}/matplotlib/enthought/traits/__init__.pyc
-${PYSITELIB}/matplotlib/enthought/traits/__init__.pyo
-${PYSITELIB}/matplotlib/enthought/traits/category.py
-${PYSITELIB}/matplotlib/enthought/traits/category.pyc
-${PYSITELIB}/matplotlib/enthought/traits/category.pyo
-${PYSITELIB}/matplotlib/enthought/traits/ctraits.so
-${PYSITELIB}/matplotlib/enthought/traits/has_traits.py
-${PYSITELIB}/matplotlib/enthought/traits/has_traits.pyc
-${PYSITELIB}/matplotlib/enthought/traits/has_traits.pyo
-${PYSITELIB}/matplotlib/enthought/traits/info_traits.py
-${PYSITELIB}/matplotlib/enthought/traits/info_traits.pyc
-${PYSITELIB}/matplotlib/enthought/traits/info_traits.pyo
-${PYSITELIB}/matplotlib/enthought/traits/standard.py
-${PYSITELIB}/matplotlib/enthought/traits/standard.pyc
-${PYSITELIB}/matplotlib/enthought/traits/standard.pyo
-${PYSITELIB}/matplotlib/enthought/traits/trait_base.py
-${PYSITELIB}/matplotlib/enthought/traits/trait_base.pyc
-${PYSITELIB}/matplotlib/enthought/traits/trait_base.pyo
-${PYSITELIB}/matplotlib/enthought/traits/trait_db.py
-${PYSITELIB}/matplotlib/enthought/traits/trait_db.pyc
-${PYSITELIB}/matplotlib/enthought/traits/trait_db.pyo
-${PYSITELIB}/matplotlib/enthought/traits/trait_errors.py
-${PYSITELIB}/matplotlib/enthought/traits/trait_errors.pyc
-${PYSITELIB}/matplotlib/enthought/traits/trait_errors.pyo
-${PYSITELIB}/matplotlib/enthought/traits/trait_handlers.py
-${PYSITELIB}/matplotlib/enthought/traits/trait_handlers.pyc
-${PYSITELIB}/matplotlib/enthought/traits/trait_handlers.pyo
-${PYSITELIB}/matplotlib/enthought/traits/trait_notifiers.py
-${PYSITELIB}/matplotlib/enthought/traits/trait_notifiers.pyc
-${PYSITELIB}/matplotlib/enthought/traits/trait_notifiers.pyo
-${PYSITELIB}/matplotlib/enthought/traits/trait_numeric.py
-${PYSITELIB}/matplotlib/enthought/traits/trait_numeric.pyc
-${PYSITELIB}/matplotlib/enthought/traits/trait_numeric.pyo
-${PYSITELIB}/matplotlib/enthought/traits/traits.py
-${PYSITELIB}/matplotlib/enthought/traits/traits.pyc
-${PYSITELIB}/matplotlib/enthought/traits/traits.pyo
-${PYSITELIB}/matplotlib/enthought/traits/ui/__init__.py
-${PYSITELIB}/matplotlib/enthought/traits/ui/__init__.pyc
-${PYSITELIB}/matplotlib/enthought/traits/ui/__init__.pyo
-${PYSITELIB}/matplotlib/enthought/traits/ui/editor.py
-${PYSITELIB}/matplotlib/enthought/traits/ui/editor.pyc
-${PYSITELIB}/matplotlib/enthought/traits/ui/editor.pyo
-${PYSITELIB}/matplotlib/enthought/traits/ui/editor_factory.py
-${PYSITELIB}/matplotlib/enthought/traits/ui/editor_factory.pyc
-${PYSITELIB}/matplotlib/enthought/traits/ui/editor_factory.pyo
-${PYSITELIB}/matplotlib/enthought/traits/ui/editors.py
-${PYSITELIB}/matplotlib/enthought/traits/ui/editors.pyc
-${PYSITELIB}/matplotlib/enthought/traits/ui/editors.pyo
-${PYSITELIB}/matplotlib/enthought/traits/ui/group.py
-${PYSITELIB}/matplotlib/enthought/traits/ui/group.pyc
-${PYSITELIB}/matplotlib/enthought/traits/ui/group.pyo
-${PYSITELIB}/matplotlib/enthought/traits/ui/handler.py
-${PYSITELIB}/matplotlib/enthought/traits/ui/handler.pyc
-${PYSITELIB}/matplotlib/enthought/traits/ui/handler.pyo
-${PYSITELIB}/matplotlib/enthought/traits/ui/help.py
-${PYSITELIB}/matplotlib/enthought/traits/ui/help.pyc
-${PYSITELIB}/matplotlib/enthought/traits/ui/help.pyo
-${PYSITELIB}/matplotlib/enthought/traits/ui/help_template.py
-${PYSITELIB}/matplotlib/enthought/traits/ui/help_template.pyc
-${PYSITELIB}/matplotlib/enthought/traits/ui/help_template.pyo
-${PYSITELIB}/matplotlib/enthought/traits/ui/helper.py
-${PYSITELIB}/matplotlib/enthought/traits/ui/helper.pyc
-${PYSITELIB}/matplotlib/enthought/traits/ui/helper.pyo
-${PYSITELIB}/matplotlib/enthought/traits/ui/include.py
-${PYSITELIB}/matplotlib/enthought/traits/ui/include.pyc
-${PYSITELIB}/matplotlib/enthought/traits/ui/include.pyo
-${PYSITELIB}/matplotlib/enthought/traits/ui/item.py
-${PYSITELIB}/matplotlib/enthought/traits/ui/item.pyc
-${PYSITELIB}/matplotlib/enthought/traits/ui/item.pyo
-${PYSITELIB}/matplotlib/enthought/traits/ui/menu.py
-${PYSITELIB}/matplotlib/enthought/traits/ui/menu.pyc
-${PYSITELIB}/matplotlib/enthought/traits/ui/menu.pyo
-${PYSITELIB}/matplotlib/enthought/traits/ui/null/__init__.py
-${PYSITELIB}/matplotlib/enthought/traits/ui/null/__init__.pyc
-${PYSITELIB}/matplotlib/enthought/traits/ui/null/__init__.pyo
-${PYSITELIB}/matplotlib/enthought/traits/ui/null/color_trait.py
-${PYSITELIB}/matplotlib/enthought/traits/ui/null/color_trait.pyc
-${PYSITELIB}/matplotlib/enthought/traits/ui/null/color_trait.pyo
-${PYSITELIB}/matplotlib/enthought/traits/ui/null/font_trait.py
-${PYSITELIB}/matplotlib/enthought/traits/ui/null/font_trait.pyc
-${PYSITELIB}/matplotlib/enthought/traits/ui/null/font_trait.pyo
-${PYSITELIB}/matplotlib/enthought/traits/ui/null/rgb_color_trait.py
-${PYSITELIB}/matplotlib/enthought/traits/ui/null/rgb_color_trait.pyc
-${PYSITELIB}/matplotlib/enthought/traits/ui/null/rgb_color_trait.pyo
-${PYSITELIB}/matplotlib/enthought/traits/ui/null/rgba_color_trait.py
-${PYSITELIB}/matplotlib/enthought/traits/ui/null/rgba_color_trait.pyc
-${PYSITELIB}/matplotlib/enthought/traits/ui/null/rgba_color_trait.pyo
-${PYSITELIB}/matplotlib/enthought/traits/ui/null/toolkit.py
-${PYSITELIB}/matplotlib/enthought/traits/ui/null/toolkit.pyc
-${PYSITELIB}/matplotlib/enthought/traits/ui/null/toolkit.pyo
-${PYSITELIB}/matplotlib/enthought/traits/ui/toolkit.py
-${PYSITELIB}/matplotlib/enthought/traits/ui/toolkit.pyc
-${PYSITELIB}/matplotlib/enthought/traits/ui/toolkit.pyo
-${PYSITELIB}/matplotlib/enthought/traits/ui/tree_node.py
-${PYSITELIB}/matplotlib/enthought/traits/ui/tree_node.pyc
-${PYSITELIB}/matplotlib/enthought/traits/ui/tree_node.pyo
-${PYSITELIB}/matplotlib/enthought/traits/ui/ui.py
-${PYSITELIB}/matplotlib/enthought/traits/ui/ui.pyc
-${PYSITELIB}/matplotlib/enthought/traits/ui/ui.pyo
-${PYSITELIB}/matplotlib/enthought/traits/ui/ui_info.py
-${PYSITELIB}/matplotlib/enthought/traits/ui/ui_info.pyc
-${PYSITELIB}/matplotlib/enthought/traits/ui/ui_info.pyo
-${PYSITELIB}/matplotlib/enthought/traits/ui/ui_traits.py
-${PYSITELIB}/matplotlib/enthought/traits/ui/ui_traits.pyc
-${PYSITELIB}/matplotlib/enthought/traits/ui/ui_traits.pyo
-${PYSITELIB}/matplotlib/enthought/traits/ui/undo.py
-${PYSITELIB}/matplotlib/enthought/traits/ui/undo.pyc
-${PYSITELIB}/matplotlib/enthought/traits/ui/undo.pyo
-${PYSITELIB}/matplotlib/enthought/traits/ui/view.py
-${PYSITELIB}/matplotlib/enthought/traits/ui/view.pyc
-${PYSITELIB}/matplotlib/enthought/traits/ui/view.pyo
-${PYSITELIB}/matplotlib/enthought/traits/ui/view_element.py
-${PYSITELIB}/matplotlib/enthought/traits/ui/view_element.pyc
-${PYSITELIB}/matplotlib/enthought/traits/ui/view_element.pyo
-${PYSITELIB}/matplotlib/enthought/traits/ui/view_elements.py
-${PYSITELIB}/matplotlib/enthought/traits/ui/view_elements.pyc
-${PYSITELIB}/matplotlib/enthought/traits/ui/view_elements.pyo
-${PYSITELIB}/matplotlib/enthought/util/__init__.py
-${PYSITELIB}/matplotlib/enthought/util/__init__.pyc
-${PYSITELIB}/matplotlib/enthought/util/__init__.pyo
-${PYSITELIB}/matplotlib/enthought/util/resource.py
-${PYSITELIB}/matplotlib/enthought/util/resource.pyc
-${PYSITELIB}/matplotlib/enthought/util/resource.pyo
+${PYSITELIB}/matplotlib/dviread.py
+${PYSITELIB}/matplotlib/dviread.pyc
+${PYSITELIB}/matplotlib/dviread.pyo
 ${PYSITELIB}/matplotlib/figure.py
 ${PYSITELIB}/matplotlib/figure.pyc
 ${PYSITELIB}/matplotlib/figure.pyo
@@ -283,6 +445,9 @@ ${PYSITELIB}/matplotlib/finance.pyo
 ${PYSITELIB}/matplotlib/font_manager.py
 ${PYSITELIB}/matplotlib/font_manager.pyc
 ${PYSITELIB}/matplotlib/font_manager.pyo
+${PYSITELIB}/matplotlib/fontconfig_pattern.py
+${PYSITELIB}/matplotlib/fontconfig_pattern.pyc
+${PYSITELIB}/matplotlib/fontconfig_pattern.pyo
 ${PYSITELIB}/matplotlib/ft2font.so
 ${PYSITELIB}/matplotlib/image.py
 ${PYSITELIB}/matplotlib/image.pyc
@@ -299,121 +464,158 @@ ${PYSITELIB}/matplotlib/mathtext.pyo
 ${PYSITELIB}/matplotlib/mlab.py
 ${PYSITELIB}/matplotlib/mlab.pyc
 ${PYSITELIB}/matplotlib/mlab.pyo
-${PYSITELIB}/matplotlib/mpl-data/Matplotlib.nib/classes.nib
-${PYSITELIB}/matplotlib/mpl-data/Matplotlib.nib/info.nib
-${PYSITELIB}/matplotlib/mpl-data/Matplotlib.nib/keyedobjects.nib
-${PYSITELIB}/matplotlib/mpl-data/Vera.ttf
-${PYSITELIB}/matplotlib/mpl-data/VeraBI.ttf
-${PYSITELIB}/matplotlib/mpl-data/VeraBd.ttf
-${PYSITELIB}/matplotlib/mpl-data/VeraIt.ttf
-${PYSITELIB}/matplotlib/mpl-data/VeraMoBI.ttf
-${PYSITELIB}/matplotlib/mpl-data/VeraMoBd.ttf
-${PYSITELIB}/matplotlib/mpl-data/VeraMoIt.ttf
-${PYSITELIB}/matplotlib/mpl-data/VeraMono.ttf
-${PYSITELIB}/matplotlib/mpl-data/VeraSe.ttf
-${PYSITELIB}/matplotlib/mpl-data/VeraSeBd.ttf
-${PYSITELIB}/matplotlib/mpl-data/back.png
-${PYSITELIB}/matplotlib/mpl-data/back.ppm
-${PYSITELIB}/matplotlib/mpl-data/back.svg
-${PYSITELIB}/matplotlib/mpl-data/back.xpm
-${PYSITELIB}/matplotlib/mpl-data/cmex10.afm
-${PYSITELIB}/matplotlib/mpl-data/cmex10.ttf
-${PYSITELIB}/matplotlib/mpl-data/cmmi10.afm
-${PYSITELIB}/matplotlib/mpl-data/cmmi10.ttf
-${PYSITELIB}/matplotlib/mpl-data/cmr10.afm
-${PYSITELIB}/matplotlib/mpl-data/cmr10.ttf
-${PYSITELIB}/matplotlib/mpl-data/cmsy10.afm
-${PYSITELIB}/matplotlib/mpl-data/cmsy10.ttf
-${PYSITELIB}/matplotlib/mpl-data/cmtt10.afm
-${PYSITELIB}/matplotlib/mpl-data/cmtt10.ttf
-${PYSITELIB}/matplotlib/mpl-data/filesave.png
-${PYSITELIB}/matplotlib/mpl-data/filesave.ppm
-${PYSITELIB}/matplotlib/mpl-data/filesave.svg
-${PYSITELIB}/matplotlib/mpl-data/filesave.xpm
-${PYSITELIB}/matplotlib/mpl-data/forward.png
-${PYSITELIB}/matplotlib/mpl-data/forward.ppm
-${PYSITELIB}/matplotlib/mpl-data/forward.svg
-${PYSITELIB}/matplotlib/mpl-data/forward.xpm
-${PYSITELIB}/matplotlib/mpl-data/hand.png
-${PYSITELIB}/matplotlib/mpl-data/hand.ppm
-${PYSITELIB}/matplotlib/mpl-data/hand.svg
-${PYSITELIB}/matplotlib/mpl-data/hand.xpm
-${PYSITELIB}/matplotlib/mpl-data/home.png
-${PYSITELIB}/matplotlib/mpl-data/home.ppm
-${PYSITELIB}/matplotlib/mpl-data/home.svg
-${PYSITELIB}/matplotlib/mpl-data/home.xpm
-${PYSITELIB}/matplotlib/mpl-data/matplotlib.svg
+${PYSITELIB}/matplotlib/mpl-data/fonts/afm/cmex10.afm
+${PYSITELIB}/matplotlib/mpl-data/fonts/afm/cmmi10.afm
+${PYSITELIB}/matplotlib/mpl-data/fonts/afm/cmr10.afm
+${PYSITELIB}/matplotlib/mpl-data/fonts/afm/cmsy10.afm
+${PYSITELIB}/matplotlib/mpl-data/fonts/afm/cmtt10.afm
+${PYSITELIB}/matplotlib/mpl-data/fonts/afm/pagd8a.afm
+${PYSITELIB}/matplotlib/mpl-data/fonts/afm/pagdo8a.afm
+${PYSITELIB}/matplotlib/mpl-data/fonts/afm/pagk8a.afm
+${PYSITELIB}/matplotlib/mpl-data/fonts/afm/pagko8a.afm
+${PYSITELIB}/matplotlib/mpl-data/fonts/afm/pbkd8a.afm
+${PYSITELIB}/matplotlib/mpl-data/fonts/afm/pbkdi8a.afm
+${PYSITELIB}/matplotlib/mpl-data/fonts/afm/pbkl8a.afm
+${PYSITELIB}/matplotlib/mpl-data/fonts/afm/pbkli8a.afm
+${PYSITELIB}/matplotlib/mpl-data/fonts/afm/pcrb8a.afm
+${PYSITELIB}/matplotlib/mpl-data/fonts/afm/pcrbo8a.afm
+${PYSITELIB}/matplotlib/mpl-data/fonts/afm/pcrr8a.afm
+${PYSITELIB}/matplotlib/mpl-data/fonts/afm/pcrro8a.afm
+${PYSITELIB}/matplotlib/mpl-data/fonts/afm/phvb8a.afm
+${PYSITELIB}/matplotlib/mpl-data/fonts/afm/phvb8an.afm
+${PYSITELIB}/matplotlib/mpl-data/fonts/afm/phvbo8a.afm
+${PYSITELIB}/matplotlib/mpl-data/fonts/afm/phvbo8an.afm
+${PYSITELIB}/matplotlib/mpl-data/fonts/afm/phvl8a.afm
+${PYSITELIB}/matplotlib/mpl-data/fonts/afm/phvlo8a.afm
+${PYSITELIB}/matplotlib/mpl-data/fonts/afm/phvr8a.afm
+${PYSITELIB}/matplotlib/mpl-data/fonts/afm/phvr8an.afm
+${PYSITELIB}/matplotlib/mpl-data/fonts/afm/phvro8a.afm
+${PYSITELIB}/matplotlib/mpl-data/fonts/afm/phvro8an.afm
+${PYSITELIB}/matplotlib/mpl-data/fonts/afm/pncb8a.afm
+${PYSITELIB}/matplotlib/mpl-data/fonts/afm/pncbi8a.afm
+${PYSITELIB}/matplotlib/mpl-data/fonts/afm/pncr8a.afm
+${PYSITELIB}/matplotlib/mpl-data/fonts/afm/pncri8a.afm
+${PYSITELIB}/matplotlib/mpl-data/fonts/afm/pplb8a.afm
+${PYSITELIB}/matplotlib/mpl-data/fonts/afm/pplbi8a.afm
+${PYSITELIB}/matplotlib/mpl-data/fonts/afm/pplr8a.afm
+${PYSITELIB}/matplotlib/mpl-data/fonts/afm/pplri8a.afm
+${PYSITELIB}/matplotlib/mpl-data/fonts/afm/psyr.afm
+${PYSITELIB}/matplotlib/mpl-data/fonts/afm/ptmb8a.afm
+${PYSITELIB}/matplotlib/mpl-data/fonts/afm/ptmbi8a.afm
+${PYSITELIB}/matplotlib/mpl-data/fonts/afm/ptmr8a.afm
+${PYSITELIB}/matplotlib/mpl-data/fonts/afm/ptmri8a.afm
+${PYSITELIB}/matplotlib/mpl-data/fonts/afm/putb8a.afm
+${PYSITELIB}/matplotlib/mpl-data/fonts/afm/putbi8a.afm
+${PYSITELIB}/matplotlib/mpl-data/fonts/afm/putr8a.afm
+${PYSITELIB}/matplotlib/mpl-data/fonts/afm/putri8a.afm
+${PYSITELIB}/matplotlib/mpl-data/fonts/afm/pzcmi8a.afm
+${PYSITELIB}/matplotlib/mpl-data/fonts/afm/pzdr.afm
+${PYSITELIB}/matplotlib/mpl-data/fonts/pdfcorefonts/Courier-Bold.afm
+${PYSITELIB}/matplotlib/mpl-data/fonts/pdfcorefonts/Courier-BoldOblique.afm
+${PYSITELIB}/matplotlib/mpl-data/fonts/pdfcorefonts/Courier-Oblique.afm
+${PYSITELIB}/matplotlib/mpl-data/fonts/pdfcorefonts/Courier.afm
+${PYSITELIB}/matplotlib/mpl-data/fonts/pdfcorefonts/Helvetica-Bold.afm
+${PYSITELIB}/matplotlib/mpl-data/fonts/pdfcorefonts/Helvetica-BoldOblique.afm
+${PYSITELIB}/matplotlib/mpl-data/fonts/pdfcorefonts/Helvetica-Oblique.afm
+${PYSITELIB}/matplotlib/mpl-data/fonts/pdfcorefonts/Helvetica.afm
+${PYSITELIB}/matplotlib/mpl-data/fonts/pdfcorefonts/Symbol.afm
+${PYSITELIB}/matplotlib/mpl-data/fonts/pdfcorefonts/Times-Bold.afm
+${PYSITELIB}/matplotlib/mpl-data/fonts/pdfcorefonts/Times-BoldItalic.afm
+${PYSITELIB}/matplotlib/mpl-data/fonts/pdfcorefonts/Times-Italic.afm
+${PYSITELIB}/matplotlib/mpl-data/fonts/pdfcorefonts/Times-Roman.afm
+${PYSITELIB}/matplotlib/mpl-data/fonts/pdfcorefonts/ZapfDingbats.afm
+${PYSITELIB}/matplotlib/mpl-data/fonts/pdfcorefonts/readme.txt
+${PYSITELIB}/matplotlib/mpl-data/fonts/ttf/STIXGeneral.ttf
+${PYSITELIB}/matplotlib/mpl-data/fonts/ttf/STIXGeneralBol.ttf
+${PYSITELIB}/matplotlib/mpl-data/fonts/ttf/STIXGeneralBolIta.ttf
+${PYSITELIB}/matplotlib/mpl-data/fonts/ttf/STIXGeneralItalic.ttf
+${PYSITELIB}/matplotlib/mpl-data/fonts/ttf/STIXNonUni.ttf
+${PYSITELIB}/matplotlib/mpl-data/fonts/ttf/STIXNonUniBol.ttf
+${PYSITELIB}/matplotlib/mpl-data/fonts/ttf/STIXNonUniBolIta.ttf
+${PYSITELIB}/matplotlib/mpl-data/fonts/ttf/STIXNonUniIta.ttf
+${PYSITELIB}/matplotlib/mpl-data/fonts/ttf/STIXSiz1Sym.ttf
+${PYSITELIB}/matplotlib/mpl-data/fonts/ttf/STIXSiz1SymBol.ttf
+${PYSITELIB}/matplotlib/mpl-data/fonts/ttf/STIXSiz2Sym.ttf
+${PYSITELIB}/matplotlib/mpl-data/fonts/ttf/STIXSiz2SymBol.ttf
+${PYSITELIB}/matplotlib/mpl-data/fonts/ttf/STIXSiz3Sym.ttf
+${PYSITELIB}/matplotlib/mpl-data/fonts/ttf/STIXSiz3SymBol.ttf
+${PYSITELIB}/matplotlib/mpl-data/fonts/ttf/STIXSiz4Sym.ttf
+${PYSITELIB}/matplotlib/mpl-data/fonts/ttf/STIXSiz4SymBol.ttf
+${PYSITELIB}/matplotlib/mpl-data/fonts/ttf/STIXSiz5Sym.ttf
+${PYSITELIB}/matplotlib/mpl-data/fonts/ttf/Vera.ttf
+${PYSITELIB}/matplotlib/mpl-data/fonts/ttf/VeraBI.ttf
+${PYSITELIB}/matplotlib/mpl-data/fonts/ttf/VeraBd.ttf
+${PYSITELIB}/matplotlib/mpl-data/fonts/ttf/VeraIt.ttf
+${PYSITELIB}/matplotlib/mpl-data/fonts/ttf/VeraMoBI.ttf
+${PYSITELIB}/matplotlib/mpl-data/fonts/ttf/VeraMoBd.ttf
+${PYSITELIB}/matplotlib/mpl-data/fonts/ttf/VeraMoIt.ttf
+${PYSITELIB}/matplotlib/mpl-data/fonts/ttf/VeraMono.ttf
+${PYSITELIB}/matplotlib/mpl-data/fonts/ttf/VeraSe.ttf
+${PYSITELIB}/matplotlib/mpl-data/fonts/ttf/VeraSeBd.ttf
+${PYSITELIB}/matplotlib/mpl-data/fonts/ttf/cmb10.ttf
+${PYSITELIB}/matplotlib/mpl-data/fonts/ttf/cmex10.ttf
+${PYSITELIB}/matplotlib/mpl-data/fonts/ttf/cmmi10.ttf
+${PYSITELIB}/matplotlib/mpl-data/fonts/ttf/cmr10.ttf
+${PYSITELIB}/matplotlib/mpl-data/fonts/ttf/cmss10.ttf
+${PYSITELIB}/matplotlib/mpl-data/fonts/ttf/cmsy10.ttf
+${PYSITELIB}/matplotlib/mpl-data/fonts/ttf/cmtt10.ttf
+${PYSITELIB}/matplotlib/mpl-data/images/back.png
+${PYSITELIB}/matplotlib/mpl-data/images/back.ppm
+${PYSITELIB}/matplotlib/mpl-data/images/back.svg
+${PYSITELIB}/matplotlib/mpl-data/images/back.xpm
+${PYSITELIB}/matplotlib/mpl-data/images/filesave.png
+${PYSITELIB}/matplotlib/mpl-data/images/filesave.ppm
+${PYSITELIB}/matplotlib/mpl-data/images/filesave.svg
+${PYSITELIB}/matplotlib/mpl-data/images/filesave.xpm
+${PYSITELIB}/matplotlib/mpl-data/images/forward.png
+${PYSITELIB}/matplotlib/mpl-data/images/forward.ppm
+${PYSITELIB}/matplotlib/mpl-data/images/forward.svg
+${PYSITELIB}/matplotlib/mpl-data/images/forward.xpm
+${PYSITELIB}/matplotlib/mpl-data/images/hand.png
+${PYSITELIB}/matplotlib/mpl-data/images/hand.ppm
+${PYSITELIB}/matplotlib/mpl-data/images/hand.svg
+${PYSITELIB}/matplotlib/mpl-data/images/hand.xpm
+${PYSITELIB}/matplotlib/mpl-data/images/home.png
+${PYSITELIB}/matplotlib/mpl-data/images/home.ppm
+${PYSITELIB}/matplotlib/mpl-data/images/home.svg
+${PYSITELIB}/matplotlib/mpl-data/images/home.xpm
+${PYSITELIB}/matplotlib/mpl-data/images/matplotlib.png
+${PYSITELIB}/matplotlib/mpl-data/images/matplotlib.svg
+${PYSITELIB}/matplotlib/mpl-data/images/move.png
+${PYSITELIB}/matplotlib/mpl-data/images/move.ppm
+${PYSITELIB}/matplotlib/mpl-data/images/move.svg
+${PYSITELIB}/matplotlib/mpl-data/images/move.xpm
+${PYSITELIB}/matplotlib/mpl-data/images/stock_close.ppm
+${PYSITELIB}/matplotlib/mpl-data/images/stock_close.xpm
+${PYSITELIB}/matplotlib/mpl-data/images/stock_down.ppm
+${PYSITELIB}/matplotlib/mpl-data/images/stock_down.xpm
+${PYSITELIB}/matplotlib/mpl-data/images/stock_left.ppm
+${PYSITELIB}/matplotlib/mpl-data/images/stock_left.xpm
+${PYSITELIB}/matplotlib/mpl-data/images/stock_refresh.ppm
+${PYSITELIB}/matplotlib/mpl-data/images/stock_refresh.xpm
+${PYSITELIB}/matplotlib/mpl-data/images/stock_right.ppm
+${PYSITELIB}/matplotlib/mpl-data/images/stock_right.xpm
+${PYSITELIB}/matplotlib/mpl-data/images/stock_save_as.ppm
+${PYSITELIB}/matplotlib/mpl-data/images/stock_save_as.xpm
+${PYSITELIB}/matplotlib/mpl-data/images/stock_up.ppm
+${PYSITELIB}/matplotlib/mpl-data/images/stock_up.xpm
+${PYSITELIB}/matplotlib/mpl-data/images/stock_zoom-in.ppm
+${PYSITELIB}/matplotlib/mpl-data/images/stock_zoom-in.xpm
+${PYSITELIB}/matplotlib/mpl-data/images/stock_zoom-out.ppm
+${PYSITELIB}/matplotlib/mpl-data/images/stock_zoom-out.xpm
+${PYSITELIB}/matplotlib/mpl-data/images/subplots.png
+${PYSITELIB}/matplotlib/mpl-data/images/subplots.ppm
+${PYSITELIB}/matplotlib/mpl-data/images/subplots.xpm
+${PYSITELIB}/matplotlib/mpl-data/images/zoom_to_rect.png
+${PYSITELIB}/matplotlib/mpl-data/images/zoom_to_rect.ppm
+${PYSITELIB}/matplotlib/mpl-data/images/zoom_to_rect.svg
+${PYSITELIB}/matplotlib/mpl-data/images/zoom_to_rect.xpm
+${PYSITELIB}/matplotlib/mpl-data/lineprops.glade
+${PYSITELIB}/matplotlib/mpl-data/matplotlib.conf
 ${PYSITELIB}/matplotlib/mpl-data/matplotlibrc
-${PYSITELIB}/matplotlib/mpl-data/move.png
-${PYSITELIB}/matplotlib/mpl-data/move.ppm
-${PYSITELIB}/matplotlib/mpl-data/move.svg
-${PYSITELIB}/matplotlib/mpl-data/move.xpm
-${PYSITELIB}/matplotlib/mpl-data/pagd8a.afm
-${PYSITELIB}/matplotlib/mpl-data/pagdo8a.afm
-${PYSITELIB}/matplotlib/mpl-data/pagk8a.afm
-${PYSITELIB}/matplotlib/mpl-data/pagko8a.afm
-${PYSITELIB}/matplotlib/mpl-data/pbkd8a.afm
-${PYSITELIB}/matplotlib/mpl-data/pbkdi8a.afm
-${PYSITELIB}/matplotlib/mpl-data/pbkl8a.afm
-${PYSITELIB}/matplotlib/mpl-data/pbkli8a.afm
-${PYSITELIB}/matplotlib/mpl-data/pcrb8a.afm
-${PYSITELIB}/matplotlib/mpl-data/pcrbo8a.afm
-${PYSITELIB}/matplotlib/mpl-data/pcrr8a.afm
-${PYSITELIB}/matplotlib/mpl-data/pcrro8a.afm
-${PYSITELIB}/matplotlib/mpl-data/phvb8a.afm
-${PYSITELIB}/matplotlib/mpl-data/phvb8an.afm
-${PYSITELIB}/matplotlib/mpl-data/phvbo8a.afm
-${PYSITELIB}/matplotlib/mpl-data/phvbo8an.afm
-${PYSITELIB}/matplotlib/mpl-data/phvl8a.afm
-${PYSITELIB}/matplotlib/mpl-data/phvlo8a.afm
-${PYSITELIB}/matplotlib/mpl-data/phvr8a.afm
-${PYSITELIB}/matplotlib/mpl-data/phvr8an.afm
-${PYSITELIB}/matplotlib/mpl-data/phvro8a.afm
-${PYSITELIB}/matplotlib/mpl-data/phvro8an.afm
-${PYSITELIB}/matplotlib/mpl-data/pncb8a.afm
-${PYSITELIB}/matplotlib/mpl-data/pncbi8a.afm
-${PYSITELIB}/matplotlib/mpl-data/pncr8a.afm
-${PYSITELIB}/matplotlib/mpl-data/pncri8a.afm
-${PYSITELIB}/matplotlib/mpl-data/pplb8a.afm
-${PYSITELIB}/matplotlib/mpl-data/pplbi8a.afm
-${PYSITELIB}/matplotlib/mpl-data/pplr8a.afm
-${PYSITELIB}/matplotlib/mpl-data/pplri8a.afm
-${PYSITELIB}/matplotlib/mpl-data/psyr.afm
-${PYSITELIB}/matplotlib/mpl-data/ptmb8a.afm
-${PYSITELIB}/matplotlib/mpl-data/ptmbi8a.afm
-${PYSITELIB}/matplotlib/mpl-data/ptmr8a.afm
-${PYSITELIB}/matplotlib/mpl-data/ptmri8a.afm
-${PYSITELIB}/matplotlib/mpl-data/putb8a.afm
-${PYSITELIB}/matplotlib/mpl-data/putbi8a.afm
-${PYSITELIB}/matplotlib/mpl-data/putr8a.afm
-${PYSITELIB}/matplotlib/mpl-data/putri8a.afm
-${PYSITELIB}/matplotlib/mpl-data/pzcmi8a.afm
-${PYSITELIB}/matplotlib/mpl-data/pzdr.afm
-${PYSITELIB}/matplotlib/mpl-data/stock_close.ppm
-${PYSITELIB}/matplotlib/mpl-data/stock_close.xpm
-${PYSITELIB}/matplotlib/mpl-data/stock_down.ppm
-${PYSITELIB}/matplotlib/mpl-data/stock_down.xpm
-${PYSITELIB}/matplotlib/mpl-data/stock_left.ppm
-${PYSITELIB}/matplotlib/mpl-data/stock_left.xpm
-${PYSITELIB}/matplotlib/mpl-data/stock_refresh.ppm
-${PYSITELIB}/matplotlib/mpl-data/stock_refresh.xpm
-${PYSITELIB}/matplotlib/mpl-data/stock_right.ppm
-${PYSITELIB}/matplotlib/mpl-data/stock_right.xpm
-${PYSITELIB}/matplotlib/mpl-data/stock_save_as.ppm
-${PYSITELIB}/matplotlib/mpl-data/stock_save_as.xpm
-${PYSITELIB}/matplotlib/mpl-data/stock_up.ppm
-${PYSITELIB}/matplotlib/mpl-data/stock_up.xpm
-${PYSITELIB}/matplotlib/mpl-data/stock_zoom-in.ppm
-${PYSITELIB}/matplotlib/mpl-data/stock_zoom-in.xpm
-${PYSITELIB}/matplotlib/mpl-data/stock_zoom-out.ppm
-${PYSITELIB}/matplotlib/mpl-data/stock_zoom-out.xpm
-${PYSITELIB}/matplotlib/mpl-data/subplots.png
-${PYSITELIB}/matplotlib/mpl-data/subplots.ppm
-${PYSITELIB}/matplotlib/mpl-data/subplots.xpm
-${PYSITELIB}/matplotlib/mpl-data/zoom_to_rect.png
-${PYSITELIB}/matplotlib/mpl-data/zoom_to_rect.ppm
-${PYSITELIB}/matplotlib/mpl-data/zoom_to_rect.svg
-${PYSITELIB}/matplotlib/mpl-data/zoom_to_rect.xpm
+${PYSITELIB}/matplotlib/mpl.py
+${PYSITELIB}/matplotlib/mpl.pyc
+${PYSITELIB}/matplotlib/mpl.pyo
 ${PYSITELIB}/matplotlib/numerix/__init__.py
 ${PYSITELIB}/matplotlib/numerix/__init__.pyc
 ${PYSITELIB}/matplotlib/numerix/__init__.pyo
@@ -438,18 +640,49 @@ ${PYSITELIB}/matplotlib/numerix/ma/__init__.pyo
 ${PYSITELIB}/matplotlib/numerix/mlab/__init__.py
 ${PYSITELIB}/matplotlib/numerix/mlab/__init__.pyc
 ${PYSITELIB}/matplotlib/numerix/mlab/__init__.pyo
+${PYSITELIB}/matplotlib/numerix/npyma/__init__.py
+${PYSITELIB}/matplotlib/numerix/npyma/__init__.pyc
+${PYSITELIB}/matplotlib/numerix/npyma/__init__.pyo
 ${PYSITELIB}/matplotlib/numerix/random_array/__init__.py
 ${PYSITELIB}/matplotlib/numerix/random_array/__init__.pyc
 ${PYSITELIB}/matplotlib/numerix/random_array/__init__.pyo
+${PYSITELIB}/matplotlib/nxutils.so
 ${PYSITELIB}/matplotlib/patches.py
 ${PYSITELIB}/matplotlib/patches.pyc
 ${PYSITELIB}/matplotlib/patches.pyo
+${PYSITELIB}/matplotlib/path.py
+${PYSITELIB}/matplotlib/path.pyc
+${PYSITELIB}/matplotlib/path.pyo
+${PYSITELIB}/matplotlib/proj3d.py
+${PYSITELIB}/matplotlib/proj3d.pyc
+${PYSITELIB}/matplotlib/proj3d.pyo
+${PYSITELIB}/matplotlib/projections/__init__.py
+${PYSITELIB}/matplotlib/projections/__init__.pyc
+${PYSITELIB}/matplotlib/projections/__init__.pyo
+${PYSITELIB}/matplotlib/projections/geo.py
+${PYSITELIB}/matplotlib/projections/geo.pyc
+${PYSITELIB}/matplotlib/projections/geo.pyo
+${PYSITELIB}/matplotlib/projections/polar.py
+${PYSITELIB}/matplotlib/projections/polar.pyc
+${PYSITELIB}/matplotlib/projections/polar.pyo
 ${PYSITELIB}/matplotlib/pylab.py
 ${PYSITELIB}/matplotlib/pylab.pyc
 ${PYSITELIB}/matplotlib/pylab.pyo
 ${PYSITELIB}/matplotlib/pyparsing.py
 ${PYSITELIB}/matplotlib/pyparsing.pyc
 ${PYSITELIB}/matplotlib/pyparsing.pyo
+${PYSITELIB}/matplotlib/pyplot.py
+${PYSITELIB}/matplotlib/pyplot.pyc
+${PYSITELIB}/matplotlib/pyplot.pyo
+${PYSITELIB}/matplotlib/quiver.py
+${PYSITELIB}/matplotlib/quiver.pyc
+${PYSITELIB}/matplotlib/quiver.pyo
+${PYSITELIB}/matplotlib/rcsetup.py
+${PYSITELIB}/matplotlib/rcsetup.pyc
+${PYSITELIB}/matplotlib/rcsetup.pyo
+${PYSITELIB}/matplotlib/scale.py
+${PYSITELIB}/matplotlib/scale.pyc
+${PYSITELIB}/matplotlib/scale.pyo
 ${PYSITELIB}/matplotlib/table.py
 ${PYSITELIB}/matplotlib/table.pyc
 ${PYSITELIB}/matplotlib/table.pyo
@@ -462,39 +695,57 @@ ${PYSITELIB}/matplotlib/text.pyo
 ${PYSITELIB}/matplotlib/ticker.py
 ${PYSITELIB}/matplotlib/ticker.pyc
 ${PYSITELIB}/matplotlib/ticker.pyo
-${PYSITELIB}/matplotlib/toolkits/__init__.py
-${PYSITELIB}/matplotlib/toolkits/__init__.pyc
-${PYSITELIB}/matplotlib/toolkits/__init__.pyo
 ${PYSITELIB}/matplotlib/transforms.py
 ${PYSITELIB}/matplotlib/transforms.pyc
 ${PYSITELIB}/matplotlib/transforms.pyo
+${PYSITELIB}/matplotlib/ttconv.so
+${PYSITELIB}/matplotlib/type1font.py
+${PYSITELIB}/matplotlib/type1font.pyc
+${PYSITELIB}/matplotlib/type1font.pyo
+${PYSITELIB}/matplotlib/units.py
+${PYSITELIB}/matplotlib/units.pyc
+${PYSITELIB}/matplotlib/units.pyo
 ${PYSITELIB}/matplotlib/widgets.py
 ${PYSITELIB}/matplotlib/widgets.pyc
 ${PYSITELIB}/matplotlib/widgets.pyo
 ${PYSITELIB}/matplotlib/windowing.py
 ${PYSITELIB}/matplotlib/windowing.pyc
 ${PYSITELIB}/matplotlib/windowing.pyo
-${PLIST.subprocess}${PYSITELIB}/subprocess/__init__.py
-${PLIST.subprocess}${PYSITELIB}/subprocess/__init__.pyc
-${PLIST.subprocess}${PYSITELIB}/subprocess/__init__.pyo
+${PYSITELIB}/mpl_toolkits/__init__.py
+${PYSITELIB}/mpl_toolkits/__init__.pyc
+${PYSITELIB}/mpl_toolkits/__init__.pyo
+${PYSITELIB}/mpl_toolkits/exceltools.py
+${PYSITELIB}/mpl_toolkits/exceltools.pyc
+${PYSITELIB}/mpl_toolkits/exceltools.pyo
+${PYSITELIB}/mpl_toolkits/gtktools.py
+${PYSITELIB}/mpl_toolkits/gtktools.pyc
+${PYSITELIB}/mpl_toolkits/gtktools.pyo
 ${PYSITELIB}/pylab.py
 ${PYSITELIB}/pylab.pyc
 ${PYSITELIB}/pylab.pyo
-@dirrm ${PYSITELIB}/matplotlib/toolkits
+@dirrm ${PYSITELIB}/mpl_toolkits
+@dirrm ${PYSITELIB}/matplotlib/projections
 @dirrm ${PYSITELIB}/matplotlib/numerix/random_array
+@dirrm ${PYSITELIB}/matplotlib/numerix/npyma
 @dirrm ${PYSITELIB}/matplotlib/numerix/mlab
 @dirrm ${PYSITELIB}/matplotlib/numerix/ma
 @dirrm ${PYSITELIB}/matplotlib/numerix/linear_algebra
 @dirrm ${PYSITELIB}/matplotlib/numerix/fft
 @dirrm ${PYSITELIB}/matplotlib/numerix
-@dirrm ${PYSITELIB}/matplotlib/mpl-data/Matplotlib.nib
+@dirrm ${PYSITELIB}/matplotlib/mpl-data/images
+@dirrm ${PYSITELIB}/matplotlib/mpl-data/fonts/ttf
+@dirrm ${PYSITELIB}/matplotlib/mpl-data/fonts/pdfcorefonts
+@dirrm ${PYSITELIB}/matplotlib/mpl-data/fonts/afm
+@dirrm ${PYSITELIB}/matplotlib/mpl-data/fonts
 @dirrm ${PYSITELIB}/matplotlib/mpl-data
-@dirrm ${PYSITELIB}/matplotlib/enthought/util
-@dirrm ${PYSITELIB}/matplotlib/enthought/traits/ui/null
-@dirrm ${PYSITELIB}/matplotlib/enthought/traits/ui
-@dirrm ${PYSITELIB}/matplotlib/enthought/traits
-@dirrm ${PYSITELIB}/matplotlib/enthought/resource
-@dirrm ${PYSITELIB}/matplotlib/enthought
+@dirrm ${PYSITELIB}/matplotlib/config
+@dirrm ${PYSITELIB}/matplotlib/backends/Matplotlib.nib
 @dirrm ${PYSITELIB}/matplotlib/backends
 @dirrm ${PYSITELIB}/matplotlib
-${PLIST.subprocess}@dirrm ${PYSITELIB}/subprocess
+@dirrm ${PYSITELIB}/enthought/traits/ui/tk
+@dirrm ${PYSITELIB}/enthought/traits/ui/null
+@dirrm ${PYSITELIB}/enthought/traits/ui/extras
+@dirrm ${PYSITELIB}/enthought/traits/ui
+@dirrm ${PYSITELIB}/enthought/traits
+@dirrm ${PYSITELIB}/enthought/etsconfig
+@dirrm ${PYSITELIB}/enthought
diff --git a/graphics/py-matplotlib/distinfo b/graphics/py-matplotlib/distinfo
index fa118b7b9ae..77d9536d794 100644
--- a/graphics/py-matplotlib/distinfo
+++ b/graphics/py-matplotlib/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.6 2008/11/11 16:34:26 joerg Exp $
+$NetBSD: distinfo,v 1.7 2008/12/19 22:35:41 markd Exp $
 
-SHA1 (matplotlib-0.87.2.tar.gz) = 9d969da7cf8ecb545f8c3a9030645292f32e1cbb
-RMD160 (matplotlib-0.87.2.tar.gz) = 0c913a357e8cec819a5a3f0812ef7854f329fb5c
-Size (matplotlib-0.87.2.tar.gz) = 2655790 bytes
-SHA1 (patch-aa) = 905b7657ac229a968c50faeee774408fd764ebfc
-SHA1 (patch-ab) = 4479168dfb7137e1061a5f19a705e39dbfca6434
-SHA1 (patch-ac) = 21a2feeb0e5c5bc984fe09fb936a98f97b698ec4
+SHA1 (matplotlib-0.98.0.tar.gz) = ce19f2fc7b1d66329e904171b04a2334bcc8400f
+RMD160 (matplotlib-0.98.0.tar.gz) = 59d429bb63ebc0fb755bd0a72e890e95a7c5d65c
+Size (matplotlib-0.98.0.tar.gz) = 4219634 bytes
+SHA1 (patch-aa) = eed9af2773cdca1e5451fd730e4b5a2a44c9efb1
diff --git a/graphics/py-matplotlib/patches/patch-aa b/graphics/py-matplotlib/patches/patch-aa
index 947fc869049..74b1a70cf56 100644
--- a/graphics/py-matplotlib/patches/patch-aa
+++ b/graphics/py-matplotlib/patches/patch-aa
@@ -1,17 +1,33 @@
-$NetBSD: patch-aa,v 1.3 2006/04/06 16:43:39 drochner Exp $
+$NetBSD: patch-aa,v 1.4 2008/12/19 22:35:41 markd Exp $
 
---- setupext.py.orig	2006-01-09 14:20:44.000000000 +0100
+--- setupext.py.orig	2008-05-30 10:47:10.000000000 +1200
 +++ setupext.py
-@@ -99,10 +99,8 @@ def temp_copy(_from, _to):
-     globals()["_cleanup_"+_to] = CleanUpFile(_to)
+@@ -108,10 +108,10 @@ options = {'display_status': True,
+            'provide_configobj': 'auto',
+            'provide_traits': 'auto',
+            'build_agg': True,
+-           'build_gtk': 'auto',
+-           'build_gtkagg': 'auto',
+-           'build_tkagg': 'auto',
+-           'build_wxagg': 'auto',
++           'build_gtk': False,
++           'build_gtkagg': False,
++           'build_tkagg': False,
++           'build_wxagg': False,
+            'build_image': True,
+            'build_windowing': True,
+            'backend': None,
+@@ -321,11 +321,8 @@ def check_for_libpng():
+     return True
  
  def add_base_flags(module):
--    incdirs = [os.path.join(p, 'include') for p in basedir[sys.platform]
--               if os.path.exists(p)]
--    libdirs = [os.path.join(p, 'lib')     for p in basedir[sys.platform]
--               if os.path.exists(p)]
+-    incdirs = filter(os.path.exists,
+-                     [os.path.join(p, 'include') for p in basedir[sys.platform] ])
+-    libdirs = filter(os.path.exists,
+-                     [os.path.join(p, 'lib')     for p in basedir[sys.platform] ]+
+-                     [os.path.join(p, 'lib64')     for p in basedir[sys.platform] ] )
 +    incdirs = os.path.join(os.environ['LOCALBASE'], 'include')
 +    libdirs = os.path.join(os.environ['LOCALBASE'], 'lib')
+ 
      module.include_dirs.extend(incdirs)
-     module.include_dirs.append('.')    
-     module.library_dirs.extend(libdirs)
+     module.include_dirs.append('.')
diff --git a/graphics/py-matplotlib/patches/patch-ab b/graphics/py-matplotlib/patches/patch-ab
deleted file mode 100644
index 8689dc24b44..00000000000
--- a/graphics/py-matplotlib/patches/patch-ab
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2006/04/06 16:43:39 drochner Exp $
-
---- setup.py.orig	2006-03-12 01:11:40.000000000 +0100
-+++ setup.py
-@@ -28,16 +28,16 @@ BUILD_IMAGE = 1
- # it.  It makes very nice antialiased output and also supports alpha
- # blending
- BUILD_AGG          = 1
--BUILD_GTKAGG       = 'auto'
--BUILD_GTK          = 'auto'
-+BUILD_GTKAGG       = 0
-+BUILD_GTK          = 0
- 
- # build TK GUI with Agg renderer ; requires Tkinter Python extension
- # and Tk includes
- # Use False or 0 if you don't want to build
--BUILD_TKAGG        = 'auto'
-+BUILD_TKAGG        = 0
- 
- # build wxPython GUI with Agg renderer ; requires wxPython package
--BUILD_WXAGG        = 'auto'
-+BUILD_WXAGG        = 0
- 
- 
- # build a small extension to manage the focus on win32 platforms.
-@@ -164,7 +164,7 @@ try: import datetime
- except ImportError: havedate = False
- else: havedate = True
- 
--if havedate: # dates require python23 datetime
-+if 0: # dates require python23 datetime
-     # only install pytz and dateutil if the user hasn't got them
-     def add_pytz():
-         packages.append('pytz')
diff --git a/graphics/py-matplotlib/patches/patch-ac b/graphics/py-matplotlib/patches/patch-ac
deleted file mode 100644
index 3469e2a4e8b..00000000000
--- a/graphics/py-matplotlib/patches/patch-ac
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2008/11/11 16:34:26 joerg Exp $
-
---- src/agg.cxx.orig	2005-11-16 18:18:44.000000000 +0100
-+++ src/agg.cxx
-@@ -1228,7 +1228,7 @@ type_error:
-     obj = pyobj;
-     if (PyCFunction_Check(obj)) {
-       /* here we get the method pointer for callbacks */
--      char *doc = (((PyCFunctionObject *)obj) -> m_ml -> ml_doc);
-+      const char *doc = (((PyCFunctionObject *)obj) -> m_ml -> ml_doc);
-       c = doc ? strstr(doc, "swig_ptr: ") : 0;
-       if (c) {
- 	c = ty ? SWIG_UnpackVoidPtr(c + 10, &vptr, ty->name) : 0;
-@@ -27621,11 +27621,11 @@ extern "C" {
-     swig_type_info **types_initial) {
-         size_t i;
-         for (i = 0; methods[i].ml_name; ++i) {
--            char *c = methods[i].ml_doc;
-+            const char *c = methods[i].ml_doc;
-             if (c && (c = strstr(c, "swig_ptr: "))) {
-                 int j;
-                 swig_const_info *ci = 0;
--                char *name = c + 10;
-+                const char *name = c + 10;
-                 for (j = 0; const_table[j].type; ++j) {
-                     if (strncmp(const_table[j].name, name, 
-                     strlen(const_table[j].name)) == 0) {