head 1.11; access; symbols pkgsrc-2013Q4:1.10.0.14 pkgsrc-2013Q4-base:1.10 pkgsrc-2013Q3:1.10.0.12 pkgsrc-2013Q3-base:1.10 pkgsrc-2013Q2:1.10.0.10 pkgsrc-2013Q2-base:1.10 pkgsrc-2013Q1:1.10.0.8 pkgsrc-2013Q1-base:1.10 pkgsrc-2012Q4:1.10.0.6 pkgsrc-2012Q4-base:1.10 pkgsrc-2012Q3:1.10.0.4 pkgsrc-2012Q3-base:1.10 pkgsrc-2012Q2:1.10.0.2 pkgsrc-2012Q2-base:1.10 pkgsrc-2012Q1:1.9.0.2 pkgsrc-2012Q1-base:1.9 pkgsrc-2011Q4:1.8.0.8 pkgsrc-2011Q4-base:1.8 pkgsrc-2011Q3:1.8.0.6 pkgsrc-2011Q3-base:1.8 pkgsrc-2011Q2:1.8.0.4 pkgsrc-2011Q2-base:1.8 pkgsrc-2011Q1:1.8.0.2 pkgsrc-2011Q1-base:1.8 pkgsrc-2010Q4:1.7.0.6 pkgsrc-2010Q4-base:1.7 pkgsrc-2010Q3:1.7.0.4 pkgsrc-2010Q3-base:1.7 pkgsrc-2010Q2:1.7.0.2 pkgsrc-2010Q2-base:1.7 pkgsrc-2010Q1:1.6.0.6 pkgsrc-2010Q1-base:1.6 pkgsrc-2009Q4:1.6.0.4 pkgsrc-2009Q4-base:1.6 pkgsrc-2009Q3:1.6.0.2 pkgsrc-2009Q3-base:1.6 pkgsrc-2009Q2:1.5.0.4 pkgsrc-2009Q2-base:1.5 pkgsrc-2009Q1:1.5.0.2 pkgsrc-2009Q1-base:1.5 pkgsrc-2008Q4:1.4.0.2 pkgsrc-2008Q4-base:1.4 pkgsrc-2008Q3:1.3.0.24 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.22 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.3.0.20 pkgsrc-2008Q2-base:1.3 cwrapper:1.3.0.18 pkgsrc-2008Q1:1.3.0.16 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.3.0.14 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.3.0.12 pkgsrc-2007Q3-base:1.3 pkgsrc-2007Q2:1.3.0.10 pkgsrc-2007Q2-base:1.3 pkgsrc-2007Q1:1.3.0.8 pkgsrc-2007Q1-base:1.3 pkgsrc-2006Q4:1.3.0.6 pkgsrc-2006Q4-base:1.3 pkgsrc-2006Q3:1.3.0.4 pkgsrc-2006Q3-base:1.3 pkgsrc-2006Q2:1.3.0.2 pkgsrc-2006Q2-base:1.3 pkgsrc-2006Q1:1.2.0.2 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.1.0.6 pkgsrc-2005Q4-base:1.1 pkgsrc-2005Q3:1.1.0.4 pkgsrc-2005Q3-base:1.1 pkgsrc-2005Q2:1.1.0.2 pkgsrc-2005Q2-base:1.1; locks; strict; comment @# @; 1.11 date 2014.01.23.18.45.16; author wiz; state dead; branches; next 1.10; commitid TIzjhWWqajaiWgmx; 1.10 date 2012.04.17.17.17.03; author drochner; state Exp; branches; next 1.9; 1.9 date 2012.04.07.11.32.29; author joerg; state Exp; branches; next 1.8; 1.8 date 2011.02.17.10.33.37; author markd; state Exp; branches; next 1.7; 1.7 date 2010.05.17.16.22.59; author drochner; state Exp; branches; next 1.6; 1.6 date 2009.08.05.11.02.12; author markd; state Exp; branches; next 1.5; 1.5 date 2009.01.05.06.50.23; author epg; state Exp; branches; next 1.4; 1.4 date 2008.12.19.22.35.41; author markd; state Exp; branches; next 1.3; 1.3 date 2006.04.06.16.43.39; author drochner; state Exp; branches; next 1.2; 1.2 date 2005.12.29.20.29.35; author markd; state Exp; branches; next 1.1; 1.1 date 2005.05.31.18.09.13; author drochner; state Exp; branches; next ; desc @@ 1.11 log @Removed unused patch @ text @$NetBSD: patch-aa,v 1.10 2012/04/17 17:17:03 drochner Exp $ --- setupext.py.orig 2011-10-06 14:50:23.000000000 +0000 +++ setupext.py @@@@ -221,12 +221,7 @@@@ sysconfig.customize_compiler = my_custom def run_child_process(cmd): - p = subprocess.Popen(cmd, shell=True, - stdin=subprocess.PIPE, - stdout=subprocess.PIPE, - stderr=subprocess.STDOUT, - close_fds=(sys.platform != 'win32')) - return p.stdin, p.stdout + return None, os.popen(cmd + " 2>&1") class CleanUpFile: """CleanUpFile deletes the specified filename when self is destroyed.""" @@@@ -364,11 +359,8 @@@@ def check_for_libpng(): return True def add_base_flags(module): - incdirs = filter(os.path.exists, - [os.path.join(p, 'include') for p in basedirlist ]) - libdirs = filter(os.path.exists, - [os.path.join(p, 'lib') for p in basedirlist ]+ - [os.path.join(p, 'lib64') for p in basedirlist ] ) + 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('.') @ 1.10 log @update to 1.1.0 many improvements, some cleanup, most notably: -new graphics types and backends -layout and legend improvements -better 3d support -Numerix support removed @ text @d1 1 a1 1 $NetBSD$ @ 1.9 log @Workaround hangs with Python 2.5 by not using pipes for both stdin and stdout. @ text @d3 1 a3 1 --- setupext.py.orig 2010-07-07 01:41:55.000000000 +0000 d5 2 a6 2 @@@@ -201,12 +201,8 @@@@ else: print_status = print_message = print_raw = print_line a14 1 + import os d19 1 a19 1 @@@@ -344,11 +340,8 @@@@ def check_for_libpng(): @ 1.8 log @Update to py-matplotlib 1.0.1 Various bugfixes. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.7 2010/05/17 16:22:59 drochner Exp $ d5 16 a20 1 @@@@ -344,11 +344,8 @@@@ def check_for_libpng(): @ 1.7 log @update to 0.99.2.1 changes: -new frameworks: mplot3d, axes grid, axis spine placement -bugfixes @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.6 2009/08/05 11:02:12 markd Exp $ d3 1 a3 1 --- setupext.py.orig 2008-12-10 14:53:21.000000000 +1300 d5 1 a5 16 @@@@ -99,10 +99,10 @@@@ options = {'display_status': True, 'provide_pytz': 'auto', 'provide_dateutil': 'auto', 'build_agg': True, - 'build_gtk': 'auto', - 'build_gtkagg': 'auto', - 'build_tkagg': 'auto', - 'build_wxagg': 'auto', + 'build_gtk': False, + 'build_gtkagg': False, + 'build_tkagg': False, + 'build_wxagg': False, 'build_macosx': 'auto', 'build_image': True, 'build_windowing': True, @@@@ -315,11 +315,8 @@@@ def check_for_libpng(): d10 1 a10 1 - [os.path.join(p, 'include') for p in basedir[sys.platform] ]) d12 2 a13 2 - [os.path.join(p, 'lib') for p in basedir[sys.platform] ]+ - [os.path.join(p, 'lib64') for p in basedir[sys.platform] ] ) @ 1.6 log @Update py-matplotlib* to 0.98.4 various bug fixes and new features. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.5 2009/01/05 06:50:23 epg Exp $ d5 3 a7 3 @@@@ -102,10 +102,10 @@@@ options = {'display_status': True, 'provide_configobj': 'auto', 'provide_traits': False, d20 1 a20 1 @@@@ -325,11 +325,8 @@@@ def check_for_libpng(): @ 1.5 log @Fix patch-aa to setup.py: incdirs and libdirs are lists of strings, not just strings. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.4 2008/12/19 22:35:41 markd Exp $ d3 1 a3 1 --- setupext.py.orig 2008-05-30 10:47:10.000000000 +1200 d5 1 a5 1 @@@@ -108,10 +108,10 @@@@ options = {'display_status': True, d7 1 a7 1 'provide_traits': 'auto', d17 1 d20 1 a20 2 'backend': None, @@@@ -321,11 +321,8 @@@@ def check_for_libpng(): @ 1.4 log @Update to matplotlib-0.98.0 3 years worth of updates. @ text @d1 1 a1 1 $NetBSD$ d29 2 a30 2 + incdirs = os.path.join(os.environ['LOCALBASE'], 'include') + libdirs = os.path.join(os.environ['LOCALBASE'], 'lib') @ 1.3 log @update to 0.87.2 too many feature additions and fixes to list here pkgsrc changes: removed all X11 frontend support, leaving just the ability to create image files frontends will be added as separate pkgs @ text @d3 1 a3 1 --- setupext.py.orig 2006-01-09 14:20:44.000000000 +0100 d5 17 a21 2 @@@@ -99,10 +99,8 @@@@ def temp_copy(_from, _to): globals()["_cleanup_"+_to] = CleanUpFile(_to) d24 5 a28 4 - 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)] d31 1 d33 1 a33 2 module.include_dirs.append('.') module.library_dirs.extend(libdirs) @ 1.2 log @Update py-matplotlib to version 0.83 Added Mark Athen's 'scale' patch, so that on a scaled axis a circle looks like circle. See help(axis). New cursor and span selector widgets You can use use matplotlib event handling to register a callback after figure draw using 'draw_event' which calls the callback with a DrawEvent instance Use 'f' to toggle full screen mode in the GTK backends. Steve Chaplin has made numerous updates to the GTK and SVG backends. Reorganized config files Updated agg_test.py to demonstrate curved paths and fills. Upgraded pyparsing and applied Paul McGuire's suggestions for speeding things up. This more than doubles the speed of mathtext in my simple tests. Bugs fixed / small features What's new in matplotlib 0.82 Subplot configuration GUI neutral widgets Exposes line cap and join style via new rc params and Line2D properties All Axes properties are now exposed via kwargs Small bugfixes and features What's new in matplotlib 0.81 TeX support Masked arrays Much faster image loading for MxNx4 or MxNx3 UInt8 images. New image interpolation options set deprecated New scalar formatter Bug fixes @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.1 2005/05/31 18:09:13 drochner Exp $ d3 1 a3 1 --- setupext.py.orig 2005-07-06 03:36:37.000000000 +1200 d5 1 a5 1 @@@@ -95,10 +95,8 @@@@ def temp_copy(_from, _to): d16 1 a17 107 @@@@ -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( @ 1.1 log @update to 0.80 this has been massively extended (since 0.32), too much to list here @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- setupext.py.orig 2005-05-12 17:44:54.000000000 +0200 d5 1 a5 1 @@@@ -87,10 +87,8 @@@@ def temp_copy(_from, _to): d18 106 @