Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/sci
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8008
Modified Files:
matplotlib-py.info matplotlib-py.patch
Log Message:
New upstream version, now depends on freetype219.
Index: matplotlib-py.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.3/unstable/main/finkinfo/sci/matplotlib-py.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- matplotlib-py.patch 31 Mar 2005 18:37:20 -0000 1.8
+++ matplotlib-py.patch 9 Apr 2005 23:52:09 -0000 1.9
@@ -23,86 +23,6 @@
if os.path.isdir(path): return path
---- matplotlib/setupext.py Wed Feb 9 11:23:59 2005
-+++ matplotlib/setupext.py.orig Mon Feb 14 16:25:49 2005
-@@ -35,7 +35,7 @@
- 'win32' : ['win32_static',],
- 'linux2' : ['/usr/local', '/usr',],
- 'linux' : ['/usr/local', '/usr',],
-- 'darwin' : ['/usr/local', '/usr', '/sw', '/usr/X11R6'],
-+ 'darwin' : ['/usr', '/usr/X11R6'],
- 'freebsd4' : ['/usr/local', '/usr'],
- 'sunos5' : [os.getenv('MPLIB_BASE') or '/usr/local',],
- }
-@@ -201,10 +201,10 @@
- print "Using default library and include directories for Tcl and Tk
because a"
- print "Tk window failed to open. You may need to define DISPLAY for Tk
to work"
- print "so that setup can determine where your libraries are located."
-- o.tcl_lib = "/usr/local/lib"
-- o.tcl_inc = "/usr/local/include"
-- o.tk_lib = "/usr/local/lib"
-- o.tk_inc = "/usr/local/include"
-+ o.tcl_lib = "@PREFIX@/lib"
-+ o.tcl_inc = "@PREFIX@/include"
-+ o.tk_lib = "@PREFIX@/lib"
-+ o.tk_inc = "@PREFIX@/include"
- o.tkv = ""
- else:
- tk.withdraw()
-@@ -250,53 +250,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()
--- 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 @@
@@ -189,95 +109,140 @@
setup(name="matplotlib",
version= __version__,
---- matplotlib/src/ft2font.cpp.orig Fri Mar 18 13:06:34 2005
-+++ matplotlib/src/ft2font.cpp Thu Mar 31 11:08:07 2005
-@@ -100,16 +100,16 @@
-
- point = outline.points + first;
- tags = outline.tags + first;
-- tag = FT_CURVE_TAG(tags[0]);
-+ tag = FT_CURVE_TAG(tags[0]);
+--- matplotlib/setupext.py.orig Sat Apr 9 06:44:43 2005
++++ matplotlib/setupext.py Sat Apr 9 11:51:43 2005
+@@ -35,7 +35,7 @@
+ 'win32' : ['win32_static',],
+ 'linux2' : ['/usr/local', '/usr',],
+ 'linux' : ['/usr/local', '/usr',],
+- 'darwin' : ['/usr/local', '/usr', '/sw', '/usr/X11R6'],
++ 'darwin' : ['/usr', '@PREFIX@/lib/freetype219'],
+ 'freebsd4' : ['/usr/local', '/usr'],
+ 'freebsd5' : ['/usr/local', '/usr'],
+ 'freebsd6' : ['/usr/local', '/usr'],
+@@ -192,44 +192,12 @@
+
+ def find_tcltk():
+ """Finds Tcl/Tk includes/libraries/version by interrogating Tkinter."""
+- try:
+- import Tkinter
+- except:
+- print "Tkinter not properly installed\n"
+- sys.exit(1)
+- if Tkinter.TkVersion < 8.3:
+- print "Tcl/Tk v8.3 or later required\n"
+- sys.exit(1)
+ o = FoundTclTk()
+- try:
+- tk=Tkinter.Tk()
+- except Tkinter.TclError:
+- print "Using default library and include directories for Tcl and Tk
because a"
+- print "Tk window failed to open. You may need to define DISPLAY for Tk
to work"
+- print "so that setup can determine where your libraries are located."
+- o.tcl_lib = "/usr/local/lib"
+- o.tcl_inc = "/usr/local/include"
+- o.tk_lib = "/usr/local/lib"
+- o.tk_inc = "/usr/local/include"
+- o.tkv = ""
+- else:
+- tk.withdraw()
+- o.tcl_lib = os.path.join((tk.getvar('tcl_library')), '../')
+- o.tk_lib = os.path.join((tk.getvar('tk_library')), '../')
+- o.tkv = str(Tkinter.TkVersion)[:3]
+- o.tcl_inc = os.path.join((tk.getvar('tcl_library')),
+- '../../include/tcl'+o.tkv)
+- if not os.path.exists(o.tcl_inc):
+- o.tcl_inc = os.path.join((tk.getvar('tcl_library')),
+- '../../include')
+- o.tk_inc = os.path.join((tk.getvar('tk_library')),
+- '../../include/tk'+o.tkv)
+- if not os.path.exists(o.tk_inc):
+- o.tk_inc = os.path.join((tk.getvar('tk_library')),
+- '../../include')
+- if not os.path.exists(o.tcl_inc):
+- print 'cannot find tcl/tk headers. giving up.'
+- sys.exit()
++ o.tcl_lib = "@PREFIX@/lib"
++ o.tcl_inc = "@PREFIX@/include"
++ o.tk_lib = "@PREFIX@/lib"
++ o.tk_inc = "@PREFIX@/include"
++ o.tkv = ""
+ 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
+--- matplotlib/../basemap-0.2.1/setup.py.orig Sat Apr 9 12:35:13 2005
++++ matplotlib/../basemap-0.2.1/setup.py Sat Apr 9 12:35:51 2005
+@@ -42,7 +42,7 @@
+ url = "http://matplotlib.sourceforge.net/toolkits.html";,
+ author = "Jeff Whitaker",
+ author_email = "[EMAIL PROTECTED]",
+- data_files =
[('share/basemap',['data/countries_c.txt','data/states_c.txt','data/countries_l.txt','data/states_l.txt','data/gshhs_c.txt','data/gshhs_l.txt','data/countries_i.txt','data/states_i.txt','data/gshhs_i.txt'])],
++ data_files = [('share/[EMAIL
PROTECTED]@',['data/countries_c.txt','data/states_c.txt','data/countries_l.txt','data/states_l.txt','data/gshhs_c.txt','data/gshhs_l.txt','data/countries_i.txt','data/states_i.txt','data/gshhs_i.txt'])],
+ packages = ['matplotlib/toolkits','matplotlib/toolkits/basemap'],
+ package_dir = {'':'lib'},
+ ext_modules = extensions)
+---
matplotlib/../basemap-0.2.1/lib/matplotlib/toolkits/basemap/basemap.py.orig
Sat Apr 9 12:36:04 2005
++++ matplotlib/../basemap-0.2.1/lib/matplotlib/toolkits/basemap/basemap.py
Sat Apr 9 12:36:20 2005
+@@ -7,7 +7,7 @@
+ from proj import Proj
+ from greatcircle import GreatCircle
+
+-_datadir = os.path.join(sys.prefix,'share/basemap')
++_datadir = os.path.join(sys.prefix,'share/[EMAIL PROTECTED]@')
+
+ class Basemap:
- // A contour cannot start with a cubic control point!
-- if(tag == FT_CURVE_TAG_CUBIC) return Py::Object();
-+ if(tag == FT_Curve_Tag_Cubic) return Py::Object();
-
- // check first point to determine origin
-- if( tag == FT_CURVE_TAG_CONIC)
-+ if( tag == FT_Curve_Tag_Conic)
- {
- // first point is conic control. Yes, this happens.
-- if(FT_CURVE_TAG(outline.tags[last]) == FT_CURVE_TAG_ON)
-+ if(FT_CURVE_TAG(outline.tags[last]) == FT_Curve_Tag_On)
- {
- // start at last point if it is on the curve
- v_start = v_last;
-@@ -146,10 +146,10 @@
- point++;
- tags++;
-
-- tag = FT_CURVE_TAG(tags[0]);
-+ tag = FT_CURVE_TAG(tags[0]);
- switch(tag)
- {
-- case FT_CURVE_TAG_ON: // emit a single line_to
-+ case FT_Curve_Tag_On: // emit a single line_to
- {
- double x = conv(point->x);
- double y = flip_y ? -conv(point->y) : conv(point->y);
-@@ -162,7 +162,7 @@
- continue;
- }
-
-- case FT_CURVE_TAG_CONIC: // consume conic arcs
-+ case FT_Curve_Tag_Conic: // consume conic arcs
- {
- v_control.x = point->x;
- v_control.y = point->y;
-@@ -175,12 +175,12 @@
-
- point++;
- tags++;
-- tag = FT_CURVE_TAG(tags[0]);
-+ tag = FT_CURVE_TAG(tags[0]);
-
- vec.x = point->x;
- vec.y = point->y;
-
-- if(tag == FT_CURVE_TAG_ON)
-+ if(tag == FT_Curve_Tag_On)
- {
- double xctl = conv(v_control.x);
- double yctl = flip_y ? -conv(v_control.y) :
conv(v_control.y);
-@@ -196,7 +196,7 @@
- continue;
- }
-
-- if(tag != FT_CURVE_TAG_CONIC) return Py::Object();
-+ if(tag != FT_Curve_Tag_Conic) return Py::Object();
-
- v_middle.x = (v_control.x + vec.x) / 2;
- v_middle.y = (v_control.y + vec.y) / 2;
-@@ -230,11 +230,11 @@
- goto Close;
- }
-
-- default: // FT_CURVE_TAG_CUBIC
-+ default: // FT_Curve_Tag_Cubic
- {
- FT_Vector vec1, vec2;
-
-- if(point + 1 > limit || FT_CURVE_TAG(tags[1]) !=
FT_CURVE_TAG_CUBIC)
-+ if(point + 1 > limit || FT_CURVE_TAG(tags[1]) !=
FT_Curve_Tag_Cubic)
- {
- return Py::Object();
- }
-@@ -624,7 +624,7 @@
- if ( use_kerning && previous && glyph_index ) {
- FT_Vector delta;
- FT_Get_Kerning( face, previous, glyph_index,
-- FT_KERNING_DEFAULT, &delta );
-+ ft_kerning_default, &delta );
- pen.x += delta.x;
- }
- error = FT_Load_Glyph( face, glyph_index, FT_LOAD_DEFAULT );
Index: matplotlib-py.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.3/unstable/main/finkinfo/sci/matplotlib-py.info,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- matplotlib-py.info 31 Mar 2005 18:37:20 -0000 1.11
+++ matplotlib-py.info 9 Apr 2005 23:52:09 -0000 1.12
@@ -1,26 +1,34 @@
Info2: <<
Package: matplotlib-py%type_pkg[python]
-Version: 0.73.1
+Version: 0.74
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]
-BuildDepends: pygtk2-py%type_pkg[python]-dev, tcltk-dev, glib2-dev, gtk+2-dev,
atk1, pango1-xft2-dev, gettext-dev, gettext-bin, gettext-tools, libiconv-dev,
pkgconfig
+Depends: python%type_pkg[python], pygtk2-py%type_pkg[python], tcltk-shlibs,
numarray-py%type_pkg[python], numeric-py%type_pkg[python], freetype219-shlibs
+BuildDepends: pygtk2-py%type_pkg[python]-dev, tcltk-dev, glib2-dev, gtk+2-dev,
atk1, pango1-xft2-dev, gettext-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
-Source-MD5: 32cd50e6b381c7761d9e20cc97e5841d
+Source2: mirror:sourceforge:matplotlib/basemap-0.2.1.tar.gz
+Source-MD5: 460413bce73450ae0b6bf78c95e75a81
+Source2-MD5: 77dde501cdaf8935ab8aa09a817ffc45
Type: python (2.2 2.3 2.4)
NoSetCPPFLAGS: True
PatchScript: sed 's|@PREFIX@|%p|g' < %a/%{ni}.patch | sed
's|@PYVER@|%type_pkg[python]|g' | patch -p1
CompileScript: <<
#!/bin/sh
%p/bin/python%type_raw[python] setup.py build
+ cd ../basemap-0.2.1
+ %p/bin/python%type_raw[python] setup.py build
<<
InstallScript: <<
#!/bin/sh
%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.2.1
+ %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
<<
License: OSI-Approved
DocFiles: README license/* TODO INTERACTIVE INSTALL CHANGELOG API_CHANGES
KNOWN_BUGS
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
