sync w/ base pkg

4 files changed, 25 insertions, 26 deletions

diff --git a/graphics/py-matplotlib-tk/Makefile b/graphics/py-matplotlib-tk/Makefile
index 370dc72949f..fd62000b05d 100644
--- a/graphics/py-matplotlib-tk/Makefile
+++ b/graphics/py-matplotlib-tk/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.13 2012/10/06 14:11:17 asau Exp $
+# $NetBSD: Makefile,v 1.14 2012/12/17 11:52:43 drochner Exp $
 #
 
-DISTNAME=		matplotlib-1.1.1
-PKGNAME=		${PYPKGPREFIX}-matplotlib-tk-1.1.1
-PKGREVISION=		1
+DISTNAME=		matplotlib-1.2.0
+PKGNAME=		${PYPKGPREFIX}-matplotlib-tk-1.2.0
 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-tk/distinfo b/graphics/py-matplotlib-tk/distinfo
index 8e71d649831..09b686ddb7d 100644
--- a/graphics/py-matplotlib-tk/distinfo
+++ b/graphics/py-matplotlib-tk/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.9 2012/07/04 20:41:29 drochner Exp $
+$NetBSD: distinfo,v 1.10 2012/12/17 11:52:43 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 (patch-aa) = 3de5207ff605dc4b2d588b3c75588d75fb57d949
-SHA1 (patch-ab) = afc6e9fd9c09de0500b29ea127b20c16c9990811
+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) = 7ff4d7f4bbd9a2b19b839f92e0a7b568db4d4fb9
+SHA1 (patch-ab) = 3dbee59792c9f5bcfdd92a019ec548dcd64b01e0
diff --git a/graphics/py-matplotlib-tk/patches/patch-aa b/graphics/py-matplotlib-tk/patches/patch-aa
index a51e2e6617e..baad9a9e581 100644
--- a/graphics/py-matplotlib-tk/patches/patch-aa
+++ b/graphics/py-matplotlib-tk/patches/patch-aa
@@ -1,11 +1,11 @@
-$NetBSD: patch-aa,v 1.6 2012/04/17 17:17:28 drochner Exp $
+$NetBSD: patch-aa,v 1.7 2012/12/17 11:52:43 drochner Exp $
 
---- setupext.py.orig	2011-10-06 14:50:23.000000000 +0000
+--- setupext.py.orig	2012-11-06 22:31:09.000000000 +0000
 +++ setupext.py
-@@ -124,13 +124,13 @@ options = {'display_status': True,
-            'verbose': False,
+@@ -108,13 +108,13 @@ options = {'display_status': True,
             'provide_pytz': 'auto',
             'provide_dateutil': 'auto',
+            'provide_six': 'auto',
 -           'build_agg': True,
 +           'build_agg': False,
             'build_gtk': 'auto',
@@ -19,7 +19,7 @@ $NetBSD: patch-aa,v 1.6 2012/04/17 17:17:28 drochner Exp $
             'backend': None,
             'basedirlist': None}
  
-@@ -221,12 +221,7 @@ sysconfig.customize_compiler = my_custom
+@@ -218,12 +218,7 @@ sysconfig.customize_compiler = my_custom
  
  
  def run_child_process(cmd):
@@ -33,7 +33,7 @@ $NetBSD: patch-aa,v 1.6 2012/04/17 17:17:28 drochner Exp $
  
  class CleanUpFile:
      """CleanUpFile deletes the specified filename when self is destroyed."""
-@@ -364,11 +359,8 @@ def check_for_libpng():
+@@ -379,11 +374,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 06dc98fc842..fb0f67c451d 100644
--- a/graphics/py-matplotlib-tk/patches/patch-ab
+++ b/graphics/py-matplotlib-tk/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.5 2012/04/17 17:17:28 drochner Exp $
+$NetBSD: patch-ab,v 1.6 2012/12/17 11:52:43 drochner Exp $
 
---- setup.py.orig	2011-10-06 14:50:23.000000000 +0000
+--- setup.py.orig	2012-11-08 02:24:12.000000000 +0000
 +++ setup.py
-@@ -119,13 +119,13 @@ if not check_for_numpy():
+@@ -141,12 +141,12 @@ if not check_for_numpy(__version__numpy_
  if not check_for_freetype():
      sys.exit(1)
  
@@ -10,20 +10,18 @@ $NetBSD: patch-ab,v 1.5 2012/04/17 17:17:28 drochner Exp $
 -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)
 +#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")
-@@ -155,13 +155,13 @@ if options['build_tkagg']:
+@@ -176,13 +176,13 @@ if options['build_tkagg']:
          build_tkagg(ext_modules, packages)
          rc['backend'] = 'TkAgg'
  
@@ -39,7 +37,7 @@ $NetBSD: patch-ab,v 1.5 2012/04/17 17:17:28 drochner Exp $
          build_gtkagg(ext_modules, packages)
          rc['backend'] = 'GTKAgg'
  
-@@ -263,11 +263,11 @@ distrib = setup(name="matplotlib",
+@@ -322,12 +322,12 @@ distrib = setup(name="matplotlib",
        interfaces and hardcopy output formats.  There is a 'pylab' mode
        which emulates matlab graphics
        """,
@@ -49,8 +47,9 @@ $NetBSD: patch-ab,v 1.5 2012/04/17 17:17:28 drochner Exp $
 -      py_modules = py_modules,
 +#      py_modules = py_modules,
        ext_modules = ext_modules,
-       package_dir = {'': 'lib'},
+       package_dir = package_dir,
 -      package_data = package_data,
 +#      package_data = package_data,
+       classifiers = classifiers,
+       cmdclass = {'build_py': build_py},
        **additional_params
-       )