From 5c63b0e1f0fc97ccbbd6ef3fabd09cef1bb44f48 Mon Sep 17 00:00:00 2001 From: drochner Date: Tue, 17 Apr 2012 17:17:28 +0000 Subject: sync w/ base pkg --- graphics/py-matplotlib-gtk2/Makefile | 7 +++---- graphics/py-matplotlib-gtk2/distinfo | 12 ++++++------ graphics/py-matplotlib-gtk2/patches/patch-aa | 14 ++++++-------- graphics/py-matplotlib-gtk2/patches/patch-ab | 16 ++++++++-------- graphics/py-matplotlib-tk/Makefile | 7 +++---- graphics/py-matplotlib-tk/distinfo | 12 ++++++------ graphics/py-matplotlib-tk/patches/patch-aa | 14 ++++++-------- graphics/py-matplotlib-tk/patches/patch-ab | 16 ++++++++-------- 8 files changed, 46 insertions(+), 52 deletions(-) diff --git a/graphics/py-matplotlib-gtk2/Makefile b/graphics/py-matplotlib-gtk2/Makefile index b5a3b0ab4a8..64bd92785ea 100644 --- a/graphics/py-matplotlib-gtk2/Makefile +++ b/graphics/py-matplotlib-gtk2/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.27 2012/04/08 19:08:58 wiz Exp $ +# $NetBSD: Makefile,v 1.28 2012/04/17 17:17:28 drochner Exp $ # -DISTNAME= matplotlib-1.0.1 -PKGNAME= ${PYPKGPREFIX}-matplotlib-gtk-1.0.1 -PKGREVISION= 4 +DISTNAME= matplotlib-1.1.0 +PKGNAME= ${PYPKGPREFIX}-matplotlib-gtk-1.1.0 CATEGORIES= graphics python MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=matplotlib/} diff --git a/graphics/py-matplotlib-gtk2/distinfo b/graphics/py-matplotlib-gtk2/distinfo index 8a08029ad89..9b327f44833 100644 --- a/graphics/py-matplotlib-gtk2/distinfo +++ b/graphics/py-matplotlib-gtk2/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.8 2012/04/07 11:32:29 joerg Exp $ +$NetBSD: distinfo,v 1.9 2012/04/17 17:17:28 drochner Exp $ -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) = 159f1c30276014e2aef83c9c3c0e2a0f6746690c -SHA1 (patch-ab) = 4bc5d9fa3d8f6236794c2e76f63f1bc45e3948ec +SHA1 (matplotlib-1.1.0.tar.gz) = 435b4f04a7e099b79f66451d69ad0b5ce66030ae +RMD160 (matplotlib-1.1.0.tar.gz) = 9313fc6407271c46f3ac5af4c53df5ea57982711 +Size (matplotlib-1.1.0.tar.gz) = 35842643 bytes +SHA1 (patch-aa) = 3de5207ff605dc4b2d588b3c75588d75fb57d949 +SHA1 (patch-ab) = afc6e9fd9c09de0500b29ea127b20c16c9990811 SHA1 (patch-agg24-include-agg_renderer_outline_aa.h) = fc7de9efc4563e75634947eac3c3a5a69441f2ce diff --git a/graphics/py-matplotlib-gtk2/patches/patch-aa b/graphics/py-matplotlib-gtk2/patches/patch-aa index 4c84cab0a47..24cdeb76ae3 100644 --- a/graphics/py-matplotlib-gtk2/patches/patch-aa +++ b/graphics/py-matplotlib-gtk2/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.7 2012/04/07 11:32:29 joerg Exp $ +$NetBSD: patch-aa,v 1.8 2012/04/17 17:17:28 drochner Exp $ ---- setupext.py.orig 2010-07-07 01:41:55.000000000 +0000 +--- setupext.py.orig 2011-10-06 14:50:23.000000000 +0000 +++ setupext.py -@@ -115,14 +115,14 @@ options = {'display_status': True, +@@ -124,13 +124,13 @@ options = {'display_status': True, 'verbose': False, 'provide_pytz': 'auto', 'provide_dateutil': 'auto', @@ -11,7 +11,6 @@ $NetBSD: patch-aa,v 1.7 2012/04/07 11:32:29 joerg Exp $ 'build_gtk': 'auto', 'build_gtkagg': 'auto', 'build_tkagg': 'auto', - 'build_wxagg': 'auto', 'build_macosx': 'auto', - 'build_image': True, - 'build_windowing': True, @@ -20,8 +19,8 @@ $NetBSD: patch-aa,v 1.7 2012/04/07 11:32:29 joerg Exp $ 'backend': None, 'basedirlist': None} -@@ -201,12 +201,8 @@ else: - print_status = print_message = print_raw = print_line +@@ -221,12 +221,7 @@ sysconfig.customize_compiler = my_custom + def run_child_process(cmd): - p = subprocess.Popen(cmd, shell=True, @@ -30,12 +29,11 @@ $NetBSD: patch-aa,v 1.7 2012/04/07 11:32:29 joerg Exp $ - stderr=subprocess.STDOUT, - close_fds=(sys.platform != 'win32')) - return p.stdin, p.stdout -+ import os + return None, os.popen(cmd + " 2>&1") class CleanUpFile: """CleanUpFile deletes the specified filename when self is destroyed.""" -@@ -344,11 +340,8 @@ def check_for_libpng(): +@@ -364,11 +359,8 @@ def check_for_libpng(): return True def add_base_flags(module): diff --git a/graphics/py-matplotlib-gtk2/patches/patch-ab b/graphics/py-matplotlib-gtk2/patches/patch-ab index b6129d2f87a..c15e9382128 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.5 2011/02/17 10:33:38 markd Exp $ +$NetBSD: patch-ab,v 1.6 2012/04/17 17:17:28 drochner Exp $ ---- setup.py.orig 2010-07-07 01:41:55.000000000 +0000 +--- setup.py.orig 2011-10-06 14:50:23.000000000 +0000 +++ setup.py -@@ -128,13 +128,13 @@ if not check_for_numpy(): +@@ -119,13 +119,13 @@ if not check_for_numpy(): if not check_for_freetype(): sys.exit(1) @@ -23,12 +23,12 @@ $NetBSD: patch-ab,v 1.5 2011/02/17 10:33:38 markd Exp $ print_raw("") print_raw("OPTIONAL BACKEND DEPENDENCIES") -@@ -175,13 +175,13 @@ if options['build_wxagg']: - print_message("WxAgg extension not required for wxPython >= 2.8") - rc['backend'] = 'WXAgg' +@@ -155,13 +155,13 @@ if options['build_tkagg']: + build_tkagg(ext_modules, packages) + rc['backend'] = 'TkAgg' -hasgtk = check_for_gtk() -+hasgtk = 1 # check_for_gtk() ++hasgtk = 1 if options['build_gtk']: if hasgtk or (options['build_gtk'] is True): build_gdk(ext_modules, packages) @@ -39,7 +39,7 @@ $NetBSD: patch-ab,v 1.5 2011/02/17 10:33:38 markd Exp $ build_gtkagg(ext_modules, packages) rc['backend'] = 'GTKAgg' -@@ -282,11 +282,11 @@ distrib = setup(name="matplotlib", +@@ -263,11 +263,11 @@ distrib = setup(name="matplotlib", interfaces and hardcopy output formats. There is a 'pylab' mode which emulates matlab graphics """, diff --git a/graphics/py-matplotlib-tk/Makefile b/graphics/py-matplotlib-tk/Makefile index 2a68476626e..cfe15778938 100644 --- a/graphics/py-matplotlib-tk/Makefile +++ b/graphics/py-matplotlib-tk/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.9 2011/11/01 06:01:44 sbd Exp $ +# $NetBSD: Makefile,v 1.10 2012/04/17 17:17:28 drochner Exp $ # -DISTNAME= matplotlib-1.0.1 -PKGNAME= ${PYPKGPREFIX}-matplotlib-tk-1.0.1 -PKGREVISION= 1 +DISTNAME= matplotlib-1.1.0 +PKGNAME= ${PYPKGPREFIX}-matplotlib-tk-1.1.0 CATEGORIES= graphics python MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=matplotlib/} diff --git a/graphics/py-matplotlib-tk/distinfo b/graphics/py-matplotlib-tk/distinfo index 9a69f35e7d9..4e5f0298de8 100644 --- a/graphics/py-matplotlib-tk/distinfo +++ b/graphics/py-matplotlib-tk/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.7 2012/04/07 11:32:29 joerg Exp $ +$NetBSD: distinfo,v 1.8 2012/04/17 17:17:28 drochner Exp $ -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) = 159f1c30276014e2aef83c9c3c0e2a0f6746690c -SHA1 (patch-ab) = 4bc5d9fa3d8f6236794c2e76f63f1bc45e3948ec +SHA1 (matplotlib-1.1.0.tar.gz) = 435b4f04a7e099b79f66451d69ad0b5ce66030ae +RMD160 (matplotlib-1.1.0.tar.gz) = 9313fc6407271c46f3ac5af4c53df5ea57982711 +Size (matplotlib-1.1.0.tar.gz) = 35842643 bytes +SHA1 (patch-aa) = 3de5207ff605dc4b2d588b3c75588d75fb57d949 +SHA1 (patch-ab) = afc6e9fd9c09de0500b29ea127b20c16c9990811 SHA1 (patch-agg24-include-agg_renderer_outline_aa.h) = fc7de9efc4563e75634947eac3c3a5a69441f2ce diff --git a/graphics/py-matplotlib-tk/patches/patch-aa b/graphics/py-matplotlib-tk/patches/patch-aa index a319c58ada0..a51e2e6617e 100644 --- a/graphics/py-matplotlib-tk/patches/patch-aa +++ b/graphics/py-matplotlib-tk/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.5 2012/04/07 11:32:30 joerg Exp $ +$NetBSD: patch-aa,v 1.6 2012/04/17 17:17:28 drochner Exp $ ---- setupext.py.orig 2010-07-07 01:41:55.000000000 +0000 +--- setupext.py.orig 2011-10-06 14:50:23.000000000 +0000 +++ setupext.py -@@ -115,14 +115,14 @@ options = {'display_status': True, +@@ -124,13 +124,13 @@ options = {'display_status': True, 'verbose': False, 'provide_pytz': 'auto', 'provide_dateutil': 'auto', @@ -11,7 +11,6 @@ $NetBSD: patch-aa,v 1.5 2012/04/07 11:32:30 joerg Exp $ 'build_gtk': 'auto', 'build_gtkagg': 'auto', 'build_tkagg': 'auto', - 'build_wxagg': 'auto', 'build_macosx': 'auto', - 'build_image': True, - 'build_windowing': True, @@ -20,8 +19,8 @@ $NetBSD: patch-aa,v 1.5 2012/04/07 11:32:30 joerg Exp $ 'backend': None, 'basedirlist': None} -@@ -201,12 +201,8 @@ else: - print_status = print_message = print_raw = print_line +@@ -221,12 +221,7 @@ sysconfig.customize_compiler = my_custom + def run_child_process(cmd): - p = subprocess.Popen(cmd, shell=True, @@ -30,12 +29,11 @@ $NetBSD: patch-aa,v 1.5 2012/04/07 11:32:30 joerg Exp $ - stderr=subprocess.STDOUT, - close_fds=(sys.platform != 'win32')) - return p.stdin, p.stdout -+ import os + return None, os.popen(cmd + " 2>&1") class CleanUpFile: """CleanUpFile deletes the specified filename when self is destroyed.""" -@@ -344,11 +340,8 @@ def check_for_libpng(): +@@ -364,11 +359,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 652a824ab05..06dc98fc842 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.4 2011/02/17 10:33:39 markd Exp $ +$NetBSD: patch-ab,v 1.5 2012/04/17 17:17:28 drochner Exp $ ---- setup.py.orig 2010-07-07 01:41:55.000000000 +0000 +--- setup.py.orig 2011-10-06 14:50:23.000000000 +0000 +++ setup.py -@@ -128,13 +128,13 @@ if not check_for_numpy(): +@@ -119,13 +119,13 @@ if not check_for_numpy(): if not check_for_freetype(): sys.exit(1) @@ -23,12 +23,12 @@ $NetBSD: patch-ab,v 1.4 2011/02/17 10:33:39 markd Exp $ print_raw("") print_raw("OPTIONAL BACKEND DEPENDENCIES") -@@ -175,13 +175,13 @@ if options['build_wxagg']: - print_message("WxAgg extension not required for wxPython >= 2.8") - rc['backend'] = 'WXAgg' +@@ -155,13 +155,13 @@ if options['build_tkagg']: + build_tkagg(ext_modules, packages) + rc['backend'] = 'TkAgg' -hasgtk = check_for_gtk() -+hasgtk = 1 # check_for_gtk() ++hasgtk = 1 if options['build_gtk']: if hasgtk or (options['build_gtk'] is True): build_gdk(ext_modules, packages) @@ -39,7 +39,7 @@ $NetBSD: patch-ab,v 1.4 2011/02/17 10:33:39 markd Exp $ build_gtkagg(ext_modules, packages) rc['backend'] = 'GTKAgg' -@@ -282,11 +282,11 @@ distrib = setup(name="matplotlib", +@@ -263,11 +263,11 @@ distrib = setup(name="matplotlib", interfaces and hardcopy output formats. There is a 'pylab' mode which emulates matlab graphics """, -- cgit v1.2.3