Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci
In directory vz-cvs-3.sog:/tmp/cvs-serv21998/stable/main/finkinfo/sci
Modified Files:
matplotlib-py.info matplotlib-py.patch
Added Files:
matplotlib-basemap-data-py.info matplotlib-basemap-py.info
Log Message:
matplotlib to stable
--- NEW FILE: matplotlib-basemap-py.info ---
Info2: <<
Package: matplotlib-basemap-py%type_pkg[python]
Version: 0.99.4
Revision: 1
Distribution: (%type_pkg[python] = 24) 10.4, (%type_pkg[python] = 24) 10.5
Maintainer: Kurt Schwehr <goat...@users.sourceforge.net>
Depends: <<
python%type_pkg[python], matplotlib-py%type_pkg[python] (>= 0.98.3),
httplib2-py%type_pkg[python],
dap-py%type_pkg[python],
libgeos2-shlibs
<<
BuildDepends: <<
httplib2-py%type_pkg[python],
dap-py%type_pkg[python],
libgeos2
<<
Source: mirror:sourceforge:matplotlib/basemap-%v.tar.gz
Source-MD5: 07fe1a01c321c43db4739c18e99d4d44
Type: python (2.4 2.5 2.6)
GCC: 4.0
NoSetCPPFLAGS: True
NoSetLDFLAGS: True
CompileScript: <<
#!/bin/sh -ev
%p/bin/python%type_raw[python] setup.py build
<<
InstallScript: <<
#!/bin/sh -ev
%p/bin/python%type_raw[python] setup.py install --root %d
rm -r %i/lib/python%type_raw[python]/site-packages/mpl_toolkits/__init__.py*
mkdir -p %i/share/doc/%n
cp -R examples %i/share/doc/%n
<<
License: OSI-Approved
DocFiles: README LICENSE_proj4 LICENSE_pyshapelib Changelog FAQ
Description: Plot data on map projections with matplotlib
DescDetail: <<
An add-on toolkit for matplotlib that lets you plot data
on map projections with coastlines, lakes, rivers and political boundaries.
See http://www.scipy.org/wikis/topical_software/Maps for an
example of what it can do.
<<
Homepage: http://matplotlib.sf.net
DescPort: <<
How can we depend on fink proj and get libgeos3 over libgeos2?
Why is there overlap of the mpl_toolkits/__init__.py between
matplotlib and matplotlib-basemap?
http://sourceforge.net/tracker/index.php?func=detail&aid=2121676&group_id=80706&atid=560720
Had to make dap and httplib2 dependencies or else matplotlib-basemap will
install
its own version of these tools and make a conflict.
If you are unable to upgrade due to a conflict with httplib2 already
being in matplotlib-basemap, you need to remove these two and reinstall
fink remove --recursive matplotlib-basemap-py25
fink install matplotlib-basemap-data-py25 matplotlib-basemap-py25
<<
<<
--- NEW FILE: matplotlib-basemap-data-py.info ---
Info2: <<
Package: matplotlib-basemap-data-py%type_pkg[python]
Version: 0.9.5
Revision: 2
Distribution: (%type_pkg[python] = 24) 10.4, (%type_pkg[python] = 24) 10.5
Maintainer: Kurt Schwehr <goat...@users.sourceforge.net>
Depends: <<
python%type_pkg[python],
matplotlib-basemap-py%type_pkg[python] (>= 0.99.1-1)
<<
BuildDepends: <<
libgeos2
<<
Source: mirror:sourceforge:matplotlib/basemap-data-hires-%v.tar.gz
Source-MD5: 749179935e013731b26724a35a486f4b
NoSourceDirectory: True
Type: python (2.4 2.5)
GCC: 4.0
NoSetCPPFLAGS: True
NoSetLDFLAGS: True
CompileScript: <<
#!/bin/sh -ev
echo "no compile script"
<<
InstallScript: <<
#!/bin/sh -ev
basemap_datadir=`%p/bin/python%type_raw[python] -c "from mpl_toolkits.basemap
import basemap_datadir; print basemap_datadir"`
mkdir -p %d/${basemap_datadir}
cp *_h.txt %d/${basemap_datadir}
<<
License: OSI-Approved
Description: High resolution data for matplotlib-basemap
Homepage: http://matplotlib.sf.net
<<
Index: matplotlib-py.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/sci/matplotlib-py.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- matplotlib-py.patch 16 Jul 2008 03:01:48 -0000 1.1
+++ matplotlib-py.patch 21 Jan 2012 21:06:07 -0000 1.2
@@ -1,39 +1,40 @@
-diff -Nurd -x'*~' matplotlib-0.91.3.orig/setup.cfg matplotlib-0.91.3/setup.cfg
---- matplotlib-0.91.3.orig/setup.cfg 1969-12-31 19:00:00.000000000 -0500
-+++ matplotlib-0.91.3/setup.cfg 2008-06-18 14:02:04.000000000 -0400
-@@ -0,0 +1,5 @@
+diff -Nurd matplotlib-1.0.1.orig/setup.cfg matplotlib-1.0.1/setup.cfg
+--- matplotlib-1.0.1.orig/setup.cfg 1969-12-31 19:00:00.000000000 -0500
++++ matplotlib-1.0.1/setup.cfg 2011-06-07 21:42:17.000000000 -0400
+@@ -0,0 +1,6 @@
+[gui_support]
+gtk = True
+gtkagg = True
+tkagg = True
+wxagg = False
-diff -Nurd -x'*~' matplotlib-0.91.3.orig/setup.py matplotlib-0.91.3/setup.py
---- matplotlib-0.91.3.orig/setup.py 2008-05-29 18:47:15.000000000 -0400
-+++ matplotlib-0.91.3/setup.py 2008-06-18 13:30:19.000000000 -0400
-@@ -255,6 +255,8 @@
++macosx = True
+diff -Nurd matplotlib-1.0.1.orig/setup.py matplotlib-1.0.1/setup.py
+--- matplotlib-1.0.1.orig/setup.py 2010-07-06 21:41:55.000000000 -0400
++++ matplotlib-1.0.1/setup.py 2011-06-07 21:43:20.000000000 -0400
+@@ -264,6 +264,9 @@
+ except NameError: additional_params = {}
+
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')
-+ mod.include_dirs.append('@PREFIX@/include')
-+ mod.library_dirs.append('@PREFIX@/lib')
- distrib = setup(name="matplotlib",
- version= __version__,
-diff -Nurd -x'*~' matplotlib-0.91.3.orig/setupext.py
matplotlib-0.91.3/setupext.py
---- matplotlib-0.91.3.orig/setupext.py 2008-05-29 18:47:15.000000000 -0400
-+++ matplotlib-0.91.3/setupext.py 2008-06-18 14:22:43.000000000 -0400
-@@ -50,8 +50,8 @@
- 'linux2' : ['/usr/local', '/usr'],
- 'linux' : ['/usr/local', '/usr',],
- 'cygwin' : ['/usr/local', '/usr',],
-- 'darwin' : ['/sw/lib/freetype2', '/sw/lib/freetype219', '/usr/local',
-- '/usr', '/sw', '/usr/X11R6'],
+diff -Nurd matplotlib-1.0.1.orig/setupext.py matplotlib-1.0.1/setupext.py
+--- matplotlib-1.0.1.orig/setupext.py 2010-07-06 21:41:55.000000000 -0400
++++ matplotlib-1.0.1/setupext.py 2011-06-07 21:44:14.000000000 -0400
+@@ -63,7 +63,8 @@
+ # people to :
+ # make -f make.osx fetch deps mpl_build mpl_install
+
+- 'darwin' : [],
+ 'darwin' : ['@PREFIX@/lib/freetype219', '@PREFIX@',
+ '/usr/X11', '/usr/X11R6', '/usr'],
+
'freebsd4' : ['/usr/local', '/usr'],
'freebsd5' : ['/usr/local', '/usr'],
- 'freebsd6' : ['/usr/local', '/usr'],
-@@ -901,6 +901,17 @@
+@@ -1011,6 +1012,17 @@
module.library_dirs.extend([os.path.join(sys.prefix, 'dlls')])
elif sys.platform == 'darwin':
Index: matplotlib-py.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci/matplotlib-py.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- matplotlib-py.info 28 Sep 2010 23:56:35 -0000 1.4
+++ matplotlib-py.info 21 Jan 2012 21:06:07 -0000 1.5
@@ -1,8 +1,8 @@
Info2: <<
Package: matplotlib-py%type_pkg[python]
-Version: 0.91.3
-Revision: 126
+Version: 1.0.1
+Revision: 1
Distribution: (%type_pkg[python] = 24) 10.4, (%type_pkg[python] = 24) 10.5
Maintainer: Kurt Schwehr <goat...@users.sourceforge.net>
Depends: <<
@@ -14,9 +14,9 @@
freetype219-shlibs (>= 2.3.5-1),
glib2-shlibs (>= 2.14.0-1),
gtk+2-shlibs (>= 2.12.0-1),
- libgettext3-shlibs,
+ libgettext8-shlibs,
libiconv,
- libpng3-shlibs,
+ libpng14-shlibs,
numarray-py%type_pkg[python] (>= 1.5.2-1),
numeric-py%type_pkg[python] (>= 24.2-1),
pango1-xft2-ft219-shlibs (>= 1.18.4-4),
@@ -24,11 +24,14 @@
pygtk2-gtk-py%type_pkg[python],
python%type_pkg[python],
pytz-py%type_pkg[python],
- scipy-core-py%type_pkg[python] (>= 1.0-4),
+ numpy-py%type_pkg[python] (>= 1.1),
tcltk-shlibs,
tetex-base,
x11-shlibs
<<
+# FIX: do we need numarray? Can it be removed or replaced?
+
+
BuildDepends: <<
atk1 (>= 1.20.0-1),
cairo (>= 1.6-1),
@@ -41,9 +44,9 @@
glib2-dev (>= 2.14.0-1),
glitz,
gtk+2-dev (>= 2.12.0-1),
- libgettext3-dev,
+ libgettext8-dev,
libiconv-dev,
- libpng3,
+ libpng14,
pango1-xft2-ft219-dev (>= 1.18.4-4),
pixman (>= 0.10.0-1),
pkgconfig (>= 0.21-1),
@@ -55,15 +58,15 @@
xft2-dev
<<
Source: mirror:sourceforge:matplotlib/matplotlib-%v.tar.gz
-Source-MD5: 40085c0334c6c6d4c4f7be71ee58b9e5
-Type: python (2.4 2.5)
+Source-MD5: 2196c0482d5b33dc8d33f67bbafc1323
+Type: python (2.4 2.5 2.6 2.7)
GCC: 4.0
NoSetCPPFLAGS: True
-SetCPPFLAGS: -I%p/include/pygtk-2.0 -I%p/lib/freetype219/include/freetype2
-I%p/lib/fontconfig2/include
+SetCPPFLAGS: -I%p/include/pygtk-2.0 -I%p/lib/freetype219/include/freetype2
-I%p/lib/fontconfig2/include -DNSIG=32
NoSetLDFLAGS: True
SetLDFLAGS: -L%p/lib/freetype219/lib -L%p/lib/fontconfig2/lib
PatchFile: %{ni}.patch
-PatchFile-MD5: 8a756cabf715fc807eb2949ca45c7f9f
+PatchFile-MD5: 758179e681590f68d65f36344a5e268f
PatchScript: <<
sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p1
<<
@@ -82,7 +85,8 @@
cp -R examples %i/share/doc/%n
<<
License: OSI-Approved
-DocFiles: README license/*LICENSE* TODO INTERACTIVE INSTALL CHANGELOG
API_CHANGES KNOWN_BUGS
+DocFiles: README.txt license/*LICENSE* TODO INTERACTIVE INSTALL CHANGELOG
KNOWN_BUGS
+# API_CHANGES
Description: Pure python 2D plotting with a Matlab syntax
DescDetail: <<
Produces publication quality figures using in a variety of hardcopy
@@ -99,8 +103,12 @@
those test results, so don't bother setting dependencies or forcing
non-detection of them.
<<
+DescPort: <<
+-DNSIG is only need for the build of the py25 variant. Don't know why.
+<<
Homepage: http://matplotlib.sf.net
DescUsage: <<
The pylab frontend is broken on x86_64.
<<
+
<<
------------------------------------------------------------------------------
Try before you buy = See our experts in action!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-dev2
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
