From a07f700bb5c04bfd35de0b0ef16720f2a4c27374 Mon Sep 17 00:00:00 2001 From: Li-Wen Hsu Date: Wed, 7 May 2008 04:43:35 +0000 Subject: - Update to 0.91.2 [1] - portlint fix - Respect NOPORTEXAMPLES PR: ports/121893 Submitted by: Geoffrey Mainland (maintainer) --- .../files/patch-lib__matplotlib__afm.py | 11 ++++++++ math/py-matplotlib/files/patch-setupext.py | 31 +++++++++++----------- math/py-matplotlib/files/patch-src__mplutils.cpp | 7 +++++ 3 files changed, 34 insertions(+), 15 deletions(-) create mode 100644 math/py-matplotlib/files/patch-lib__matplotlib__afm.py create mode 100644 math/py-matplotlib/files/patch-src__mplutils.cpp (limited to 'math/py-matplotlib/files') diff --git a/math/py-matplotlib/files/patch-lib__matplotlib__afm.py b/math/py-matplotlib/files/patch-lib__matplotlib__afm.py new file mode 100644 index 000000000000..d82ba9daed08 --- /dev/null +++ b/math/py-matplotlib/files/patch-lib__matplotlib__afm.py @@ -0,0 +1,11 @@ +--- lib/matplotlib/afm.py.orig 2008-02-22 14:38:41.000000000 -0500 ++++ lib/matplotlib/afm.py 2008-02-22 14:39:40.000000000 -0500 +@@ -164,7 +164,7 @@ + num = _to_int(vals[0].split()[1]) + wx = _to_float(vals[1].split()[1]) + name = vals[2].split()[1] +- bbox = _to_list_of_ints(vals[3][2:]) ++ bbox = _to_list_of_floats(vals[3][2:]) + # Workaround: If the character name is 'Euro', give it the corresponding + # character code, according to WinAnsiEncoding (see PDF Reference). + if name == 'Euro': diff --git a/math/py-matplotlib/files/patch-setupext.py b/math/py-matplotlib/files/patch-setupext.py index 027a6564d6d4..c14f8843bc0b 100644 --- a/math/py-matplotlib/files/patch-setupext.py +++ b/math/py-matplotlib/files/patch-setupext.py @@ -1,9 +1,9 @@ ---- setupext.py.orig 2007-02-01 04:32:51.000000000 -0500 -+++ setupext.py 2007-12-19 21:26:33.000000000 -0500 -@@ -50,9 +50,11 @@ +--- setupext.py.orig 2007-12-24 13:23:32.000000000 -0500 ++++ setupext.py 2008-02-22 12:23:24.000000000 -0500 +@@ -52,9 +52,11 @@ 'cygwin' : ['/usr/local', '/usr',], 'darwin' : ['/sw/lib/freetype2', '/sw/lib/freetype219', '/usr/local', - '/usr', '/sw'], + '/usr', '/sw', '/usr/X11R6'], - 'freebsd4' : ['/usr/local', '/usr'], - 'freebsd5' : ['/usr/local', '/usr'], - 'freebsd6' : ['/usr/local', '/usr'], @@ -15,15 +15,16 @@ 'sunos5' : [os.getenv('MPLIB_BASE') or '/usr/local',], 'gnukfreebsd5' : ['/usr/local', '/usr'], 'gnukfreebsd6' : ['/usr/local', '/usr'], -@@ -455,9 +457,9 @@ +@@ -983,9 +985,9 @@ + tk_lib = "/usr/local/lib" + tk_ver = "" + # Add final versions of directories and libraries to module lists +- module.include_dirs.extend([tcl_inc, tk_inc]) +- module.library_dirs.extend([tcl_lib, tk_lib]) +- module.libraries.extend(['tk' + tk_ver, 'tcl' + tk_ver]) ++ module.include_dirs.extend(["%%TCL_INCLUDEDIR%%", "%%TK_INCLUDEDIR%%"]) ++ module.library_dirs.extend(["%%TCL_LIBDIR%%", "%%TK_LIBDIR%%"]) ++ module.libraries.extend(['tk%%USE_TK%%', 'tcl%%USE_TCL%%']) + + return message - # you're still here? ok we'll try it this way - o = find_tcltk() # todo: try/except -- module.include_dirs.extend([o.tcl_inc, o.tk_inc]) -+ module.include_dirs.extend(["%%TCL_INCLUDEDIR%%", "%%TK_INCLUDEDIR%%"]) - module.library_dirs.extend([o.tcl_lib, o.tk_lib]) -- module.libraries.extend(['tk'+o.tkv, 'tcl'+o.tkv]) -+ module.libraries.extend(['tk%%USE_TK%%', 'tcl%%USE_TCL%%']) - - - def add_windowing_flags(module): diff --git a/math/py-matplotlib/files/patch-src__mplutils.cpp b/math/py-matplotlib/files/patch-src__mplutils.cpp new file mode 100644 index 000000000000..a953442f8385 --- /dev/null +++ b/math/py-matplotlib/files/patch-src__mplutils.cpp @@ -0,0 +1,7 @@ +--- src/mplutils.cpp.orig Wed Mar 9 16:35:35 2005 ++++ src/mplutils.cpp Wed Mar 9 16:36:19 2005 +@@ -1,3 +1,4 @@ ++#include + #include + #include + #include "mplutils.h" -- cgit v1.2.3