diff options
| author | Martin Wilke <miwi@FreeBSD.org> | 2008-10-05 13:31:32 +0000 |
|---|---|---|
| committer | Martin Wilke <miwi@FreeBSD.org> | 2008-10-05 13:31:32 +0000 |
| commit | 3c36e3474deddf85d2ca1e5b1f1b7e0cc5977f11 (patch) | |
| tree | 8037259a6a6544ad5115b68af2782b319839dba2 /math/py-matplotlib/files | |
| parent | - Update to 3.10.0 (diff) | |
- Update to 0.98.3
- Detects and uses wxpython if installed
PR: 127726
Submitted by: Li-Lun Wang <llwang@infor.org>
Approved by: maintainer
Notes
Notes:
svn path=/head/; revision=221238
Diffstat (limited to 'math/py-matplotlib/files')
| -rw-r--r-- | math/py-matplotlib/files/patch-setupext.py | 43 | ||||
| -rw-r--r-- | math/py-matplotlib/files/patch-src__mplutils.cpp | 7 |
2 files changed, 23 insertions, 27 deletions
diff --git a/math/py-matplotlib/files/patch-setupext.py b/math/py-matplotlib/files/patch-setupext.py index c14f8843bc0b..ddb175989872 100644 --- a/math/py-matplotlib/files/patch-setupext.py +++ b/math/py-matplotlib/files/patch-setupext.py @@ -1,30 +1,33 @@ ---- 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/X11R6'], -- 'freebsd4' : ['/usr/local', '/usr'], -- 'freebsd5' : ['/usr/local', '/usr'], -- 'freebsd6' : ['/usr/local', '/usr'], -+ 'freebsd4' : ['%%LOCALBASE%%', '/usr'], -+ 'freebsd5' : ['%%LOCALBASE%%', '/usr'], -+ 'freebsd6' : ['%%LOCALBASE%%', '/usr'], -+ 'freebsd7' : ['%%LOCALBASE%%', '/usr'], -+ 'freebsd8' : ['%%LOCALBASE%%', '/usr'], +--- setupext.py.orig 2008-08-03 13:15:22.000000000 -0500 ++++ setupext.py 2008-09-29 13:20:02.000000000 -0500 +@@ -55,6 +55,8 @@ + 'freebsd4' : ['/usr/local', '/usr'], + 'freebsd5' : ['/usr/local', '/usr'], + 'freebsd6' : ['/usr/local', '/usr'], ++ 'freebsd7' : ['/usr/local', '/usr'], ++ 'freebsd8' : ['/usr/local', '/usr'], 'sunos5' : [os.getenv('MPLIB_BASE') or '/usr/local',], 'gnukfreebsd5' : ['/usr/local', '/usr'], 'gnukfreebsd6' : ['/usr/local', '/usr'], -@@ -983,9 +985,9 @@ - tk_lib = "/usr/local/lib" - tk_ver = "" +@@ -814,7 +816,7 @@ + module.libraries.extend(wxlibs) + return + +- get_pkgconfig(module, '', flags='--cppflags --libs', pkg_config_exec='wx-config') ++ get_pkgconfig(module, '', flags='--cppflags --libs', pkg_config_exec=wxconfig) + + # Make sure you use the Tk version given by Tkinter.TkVersion + # or else you'll build for a wrong version of the Tcl +@@ -1096,9 +1098,9 @@ + # Add final versions of directories and libraries to module lists + tcl_lib, tcl_inc, tk_lib, tk_inc = result - 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.include_dirs.extend(["/usr/local/include/tcl8.4", "/usr/local/include/tk8.4"]) + module.library_dirs.extend(["%%TCL_LIBDIR%%", "%%TK_LIBDIR%%"]) -+ module.libraries.extend(['tk%%USE_TK%%', 'tcl%%USE_TCL%%']) - ++ module.libraries.extend(['tk84', 'tcl84']) + return message diff --git a/math/py-matplotlib/files/patch-src__mplutils.cpp b/math/py-matplotlib/files/patch-src__mplutils.cpp deleted file mode 100644 index a953442f8385..000000000000 --- a/math/py-matplotlib/files/patch-src__mplutils.cpp +++ /dev/null @@ -1,7 +0,0 @@ ---- 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 <stdio.h> - #include <iostream> - #include <cstdarg> - #include "mplutils.h" |