Update py-matplotlib* to 0.98.4

various bug fixes and new features.

12 files changed, 100 insertions, 345 deletions

diff --git a/graphics/py-matplotlib-gtk2/Makefile b/graphics/py-matplotlib-gtk2/Makefile
index b505b87093c..2b8074e60c2 100644
--- a/graphics/py-matplotlib-gtk2/Makefile
+++ b/graphics/py-matplotlib-gtk2/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2009/02/11 14:23:32 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2009/08/05 11:02:12 markd Exp $
 #
 
-DISTNAME=		matplotlib-0.98.0
-PKGNAME=		${PYPKGPREFIX}-matplotlib-gtk-0.98.0
+DISTNAME=		matplotlib-0.98.4
+PKGNAME=		${PYPKGPREFIX}-matplotlib-gtk-0.98.4
 CATEGORIES=		graphics python
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=matplotlib/}
 
@@ -17,7 +17,7 @@ PY_PATCHPLIST=		yes
 PYDISTUTILSPKG=		yes
 USE_LANGUAGES=		c c++
 
-PYTHON_VERSIONS_ACCEPTED=	25 24
+PYTHON_VERSIONS_ACCEPTED=	26 25 24
 
 .include "../../lang/python/extension.mk"
 .include "../../graphics/py-matplotlib/buildlink3.mk"
diff --git a/graphics/py-matplotlib-gtk2/distinfo b/graphics/py-matplotlib-gtk2/distinfo
index 0792dcf89c9..44b0857e0b0 100644
--- a/graphics/py-matplotlib-gtk2/distinfo
+++ b/graphics/py-matplotlib-gtk2/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2008/12/19 22:39:47 markd Exp $
+$NetBSD: distinfo,v 1.3 2009/08/05 11:02:12 markd Exp $
 
-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) = 0ce9c08d1070936a18176379fadd578707f3101f
-SHA1 (patch-ab) = a3ef38a41421ffd5b6ab0b24f91b848b2e67441c
+SHA1 (matplotlib-0.98.4.tar.gz) = 68f99ff3e9a68a1ed94f4c275ef231c1ac84e96f
+RMD160 (matplotlib-0.98.4.tar.gz) = cd0a8be26296eb30fb7e0ab506c8145228152a84
+Size (matplotlib-0.98.4.tar.gz) = 9406439 bytes
+SHA1 (patch-aa) = 03791f9ce158e89882af266398f22a21c3a12091
+SHA1 (patch-ab) = 73eac4c875d4d788657e053f9eb201d6f0003fd4
diff --git a/graphics/py-matplotlib-gtk2/patches/patch-aa b/graphics/py-matplotlib-gtk2/patches/patch-aa
index ce4f0d51729..31ede69b272 100644
--- a/graphics/py-matplotlib-gtk2/patches/patch-aa
+++ b/graphics/py-matplotlib-gtk2/patches/patch-aa
@@ -1,37 +1,38 @@
-$NetBSD: patch-aa,v 1.2 2008/12/19 22:39:47 markd Exp $
+$NetBSD: patch-aa,v 1.3 2009/08/05 11:02:12 markd Exp $
 
---- setupext.py.orig	2008-05-30 10:47:10.000000000 +1200
+--- setupext.py.orig	2008-12-10 14:53:21.000000000 +1300
 +++ setupext.py
-@@ -103,17 +103,17 @@ numpy_inc_dirs = []
+@@ -97,18 +97,18 @@ numpy_inc_dirs = []
  # matplotlib build options, which can be altered using setup.cfg
  options = {'display_status': True,
             'verbose': False,
 -           'provide_pytz': 'auto',
 -           'provide_dateutil': 'auto',
 -           'provide_configobj': 'auto',
--           'provide_traits': 'auto',
++           'provide_pytz': False,
++           'provide_dateutil': False,
++           'provide_configobj': False,
+            'provide_traits': False,
 -           'build_agg': True,
 -           'build_gtk': 'auto',
 -           'build_gtkagg': 'auto',
 -           'build_tkagg': 'auto',
 -           'build_wxagg': 'auto',
+-           'build_macosx': 'auto',
 -           'build_image': True,
 -           'build_windowing': True,
-+           'provide_pytz': False,
-+           'provide_dateutil': False,
-+           'provide_configobj': False,
-+           'provide_traits': False,
 +           'build_agg': False,
 +           'build_gtk': True,
 +           'build_gtkagg': True,
 +           'build_tkagg': False,
 +           'build_wxagg': False,
++           'build_macosx': False,
 +           'build_image': False,
 +           'build_windowing': False,
             'backend': None,
             'numerix': None}
  
-@@ -321,11 +321,8 @@ def check_for_libpng():
+@@ -325,11 +325,8 @@ def check_for_libpng():
      return True
  
  def add_base_flags(module):
diff --git a/graphics/py-matplotlib-gtk2/patches/patch-ab b/graphics/py-matplotlib-gtk2/patches/patch-ab
index aed264a6799..cf5fdcdf916 100644
--- a/graphics/py-matplotlib-gtk2/patches/patch-ab
+++ b/graphics/py-matplotlib-gtk2/patches/patch-ab
@@ -1,25 +1,27 @@
-$NetBSD: patch-ab,v 1.2 2008/12/19 22:39:47 markd Exp $
+$NetBSD: patch-ab,v 1.3 2009/08/05 11:02:12 markd Exp $
 
---- setup.py.orig	2008-05-30 10:47:09.000000000 +1200
+--- setup.py.orig	2008-12-10 14:53:21.000000000 +1300
 +++ setup.py
-@@ -92,11 +92,11 @@ if not check_for_numpy():
+@@ -93,12 +93,12 @@ if not check_for_numpy():
  if not check_for_freetype():
      sys.exit(1)
  
 -build_ft2font(ext_modules, packages)
 -build_ttconv(ext_modules, packages)
 -build_contour(ext_modules, packages)
+-build_delaunay(ext_modules, packages)
 -build_nxutils(ext_modules, packages)
 -build_path(ext_modules, packages)
 +#build_ft2font(ext_modules, packages)
 +#build_ttconv(ext_modules, packages)
 +#build_contour(ext_modules, packages)
++#build_delaunay(ext_modules, packages)
 +#build_nxutils(ext_modules, packages)
 +#build_path(ext_modules, packages)
  
  print_raw("")
  print_raw("OPTIONAL BACKEND DEPENDENCIES")
-@@ -133,13 +133,13 @@ if options['build_wxagg']:
+@@ -139,13 +139,13 @@ if options['build_wxagg']:
              print_message("WxAgg extension not required for wxPython >= 2.8")
          rc['backend'] = 'WXAgg'
  
@@ -35,7 +37,7 @@ $NetBSD: patch-ab,v 1.2 2008/12/19 22:39:47 markd Exp $
          build_gtkagg(ext_modules, packages)
          rc['backend'] = 'GTKAgg'
  
-@@ -197,9 +197,9 @@ check_for_pdftops()
+@@ -212,9 +212,9 @@ check_for_pdftops()
  # TODO: comment out for mpl release:
  print_raw("")
  print_raw("EXPERIMENTAL CONFIG PACKAGE DEPENDENCIES")
@@ -48,7 +50,7 @@ $NetBSD: patch-ab,v 1.2 2008/12/19 22:39:47 markd Exp $
  
  print_raw("")
  print_raw("[Edit setup.cfg to suppress the above messages]")
-@@ -238,11 +238,11 @@ distrib = setup(name="matplotlib",
+@@ -255,11 +255,11 @@ distrib = setup(name="matplotlib",
        interfaces and hardcopy output formats.  There is a 'pylab' mode
        which emulates matlab graphics
        """,
diff --git a/graphics/py-matplotlib-tk/Makefile b/graphics/py-matplotlib-tk/Makefile
index 897225c26ab..24f374df65d 100644
--- a/graphics/py-matplotlib-tk/Makefile
+++ b/graphics/py-matplotlib-tk/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2009/05/24 23:27:07 he Exp $
+# $NetBSD: Makefile,v 1.3 2009/08/05 11:02:12 markd Exp $
 #
 
-DISTNAME=		matplotlib-0.98.0
-PKGNAME=		${PYPKGPREFIX}-matplotlib-tk-0.98.0
+DISTNAME=		matplotlib-0.98.4
+PKGNAME=		${PYPKGPREFIX}-matplotlib-tk-0.98.4
 CATEGORIES=		graphics python
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=matplotlib/}
 
@@ -17,7 +17,7 @@ PY_PATCHPLIST=		yes
 PYDISTUTILSPKG=		yes
 USE_LANGUAGES=		c c++
 
-PYTHON_VERSIONS_ACCEPTED=	25 24
+PYTHON_VERSIONS_ACCEPTED=	26 25 24
 
 .include "../../lang/python/extension.mk"
 .include "../../graphics/py-matplotlib/buildlink3.mk"
diff --git a/graphics/py-matplotlib-tk/distinfo b/graphics/py-matplotlib-tk/distinfo
index 1fcefce77ba..2bbc04960eb 100644
--- a/graphics/py-matplotlib-tk/distinfo
+++ b/graphics/py-matplotlib-tk/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2009/05/24 22:56:53 he Exp $
+$NetBSD: distinfo,v 1.3 2009/08/05 11:02:12 markd Exp $
 
-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) = fbbc7b57943f8ce4252d154fe1be01e09838027c
-SHA1 (patch-ab) = dcf810dd37baca656bcb291dfd1b4089c42cfac3
+SHA1 (matplotlib-0.98.4.tar.gz) = 68f99ff3e9a68a1ed94f4c275ef231c1ac84e96f
+RMD160 (matplotlib-0.98.4.tar.gz) = cd0a8be26296eb30fb7e0ab506c8145228152a84
+Size (matplotlib-0.98.4.tar.gz) = 9406439 bytes
+SHA1 (patch-aa) = 63d0e5eb866f2e4dd1ed1dc25e12040f5e0f2383
+SHA1 (patch-ab) = 291205d748e0109378f076a8a2b5c5e23d176cb2
diff --git a/graphics/py-matplotlib-tk/patches/patch-aa b/graphics/py-matplotlib-tk/patches/patch-aa
index 7286f4764b9..41567773499 100644
--- a/graphics/py-matplotlib-tk/patches/patch-aa
+++ b/graphics/py-matplotlib-tk/patches/patch-aa
@@ -1,39 +1,40 @@
-$NetBSD: patch-aa,v 1.1.1.1 2009/05/14 13:54:13 he Exp $
+$NetBSD: patch-aa,v 1.2 2009/08/05 11:02:12 markd Exp $
 
 Only turn on building of the Tk part.
 
---- setupext.py.orig	2008-05-30 10:47:10.000000000 +1200
+--- setupext.py.orig	2008-12-10 14:53:21.000000000 +1300
 +++ setupext.py
-@@ -103,17 +103,17 @@ numpy_inc_dirs = []
+@@ -97,18 +97,18 @@ numpy_inc_dirs = []
  # matplotlib build options, which can be altered using setup.cfg
  options = {'display_status': True,
             'verbose': False,
 -           'provide_pytz': 'auto',
 -           'provide_dateutil': 'auto',
 -           'provide_configobj': 'auto',
--           'provide_traits': 'auto',
++           'provide_pytz': False,
++           'provide_dateutil': False,
++           'provide_configobj': False,
+            'provide_traits': False,
 -           'build_agg': True,
 -           'build_gtk': 'auto',
 -           'build_gtkagg': 'auto',
 -           'build_tkagg': 'auto',
 -           'build_wxagg': 'auto',
+-           'build_macosx': 'auto',
 -           'build_image': True,
 -           'build_windowing': True,
-+           'provide_pytz': False,
-+           'provide_dateutil': False,
-+           'provide_configobj': False,
-+           'provide_traits': False,
 +           'build_agg': False,
 +           'build_gtk': False,
 +           'build_gtkagg': False,
 +           'build_tkagg': True,
 +           'build_wxagg': False,
++           'build_macosx': False,
 +           'build_image': False,
 +           'build_windowing': False,
             'backend': None,
             'numerix': None}
  
-@@ -321,11 +321,8 @@ def check_for_libpng():
+@@ -325,11 +325,8 @@ def check_for_libpng():
      return True
  
  def add_base_flags(module):
diff --git a/graphics/py-matplotlib-tk/patches/patch-ab b/graphics/py-matplotlib-tk/patches/patch-ab
index c669f5a5b90..55265b70344 100644
--- a/graphics/py-matplotlib-tk/patches/patch-ab
+++ b/graphics/py-matplotlib-tk/patches/patch-ab
@@ -1,28 +1,30 @@
-$NetBSD: patch-ab,v 1.1.1.1 2009/05/14 13:54:13 he Exp $
+$NetBSD: patch-ab,v 1.2 2009/08/05 11:02:12 markd Exp $
 
 Ensure we skip installation of the non-Tk stuff, installed
 by py-matplotlib itself.
 
---- setup.py.orig	2008-05-30 10:47:09.000000000 +1200
+--- setup.py.orig	2008-12-10 14:53:21.000000000 +1300
 +++ setup.py
-@@ -92,11 +92,11 @@ if not check_for_numpy():
+@@ -93,12 +93,12 @@ if not check_for_numpy():
  if not check_for_freetype():
      sys.exit(1)
  
 -build_ft2font(ext_modules, packages)
 -build_ttconv(ext_modules, packages)
 -build_contour(ext_modules, packages)
+-build_delaunay(ext_modules, packages)
 -build_nxutils(ext_modules, packages)
 -build_path(ext_modules, packages)
 +#build_ft2font(ext_modules, packages)
 +#build_ttconv(ext_modules, packages)
 +#build_contour(ext_modules, packages)
++#build_delaunay(ext_modules, packages)
 +#build_nxutils(ext_modules, packages)
 +#build_path(ext_modules, packages)
  
  print_raw("")
  print_raw("OPTIONAL BACKEND DEPENDENCIES")
-@@ -133,13 +133,13 @@ if options['build_wxagg']:
+@@ -139,13 +139,13 @@ if options['build_wxagg']:
              print_message("WxAgg extension not required for wxPython >= 2.8")
          rc['backend'] = 'WXAgg'
  
@@ -38,7 +40,7 @@ by py-matplotlib itself.
          build_gtkagg(ext_modules, packages)
          rc['backend'] = 'GTKAgg'
  
-@@ -197,9 +197,9 @@ check_for_pdftops()
+@@ -212,9 +212,9 @@ check_for_pdftops()
  # TODO: comment out for mpl release:
  print_raw("")
  print_raw("EXPERIMENTAL CONFIG PACKAGE DEPENDENCIES")
@@ -51,7 +53,7 @@ by py-matplotlib itself.
  
  print_raw("")
  print_raw("[Edit setup.cfg to suppress the above messages]")
-@@ -238,11 +238,11 @@ distrib = setup(name="matplotlib",
+@@ -255,11 +255,11 @@ distrib = setup(name="matplotlib",
        interfaces and hardcopy output formats.  There is a 'pylab' mode
        which emulates matlab graphics
        """,
diff --git a/graphics/py-matplotlib/Makefile b/graphics/py-matplotlib/Makefile
index e84f6407da0..c77a63df98d 100644
--- a/graphics/py-matplotlib/Makefile
+++ b/graphics/py-matplotlib/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2008/12/19 22:35:41 markd Exp $
+# $NetBSD: Makefile,v 1.23 2009/08/05 11:02:12 markd Exp $
 #
 
-DISTNAME=		matplotlib-0.98.0
+DISTNAME=		matplotlib-0.98.4
 PKGNAME=		${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=		graphics python
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=matplotlib/}
@@ -19,7 +19,7 @@ USE_LANGUAGES=		c c++
 USE_TOOLS+=		pkg-config
 PY_PATCHPLIST=		yes
 PYDISTUTILSPKG=		yes
-PYTHON_VERSIONS_ACCEPTED=	25 24
+PYTHON_VERSIONS_ACCEPTED=	26 25 24
 
 .include "../../lang/python/extension.mk"
 
diff --git a/graphics/py-matplotlib/PLIST b/graphics/py-matplotlib/PLIST
index 1292df751a5..bcc7e0ffa57 100644
--- a/graphics/py-matplotlib/PLIST
+++ b/graphics/py-matplotlib/PLIST
@@ -1,278 +1,7 @@
-@comment $NetBSD: PLIST,v 1.10 2009/06/14 17:59:26 joerg Exp $
+@comment $NetBSD: PLIST,v 1.11 2009/08/05 11:02:12 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
@@ -280,20 +9,19 @@ ${PYSITELIB}/matplotlib/_cm.py
 ${PYSITELIB}/matplotlib/_cm.pyc
 ${PYSITELIB}/matplotlib/_cm.pyo
 ${PYSITELIB}/matplotlib/_cntr.so
+${PYSITELIB}/matplotlib/_delaunay.so
 ${PYSITELIB}/matplotlib/_image.so
 ${PYSITELIB}/matplotlib/_mathtext_data.py
 ${PYSITELIB}/matplotlib/_mathtext_data.pyc
 ${PYSITELIB}/matplotlib/_mathtext_data.pyo
 ${PYSITELIB}/matplotlib/_path.so
+${PYSITELIB}/matplotlib/_png.so
 ${PYSITELIB}/matplotlib/_pylab_helpers.py
 ${PYSITELIB}/matplotlib/_pylab_helpers.pyc
 ${PYSITELIB}/matplotlib/_pylab_helpers.pyo
 ${PYSITELIB}/matplotlib/afm.py
 ${PYSITELIB}/matplotlib/afm.pyc
 ${PYSITELIB}/matplotlib/afm.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
@@ -306,9 +34,6 @@ ${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
@@ -346,6 +71,9 @@ ${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_macosx.py
+${PYSITELIB}/matplotlib/backends/backend_macosx.pyc
+${PYSITELIB}/matplotlib/backends/backend_macosx.pyo
 ${PYSITELIB}/matplotlib/backends/backend_mixed.py
 ${PYSITELIB}/matplotlib/backends/backend_mixed.pyc
 ${PYSITELIB}/matplotlib/backends/backend_mixed.pyo
@@ -385,6 +113,12 @@ ${PYSITELIB}/matplotlib/backends/backend_wxagg.pyo
 ${PYSITELIB}/matplotlib/backends/tkagg.py
 ${PYSITELIB}/matplotlib/backends/tkagg.pyc
 ${PYSITELIB}/matplotlib/backends/tkagg.pyo
+${PYSITELIB}/matplotlib/bezier.py
+${PYSITELIB}/matplotlib/bezier.pyc
+${PYSITELIB}/matplotlib/bezier.pyo
+${PYSITELIB}/matplotlib/blocking_input.py
+${PYSITELIB}/matplotlib/blocking_input.pyc
+${PYSITELIB}/matplotlib/blocking_input.pyo
 ${PYSITELIB}/matplotlib/cbook.py
 ${PYSITELIB}/matplotlib/cbook.pyc
 ${PYSITELIB}/matplotlib/cbook.pyo
@@ -433,6 +167,18 @@ ${PYSITELIB}/matplotlib/contour.pyo
 ${PYSITELIB}/matplotlib/dates.py
 ${PYSITELIB}/matplotlib/dates.pyc
 ${PYSITELIB}/matplotlib/dates.pyo
+${PYSITELIB}/matplotlib/delaunay/__init__.py
+${PYSITELIB}/matplotlib/delaunay/__init__.pyc
+${PYSITELIB}/matplotlib/delaunay/__init__.pyo
+${PYSITELIB}/matplotlib/delaunay/interpolate.py
+${PYSITELIB}/matplotlib/delaunay/interpolate.pyc
+${PYSITELIB}/matplotlib/delaunay/interpolate.pyo
+${PYSITELIB}/matplotlib/delaunay/testfuncs.py
+${PYSITELIB}/matplotlib/delaunay/testfuncs.pyc
+${PYSITELIB}/matplotlib/delaunay/testfuncs.pyo
+${PYSITELIB}/matplotlib/delaunay/triangulate.py
+${PYSITELIB}/matplotlib/delaunay/triangulate.pyc
+${PYSITELIB}/matplotlib/delaunay/triangulate.pyo
 ${PYSITELIB}/matplotlib/dviread.py
 ${PYSITELIB}/matplotlib/dviread.pyc
 ${PYSITELIB}/matplotlib/dviread.pyo
@@ -464,6 +210,9 @@ ${PYSITELIB}/matplotlib/mathtext.pyo
 ${PYSITELIB}/matplotlib/mlab.py
 ${PYSITELIB}/matplotlib/mlab.pyc
 ${PYSITELIB}/matplotlib/mlab.pyo
+${PYSITELIB}/matplotlib/mpl-data/example/aapl.npy
+${PYSITELIB}/matplotlib/mpl-data/example/goog.npy
+${PYSITELIB}/matplotlib/mpl-data/example/msft_nasdaq.npy
 ${PYSITELIB}/matplotlib/mpl-data/fonts/afm/cmex10.afm
 ${PYSITELIB}/matplotlib/mpl-data/fonts/afm/cmmi10.afm
 ${PYSITELIB}/matplotlib/mpl-data/fonts/afm/cmr10.afm
@@ -647,15 +396,15 @@ ${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/offsetbox.py
+${PYSITELIB}/matplotlib/offsetbox.pyc
+${PYSITELIB}/matplotlib/offsetbox.pyo
 ${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
diff --git a/graphics/py-matplotlib/distinfo b/graphics/py-matplotlib/distinfo
index 3329535c247..c502a02ec5f 100644
--- a/graphics/py-matplotlib/distinfo
+++ b/graphics/py-matplotlib/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.8 2009/01/05 06:50:23 epg Exp $
+$NetBSD: distinfo,v 1.9 2009/08/05 11:02:12 markd Exp $
 
-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) = d4d8dc6cf20e0de84fad772681f7abce784cde28
+SHA1 (matplotlib-0.98.4.tar.gz) = 68f99ff3e9a68a1ed94f4c275ef231c1ac84e96f
+RMD160 (matplotlib-0.98.4.tar.gz) = cd0a8be26296eb30fb7e0ab506c8145228152a84
+Size (matplotlib-0.98.4.tar.gz) = 9406439 bytes
+SHA1 (patch-aa) = 418da6795362454a91d8e569e21dc8222a9ce7e3
diff --git a/graphics/py-matplotlib/patches/patch-aa b/graphics/py-matplotlib/patches/patch-aa
index 2a3d59c6e35..bbc6105e794 100644
--- a/graphics/py-matplotlib/patches/patch-aa
+++ b/graphics/py-matplotlib/patches/patch-aa
@@ -1,10 +1,10 @@
-$NetBSD: patch-aa,v 1.5 2009/01/05 06:50:23 epg Exp $
+$NetBSD: patch-aa,v 1.6 2009/08/05 11:02:12 markd Exp $
 
---- setupext.py.orig	2008-05-30 10:47:10.000000000 +1200
+--- setupext.py.orig	2008-12-10 14:53:21.000000000 +1300
 +++ setupext.py
-@@ -108,10 +108,10 @@ options = {'display_status': True,
+@@ -102,10 +102,10 @@ options = {'display_status': True,
             'provide_configobj': 'auto',
-            'provide_traits': 'auto',
+            'provide_traits': False,
             'build_agg': True,
 -           'build_gtk': 'auto',
 -           'build_gtkagg': 'auto',
@@ -14,10 +14,10 @@ $NetBSD: patch-aa,v 1.5 2009/01/05 06:50:23 epg Exp $
 +           'build_gtkagg': False,
 +           'build_tkagg': False,
 +           'build_wxagg': False,
+            'build_macosx': 'auto',
             'build_image': True,
             'build_windowing': True,
-            'backend': None,
-@@ -321,11 +321,8 @@ def check_for_libpng():
+@@ -325,11 +325,8 @@ def check_for_libpng():
      return True
  
  def add_base_flags(module):