summaryrefslogtreecommitdiff
path: root/math/py-matplotlib/files/patch-setupext.py
diff options
context:
space:
mode:
authorJosh Paetzel <jpaetzel@FreeBSD.org>2010-07-29 04:01:50 +0000
committerJosh Paetzel <jpaetzel@FreeBSD.org>2010-07-29 04:01:50 +0000
commit8edd02e17089303568ace3fefe3ca1775d365cf9 (patch)
treee961c7b49ff083af6de5a6bab9dd3d7dfff0d504 /math/py-matplotlib/files/patch-setupext.py
parent- Update my MAINTAINER address to sahil@FreeBSD.org (diff)
Update to 1.0.0
PR: ports/149046 Submitted by: Geoffrey Mainland <mainland@apeiron.net>
Notes
Notes: svn path=/head/; revision=258414
Diffstat (limited to '')
-rw-r--r--math/py-matplotlib/files/patch-setupext.py24
1 files changed, 12 insertions, 12 deletions
diff --git a/math/py-matplotlib/files/patch-setupext.py b/math/py-matplotlib/files/patch-setupext.py
index df1d514910b9..760facd283b8 100644
--- a/math/py-matplotlib/files/patch-setupext.py
+++ b/math/py-matplotlib/files/patch-setupext.py
@@ -1,6 +1,6 @@
---- setupext.py.orig 2009-08-02 03:15:24.000000000 +0800
-+++ setupext.py 2009-11-18 15:03:10.000000000 +0800
-@@ -55,6 +55,9 @@
+--- setupext.py.orig 2010-07-28 11:18:08.000000000 -0400
++++ setupext.py 2010-07-28 11:21:02.000000000 -0400
+@@ -68,6 +68,9 @@
'freebsd4' : ['/usr/local', '/usr'],
'freebsd5' : ['/usr/local', '/usr'],
'freebsd6' : ['/usr/local', '/usr'],
@@ -10,25 +10,25 @@
'sunos5' : [os.getenv('MPLIB_BASE') or '/usr/local',],
'gnukfreebsd5' : ['/usr/local', '/usr'],
'gnukfreebsd6' : ['/usr/local', '/usr'],
-@@ -756,7 +759,7 @@
+@@ -789,7 +792,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
-@@ -1054,9 +1057,9 @@
-
+@@ -1092,9 +1095,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(["/usr/local/include/tcl8.5", "/usr/local/include/tk8.5"])
++ module.include_dirs.extend(["%%TCL_INCLUDEDIR%%", "%%TK_INCLUDEDIR%%"])
+ module.library_dirs.extend(["%%TCL_LIBDIR%%", "%%TK_LIBDIR%%"])
-+ module.libraries.extend(['tk85', 'tcl85'])
-
++ module.libraries.extend(['tk' + "%%TK_VER%%", 'tcl' + "%%TCL_VER%%"])
+
return message
-
+