Update of /cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/sci
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv6594
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.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- matplotlib-py.patch 2 Jun 2006 17:09:40 -0000 1.12
+++ matplotlib-py.patch 8 Jun 2006 12:58:35 -0000 1.13
@@ -1,27 +1,18 @@
--- matplotlib/setupext.py.orig 2006-01-14 10:51:44.000000000 -0700
+++ matplotlib/setupext.py 2006-01-14 10:53:23.000000000 -0700
-@@ -38,8 +38,7 @@
+@@ -48,8 +48,7 @@
'linux2' : ['/usr/local', '/usr',],
'linux' : ['/usr/local', '/usr',],
'cygwin' : ['/usr/local', '/usr',],
- 'darwin' : ['/sw/lib/freetype2', '/sw/lib/freetype219', '/usr/local',
- '/usr', '/sw'],
-+ 'darwin' : ['@PREFIX@/lib/freetype219', '/usr/local', '/usr', '@PREFIX@'],
++ 'darwin' : ['/sw/lib/freetype219', '/usr/local', '/usr', '/sw'],
'freebsd4' : ['/usr/local', '/usr'],
'freebsd5' : ['/usr/local', '/usr'],
'freebsd6' : ['/usr/local', '/usr'],
-@@ -294,44 +293,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)
+@@ -333,44 +332,11 @@
+ print "Tcl/Tk v8.3 or later required\n"
+ sys.exit(1)
o = FoundTclTk()
- try:
- tk=Tkinter.Tk()
@@ -49,13 +40,22 @@
- 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):
+- # this is a hack for suse linux, which is broken
+- if (sys.platform.startswith('linux') and
+- os.path.exists('/usr/include/tcl.h') and
+- os.path.exists('/usr/include/tk.h')):
+- o.tcl_inc = '/usr/include/'
+- o.tk_inc = '/usr/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.tcl_lib = "/sw/lib"
++ o.tcl_inc = "/sw/include"
++ o.tk_lib = "/sw/lib"
++ o.tk_inc = "/sw/include"
+ o.tkv = ""
return o
Index: matplotlib-py.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/sci/matplotlib-py.info,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- matplotlib-py.info 2 Jun 2006 17:09:40 -0000 1.21
+++ matplotlib-py.info 8 Jun 2006 12:58:35 -0000 1.22
@@ -1,13 +1,13 @@
Info2: <<
Package: matplotlib-py%type_pkg[python]
-Version: 0.87.2
+Version: 0.87.3
Revision: 1
Maintainer: Jeffrey Whitaker <[EMAIL PROTECTED]>
Depends: python%type_pkg[python], pygtk2-py%type_pkg[python], tcltk-shlibs,
numarray-py%type_pkg[python] (>= 1.5.0-1), numeric-py%type_pkg[python] (>=
24.2-1), freetype219-shlibs, tetex-base, scipy-core-py%type_pkg[python] (>=
0.9.8-1)
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, libpng3
Source: mirror:sourceforge:matplotlib/matplotlib-%v.tar.gz
-Source-MD5: 74dde3c3e33797f56ebd6ca578090f8e
+Source-MD5: 9e961e90be07701ab6a99aa8cdc6b831
Type: python (2.3 2.4)
GCC: 3.3
NoSetCPPFLAGS: True
@@ -16,7 +16,7 @@
PatchScript: sed 's|@PREFIX@|%p|g' < %a/%{ni}.patch | sed
's|@PYVER@|%type_pkg[python]|g' | patch -p1
CompileScript: <<
#!/bin/sh -ev
- export CXX=gcc
+ export CXX=g++-4
%p/bin/python%type_raw[python] setup.py build
<<
InstallScript: <<
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
