Update to py-matplotlib 1.0.1

Various bugfixes.

4 files changed, 48 insertions, 44 deletions

diff --git a/graphics/py-matplotlib-gtk2/Makefile b/graphics/py-matplotlib-gtk2/Makefile
index b241b4ae25c..b1255d0f775 100644
--- a/graphics/py-matplotlib-gtk2/Makefile
+++ b/graphics/py-matplotlib-gtk2/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2011/01/13 13:38:17 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2011/02/17 10:33:38 markd Exp $
 #
 
-DISTNAME=		matplotlib-0.99.1.2
-PKGNAME=		${PYPKGPREFIX}-matplotlib-gtk-0.99.1.2
-PKGREVISION=		4
+DISTNAME=		matplotlib-1.0.1
+PKGNAME=		${PYPKGPREFIX}-matplotlib-gtk-1.0.1
 CATEGORIES=		graphics python
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=matplotlib/}
 
@@ -13,7 +12,6 @@ COMMENT=		GTK frontend for matplotlib
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-WRKSRC=	${WRKDIR}/matplotlib-0.99.1.1
 USE_TOOLS+=		pkg-config
 PY_PATCHPLIST=		yes
 PYDISTUTILSPKG=		yes
@@ -21,6 +19,19 @@ USE_LANGUAGES=		c c++
 
 PYTHON_VERSIONS_ACCEPTED=	26 25
 
+post-patch:
+	( echo "[directories]"; \
+	echo "basedirlist=/usr"; \
+	echo "[provide_packages]"; \
+	echo "pytz = False"; \
+	echo "dateutil = False"; \
+	echo "[gui_support]"; \
+	echo "gtk = True"; \
+	echo "gtkagg = True"; \
+	echo "tkagg = False"; \
+	echo "wxagg = False"; \
+	echo "macosx = False" ) > ${WRKSRC}/setup.cfg
+
 .include "../../lang/python/extension.mk"
 .include "../../graphics/py-matplotlib/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
diff --git a/graphics/py-matplotlib-gtk2/distinfo b/graphics/py-matplotlib-gtk2/distinfo
index 7810c8d5da6..302014a1bdf 100644
--- a/graphics/py-matplotlib-gtk2/distinfo
+++ b/graphics/py-matplotlib-gtk2/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.5 2010/07/20 09:00:17 markd Exp $
+$NetBSD: distinfo,v 1.6 2011/02/17 10:33:38 markd Exp $
 
-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) = dcfd3cdba8c8c2ebbd68e14c8e1d026dd70968d6
-SHA1 (patch-ab) = ee836eef8a183e79fc25cd0a5a2538d6f54cbef3
+SHA1 (matplotlib-1.0.1.tar.gz) = c7a832f28a66817626e7a8af21e14ea0e15f4008
+RMD160 (matplotlib-1.0.1.tar.gz) = e3e326f7f31ef995253da483444cb593b8e6753b
+Size (matplotlib-1.0.1.tar.gz) = 13285166 bytes
+SHA1 (patch-aa) = 611a55383e4d343f220f6bdb814629b22e70848d
+SHA1 (patch-ab) = 4bc5d9fa3d8f6236794c2e76f63f1bc45e3948ec
diff --git a/graphics/py-matplotlib-gtk2/patches/patch-aa b/graphics/py-matplotlib-gtk2/patches/patch-aa
index 36519fa4808..7069feb1667 100644
--- a/graphics/py-matplotlib-gtk2/patches/patch-aa
+++ b/graphics/py-matplotlib-gtk2/patches/patch-aa
@@ -1,45 +1,36 @@
-$NetBSD: patch-aa,v 1.5 2010/07/20 09:00:17 markd Exp $
+$NetBSD: patch-aa,v 1.6 2011/02/17 10:33:38 markd Exp $
 
---- setupext.py.orig	2009-08-23 05:27:32.000000000 +0000
+--- setupext.py.orig	2010-07-07 01:41:55.000000000 +0000
 +++ setupext.py
-@@ -103,16 +103,16 @@ numpy_inc_dirs = []
- # matplotlib build options, which can be altered using setup.cfg
- options = {'display_status': True,
+@@ -115,14 +115,14 @@ options = {'display_status': True,
             'verbose': False,
--           'provide_pytz': 'auto',
--           'provide_dateutil': 'auto',
+            'provide_pytz': 'auto',
+            'provide_dateutil': 'auto',
 -           'build_agg': True,
--           'build_gtk': 'auto',
--           'build_gtkagg': 'auto',
--           'build_tkagg': 'auto',
--           'build_wxagg': 'auto',
--           'build_macosx': 'auto',
++           'build_agg': False,
+            '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,
-+           '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}
+            'backend': None,
+            'basedirlist': None}
  
- # Based on the contents of setup.cfg, determine the build options
-@@ -320,11 +320,8 @@ def check_for_libpng():
+@@ -344,11 +344,8 @@ def check_for_libpng():
      return True
  
  def add_base_flags(module):
 -    incdirs = filter(os.path.exists,
--                     [os.path.join(p, 'include') for p in basedir[sys.platform] ])
+-                     [os.path.join(p, 'include') for p in basedirlist ])
 -    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')
+-                     [os.path.join(p, 'lib')     for p in basedirlist ]+
+-                     [os.path.join(p, 'lib64')     for p in basedirlist ] )
++    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('.')
diff --git a/graphics/py-matplotlib-gtk2/patches/patch-ab b/graphics/py-matplotlib-gtk2/patches/patch-ab
index 089a8620c7d..b6129d2f87a 100644
--- a/graphics/py-matplotlib-gtk2/patches/patch-ab
+++ b/graphics/py-matplotlib-gtk2/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.4 2010/05/17 16:22:59 drochner Exp $
+$NetBSD: patch-ab,v 1.5 2011/02/17 10:33:38 markd Exp $
 
---- setup.py.orig	2008-12-10 14:53:21.000000000 +1300
+--- setup.py.orig	2010-07-07 01:41:55.000000000 +0000
 +++ setup.py
-@@ -101,12 +101,12 @@ if not check_for_numpy():
+@@ -128,13 +128,13 @@ if not check_for_numpy():
  if not check_for_freetype():
      sys.exit(1)
  
@@ -12,16 +12,18 @@ $NetBSD: patch-ab,v 1.4 2010/05/17 16:22:59 drochner Exp $
 -build_delaunay(ext_modules, packages)
 -build_nxutils(ext_modules, packages)
 -build_path(ext_modules, packages)
+-build_tri(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)
++#build_tri(ext_modules, packages)
  
  print_raw("")
  print_raw("OPTIONAL BACKEND DEPENDENCIES")
-@@ -147,13 +147,13 @@ if options['build_wxagg']:
+@@ -175,13 +175,13 @@ if options['build_wxagg']:
              print_message("WxAgg extension not required for wxPython >= 2.8")
          rc['backend'] = 'WXAgg'
  
@@ -37,7 +39,7 @@ $NetBSD: patch-ab,v 1.4 2010/05/17 16:22:59 drochner Exp $
          build_gtkagg(ext_modules, packages)
          rc['backend'] = 'GTKAgg'
  
-@@ -257,11 +257,11 @@ distrib = setup(name="matplotlib",
+@@ -282,11 +282,11 @@ distrib = setup(name="matplotlib",
        interfaces and hardcopy output formats.  There is a 'pylab' mode
        which emulates matlab graphics
        """,