Update of /cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/sci
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20003
Modified Files:
matplotlib-py.info matplotlib-py.patch
Log Message:
New upstream version.
Index: matplotlib-py.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/sci/matplotlib-py.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- matplotlib-py.patch 24 Jun 2005 22:29:03 -0000 1.3
+++ matplotlib-py.patch 22 Sep 2005 13:02:30 -0000 1.4
@@ -1,69 +1,36 @@
---- matplotlib/lib/matplotlib/__init__.py Mon Feb 14 16:30:46 2005
-+++ matplotlib/lib/matplotlib/__init__.py Mon Feb 14 08:11:18 2005
-@@ -294,7 +294,7 @@
- path = os.environ['MATPLOTLIBDATA']
- if os.path.isdir(path): return path
-
-- path = os.path.join(distutils.sysconfig.PREFIX, 'share', 'matplotlib')
-+ path = os.path.join(distutils.sysconfig.PREFIX, 'share', '[EMAIL
PROTECTED]@')
- if os.path.isdir(path): return path
-
- path = '/usr/local/share/matplotlib'
-@@ -304,11 +304,11 @@
- if os.path.isdir(path): return path
-
- path = os.path.join(os.sep.join(__file__.split(os.sep)[:-1]),
-- 'share','matplotlib')
-+ 'share','[EMAIL PROTECTED]@')
- if os.path.isdir(path): return path
-
- path = os.path.join(os.sep.join(__file__.split(os.sep)[:-5]),
-- 'share','matplotlib')
-+ 'share','[EMAIL PROTECTED]@')
- if os.path.isdir(path): return path
-
-
---- matplotlib/setup.py.orig Thu Mar 31 06:15:08 2005
-+++ matploblib/setup.py Thu Mar 31 10:56:51 2005
-@@ -28,19 +28,19 @@
-
- # Render Agg to the GTK canvas
- #BUILD_GTKAGG = 0
+--- matplotlib/setup.py.orig Wed Sep 21 06:51:46 2005
++++ matplotlib/setup.py Wed Sep 21 06:57:32 2005
+@@ -25,21 +25,21 @@
+ # it. It makes very nice antialiased output and also supports alpha
+ # blending
+ BUILD_AGG = 1
-BUILD_GTKAGG = 'auto'
-+BUILD_GTKAGG = 1
-
-BUILD_GTK = 'auto'
-+BUILD_GTK = 1
++BUILD_GTKAGG = 1
++BUILD_GTK = 1
# build TK GUI with Agg renderer ; requires Tkinter Python extension
# and Tk includes
# Use False or 0 if you don't want to build
- #BUILD_TKAGG = 0
-BUILD_TKAGG = 'auto'
+BUILD_TKAGG = 1
+ # build wxPython GUI with Agg renderer ; requires wxPython package
+-BUILD_WXAGG = 'auto'
++BUILD_WXAGG = 0
+
+
# build a small extension to manage the focus on win32 platforms.
--#BUILD_WINDOWING = 0
+ #BUILD_WINDOWING = 0
-BUILD_WINDOWING = 'auto'
+BUILD_WINDOWING = 0
-+#BUILD_WINDOWING = 'auto'
- VERBOSE = False # insert lots of diagnostic prints in extension code
-@@ -79,7 +79,7 @@
- data.extend(glob.glob('images/*.ppm'))
- data.append('.matplotlibrc')
-
--data_files=[('share/matplotlib', data),]
-+data_files=[('share/[EMAIL PROTECTED]@', data),]
-
- # Figure out which array packages to provide binary support for
- # and define the NUMERIX value: Numeric, numarray, or both.
-@@ -155,37 +155,17 @@
- build_transforms(ext_modules, packages, NUMERIX)
+ VERBOSE = False # insert lots of diagnostic prints in extension code
+@@ -165,47 +165,21 @@
build_enthought(ext_modules, packages)
--if BUILD_GTK:
+ if BUILD_GTK:
- try:
- import gtk
- except ImportError:
@@ -71,11 +38,10 @@
- BUILD_GTK=0
- except RuntimeError:
- print 'pygtk present but import failed'
--
+-
+-if BUILD_GTK:
+ build_gdk(ext_modules, packages, NUMERIX)
- if BUILD_GTK:
- build_gdk(ext_modules, packages, NUMERIX)
-
if BUILD_GTKAGG:
- try:
- import gtk
@@ -97,32 +63,48 @@
+ BUILD_AGG = 1
+ build_tkagg(ext_modules, packages, NUMERIX)
+ if BUILD_WXAGG:
+- try: import wxPython
+- except ImportError:
+- if BUILD_WXAGG != 'auto':
+- print 'WXAgg\'s accelerator requires wxPython'
+- BUILD_WXAGG = 0
+- else:
+- BUILD_AGG = 1
+- build_wxagg(ext_modules, packages, NUMERIX,
+- not (isinstance(BUILD_WXAGG, str) # don't about if BUILD_WXAGG
+- and BUILD_WXAGG.lower() == 'auto')) # is "auto"
++ BUILD_AGG = 1
++ build_wxagg(ext_modules, packages, NUMERIX,
++ not (isinstance(BUILD_WXAGG, str) # don't about if BUILD_WXAGG
++ and BUILD_WXAGG.lower() == 'auto')) # is "auto"
if BUILD_AGG:
-@@ -206,6 +186,9 @@
+ build_agg(ext_modules, packages, NUMERIX)
+@@ -225,6 +199,8 @@
for mod in ext_modules:
if VERBOSE:
mod.extra_compile_args.append('-DVERBOSE')
+ mod.include_dirs.append('@PREFIX@/include')
+ mod.library_dirs.append('@PREFIX@/lib')
-+
-
+
setup(name="matplotlib",
version= __version__,
---- matplotlib/setupext.py.orig Sat Apr 9 06:44:43 2005
-+++ matplotlib/setupext.py Sat Apr 9 11:51:43 2005
-@@ -37,9 +37,9 @@
- 'win32' : ['win32_static',],
- 'linux2' : ['/usr/local', '/usr',],
+--- matplotlib/setupext.py.orig Wed Sep 21 07:00:03 2005
++++ matplotlib/setupext.py Wed Sep 21 07:19:41 2005
+@@ -39,8 +39,9 @@
'linux' : ['/usr/local', '/usr',],
# Charles Moad recommends not putting in /usr/X11R6 for darwin
# because freetype in this dir is too old for mpl
-- 'darwin' : ['/sw/lib/freetype219', '/usr/local', '/usr', '/sw'],
+- 'darwin' : ['/sw/lib/freetype2', '/sw/lib/freetype219', '/usr/local',
+- '/usr', '/sw'],
++# 'darwin' : ['/sw/lib/freetype2', '/sw/lib/freetype219', '/usr/local',
++# '/usr', '/sw'],
+ 'darwin' : ['@PREFIX@/lib/freetype219', '/usr/local', '/usr', '@PREFIX@'],
'freebsd4' : ['/usr/local', '/usr'],
'freebsd5' : ['/usr/local', '/usr'],
'freebsd6' : ['/usr/local', '/usr'],
-@@ -192,44 +192,12 @@
+@@ -271,44 +272,12 @@
def find_tcltk():
"""Finds Tcl/Tk includes/libraries/version by interrogating Tkinter."""
@@ -172,57 +154,3 @@
return o
-@@ -256,53 +224,6 @@
- else:
- raise RuntimeError('No tk/win32 support for this python version
yet')
- return
--
-- elif sys.platform == 'darwin' :
-- # this config section lifted directly from Imaging - thanks to
-- # the effbot!
--
-- # First test for a MacOSX/darwin framework install
-- from os.path import join, exists
-- framework_dirs = [
-- '/System/Library/Frameworks/',
-- '/Library/Frameworks',
-- join(os.getenv('HOME'), '/Library/Frameworks')
-- ]
--
-- # Find the directory that contains the Tcl.framwork and Tk.framework
-- # bundles.
-- # XXX distutils should support -F!
-- tk_framework_found = 0
-- for F in framework_dirs:
-- # both Tcl.framework and Tk.framework should be present
-- for fw in 'Tcl', 'Tk':
-- if not exists(join(F, fw + '.framework')):
-- break
-- else:
-- # ok, F is now directory with both frameworks. Continure
-- # building
-- tk_framework_found = 1
-- break
-- if tk_framework_found:
-- # For 8.4a2, we must add -I options that point inside the Tcl and
Tk
-- # frameworks. In later release we should hopefully be able to pass
-- # the -F option to gcc, which specifies a framework lookup path.
-- #
-- tk_include_dirs = [
-- join(F, fw + '.framework', H)
-- for fw in 'Tcl', 'Tk'
-- for H in 'Headers', 'Versions/Current/PrivateHeaders'
-- ]
--
-- # For 8.4a2, the X11 headers are not included. Rather than
include a
-- # complicated search, this is a hard-coded path. It could bail out
-- # if X11 libs are not found...
-- # tk_include_dirs.append('/usr/X11R6/include')
-- frameworks = ['-framework', 'Tcl', '-framework', 'Tk']
-- module.include_dirs.extend(tk_include_dirs)
-- module.extra_link_args.extend(frameworks)
-- module.extra_compile_args.extend(frameworks)
-- return
-
- # you're still here? ok we'll try it this way
- o = find_tcltk() # todo: try/except
Index: matplotlib-py.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/sci/matplotlib-py.info,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- matplotlib-py.info 1 Aug 2005 17:41:24 -0000 1.10
+++ matplotlib-py.info 22 Sep 2005 13:02:30 -0000 1.11
@@ -1,59 +1,41 @@
Info2: <<
Package: matplotlib-py%type_pkg[python]
-Version: 0.83.1
-Revision: 3
+Version: 0.84
+Revision: 1
Maintainer: Jeffrey Whitaker <[EMAIL PROTECTED]>
Depends: python%type_pkg[python], pygtk2-py%type_pkg[python], tcltk-shlibs,
numarray-py%type_pkg[python], numeric-py%type_pkg[python], freetype219-shlibs,
tetex-base
BuildDepends: pygtk2-py%type_pkg[python]-dev, tcltk-dev, glib2-dev, gtk+2-dev,
atk1, pango1-xft2-dev, libgettext3-dev, gettext-bin, gettext-tools,
libiconv-dev, pkgconfig, freetype219
-Suggests: wxpython-py%type_pkg[python] (>= 2.5.1.5-1)
Source: mirror:sourceforge:matplotlib/matplotlib-%v.tar.gz
-Source2: mirror:sourceforge:matplotlib/basemap-0.5.2.tar.gz
-Source-MD5: 6142d63cafd8a4a2ed0c94d772c68611
-Source2-MD5: 7fe9fb4ef44b48a18f1c9a6b6d6ffba7
+Source-MD5: 9d7a9831f64a7c376b98333604e38cc1
Type: python (2.2 2.3 2.4)
GCC: 3.3
-# The SetCC is needed on 10.4-transitional, because the build script
-# uses $CC for compiling C++ sources, not $CXX. It can go away on 10.4.
-SetCC: gcc-3.3
-NoSetPATH: true
NoSetCPPFLAGS: True
SetCPPFLAGS: -I%p/include/pygtk-2.0 -I%p/lib/freetype219/include/freetype2
+NoSetLDFLAGS: True
PatchScript: sed 's|@PREFIX@|%p|g' < %a/%{ni}.patch | sed
's|@PYVER@|%type_pkg[python]|g' | patch -p1
CompileScript: <<
#!/bin/sh -ev
%p/bin/python%type_raw[python] setup.py build
- cd ../basemap-0.5.2
- %p/bin/python%type_raw[python] setup.py build
<<
InstallScript: <<
#!/bin/sh -ev
%p/bin/python%type_raw[python] setup.py install --root %d
mkdir -p %i/share/doc/%n
cp -R examples %i/share/doc/%n
- cd ../basemap-0.5.2
- %p/bin/python%type_raw[python] setup.py install --root %d
- mkdir -p %i/share/doc/%n/basemap
- cp -R examples %i/share/doc/%n/basemap
- cp README README.basemap
- cp Changelog Changelog.basemap
- cp README.basemap Changelog.basemap LICENSE_proj4 %i/share/doc/%n
<<
License: OSI-Approved
DocFiles: README license/*LICENSE* TODO INTERACTIVE INSTALL CHANGELOG
API_CHANGES KNOWN_BUGS
-Description: Pure python 2D plotting library with a Matlab syntax
+Description: Pure python 2D plotting with a Matlab syntax
DescDetail: <<
Produces publication quality figures using in a variety of hardcopy
formats (PNG, JPG, TIFF, PS) and interactive GUI environments
-(WX, GTK) across platforms. matplotlib can be used in python scripts,
+across platforms. matplotlib can be used in python scripts,
interactively from the python shell (ala matlab or mathematica),
in web application servers generating dynamic charts, or embedded
-in GTK or WX applications.
-
-Includes GTK, TkAgg, GTKAgg, WXAgg, SVG, PS, WX and Agg backends.
-(no GD or Paint, since these require separate python modules not yet packaged).
+in applications.
-Includes basemap toolkit for plotting data on map projections.
+Includes GTK, TkAgg, GTKAgg, SVG, PS and Agg backends.
<<
Homepage: http://matplotlib.sf.net
-------------------------------------------------------
SF.Net email is sponsored by:
Tame your development challenges with Apache's Geronimo App Server.
Download it for free - -and be entered to win a 42" plasma tv or your very
own Sony(tm)PSP. Click here to play: http://sourceforge.net/geronimo.php
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
