head 1.10; access; symbols pkgsrc-2013Q4:1.9.0.10 pkgsrc-2013Q4-base:1.9 pkgsrc-2013Q3:1.9.0.8 pkgsrc-2013Q3-base:1.9 pkgsrc-2013Q2:1.9.0.6 pkgsrc-2013Q2-base:1.9 pkgsrc-2013Q1:1.9.0.4 pkgsrc-2013Q1-base:1.9 pkgsrc-2012Q4:1.9.0.2 pkgsrc-2012Q4-base:1.9 pkgsrc-2012Q3:1.8.0.4 pkgsrc-2012Q3-base:1.8 pkgsrc-2012Q2:1.8.0.2 pkgsrc-2012Q2-base:1.8 pkgsrc-2012Q1:1.7.0.2 pkgsrc-2012Q1-base:1.7 pkgsrc-2011Q4:1.6.0.8 pkgsrc-2011Q4-base:1.6 pkgsrc-2011Q3:1.6.0.6 pkgsrc-2011Q3-base:1.6 pkgsrc-2011Q2:1.6.0.4 pkgsrc-2011Q2-base:1.6 pkgsrc-2011Q1:1.6.0.2 pkgsrc-2011Q1-base:1.6 pkgsrc-2010Q4:1.5.0.4 pkgsrc-2010Q4-base:1.5 pkgsrc-2010Q3:1.5.0.2 pkgsrc-2010Q3-base:1.5 pkgsrc-2010Q2:1.4.0.2 pkgsrc-2010Q2-base:1.4 pkgsrc-2010Q1:1.3.0.6 pkgsrc-2010Q1-base:1.3 pkgsrc-2009Q4:1.3.0.4 pkgsrc-2009Q4-base:1.3 pkgsrc-2009Q3:1.3.0.2 pkgsrc-2009Q3-base:1.3 pkgsrc-2009Q2:1.2.0.6 pkgsrc-2009Q2-base:1.2 pkgsrc-2009Q1:1.2.0.4 pkgsrc-2009Q1-base:1.2 pkgsrc-2008Q4:1.2.0.2 pkgsrc-2008Q4-base:1.2 pkgsrc-2008Q3:1.1.1.1.0.24 pkgsrc-2008Q3-base:1.1.1.1 cube-native-xorg:1.1.1.1.0.22 cube-native-xorg-base:1.1.1.1 pkgsrc-2008Q2:1.1.1.1.0.20 pkgsrc-2008Q2-base:1.1.1.1 cwrapper:1.1.1.1.0.18 pkgsrc-2008Q1:1.1.1.1.0.16 pkgsrc-2008Q1-base:1.1.1.1 pkgsrc-2007Q4:1.1.1.1.0.14 pkgsrc-2007Q4-base:1.1.1.1 pkgsrc-2007Q3:1.1.1.1.0.12 pkgsrc-2007Q3-base:1.1.1.1 pkgsrc-2007Q2:1.1.1.1.0.10 pkgsrc-2007Q2-base:1.1.1.1 pkgsrc-2007Q1:1.1.1.1.0.8 pkgsrc-2007Q1-base:1.1.1.1 pkgsrc-2006Q4:1.1.1.1.0.6 pkgsrc-2006Q4-base:1.1.1.1 pkgsrc-2006Q3:1.1.1.1.0.4 pkgsrc-2006Q3-base:1.1.1.1 pkgsrc-2006Q2:1.1.1.1.0.2 pkgsrc-2006Q2-base:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.10 date 2014.01.21.21.16.02; author drochner; state dead; branches; next 1.9; commitid hcmBKjlywxsXP1mx; 1.9 date 2012.12.17.11.52.42; author drochner; state Exp; branches; next 1.8; 1.8 date 2012.04.17.17.17.28; author drochner; state Exp; branches; next 1.7; 1.7 date 2012.04.07.11.32.29; author joerg; state Exp; branches; next 1.6; 1.6 date 2011.02.17.10.33.38; author markd; state Exp; branches; next 1.5; 1.5 date 2010.07.20.09.00.17; author markd; state Exp; branches; next 1.4; 1.4 date 2010.05.17.16.22.59; author drochner; state Exp; branches; next 1.3; 1.3 date 2009.08.05.11.02.12; author markd; state Exp; branches; next 1.2; 1.2 date 2008.12.19.22.39.47; author markd; state Exp; branches; next 1.1; 1.1 date 2006.04.06.16.45.34; author drochner; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2006.04.06.16.45.34; author drochner; state Exp; branches; next ; desc @@ 1.10 log @sync w/ base pkg @ text @$NetBSD: patch-aa,v 1.9 2012/12/17 11:52:42 drochner Exp $ --- setupext.py.orig 2012-11-06 22:31:09.000000000 +0000 +++ setupext.py @@@@ -108,13 +108,13 @@@@ options = {'display_status': True, 'provide_pytz': 'auto', 'provide_dateutil': 'auto', 'provide_six': 'auto', - 'build_agg': True, + 'build_agg': False, 'build_gtk': 'auto', 'build_gtkagg': 'auto', 'build_tkagg': 'auto', 'build_macosx': 'auto', - 'build_image': True, - 'build_windowing': True, + 'build_image': False, + 'build_windowing': False, 'backend': None, 'basedirlist': None} @@@@ -218,12 +218,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.""" @@@@ -379,11 +374,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.9 log @sync w/ base pkg @ text @d1 1 a1 1 $NetBSD$ @ 1.8 log @sync w/ base pkg @ text @d3 1 a3 1 --- setupext.py.orig 2011-10-06 14:50:23.000000000 +0000 d5 1 a5 2 @@@@ -124,13 +124,13 @@@@ options = {'display_status': True, 'verbose': False, d8 1 d22 1 a22 1 @@@@ -221,12 +221,7 @@@@ sysconfig.customize_compiler = my_custom d36 1 a36 1 @@@@ -364,11 +359,8 @@@@ def check_for_libpng(): @ 1.7 log @Workaround hangs with Python 2.5 by not using pipes for both stdin and stdout. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.6 2011/02/17 10:33:38 markd Exp $ d3 1 a3 1 --- setupext.py.orig 2010-07-07 01:41:55.000000000 +0000 d5 1 a5 1 @@@@ -115,14 +115,14 @@@@ options = {'display_status': True, a13 1 'build_wxagg': 'auto', d22 2 a23 2 @@@@ -201,12 +201,8 @@@@ else: print_status = print_message = print_raw = print_line a31 1 + import os d36 1 a36 1 @@@@ -344,11 +340,8 @@@@ def check_for_libpng(): @ 1.6 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 $ d23 16 a38 1 @@@@ -344,11 +344,8 @@@@ def check_for_libpng(): @ 1.5 log @Fix booleans in the patch. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.4 2010/05/17 16:22:59 drochner Exp $ d3 1 a3 1 --- setupext.py.orig 2009-08-23 05:27:32.000000000 +0000 d5 1 a5 3 @@@@ -103,16 +103,16 @@@@ numpy_inc_dirs = [] # matplotlib build options, which can be altered using setup.cfg options = {'display_status': True, d7 2 a8 2 - 'provide_pytz': 'auto', - 'provide_dateutil': 'auto', d10 6 a15 5 - 'build_gtk': 'auto', - 'build_gtkagg': 'auto', - 'build_tkagg': 'auto', - 'build_wxagg': 'auto', - 'build_macosx': 'auto', a17 8 + 'provide_pytz': False, + 'provide_dateutil': False, + 'build_agg': False, + 'build_gtk': True, + 'build_gtkagg': True, + 'build_tkagg': False, + 'build_wxagg': False, + 'build_macosx': False, d20 2 a21 1 'backend': None} d23 1 a23 2 # Based on the contents of setup.cfg, determine the build options @@@@ -320,11 +320,8 @@@@ def check_for_libpng(): d28 1 a28 1 - [os.path.join(p, 'include') for p in basedir[sys.platform] ]) d30 4 a33 4 - [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') @ 1.4 log @update to 0.99.2.1 changes: -new frameworks: mplot3d, axes grid, axis spine placement -bugfixes @ text @d1 1 a1 1 $NetBSD$ d19 2 a20 2 + 'provide_pytz': 'False', + 'provide_dateutil': 'False', d22 5 a26 5 + 'build_gtk': 'True', + 'build_gtkagg': 'True', + 'build_tkagg': 'False', + 'build_wxagg': 'False', + 'build_macosx': 'False', @ 1.3 log @Update py-matplotlib* to 0.98.4 various bug fixes and new features. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.2 2008/12/19 22:39:47 markd Exp $ d3 1 a3 1 --- setupext.py.orig 2008-12-10 14:53:21.000000000 +1300 d5 1 a5 1 @@@@ -97,18 +97,18 @@@@ numpy_inc_dirs = [] a10 5 - 'provide_configobj': 'auto', + 'provide_pytz': False, + 'provide_dateutil': False, + 'provide_configobj': False, 'provide_traits': False, d19 2 d22 5 a26 5 + 'build_gtk': True, + 'build_gtkagg': True, + 'build_tkagg': False, + 'build_wxagg': False, + 'build_macosx': False, d29 1 a29 2 'backend': None, 'numerix': None} d31 2 a32 1 @@@@ -325,11 +325,8 @@@@ def check_for_libpng(): @ 1.2 log @Update to py-matplotlib-gtk2 0.98.0 three years of updates. @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- setupext.py.orig 2008-05-30 10:47:10.000000000 +1200 d5 1 a5 1 @@@@ -103,17 +103,17 @@@@ numpy_inc_dirs = [] d12 4 a15 1 - 'provide_traits': 'auto', d21 1 a23 4 + 'provide_pytz': False, + 'provide_dateutil': False, + 'provide_configobj': False, + 'provide_traits': False, d29 1 d35 1 a35 1 @@@@ -321,11 +321,8 @@@@ def check_for_libpng(): @ 1.1 log @Initial revision @ text @d3 1 a3 1 --- setupext.py.orig 2006-01-09 14:20:44.000000000 +0100 d5 31 a35 2 @@@@ -99,10 +99,8 @@@@ def temp_copy(_from, _to): globals()["_cleanup_"+_to] = CleanUpFile(_to) d38 5 a42 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)] d45 1 d47 1 a47 2 module.include_dirs.append('.') module.library_dirs.extend(libdirs) @ 1.1.1.1 log @add the gtk frontend for py-matplotlib-0.8.2 as separate pkg @ text @@