Update py-matplotlib* to 0.98.4

various bug fixes and new features.

4 files changed, 28 insertions, 25 deletions

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
        """,