From da6df785249eb8c354300b1be06fc4d638421b2b Mon Sep 17 00:00:00 2001 From: markd Date: Fri, 19 Dec 2008 22:39:47 +0000 Subject: Update to py-matplotlib-gtk2 0.98.0 three years of updates. --- graphics/py-matplotlib-gtk2/Makefile | 10 +- graphics/py-matplotlib-gtk2/PLIST | 5 +- graphics/py-matplotlib-gtk2/distinfo | 12 +-- graphics/py-matplotlib-gtk2/patches/patch-aa | 50 ++++++++-- graphics/py-matplotlib-gtk2/patches/patch-ab | 135 ++++++++++----------------- 5 files changed, 103 insertions(+), 109 deletions(-) (limited to 'graphics') diff --git a/graphics/py-matplotlib-gtk2/Makefile b/graphics/py-matplotlib-gtk2/Makefile index e244c3eaa86..f7171aef8f7 100644 --- a/graphics/py-matplotlib-gtk2/Makefile +++ b/graphics/py-matplotlib-gtk2/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.10 2008/11/19 03:39:57 hasso Exp $ +# $NetBSD: Makefile,v 1.11 2008/12/19 22:39:47 markd Exp $ # -DISTNAME= matplotlib-0.87.2 -PKGNAME= ${PYPKGPREFIX}-matplotlib-gtk-0.87.2 -PKGREVISION= 2 +DISTNAME= matplotlib-0.98.0 +PKGNAME= ${PYPKGPREFIX}-matplotlib-gtk-0.98.0 CATEGORIES= graphics python MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=matplotlib/} @@ -25,7 +24,6 @@ PYTHON_VERSIONS_ACCEPTED= 24 25 .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" -.include "../../math/py-Numeric/buildlink3.mk" -.include "../../math/py-numarray/buildlink3.mk" +.include "../../math/py-numpy/buildlink3.mk" .include "../../x11/py-gtk2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/py-matplotlib-gtk2/PLIST b/graphics/py-matplotlib-gtk2/PLIST index d424fabc552..1df8fdc37aa 100644 --- a/graphics/py-matplotlib-gtk2/PLIST +++ b/graphics/py-matplotlib-gtk2/PLIST @@ -1,4 +1,3 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2006/04/06 16:45:34 drochner Exp $ +@comment $NetBSD: PLIST,v 1.2 2008/12/19 22:39:47 markd Exp $ +${PYSITELIB}/matplotlib/backends/_backend_gdk.so ${PYSITELIB}/matplotlib/backends/_gtkagg.so -${PYSITELIB}/matplotlib/backends/_na_backend_gdk.so -${PYSITELIB}/matplotlib/backends/_nc_backend_gdk.so diff --git a/graphics/py-matplotlib-gtk2/distinfo b/graphics/py-matplotlib-gtk2/distinfo index c1d3312d6cb..0792dcf89c9 100644 --- a/graphics/py-matplotlib-gtk2/distinfo +++ b/graphics/py-matplotlib-gtk2/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.1.1.1 2006/04/06 16:45:34 drochner Exp $ +$NetBSD: distinfo,v 1.2 2008/12/19 22:39:47 markd Exp $ -SHA1 (matplotlib-0.87.2.tar.gz) = 9d969da7cf8ecb545f8c3a9030645292f32e1cbb -RMD160 (matplotlib-0.87.2.tar.gz) = 0c913a357e8cec819a5a3f0812ef7854f329fb5c -Size (matplotlib-0.87.2.tar.gz) = 2655790 bytes -SHA1 (patch-aa) = 905b7657ac229a968c50faeee774408fd764ebfc -SHA1 (patch-ab) = 1b9632f54db3e9a04546b47814f6805a835830bd +SHA1 (matplotlib-0.98.0.tar.gz) = ce19f2fc7b1d66329e904171b04a2334bcc8400f +RMD160 (matplotlib-0.98.0.tar.gz) = 59d429bb63ebc0fb755bd0a72e890e95a7c5d65c +Size (matplotlib-0.98.0.tar.gz) = 4219634 bytes +SHA1 (patch-aa) = 0ce9c08d1070936a18176379fadd578707f3101f +SHA1 (patch-ab) = a3ef38a41421ffd5b6ab0b24f91b848b2e67441c diff --git a/graphics/py-matplotlib-gtk2/patches/patch-aa b/graphics/py-matplotlib-gtk2/patches/patch-aa index fbc35662f82..ce4f0d51729 100644 --- a/graphics/py-matplotlib-gtk2/patches/patch-aa +++ b/graphics/py-matplotlib-gtk2/patches/patch-aa @@ -1,17 +1,47 @@ -$NetBSD: patch-aa,v 1.1.1.1 2006/04/06 16:45:34 drochner Exp $ +$NetBSD: patch-aa,v 1.2 2008/12/19 22:39:47 markd Exp $ ---- setupext.py.orig 2006-01-09 14:20:44.000000000 +0100 +--- setupext.py.orig 2008-05-30 10:47:10.000000000 +1200 +++ setupext.py -@@ -99,10 +99,8 @@ def temp_copy(_from, _to): - globals()["_cleanup_"+_to] = CleanUpFile(_to) +@@ -103,17 +103,17 @@ 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_traits': 'auto', +- 'build_agg': True, +- 'build_gtk': 'auto', +- 'build_gtkagg': 'auto', +- 'build_tkagg': 'auto', +- 'build_wxagg': 'auto', +- 'build_image': True, +- 'build_windowing': True, ++ 'provide_pytz': False, ++ 'provide_dateutil': False, ++ 'provide_configobj': False, ++ 'provide_traits': False, ++ 'build_agg': False, ++ 'build_gtk': True, ++ 'build_gtkagg': True, ++ 'build_tkagg': False, ++ 'build_wxagg': False, ++ 'build_image': False, ++ 'build_windowing': False, + 'backend': None, + 'numerix': None} + +@@ -321,11 +321,8 @@ def check_for_libpng(): + return True def add_base_flags(module): -- incdirs = [os.path.join(p, 'include') for p in basedir[sys.platform] -- if os.path.exists(p)] -- libdirs = [os.path.join(p, 'lib') for p in basedir[sys.platform] -- if os.path.exists(p)] +- incdirs = filter(os.path.exists, +- [os.path.join(p, 'include') for p in basedir[sys.platform] ]) +- 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') + module.include_dirs.extend(incdirs) - module.include_dirs.append('.') - module.library_dirs.extend(libdirs) + module.include_dirs.append('.') diff --git a/graphics/py-matplotlib-gtk2/patches/patch-ab b/graphics/py-matplotlib-gtk2/patches/patch-ab index 45b12a06a56..aed264a6799 100644 --- a/graphics/py-matplotlib-gtk2/patches/patch-ab +++ b/graphics/py-matplotlib-gtk2/patches/patch-ab @@ -1,98 +1,65 @@ -$NetBSD: patch-ab,v 1.1.1.1 2006/04/06 16:45:34 drochner Exp $ +$NetBSD: patch-ab,v 1.2 2008/12/19 22:39:47 markd Exp $ ---- setup.py.orig 2006-03-12 01:11:40.000000000 +0100 +--- setup.py.orig 2008-05-30 10:47:09.000000000 +1200 +++ setup.py -@@ -21,23 +21,23 @@ rc = dict({'backend':'PS', 'numerix':'Nu - # numarray. You can build the image module with either Numeric or - # numarray or both. By default, matplotlib will build support for - # whatever array packages you have installed. --BUILD_IMAGE = 1 -+BUILD_IMAGE = 0 +@@ -92,11 +92,11 @@ if not check_for_numpy(): + if not check_for_freetype(): + sys.exit(1) - # Build the antigrain geometry toolkit. Agg makes heavy use of - # templates, so it probably requires a fairly recent compiler to build - # it. It makes very nice antialiased output and also supports alpha - # blending --BUILD_AGG = 1 --BUILD_GTKAGG = 'auto' --BUILD_GTK = 'auto' -+BUILD_AGG = 0 -+BUILD_GTKAGG = 1 -+BUILD_GTK = 1 +-build_ft2font(ext_modules, packages) +-build_ttconv(ext_modules, packages) +-build_contour(ext_modules, packages) +-build_nxutils(ext_modules, packages) +-build_path(ext_modules, packages) ++#build_ft2font(ext_modules, packages) ++#build_ttconv(ext_modules, packages) ++#build_contour(ext_modules, packages) ++#build_nxutils(ext_modules, packages) ++#build_path(ext_modules, packages) - # build TK GUI with Agg renderer ; requires Tkinter Python extension - # and Tk includes - # Use False or 0 if you don't want to build --BUILD_TKAGG = 'auto' -+BUILD_TKAGG = 0 + print_raw("") + print_raw("OPTIONAL BACKEND DEPENDENCIES") +@@ -133,13 +133,13 @@ if options['build_wxagg']: + print_message("WxAgg extension not required for wxPython >= 2.8") + rc['backend'] = 'WXAgg' - # build wxPython GUI with Agg renderer ; requires wxPython package --BUILD_WXAGG = 'auto' -+BUILD_WXAGG = 0 +-hasgtk = check_for_gtk() ++hasgtk = 1 # check_for_gtk() + if options['build_gtk']: + if hasgtk or (options['build_gtk'] is True): + build_gdk(ext_modules, packages) + if options['build_gtkagg']: + if hasgtk or (options['build_gtkagg'] is True): +- options['build_agg'] = 1 ++ options['build_agg'] = 0 + build_gtkagg(ext_modules, packages) + rc['backend'] = 'GTKAgg' +@@ -197,9 +197,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) - # build a small extension to manage the focus on win32 platforms. -@@ -137,7 +137,7 @@ rc['numerix'] = NUMERIX[-1] - ext_modules = [] - - # these are not optional --BUILD_FT2FONT = 1 -+BUILD_FT2FONT = 0 - BUILD_CONTOUR = 1 - - # jdh -@@ -164,7 +164,7 @@ try: import datetime - except ImportError: havedate = False - else: havedate = True - --if havedate: # dates require python23 datetime -+if 0: # dates require python23 datetime - # only install pytz and dateutil if the user hasn't got them - def add_pytz(): - packages.append('pytz') -@@ -190,9 +190,9 @@ if havedate: # dates require python23 da - except ImportError: - add_pytz() - --build_swigagg(ext_modules, packages) --build_transforms(ext_modules, packages, NUMERIX) --build_enthought(ext_modules, packages) -+#build_swigagg(ext_modules, packages) -+#build_transforms(ext_modules, packages, NUMERIX) -+#build_enthought(ext_modules, packages) - - if BUILD_GTK: - try: -@@ -238,7 +238,7 @@ if BUILD_GTKAGG: - print 'pygtk present but import failed' - - if BUILD_GTKAGG: -- BUILD_AGG = 1 -+ BUILD_AGG = 0 - build_gtkagg(ext_modules, packages, NUMERIX) - rc['backend'] = 'GTKAgg' - -@@ -257,7 +257,7 @@ if BUILD_WINDOWING and sys.platform=='wi - if BUILD_IMAGE: - build_image(ext_modules, packages, NUMERIX) - --if 1: # I don't think we need to make these optional -+if 0: # I don't think we need to make these optional - build_contour(ext_modules, packages, NUMERIX) - - for mod in ext_modules: -@@ -290,11 +290,11 @@ distrib = setup(name="matplotlib", - object oriented, there is a functional interface "pylab" - for people coming from Matlab. + print_raw("") + print_raw("[Edit setup.cfg to suppress the above messages]") +@@ -238,11 +238,11 @@ distrib = setup(name="matplotlib", + interfaces and hardcopy output formats. There is a 'pylab' mode + which emulates matlab graphics """, - packages = packages, +# packages = packages, platforms='any', -- py_modules = ['pylab'], -+# py_modules = ['pylab'], +- py_modules = py_modules, ++# py_modules = py_modules, ext_modules = ext_modules, -- data_files = data_files, -+# data_files = data_files, package_dir = {'': 'lib'}, - cmdclass = {'install_data':smart_install_data}, +- package_data = package_data, ++# package_data = package_data, **additional_params + ) -- cgit v1.2.3