diff --git a/graphics/py-matplotlib/Makefile b/graphics/py-matplotlib/Makefile index 7d6f6e7c0e66..d980eaa62f14 100644 --- a/graphics/py-matplotlib/Makefile +++ b/graphics/py-matplotlib/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.5 2005/07/27 16:21:17 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2005/12/29 20:29:34 markd Exp $ # -DISTNAME= matplotlib-0.80 +DISTNAME= matplotlib-0.83 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} CATEGORIES= graphics python MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=matplotlib/} diff --git a/graphics/py-matplotlib/PLIST b/graphics/py-matplotlib/PLIST index 0733cdc0a245..95ce4c505556 100644 --- a/graphics/py-matplotlib/PLIST +++ b/graphics/py-matplotlib/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2005/05/31 18:09:13 drochner Exp $ +@comment $NetBSD: PLIST,v 1.3 2005/12/29 20:29:35 markd Exp $ ${PYSITELIB}/dateutil/__init__.py ${PYSITELIB}/dateutil/__init__.pyc ${PYSITELIB}/dateutil/__init__.pyo @@ -30,8 +30,7 @@ ${PYSITELIB}/matplotlib/_image.pyo ${PYSITELIB}/matplotlib/_mathtext_data.py ${PYSITELIB}/matplotlib/_mathtext_data.pyc ${PYSITELIB}/matplotlib/_mathtext_data.pyo -${PYSITELIB}/matplotlib/_nc_backend_gdk.so -${PYSITELIB}/matplotlib/_nc_contour.so +${PYSITELIB}/matplotlib/_nc_cntr.so ${PYSITELIB}/matplotlib/_nc_image.so ${PYSITELIB}/matplotlib/_nc_transforms.so ${PYSITELIB}/matplotlib/_pylab_helpers.py @@ -63,13 +62,20 @@ ${PYSITELIB}/matplotlib/backends/__init__.pyc ${PYSITELIB}/matplotlib/backends/__init__.pyo ${PYSITELIB}/matplotlib/backends/_gtkagg.so ${PYSITELIB}/matplotlib/backends/_nc_backend_agg.so +${PYSITELIB}/matplotlib/backends/_nc_backend_gdk.so ${PYSITELIB}/matplotlib/backends/_tkagg.so ${PYSITELIB}/matplotlib/backends/backend_agg.py ${PYSITELIB}/matplotlib/backends/backend_agg.pyc ${PYSITELIB}/matplotlib/backends/backend_agg.pyo +${PYSITELIB}/matplotlib/backends/backend_agg2.py +${PYSITELIB}/matplotlib/backends/backend_agg2.pyc +${PYSITELIB}/matplotlib/backends/backend_agg2.pyo ${PYSITELIB}/matplotlib/backends/backend_cairo.py ${PYSITELIB}/matplotlib/backends/backend_cairo.pyc ${PYSITELIB}/matplotlib/backends/backend_cairo.pyo +${PYSITELIB}/matplotlib/backends/backend_cocoaagg.py +${PYSITELIB}/matplotlib/backends/backend_cocoaagg.pyc +${PYSITELIB}/matplotlib/backends/backend_cocoaagg.pyo ${PYSITELIB}/matplotlib/backends/backend_fltkagg.py ${PYSITELIB}/matplotlib/backends/backend_fltkagg.pyc ${PYSITELIB}/matplotlib/backends/backend_fltkagg.pyo @@ -339,6 +345,9 @@ ${PYSITELIB}/matplotlib/pyparsing.pyo ${PYSITELIB}/matplotlib/table.py ${PYSITELIB}/matplotlib/table.pyc ${PYSITELIB}/matplotlib/table.pyo +${PYSITELIB}/matplotlib/texmanager.py +${PYSITELIB}/matplotlib/texmanager.pyc +${PYSITELIB}/matplotlib/texmanager.pyo ${PYSITELIB}/matplotlib/text.py ${PYSITELIB}/matplotlib/text.pyc ${PYSITELIB}/matplotlib/text.pyo @@ -348,6 +357,9 @@ ${PYSITELIB}/matplotlib/ticker.pyo ${PYSITELIB}/matplotlib/transforms.py ${PYSITELIB}/matplotlib/transforms.pyc ${PYSITELIB}/matplotlib/transforms.pyo +${PYSITELIB}/matplotlib/widgets.py +${PYSITELIB}/matplotlib/widgets.pyc +${PYSITELIB}/matplotlib/widgets.pyo ${PYSITELIB}/matplotlib/windowing.py ${PYSITELIB}/matplotlib/windowing.pyc ${PYSITELIB}/matplotlib/windowing.pyo @@ -2069,7 +2081,6 @@ ${PYSITELIB}/pytz/zoneinfo/__init__.pyo ${PYSITELIB}/pytz/zoneinfo/posixrules.py ${PYSITELIB}/pytz/zoneinfo/posixrules.pyc ${PYSITELIB}/pytz/zoneinfo/posixrules.pyo -share/matplotlib/.matplotlibrc share/matplotlib/Vera.ttf share/matplotlib/VeraBI.ttf share/matplotlib/VeraBd.ttf @@ -2111,6 +2122,7 @@ share/matplotlib/home.ppm share/matplotlib/home.svg share/matplotlib/home.xpm share/matplotlib/matplotlib.svg +share/matplotlib/matplotlibrc share/matplotlib/move.png share/matplotlib/move.ppm share/matplotlib/move.svg @@ -2174,6 +2186,9 @@ share/matplotlib/stock_zoom-in.ppm share/matplotlib/stock_zoom-in.xpm share/matplotlib/stock_zoom-out.ppm share/matplotlib/stock_zoom-out.xpm +share/matplotlib/subplots.png +share/matplotlib/subplots.ppm +share/matplotlib/subplots.xpm share/matplotlib/zoom_to_rect.png share/matplotlib/zoom_to_rect.ppm share/matplotlib/zoom_to_rect.svg diff --git a/graphics/py-matplotlib/distinfo b/graphics/py-matplotlib/distinfo index 35f705e1e701..ed731115790f 100644 --- a/graphics/py-matplotlib/distinfo +++ b/graphics/py-matplotlib/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.3 2005/05/31 18:09:13 drochner Exp $ +$NetBSD: distinfo,v 1.4 2005/12/29 20:29:35 markd Exp $ -SHA1 (matplotlib-0.80.tar.gz) = 639bc10a311319459214d4d23c8c94003d2589ac -RMD160 (matplotlib-0.80.tar.gz) = 503924ec1567605f53b3f01656129035b688362e -Size (matplotlib-0.80.tar.gz) = 2332845 bytes -SHA1 (patch-aa) = a18d4af17526047d3d70cb0d1685365891b7d75c +SHA1 (matplotlib-0.83.tar.gz) = a9ac202e1ad1be4c52769487968fee7bab9ca3e4 +RMD160 (matplotlib-0.83.tar.gz) = 94c4b62e57bf713f0422c905393805e951f55c88 +Size (matplotlib-0.83.tar.gz) = 2703881 bytes +SHA1 (patch-aa) = b9f154c5d16b231384162bf789cc8d025f22e776 diff --git a/graphics/py-matplotlib/patches/patch-aa b/graphics/py-matplotlib/patches/patch-aa index 9961f4d2ff1c..a4bd57798a44 100644 --- a/graphics/py-matplotlib/patches/patch-aa +++ b/graphics/py-matplotlib/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.1 2005/05/31 18:09:13 drochner Exp $ +$NetBSD: patch-aa,v 1.2 2005/12/29 20:29:35 markd Exp $ ---- setupext.py.orig 2005-05-12 17:44:54.000000000 +0200 +--- setupext.py.orig 2005-07-06 03:36:37.000000000 +1200 +++ setupext.py -@@ -87,10 +87,8 @@ def temp_copy(_from, _to): +@@ -95,10 +95,8 @@ def temp_copy(_from, _to): globals()["_cleanup_"+_to] = CleanUpFile(_to) def add_base_flags(module): @@ -15,3 +15,109 @@ $NetBSD: patch-aa,v 1.1 2005/05/31 18:09:13 drochner Exp $ module.include_dirs.extend(incdirs) module.library_dirs.extend(libdirs) +@@ -408,22 +406,6 @@ def build_agg(ext_modules, packages, num + 'agg_rasterizer_scanline_aa.cpp', + ) + +- if numerix in ["numarray","both"]: # Build for numarray +- deps = ['%s/src/%s'%(AGG_VERSION,name) for name in agg] +- deps.extend(('src/ft2font.cpp', 'src/mplutils.cpp')) +- deps.extend(glob.glob('CXX/*.cxx')) +- deps.extend(glob.glob('CXX/*.c')) +- temp_copy('src/_backend_agg.cpp', 'src/_na_backend_agg.cpp') +- deps.append('src/_na_backend_agg.cpp') +- module = Extension( +- 'matplotlib.backends._na_backend_agg', +- deps, +- include_dirs=numarray_inc_dirs, +- ) +- module.extra_compile_args.append('-DNUMARRAY=1') +- add_agg_flags(module) +- add_ft2font_flags(module) +- ext_modules.append(module) + if numerix in ["Numeric","both"]: # Build for Numeric + deps = ['%s/src/%s'%(AGG_VERSION, name) for name in agg] + deps.extend(('src/ft2font.cpp', 'src/mplutils.cpp')) +@@ -456,21 +438,6 @@ def build_image(ext_modules, packages, n + 'agg_bezier_arc.cpp', + ) + +- if numerix in ["numarray","both"]: # Build for numarray +- temp_copy('src/_image.cpp', 'src/_na_image.cpp') +- deps = ['src/_na_image.cpp', 'src/mplutils.cpp'] +- deps.extend(['%s/src/%s'%(AGG_VERSION, name) for name in agg]) +- deps.extend(glob.glob('CXX/*.cxx')) +- deps.extend(glob.glob('CXX/*.c')) +- module = Extension( +- 'matplotlib._na_image', +- deps, +- include_dirs=numarray_inc_dirs, +- ) +- module.extra_compile_args.append('-DNUMARRAY=1') +- add_agg_flags(module) +- ext_modules.append(module) +- + if numerix in ["Numeric","both"]: # Build for Numeric + temp_copy('src/_image.cpp', 'src/_nc_image.cpp') + deps = ['src/_nc_image.cpp', 'src/mplutils.cpp'] +@@ -514,21 +481,6 @@ def build_swigagg(ext_modules, packages) + ext_modules.append(agg) + + def build_transforms(ext_modules, packages, numerix): +- if numerix in ["numarray","both"]: # Build for numarray +- cxx = glob.glob('CXX/*.cxx') +- cxx.extend(glob.glob('CXX/*.c')) +- temp_copy("src/_transforms.cpp","src/_na_transforms.cpp") +- module = Extension('matplotlib._na_transforms', +- ['src/_na_transforms.cpp', +- 'src/mplutils.cpp'] + cxx, +- libraries = ['stdc++', 'm'], +- include_dirs = ['src', '.']+numarray_inc_dirs, +- ) +- +- module.extra_compile_args.append("-DNUMARRAY=1") +- add_base_flags(module) +- ext_modules.append(module) +- + if numerix in ["Numeric","both"]: # Build for Numeric + cxx = glob.glob('CXX/*.cxx') + cxx.extend(glob.glob('CXX/*.c')) +@@ -563,18 +515,6 @@ def build_contour(ext_modules, packages, + global BUILT_CONTOUR + if BUILT_CONTOUR: return # only build it if you you haven't already + +- if numerix in ["numarray","both"]: # Build for numarray +- temp_copy('src/cntr.c', 'src/_na_cntr.c') +- module = Extension( +- 'matplotlib._na_cntr', +- [ 'src/_na_cntr.c',], +- #libraries = ['stdc++'], +- include_dirs=numarray_inc_dirs, +- ) +- module.extra_compile_args.append('-DNUMARRAY=1') +- add_base_flags(module) +- ext_modules.append(module) +- + if numerix in ["Numeric","both"]: # Build for Numeric + temp_copy('src/cntr.c', 'src/_nc_cntr.c') + module = Extension( +@@ -593,19 +533,6 @@ def build_gdk(ext_modules, packages, num + global BUILT_GDK + if BUILT_GDK: return # only build it if you you haven't already + +- if numerix in ["numarray","both"]: # Build for numarray +- temp_copy('src/_backend_gdk.c', 'src/_na_backend_gdk.c') +- module = Extension( +- 'matplotlib.backends._na_backend_gdk', +- ['src/_na_backend_gdk.c', ], +- libraries = [], +- include_dirs=numarray_inc_dirs, +- ) +- module.extra_compile_args.append('-DNUMARRAY=1') +- add_base_flags(module) +- add_pygtk_flags(module) +- ext_modules.append(module) +- + if numerix in ["Numeric","both"]: # Build for Numeric + temp_copy('src/_backend_gdk.c', 'src/_nc_backend_gdk.c') + module = Extension(