Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv27489/sci
Modified Files:
matplotlib-py.info matplotlib-py.patch
Log Message:
ipython 1.0.0, switch to libzmq4
jinja2 2.7.1
markupsafe 0.18
zmq-py to 13.1.0
matplotlib 1.3.0 - had to force remove the macosx backend. grr
tornado 3.1
Index: matplotlib-py.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/matplotlib-py.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- matplotlib-py.patch 7 Jun 2013 15:22:37 -0000 1.5
+++ matplotlib-py.patch 10 Aug 2013 14:45:36 -0000 1.6
@@ -1,59 +1,74 @@
-diff -ruNd matplotlib-1.2.0.orig/setup.cfg.template
matplotlib-1.2.0/setup.cfg.template
---- matplotlib-1.2.0.orig/setup.cfg.template 2012-11-06 14:31:09.000000000
-0800
-+++ matplotlib-1.2.0/setup.cfg.template 2013-01-19 07:08:55.000000000
-0800
-@@ -59,6 +59,11 @@
- #gtkagg = False
- #tkagg = False
- #macosx = False
+diff -ruNd matplotlib-1.3.0.orig/setup.cfg.template
matplotlib-1.3.0/setup.cfg.template
+--- matplotlib-1.3.0.orig/setup.cfg.template 2013-07-30 11:56:33.000000000
-0700
++++ matplotlib-1.3.0/setup.cfg.template 2013-08-10 07:29:34.000000000
-0700
+@@ -54,10 +54,12 @@
+ # otherwise skip silently. This is the default
+ # behavior
+ #
+-#gtk = auto
+-#gtkagg = auto
+-#tkagg = auto
+-#macosx = auto
+gtk = True
+gtkagg = True
+tkagg = True
++macosx = False
++wx = True
+wxagg = True
-+macosx = True
+ #windowing = auto
+ #gtk3cairo = auto
+ #gtk3agg = auto
+diff -ruNd matplotlib-1.3.0.orig/setup.py matplotlib-1.3.0/setup.py
+--- matplotlib-1.3.0.orig/setup.py 2013-07-30 11:56:33.000000000 -0700
++++ matplotlib-1.3.0/setup.py 2013-08-10 06:55:08.000000000 -0700
+@@ -205,6 +205,9 @@
+ for mod in ext_modules:
+ mod.extra_compile_args.append('-DVERBOSE')
- [rc_options]
- # User-configurable options
-diff -ruNd matplotlib-1.2.0.orig/setup.py matplotlib-1.2.0/setup.py
---- matplotlib-1.2.0.orig/setup.py 2012-11-07 18:24:12.000000000 -0800
-+++ matplotlib-1.2.0/setup.py 2013-01-19 07:15:38.000000000 -0800
-@@ -267,6 +267,9 @@
- except NameError: additional_params = {}
++ for mod in ext_modules:
++ mod.include_dirs.append('@PREFIX@/include')
++ mod.library_dirs.append('@PREFIX@/lib')
- for mod in ext_modules:
-+ mod.include_dirs.append('@PREFIX@/include')
-+ mod.library_dirs.append('@PREFIX@/lib')
-+
- if options['verbose']:
- mod.extra_compile_args.append('-DVERBOSE')
+ # Finally, pass this all along to distutils to do the heavy lifting.
+ distrib = setup(name="matplotlib",
+diff -ruNd matplotlib-1.3.0.orig/setupext.py matplotlib-1.3.0/setupext.py
+--- matplotlib-1.3.0.orig/setupext.py 2013-07-30 12:06:10.000000000 -0700
++++ matplotlib-1.3.0/setupext.py 2013-08-10 07:36:51.000000000 -0700
+@@ -144,7 +144,8 @@
-diff -ruNd matplotlib-1.2.0.orig/setupext.py matplotlib-1.2.0/setupext.py
---- matplotlib-1.2.0.orig/setupext.py 2012-11-06 14:31:09.000000000 -0800
-+++ matplotlib-1.2.0/setupext.py 2013-01-19 07:21:33.000000000 -0800
-@@ -57,7 +57,8 @@
- basedir = defaultdict(lambda: ['/usr/local', '/usr'], {
- # execptions to the ['/usr/local', '/usr'] defaults
- 'win32' : ['win32_static',],
-- 'darwin' : ['/usr/local/', '/usr', '/usr/X11', '/opt/local'],
-+ 'darwin' : ['@PREFIX@/lib/freetype219', '@PREFIX@',
-+ '/usr', '/usr/X11', '/opt/X11',],
- 'sunos5' : [os.getenv('MPLIB_BASE') or '/usr/local',],
- 'gnu0' : ['/usr'],
- 'aix5' : ['/usr/local'],
-@@ -1002,6 +1003,17 @@
- # this config section lifted directly from Imaging - thanks to
- # the effbot!
+ basedir_map = {
+ 'win32': ['win32_static',],
+- 'darwin': ['/usr/local/', '/usr', '/usr/X11', '/opt/local'],
++ 'darwin' : ['@PREFIX@/lib/freetype219', '@PREFIX@',
++ '/usr', '/usr/X11', '/opt/X11',],
+ 'sunos5': [os.getenv('MPLIB_BASE') or '/usr/local',],
+ 'gnu0': ['/usr'],
+ 'aix5': ['/usr/local'],
+@@ -1237,6 +1238,17 @@
+ # this config section lifted directly from Imaging - thanks to
+ # the effbot!
-+ tcl_inc = "@PREFIX@/include"
-+ tk_inc = "@PREFIX@/include"
-+ tcl_lib = "@PREFIX@/lib"
-+ tk_lib = "@PREFIX@/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])
++ tcl_inc = "@PREFIX@/include"
++ tk_inc = "@PREFIX@/include"
++ tcl_lib = "@PREFIX@/lib"
++ tk_lib = "@PREFIX@/lib"
++ tk_ver = ""
++ # Add final versions of directories and libraries to module lists
++ ext.include_dirs.extend([tcl_inc, tk_inc])
++ ext.library_dirs.extend([tcl_lib, tk_lib])
++ ext.libraries.extend(['tk' + tk_ver, 'tcl' + tk_ver])
+
-+ elif False:
- # First test for a MacOSX/darwin framework install
- from os.path import join, exists
- framework_dirs = [
++ elif False:
+ # First test for a MacOSX/darwin framework install
+ from os.path import join, exists
+ framework_dirs = [
+@@ -1600,6 +1612,9 @@
+ name = 'macosx'
+
+ def check(self):
++ if True:
++ raise CheckFailed("fink can't use macosc backend - not using
frameworks")
++
+ if self.get_config() is False:
+ raise CheckFailed("skipping due to configuration")
+
Index: matplotlib-py.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/matplotlib-py.info,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- matplotlib-py.info 25 Jun 2013 11:45:32 -0000 1.12
+++ matplotlib-py.info 10 Aug 2013 14:45:36 -0000 1.13
@@ -3,10 +3,10 @@
# https://github.com/matplotlib/matplotlib/issues/434
Package: matplotlib-py%type_pkg[python]
-Version: 1.2.1
-Revision: 2
+Version: 1.3.0
+Revision: 1
Source: mirror:sourceforge:matplotlib/matplotlib-%v.tar.gz
-Source-MD5: 326a959c4c3f85417a3daf805cfb54f9
+Source-MD5: 139e1157a3e641fa6270d667a2088458
Type: python (2.7)
Maintainer: Kurt Schwehr <goat...@users.sourceforge.net>
@@ -26,6 +26,7 @@
pygobject2-py%type_pkg[python],
pygtk2-gtk-py%type_pkg[python],
python%type_pkg[python],
+ pyparsing-py%type_pkg[python],
pytz-py%type_pkg[python],
numpy-py%type_pkg[python],
tcltk-shlibs,
@@ -71,7 +72,7 @@
SetCXXFLAGS: -MD
PatchFile: %{ni}.patch
-PatchFile-MD5: e56656ac339f6594b7301c5f421bc075
+PatchFile-MD5: 65cb34692a0de40e6c4befbc0e343ddd
PatchScript: sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p1
CompileScript: <<
@@ -93,7 +94,7 @@
cp -R examples %i/share/doc/%n
<<
License: OSI-Approved
-DocFiles: README.txt TODO INSTALL CHANGELOG
+DocFiles: README.rst TODO INSTALL CHANGELOG
# API_CHANGES
Description: Pure python 2D plotting with a Matlab syntax
DescDetail: <<
------------------------------------------------------------------------------
Get 100% visibility into Java/.NET code with AppDynamics Lite!
It's a free troubleshooting tool designed for production.
Get down to code-level detail for bottlenecks, with <2% overhead.
Download for free and get started troubleshooting in minutes.
http://pubads.g.doubleclick.net/gampad/clk?id=48897031&iu=/4140/ostg.clktrk
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
