update to 0.99.2.1

changes:
-new frameworks: mplot3d, axes grid, axis spine placement
-bugfixes

4 files changed, 23 insertions, 43 deletions

diff --git a/graphics/py-matplotlib-tk/Makefile b/graphics/py-matplotlib-tk/Makefile
index c0d889351e6..5142ba35e37 100644
--- a/graphics/py-matplotlib-tk/Makefile
+++ b/graphics/py-matplotlib-tk/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2009/09/23 09:54:45 tron Exp $
+# $NetBSD: Makefile,v 1.5 2010/05/17 16:22:59 drochner Exp $
 #
 
-DISTNAME=		matplotlib-0.98.4
-PKGNAME=		${PYPKGPREFIX}-matplotlib-tk-0.98.4
+DISTNAME=		matplotlib-0.99.1.2
+PKGNAME=		${PYPKGPREFIX}-matplotlib-tk-0.99.1.2
 CATEGORIES=		graphics python
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=matplotlib/}
 
@@ -12,6 +12,7 @@ COMMENT=		Tk frontend for matplotlib
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
+WRKSRC=	${WRKDIR}/matplotlib-0.99.1.1
 USE_TOOLS+=		pkg-config
 PY_PATCHPLIST=		yes
 PYDISTUTILSPKG=		yes
diff --git a/graphics/py-matplotlib-tk/distinfo b/graphics/py-matplotlib-tk/distinfo
index 2bbc04960eb..fcd0804da03 100644
--- a/graphics/py-matplotlib-tk/distinfo
+++ b/graphics/py-matplotlib-tk/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.3 2009/08/05 11:02:12 markd Exp $
+$NetBSD: distinfo,v 1.4 2010/05/17 16:22:59 drochner Exp $
 
-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
+SHA1 (matplotlib-0.99.1.2.tar.gz) = c3f9053a8522e2541d93ee55e8b447165708ac15
+RMD160 (matplotlib-0.99.1.2.tar.gz) = 11daee415102dff944d9c45de22c48c83e76dde7
+Size (matplotlib-0.99.1.2.tar.gz) = 11940390 bytes
+SHA1 (patch-aa) = 193497e854113548345f10fc21b0d258f6376267
+SHA1 (patch-ab) = 0a89e0d6fd96e3f998ab92130596c248061c36e3
diff --git a/graphics/py-matplotlib-tk/patches/patch-aa b/graphics/py-matplotlib-tk/patches/patch-aa
index 41567773499..6d8764bb35d 100644
--- a/graphics/py-matplotlib-tk/patches/patch-aa
+++ b/graphics/py-matplotlib-tk/patches/patch-aa
@@ -1,20 +1,13 @@
-$NetBSD: patch-aa,v 1.2 2009/08/05 11:02:12 markd Exp $
+$NetBSD: patch-aa,v 1.3 2010/05/17 16:22:59 drochner Exp $
 
-Only turn on building of the Tk part.
-
---- setupext.py.orig	2008-12-10 14:53:21.000000000 +1300
+--- setupext.py.orig	2009-08-23 05:27:32.000000000 +0000
 +++ setupext.py
-@@ -97,18 +97,18 @@ numpy_inc_dirs = []
+@@ -103,16 +103,16 @@ 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_pytz': False,
-+           'provide_dateutil': False,
-+           'provide_configobj': False,
-            'provide_traits': False,
 -           'build_agg': True,
 -           'build_gtk': 'auto',
 -           'build_gtkagg': 'auto',
@@ -23,6 +16,8 @@ Only turn on building of the Tk part.
 -           'build_macosx': 'auto',
 -           'build_image': True,
 -           'build_windowing': True,
++           'provide_pytz': False,
++           'provide_dateutil': False,
 +           'build_agg': False,
 +           'build_gtk': False,
 +           'build_gtkagg': False,
@@ -31,10 +26,10 @@ Only turn on building of the Tk part.
 +           'build_macosx': False,
 +           'build_image': False,
 +           'build_windowing': False,
-            'backend': None,
-            'numerix': None}
+            'backend': None}
  
-@@ -325,11 +325,8 @@ def check_for_libpng():
+ # Based on the contents of setup.cfg, determine the build options
+@@ -320,11 +320,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 55265b70344..bbf661a4519 100644
--- a/graphics/py-matplotlib-tk/patches/patch-ab
+++ b/graphics/py-matplotlib-tk/patches/patch-ab
@@ -1,11 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2009/08/05 11:02:12 markd Exp $
+$NetBSD: patch-ab,v 1.3 2010/05/17 16:22:59 drochner Exp $
 
-Ensure we skip installation of the non-Tk stuff, installed
-by py-matplotlib itself.
-
---- setup.py.orig	2008-12-10 14:53:21.000000000 +1300
+--- setup.py.orig	2009-08-01 19:15:24.000000000 +0000
 +++ setup.py
-@@ -93,12 +93,12 @@ if not check_for_numpy():
+@@ -105,12 +105,12 @@ if not check_for_numpy():
  if not check_for_freetype():
      sys.exit(1)
  
@@ -24,7 +21,7 @@ by py-matplotlib itself.
  
  print_raw("")
  print_raw("OPTIONAL BACKEND DEPENDENCIES")
-@@ -139,13 +139,13 @@ if options['build_wxagg']:
+@@ -151,13 +151,13 @@ if options['build_wxagg']:
              print_message("WxAgg extension not required for wxPython >= 2.8")
          rc['backend'] = 'WXAgg'
  
@@ -40,20 +37,7 @@ by py-matplotlib itself.
          build_gtkagg(ext_modules, packages)
          rc['backend'] = 'GTKAgg'
  
-@@ -212,9 +212,9 @@ check_for_pdftops()
- # TODO: comment out for mpl release:
- print_raw("")
- print_raw("EXPERIMENTAL CONFIG PACKAGE DEPENDENCIES")
--packages.append('matplotlib.config')
--if check_provide_configobj(): py_modules.append('configobj')
--if check_provide_traits(): build_traits(ext_modules, packages)
-+#packages.append('matplotlib.config')
-+#if check_provide_configobj(): py_modules.append('configobj')
-+#if check_provide_traits(): build_traits(ext_modules, packages)
- 
- print_raw("")
- print_raw("[Edit setup.cfg to suppress the above messages]")
-@@ -255,11 +255,11 @@ distrib = setup(name="matplotlib",
+@@ -258,11 +258,11 @@ distrib = setup(name="matplotlib",
        interfaces and hardcopy output formats.  There is a 'pylab' mode
        which emulates matlab graphics
        """,