sync w/ base pkg

6 files changed, 24 insertions, 26 deletions

diff --git a/graphics/py-matplotlib-gtk2/Makefile b/graphics/py-matplotlib-gtk2/Makefile
index c9d08a6ccf4..2ef957d68f9 100644
--- a/graphics/py-matplotlib-gtk2/Makefile
+++ b/graphics/py-matplotlib-gtk2/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.41 2013/06/06 12:54:34 wiz Exp $
+# $NetBSD: Makefile,v 1.42 2013/07/24 11:13:56 drochner Exp $
 #
 
-DISTNAME=		matplotlib-1.2.0
-PKGNAME=		${PYPKGPREFIX}-matplotlib-gtk-1.2.0
-PKGREVISION=		4
+DISTNAME=		matplotlib-1.2.1
+PKGNAME=		${PYPKGPREFIX}-matplotlib-gtk-1.2.1
 CATEGORIES=		graphics python
 MASTER_SITES=		https://github.com/downloads/matplotlib/matplotlib/
 FETCH_USING=		curl
diff --git a/graphics/py-matplotlib-gtk2/distinfo b/graphics/py-matplotlib-gtk2/distinfo
index 51f2c27d959..9e36ac0179a 100644
--- a/graphics/py-matplotlib-gtk2/distinfo
+++ b/graphics/py-matplotlib-gtk2/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.11 2012/12/17 11:52:42 drochner Exp $
+$NetBSD: distinfo,v 1.12 2013/07/24 11:13:56 drochner Exp $
 
-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 (matplotlib-1.2.1.tar.gz) = 82fc44d0047a713c1b0b1b4ea2503e6a41c57f98
+RMD160 (matplotlib-1.2.1.tar.gz) = c27142f1d6665bc6a748f601558045e7d801dbef
+Size (matplotlib-1.2.1.tar.gz) = 38446200 bytes
 SHA1 (patch-aa) = 7ff4d7f4bbd9a2b19b839f92e0a7b568db4d4fb9
-SHA1 (patch-ab) = 3dbee59792c9f5bcfdd92a019ec548dcd64b01e0
+SHA1 (patch-ab) = d6b69b74d74a67c90b09f821ffe7da8eec79a855
diff --git a/graphics/py-matplotlib-gtk2/patches/patch-ab b/graphics/py-matplotlib-gtk2/patches/patch-ab
index 0f1b14f9bf0..7869a075637 100644
--- a/graphics/py-matplotlib-gtk2/patches/patch-ab
+++ b/graphics/py-matplotlib-gtk2/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.7 2012/12/17 11:52:42 drochner Exp $
+$NetBSD: patch-ab,v 1.8 2013/07/24 11:13:56 drochner Exp $
 
---- setup.py.orig	2012-11-08 02:24:12.000000000 +0000
+--- setup.py.orig	2013-03-26 13:04:37.000000000 +0000
 +++ setup.py
 @@ -141,12 +141,12 @@ if not check_for_numpy(__version__numpy_
  if not check_for_freetype():
@@ -37,10 +37,10 @@ $NetBSD: patch-ab,v 1.7 2012/12/17 11:52:42 drochner Exp $
          build_gtkagg(ext_modules, packages)
          rc['backend'] = 'GTKAgg'
  
-@@ -322,12 +322,12 @@ distrib = setup(name="matplotlib",
-       interfaces and hardcopy output formats.  There is a 'pylab' mode
+@@ -323,12 +323,12 @@ distrib = setup(name="matplotlib",
        which emulates matlab graphics
        """,
+       download_url="https://downloads.sourceforge.net/project/matplotlib/matplotlib/matplotlib-{0}/matplotlib-{0}.tar.gz".format(__version__),
 -      packages = packages,
 +#      packages = packages,
        platforms='any',
diff --git a/graphics/py-matplotlib-tk/Makefile b/graphics/py-matplotlib-tk/Makefile
index 3b3d627d5b4..efb004c2273 100644
--- a/graphics/py-matplotlib-tk/Makefile
+++ b/graphics/py-matplotlib-tk/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2013/06/06 12:54:34 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2013/07/24 11:13:56 drochner Exp $
 
-DISTNAME=		matplotlib-1.2.0
-PKGNAME=		${PYPKGPREFIX}-matplotlib-tk-1.2.0
-PKGREVISION=		4
+DISTNAME=		matplotlib-1.2.1
+PKGNAME=		${PYPKGPREFIX}-matplotlib-tk-1.2.1
 CATEGORIES=		graphics python
 MASTER_SITES=		https://github.com/downloads/matplotlib/matplotlib/
 FETCH_USING=		curl
diff --git a/graphics/py-matplotlib-tk/distinfo b/graphics/py-matplotlib-tk/distinfo
index 09b686ddb7d..bb7111589d7 100644
--- a/graphics/py-matplotlib-tk/distinfo
+++ b/graphics/py-matplotlib-tk/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.10 2012/12/17 11:52:43 drochner Exp $
+$NetBSD: distinfo,v 1.11 2013/07/24 11:13:56 drochner Exp $
 
-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 (matplotlib-1.2.1.tar.gz) = 82fc44d0047a713c1b0b1b4ea2503e6a41c57f98
+RMD160 (matplotlib-1.2.1.tar.gz) = c27142f1d6665bc6a748f601558045e7d801dbef
+Size (matplotlib-1.2.1.tar.gz) = 38446200 bytes
 SHA1 (patch-aa) = 7ff4d7f4bbd9a2b19b839f92e0a7b568db4d4fb9
-SHA1 (patch-ab) = 3dbee59792c9f5bcfdd92a019ec548dcd64b01e0
+SHA1 (patch-ab) = d6b69b74d74a67c90b09f821ffe7da8eec79a855
diff --git a/graphics/py-matplotlib-tk/patches/patch-ab b/graphics/py-matplotlib-tk/patches/patch-ab
index fb0f67c451d..8e0bcfa1e1f 100644
--- a/graphics/py-matplotlib-tk/patches/patch-ab
+++ b/graphics/py-matplotlib-tk/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.6 2012/12/17 11:52:43 drochner Exp $
+$NetBSD: patch-ab,v 1.7 2013/07/24 11:13:56 drochner Exp $
 
---- setup.py.orig	2012-11-08 02:24:12.000000000 +0000
+--- setup.py.orig	2013-03-26 13:04:37.000000000 +0000
 +++ setup.py
 @@ -141,12 +141,12 @@ if not check_for_numpy(__version__numpy_
  if not check_for_freetype():
@@ -37,10 +37,10 @@ $NetBSD: patch-ab,v 1.6 2012/12/17 11:52:43 drochner Exp $
          build_gtkagg(ext_modules, packages)
          rc['backend'] = 'GTKAgg'
  
-@@ -322,12 +322,12 @@ distrib = setup(name="matplotlib",
-       interfaces and hardcopy output formats.  There is a 'pylab' mode
+@@ -323,12 +323,12 @@ distrib = setup(name="matplotlib",
        which emulates matlab graphics
        """,
+       download_url="https://downloads.sourceforge.net/project/matplotlib/matplotlib/matplotlib-{0}/matplotlib-{0}.tar.gz".format(__version__),
 -      packages = packages,
 +#      packages = packages,
        platforms='any',