update to 1.2

changes: feature extensions, new plot types etc.

3 files changed, 204 insertions, 13 deletions

diff --git a/graphics/py-matplotlib/Makefile b/graphics/py-matplotlib/Makefile
index c884491ead3..b297612ad11 100644
--- a/graphics/py-matplotlib/Makefile
+++ b/graphics/py-matplotlib/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.33 2012/10/06 14:11:17 asau Exp $
+# $NetBSD: Makefile,v 1.34 2012/12/17 11:51:18 drochner Exp $
 #
 
-DISTNAME=		matplotlib-1.1.1
+DISTNAME=		matplotlib-1.2.0
 PKGNAME=		${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=		graphics python
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=matplotlib/}
+MASTER_SITES=		https://github.com/downloads/matplotlib/matplotlib/
+FETCH_USING=		curl
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://matplotlib.sourceforge.net/
diff --git a/graphics/py-matplotlib/PLIST b/graphics/py-matplotlib/PLIST
index eaa63f9eb5a..822d246881e 100644
--- a/graphics/py-matplotlib/PLIST
+++ b/graphics/py-matplotlib/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2012/07/02 17:19:05 prlw1 Exp $
+@comment $NetBSD: PLIST,v 1.16 2012/12/17 11:51:18 drochner Exp $
 ${PYSITELIB}/matplotlib/__init__.py
 ${PYSITELIB}/matplotlib/__init__.pyc
 ${PYSITELIB}/matplotlib/__init__.pyo
@@ -63,6 +63,15 @@ ${PYSITELIB}/matplotlib/backends/backend_gdk.pyo
 ${PYSITELIB}/matplotlib/backends/backend_gtk.py
 ${PYSITELIB}/matplotlib/backends/backend_gtk.pyc
 ${PYSITELIB}/matplotlib/backends/backend_gtk.pyo
+${PYSITELIB}/matplotlib/backends/backend_gtk3.py
+${PYSITELIB}/matplotlib/backends/backend_gtk3.pyc
+${PYSITELIB}/matplotlib/backends/backend_gtk3.pyo
+${PYSITELIB}/matplotlib/backends/backend_gtk3agg.py
+${PYSITELIB}/matplotlib/backends/backend_gtk3agg.pyc
+${PYSITELIB}/matplotlib/backends/backend_gtk3agg.pyo
+${PYSITELIB}/matplotlib/backends/backend_gtk3cairo.py
+${PYSITELIB}/matplotlib/backends/backend_gtk3cairo.pyc
+${PYSITELIB}/matplotlib/backends/backend_gtk3cairo.pyo
 ${PYSITELIB}/matplotlib/backends/backend_gtkagg.py
 ${PYSITELIB}/matplotlib/backends/backend_gtkagg.pyc
 ${PYSITELIB}/matplotlib/backends/backend_gtkagg.pyo
@@ -78,6 +87,9 @@ ${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_pgf.py
+${PYSITELIB}/matplotlib/backends/backend_pgf.pyc
+${PYSITELIB}/matplotlib/backends/backend_pgf.pyo
 ${PYSITELIB}/matplotlib/backends/backend_ps.py
 ${PYSITELIB}/matplotlib/backends/backend_ps.pyc
 ${PYSITELIB}/matplotlib/backends/backend_ps.pyo
@@ -333,6 +345,7 @@ ${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.gif
 ${PYSITELIB}/matplotlib/mpl-data/images/matplotlib.png
 ${PYSITELIB}/matplotlib/mpl-data/images/matplotlib.svg
 ${PYSITELIB}/matplotlib/mpl-data/images/move.png
@@ -367,12 +380,32 @@ ${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/sample_data/AAPL.dat.gz
+${PYSITELIB}/matplotlib/mpl-data/sample_data/INTC.dat.gz
+${PYSITELIB}/matplotlib/mpl-data/sample_data/Minduka_Present_Blue_Pack.png
+${PYSITELIB}/matplotlib/mpl-data/sample_data/README.txt
+${PYSITELIB}/matplotlib/mpl-data/sample_data/aapl.csv
+${PYSITELIB}/matplotlib/mpl-data/sample_data/aapl.npy.gz
+${PYSITELIB}/matplotlib/mpl-data/sample_data/axes_grid/bivariate_normal.npy
+${PYSITELIB}/matplotlib/mpl-data/sample_data/ct.raw.gz
+${PYSITELIB}/matplotlib/mpl-data/sample_data/data_x_x2_x3.csv
+${PYSITELIB}/matplotlib/mpl-data/sample_data/demodata.csv
+${PYSITELIB}/matplotlib/mpl-data/sample_data/eeg.dat
+${PYSITELIB}/matplotlib/mpl-data/sample_data/embedding_in_wx3.xrc
+${PYSITELIB}/matplotlib/mpl-data/sample_data/goog.npy
+${PYSITELIB}/matplotlib/mpl-data/sample_data/lena.jpg
+${PYSITELIB}/matplotlib/mpl-data/sample_data/lena.png
+${PYSITELIB}/matplotlib/mpl-data/sample_data/logo2.png
+${PYSITELIB}/matplotlib/mpl-data/sample_data/membrane.dat
+${PYSITELIB}/matplotlib/mpl-data/sample_data/msft.csv
+${PYSITELIB}/matplotlib/mpl-data/sample_data/s1045.ima.gz
 ${PYSITELIB}/matplotlib/mpl.py
 ${PYSITELIB}/matplotlib/mpl.pyc
 ${PYSITELIB}/matplotlib/mpl.pyo
-${PYSITELIB}/matplotlib/nxutils.so
+${PYSITELIB}/matplotlib/nxutils.py
+${PYSITELIB}/matplotlib/nxutils.pyc
+${PYSITELIB}/matplotlib/nxutils.pyo
 ${PYSITELIB}/matplotlib/offsetbox.py
 ${PYSITELIB}/matplotlib/offsetbox.pyc
 ${PYSITELIB}/matplotlib/offsetbox.pyo
@@ -397,9 +430,12 @@ ${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/pyparsing_py2.py
+${PYSITELIB}/matplotlib/pyparsing_py2.pyc
+${PYSITELIB}/matplotlib/pyparsing_py2.pyo
+${PYSITELIB}/matplotlib/pyparsing_py3.py
+${PYSITELIB}/matplotlib/pyparsing_py3.pyc
+${PYSITELIB}/matplotlib/pyparsing_py3.pyo
 ${PYSITELIB}/matplotlib/pyplot.py
 ${PYSITELIB}/matplotlib/pyplot.pyc
 ${PYSITELIB}/matplotlib/pyplot.pyo
@@ -421,6 +457,9 @@ ${PYSITELIB}/matplotlib/sphinxext/__init__.pyo
 ${PYSITELIB}/matplotlib/sphinxext/ipython_console_highlighting.py
 ${PYSITELIB}/matplotlib/sphinxext/ipython_console_highlighting.pyc
 ${PYSITELIB}/matplotlib/sphinxext/ipython_console_highlighting.pyo
+${PYSITELIB}/matplotlib/sphinxext/ipython_directive.py
+${PYSITELIB}/matplotlib/sphinxext/ipython_directive.pyc
+${PYSITELIB}/matplotlib/sphinxext/ipython_directive.pyo
 ${PYSITELIB}/matplotlib/sphinxext/mathmpl.py
 ${PYSITELIB}/matplotlib/sphinxext/mathmpl.pyc
 ${PYSITELIB}/matplotlib/sphinxext/mathmpl.pyo
@@ -433,6 +472,12 @@ ${PYSITELIB}/matplotlib/sphinxext/plot_directive.pyo
 ${PYSITELIB}/matplotlib/spines.py
 ${PYSITELIB}/matplotlib/spines.pyc
 ${PYSITELIB}/matplotlib/spines.pyo
+${PYSITELIB}/matplotlib/stackplot.py
+${PYSITELIB}/matplotlib/stackplot.pyc
+${PYSITELIB}/matplotlib/stackplot.pyo
+${PYSITELIB}/matplotlib/streamplot.py
+${PYSITELIB}/matplotlib/streamplot.pyc
+${PYSITELIB}/matplotlib/streamplot.pyo
 ${PYSITELIB}/matplotlib/table.py
 ${PYSITELIB}/matplotlib/table.pyc
 ${PYSITELIB}/matplotlib/table.pyo
@@ -445,6 +490,9 @@ ${PYSITELIB}/matplotlib/testing/compare.pyo
 ${PYSITELIB}/matplotlib/testing/decorators.py
 ${PYSITELIB}/matplotlib/testing/decorators.pyc
 ${PYSITELIB}/matplotlib/testing/decorators.pyo
+${PYSITELIB}/matplotlib/testing/image_util.py
+${PYSITELIB}/matplotlib/testing/image_util.pyc
+${PYSITELIB}/matplotlib/testing/image_util.pyo
 ${PYSITELIB}/matplotlib/testing/jpl_units/Duration.py
 ${PYSITELIB}/matplotlib/testing/jpl_units/Duration.pyc
 ${PYSITELIB}/matplotlib/testing/jpl_units/Duration.pyo
@@ -472,6 +520,9 @@ ${PYSITELIB}/matplotlib/testing/jpl_units/__init__.pyo
 ${PYSITELIB}/matplotlib/testing/noseclasses.py
 ${PYSITELIB}/matplotlib/testing/noseclasses.pyc
 ${PYSITELIB}/matplotlib/testing/noseclasses.pyo
+${PYSITELIB}/matplotlib/testing/util.py
+${PYSITELIB}/matplotlib/testing/util.pyc
+${PYSITELIB}/matplotlib/testing/util.pyo
 ${PYSITELIB}/matplotlib/tests/__init__.py
 ${PYSITELIB}/matplotlib/tests/__init__.pyc
 ${PYSITELIB}/matplotlib/tests/__init__.pyo
@@ -491,27 +542,51 @@ ${PYSITELIB}/matplotlib/tests/baseline_images/pngsuite/basn4a08.png
 ${PYSITELIB}/matplotlib/tests/baseline_images/pngsuite/basn4a16.png
 ${PYSITELIB}/matplotlib/tests/baseline_images/pngsuite/basn6a08.png
 ${PYSITELIB}/matplotlib/tests/baseline_images/pngsuite/basn6a16.png
+${PYSITELIB}/matplotlib/tests/baseline_images/test_arrow_patches/fancyarrow_test_image.pdf
+${PYSITELIB}/matplotlib/tests/baseline_images/test_arrow_patches/fancyarrow_test_image.png
+${PYSITELIB}/matplotlib/tests/baseline_images/test_arrow_patches/fancyarrow_test_image.svg
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/arc_ellipse.pdf
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/arc_ellipse.png
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/arc_ellipse.svg
+${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/autoscale_tiny_range.pdf
+${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/autoscale_tiny_range.png
+${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/autoscale_tiny_range.svg
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/axhspan_epoch.pdf
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/axhspan_epoch.png
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/axhspan_epoch.svg
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/axvspan_epoch.pdf
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/axvspan_epoch.png
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/axvspan_epoch.svg
+${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/boxplot.pdf
+${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/boxplot.png
+${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/boxplot.svg
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/canonical.pdf
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/canonical.png
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/canonical.svg
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/const_xy.pdf
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/const_xy.png
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/const_xy.svg
+${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/contour_colorbar.pdf
+${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/contour_colorbar.png
+${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/contour_colorbar.svg
+${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/contour_hatching.pdf
+${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/contour_hatching.png
+${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/contour_hatching.svg
+${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/errorbar_basic.pdf
+${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/errorbar_basic.png
+${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/errorbar_basic.svg
+${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/errorbar_mixed.pdf
+${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/errorbar_mixed.png
+${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/errorbar_mixed.svg
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/fill_between_interpolate.pdf
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/fill_between_interpolate.png
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/fill_between_interpolate.svg
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/fill_units.pdf
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/fill_units.png
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/fill_units.svg
+${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/formatter_large_small.pdf
+${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/formatter_large_small.png
+${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/formatter_large_small.svg
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/formatter_ticker_001.pdf
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/formatter_ticker_001.png
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/formatter_ticker_001.svg
@@ -530,15 +605,33 @@ ${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/formatter_ticker_005.svg
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/hexbin_extent.pdf
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/hexbin_extent.png
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/hexbin_extent.svg
+${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/hist2d.pdf
+${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/hist2d.png
+${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/hist2d.svg
+${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/hist2d_transpose.pdf
+${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/hist2d_transpose.png
+${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/hist2d_transpose.svg
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/hist_log.pdf
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/hist_log.png
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/hist_log.svg
+${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/hist_stacked.pdf
+${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/hist_stacked.png
+${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/hist_stacked.svg
+${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/hist_stacked_weights.pdf
+${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/hist_stacked_weights.png
+${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/hist_stacked_weights.svg
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/imshow.pdf
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/imshow.png
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/imshow.svg
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/imshow_clip.pdf
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/imshow_clip.png
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/imshow_clip.svg
+${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/log_scales.pdf
+${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/log_scales.png
+${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/log_scales.svg
+${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/marker_edges.pdf
+${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/marker_edges.png
+${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/marker_edges.svg
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/markevery.pdf
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/markevery.png
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/markevery.svg
@@ -581,6 +674,9 @@ ${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/polar_wrap_360.svg
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/polycollection_joinstyle.pdf
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/polycollection_joinstyle.png
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/polycollection_joinstyle.svg
+${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/scatter.pdf
+${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/scatter.png
+${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/scatter.svg
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/shaped_data.pdf
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/shaped_data.png
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/shaped_data.svg
@@ -590,16 +686,31 @@ ${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/single_date.svg
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/single_point.pdf
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/single_point.png
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/single_point.svg
+${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/stackplot_test_image.pdf
+${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/stackplot_test_image.png
+${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/stackplot_test_image.svg
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/symlog.pdf
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/symlog.png
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/symlog.svg
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/symlog2.pdf
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/symlog2.png
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/symlog2.svg
+${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/transparent_markers.pdf
+${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/transparent_markers.png
+${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/transparent_markers.svg
+${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/twin_axis_locaters_formatters.pdf
+${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/twin_axis_locaters_formatters.png
+${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/twin_axis_locaters_formatters.svg
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/units_strings.pdf
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/units_strings.png
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_axes/units_strings.svg
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_backend_pdf/pdf_use14corefonts.pdf
+${PYSITELIB}/matplotlib/tests/baseline_images/test_backend_pgf/pgf_pdflatex.pdf
+${PYSITELIB}/matplotlib/tests/baseline_images/test_backend_pgf/pgf_rcupdate1.pdf
+${PYSITELIB}/matplotlib/tests/baseline_images/test_backend_pgf/pgf_rcupdate2.pdf
+${PYSITELIB}/matplotlib/tests/baseline_images/test_backend_pgf/pgf_xelatex.pdf
+${PYSITELIB}/matplotlib/tests/baseline_images/test_colorbar/colorbar_extensions_proportional.png
+${PYSITELIB}/matplotlib/tests/baseline_images/test_colorbar/colorbar_extensions_uniform.png
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_dates/DateFormatter_fractionalSeconds.pdf
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_dates/DateFormatter_fractionalSeconds.png
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_dates/DateFormatter_fractionalSeconds.svg
@@ -692,17 +803,29 @@ ${PYSITELIB}/matplotlib/tests/baseline_images/test_image/image_clip.svg
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_image/image_interps.pdf
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_image/image_interps.png
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_image/image_interps.svg
+${PYSITELIB}/matplotlib/tests/baseline_images/test_image/image_shift.pdf
+${PYSITELIB}/matplotlib/tests/baseline_images/test_image/image_shift.svg
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_image/imshow.pdf
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_image/imshow.png
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_image/imshow.svg
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_image/interp_nearest_vs_none.pdf
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_image/interp_nearest_vs_none.svg
+${PYSITELIB}/matplotlib/tests/baseline_images/test_image/no_interpolation_origin.pdf
+${PYSITELIB}/matplotlib/tests/baseline_images/test_image/no_interpolation_origin.png
+${PYSITELIB}/matplotlib/tests/baseline_images/test_image/no_interpolation_origin.svg
+${PYSITELIB}/matplotlib/tests/baseline_images/test_image/uint16.tif
+${PYSITELIB}/matplotlib/tests/baseline_images/test_legend/fancy.pdf
+${PYSITELIB}/matplotlib/tests/baseline_images/test_legend/fancy.png
+${PYSITELIB}/matplotlib/tests/baseline_images/test_legend/fancy.svg
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_legend/legend_auto1.pdf
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_legend/legend_auto1.png
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_legend/legend_auto1.svg
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_legend/legend_auto2.pdf
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_legend/legend_auto2.png
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_legend/legend_auto2.svg
+${PYSITELIB}/matplotlib/tests/baseline_images/test_legend/legend_various_labels.pdf
+${PYSITELIB}/matplotlib/tests/baseline_images/test_legend/legend_various_labels.png
+${PYSITELIB}/matplotlib/tests/baseline_images/test_legend/legend_various_labels.svg
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_mathtext/mathfont_cm_00.png
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_mathtext/mathfont_cm_01.png
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_mathtext/mathfont_cm_02.png
@@ -1081,6 +1204,12 @@ ${PYSITELIB}/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_64.svg
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_65.pdf
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_65.png
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_65.svg
+${PYSITELIB}/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_66.pdf
+${PYSITELIB}/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_66.png
+${PYSITELIB}/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_66.svg
+${PYSITELIB}/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_67.pdf
+${PYSITELIB}/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_67.png
+${PYSITELIB}/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_67.svg
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_00.pdf
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_00.png
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_00.svg
@@ -1279,6 +1408,12 @@ ${PYSITELIB}/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_64.svg
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_65.pdf
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_65.png
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_65.svg
+${PYSITELIB}/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_66.pdf
+${PYSITELIB}/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_66.png
+${PYSITELIB}/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_66.svg
+${PYSITELIB}/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_67.pdf
+${PYSITELIB}/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_67.png
+${PYSITELIB}/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_67.svg
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_00.pdf
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_00.png
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_00.svg
@@ -1477,7 +1612,18 @@ ${PYSITELIB}/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_64
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_65.pdf
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_65.png
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_65.svg
+${PYSITELIB}/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_66.pdf
+${PYSITELIB}/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_66.png
+${PYSITELIB}/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_66.svg
+${PYSITELIB}/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_67.pdf
+${PYSITELIB}/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_67.png
+${PYSITELIB}/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_67.svg
+${PYSITELIB}/matplotlib/tests/baseline_images/test_pickle/multi_pickle.png
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_png/pngsuite.png
+${PYSITELIB}/matplotlib/tests/baseline_images/test_png/uint16.png
+${PYSITELIB}/matplotlib/tests/baseline_images/test_scale/log_scales.pdf
+${PYSITELIB}/matplotlib/tests/baseline_images/test_scale/log_scales.png
+${PYSITELIB}/matplotlib/tests/baseline_images/test_scale/log_scales.svg
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_simplification/clipper_edge.pdf
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_simplification/clipper_edge.png
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_simplification/clipper_edge.svg
@@ -1508,6 +1654,9 @@ ${PYSITELIB}/matplotlib/tests/baseline_images/test_simplification/simplify_curve
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.pdf
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.svg
+${PYSITELIB}/matplotlib/tests/baseline_images/test_subplots/subplots_offset_text.pdf
+${PYSITELIB}/matplotlib/tests/baseline_images/test_subplots/subplots_offset_text.png
+${PYSITELIB}/matplotlib/tests/baseline_images/test_subplots/subplots_offset_text.svg
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_text/antialiased.png
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_text/font_styles.pdf
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_text/font_styles.png
@@ -1515,6 +1664,7 @@ ${PYSITELIB}/matplotlib/tests/baseline_images/test_text/font_styles.svg
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_text/multiline.pdf
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_text/multiline.png
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_text/multiline.svg
+${PYSITELIB}/matplotlib/tests/baseline_images/test_text/text_contains.png
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_tightlayout/tight_layout1.pdf
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_tightlayout/tight_layout1.png
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_tightlayout/tight_layout1.svg
@@ -1533,17 +1683,32 @@ ${PYSITELIB}/matplotlib/tests/baseline_images/test_tightlayout/tight_layout5.svg
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_tightlayout/tight_layout6.pdf
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_tightlayout/tight_layout6.png
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_tightlayout/tight_layout6.svg
+${PYSITELIB}/matplotlib/tests/baseline_images/test_transforms/pre_transform_data.pdf
+${PYSITELIB}/matplotlib/tests/baseline_images/test_transforms/pre_transform_data.png
+${PYSITELIB}/matplotlib/tests/baseline_images/test_transforms/pre_transform_data.svg
+${PYSITELIB}/matplotlib/tests/baseline_images/test_triangulation/tripcolor1.pdf
+${PYSITELIB}/matplotlib/tests/baseline_images/test_triangulation/tripcolor1.png
+${PYSITELIB}/matplotlib/tests/baseline_images/test_triangulation/tripcolor1.svg
 ${PYSITELIB}/matplotlib/tests/baseline_images/test_ttconv/truetype-conversion.pdf
 ${PYSITELIB}/matplotlib/tests/mpltest.ttf
 ${PYSITELIB}/matplotlib/tests/test_agg.py
 ${PYSITELIB}/matplotlib/tests/test_agg.pyc
 ${PYSITELIB}/matplotlib/tests/test_agg.pyo
+${PYSITELIB}/matplotlib/tests/test_arrow_patches.py
+${PYSITELIB}/matplotlib/tests/test_arrow_patches.pyc
+${PYSITELIB}/matplotlib/tests/test_arrow_patches.pyo
+${PYSITELIB}/matplotlib/tests/test_artist.py
+${PYSITELIB}/matplotlib/tests/test_artist.pyc
+${PYSITELIB}/matplotlib/tests/test_artist.pyo
 ${PYSITELIB}/matplotlib/tests/test_axes.py
 ${PYSITELIB}/matplotlib/tests/test_axes.pyc
 ${PYSITELIB}/matplotlib/tests/test_axes.pyo
 ${PYSITELIB}/matplotlib/tests/test_backend_pdf.py
 ${PYSITELIB}/matplotlib/tests/test_backend_pdf.pyc
 ${PYSITELIB}/matplotlib/tests/test_backend_pdf.pyo
+${PYSITELIB}/matplotlib/tests/test_backend_pgf.py
+${PYSITELIB}/matplotlib/tests/test_backend_pgf.pyc
+${PYSITELIB}/matplotlib/tests/test_backend_pgf.pyo
 ${PYSITELIB}/matplotlib/tests/test_backend_svg.py
 ${PYSITELIB}/matplotlib/tests/test_backend_svg.pyc
 ${PYSITELIB}/matplotlib/tests/test_backend_svg.pyo
@@ -1553,6 +1718,12 @@ ${PYSITELIB}/matplotlib/tests/test_basic.pyo
 ${PYSITELIB}/matplotlib/tests/test_cbook.py
 ${PYSITELIB}/matplotlib/tests/test_cbook.pyc
 ${PYSITELIB}/matplotlib/tests/test_cbook.pyo
+${PYSITELIB}/matplotlib/tests/test_colorbar.py
+${PYSITELIB}/matplotlib/tests/test_colorbar.pyc
+${PYSITELIB}/matplotlib/tests/test_colorbar.pyo
+${PYSITELIB}/matplotlib/tests/test_colors.py
+${PYSITELIB}/matplotlib/tests/test_colors.pyc
+${PYSITELIB}/matplotlib/tests/test_colors.pyo
 ${PYSITELIB}/matplotlib/tests/test_dates.py
 ${PYSITELIB}/matplotlib/tests/test_dates.pyc
 ${PYSITELIB}/matplotlib/tests/test_dates.pyo
@@ -1577,18 +1748,37 @@ ${PYSITELIB}/matplotlib/tests/test_mathtext.pyo
 ${PYSITELIB}/matplotlib/tests/test_mlab.py
 ${PYSITELIB}/matplotlib/tests/test_mlab.pyc
 ${PYSITELIB}/matplotlib/tests/test_mlab.pyo
+${PYSITELIB}/matplotlib/tests/test_patches.py
+${PYSITELIB}/matplotlib/tests/test_patches.pyc
+${PYSITELIB}/matplotlib/tests/test_patches.pyo
+${PYSITELIB}/matplotlib/tests/test_pickle.py
+${PYSITELIB}/matplotlib/tests/test_pickle.pyc
+${PYSITELIB}/matplotlib/tests/test_pickle.pyo
 ${PYSITELIB}/matplotlib/tests/test_png.py
 ${PYSITELIB}/matplotlib/tests/test_png.pyc
 ${PYSITELIB}/matplotlib/tests/test_png.pyo
+${PYSITELIB}/matplotlib/tests/test_rcparams.py
+${PYSITELIB}/matplotlib/tests/test_rcparams.pyc
+${PYSITELIB}/matplotlib/tests/test_rcparams.pyo
+${PYSITELIB}/matplotlib/tests/test_rcparams.rc
+${PYSITELIB}/matplotlib/tests/test_scale.py
+${PYSITELIB}/matplotlib/tests/test_scale.pyc
+${PYSITELIB}/matplotlib/tests/test_scale.pyo
 ${PYSITELIB}/matplotlib/tests/test_simplification.py
 ${PYSITELIB}/matplotlib/tests/test_simplification.pyc
 ${PYSITELIB}/matplotlib/tests/test_simplification.pyo
 ${PYSITELIB}/matplotlib/tests/test_spines.py
 ${PYSITELIB}/matplotlib/tests/test_spines.pyc
 ${PYSITELIB}/matplotlib/tests/test_spines.pyo
+${PYSITELIB}/matplotlib/tests/test_subplots.py
+${PYSITELIB}/matplotlib/tests/test_subplots.pyc
+${PYSITELIB}/matplotlib/tests/test_subplots.pyo
 ${PYSITELIB}/matplotlib/tests/test_text.py
 ${PYSITELIB}/matplotlib/tests/test_text.pyc
 ${PYSITELIB}/matplotlib/tests/test_text.pyo
+${PYSITELIB}/matplotlib/tests/test_ticker.py
+${PYSITELIB}/matplotlib/tests/test_ticker.pyc
+${PYSITELIB}/matplotlib/tests/test_ticker.pyo
 ${PYSITELIB}/matplotlib/tests/test_tightlayout.py
 ${PYSITELIB}/matplotlib/tests/test_tightlayout.pyc
 ${PYSITELIB}/matplotlib/tests/test_tightlayout.pyo
diff --git a/graphics/py-matplotlib/distinfo b/graphics/py-matplotlib/distinfo
index 19b42f881d8..2f930290cf1 100644
--- a/graphics/py-matplotlib/distinfo
+++ b/graphics/py-matplotlib/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.17 2012/07/02 17:19:05 prlw1 Exp $
+$NetBSD: distinfo,v 1.18 2012/12/17 11:51:18 drochner Exp $
 
-SHA1 (matplotlib-1.1.1.tar.gz) = e47ecb0c651961dbaba57fd172e3b770da197e84
-RMD160 (matplotlib-1.1.1.tar.gz) = d6289c7d001c078300ce360d33d424bd3eb93e13
-Size (matplotlib-1.1.1.tar.gz) = 33704843 bytes
+SHA1 (matplotlib-1.2.0.tar.gz) = 1d0c319b2bc545f1a7002f56768e5730fe573518
+RMD160 (matplotlib-1.2.0.tar.gz) = 0f41765944cb26eaa9dadd0ec164e941dbc46363
+Size (matplotlib-1.2.0.tar.gz) = 36893347 bytes
 SHA1 (patch-aa) = 447d50c1f5838ef0234d366b7ac29a47002a737d