Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/sci
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27713
Modified Files:
matplotlib-py.info matplotlib-py.patch
Log Message:
data files in python version numbered dir
Index: matplotlib-py.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.3/unstable/main/finkinfo/sci/matplotlib-py.patch,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- matplotlib-py.patch 22 Sep 2005 12:55:56 -0000 1.13
+++ matplotlib-py.patch 23 Sep 2005 12:00:16 -0000 1.14
@@ -1,3 +1,67 @@
+--- 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/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'],
+@@ -271,44 +272,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
+
+
--- 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 @@
@@ -17,7 +81,7 @@
# build wxPython GUI with Agg renderer ; requires wxPython package
-BUILD_WXAGG = 'auto'
-+BUILD_WXAGG = 0
++BUILD_WXAGG = 1
# build a small extension to manage the focus on win32 platforms.
@@ -27,6 +91,15 @@
VERBOSE = False # insert lots of diagnostic prints in extension code
+@@ -83,7 +83,7 @@
+ data.extend(glob.glob('images/*.ppm'))
+ data.append('matplotlibrc')
+
+-data_files=[('share/matplotlib', data),]
++data_files=[('share/[EMAIL PROTECTED]@', data),]
+
+ # Needed for CocoaAgg
+ data_files.append(('share/matplotlib/Matplotlib.nib',
@@ -165,47 +165,21 @@
build_enthought(ext_modules, packages)
@@ -90,67 +163,15 @@
setup(name="matplotlib",
version= __version__,
---- 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/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'],
-@@ -271,44 +272,12 @@
+--- matplotlib/lib/matplotlib/__init__.py.orig Fri Sep 23 05:44:32 2005
++++ matplotlib/lib/matplotlib/__init__.py Fri Sep 23 05:46:26 2005
+@@ -367,7 +367,8 @@
+ path = os.environ['MATPLOTLIBDATA']
+ if os.path.isdir(path): return path
- 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
-
+- 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'
Index: matplotlib-py.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.3/unstable/main/finkinfo/sci/matplotlib-py.info,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- matplotlib-py.info 22 Sep 2005 12:55:56 -0000 1.22
+++ matplotlib-py.info 23 Sep 2005 12:00:16 -0000 1.23
@@ -2,7 +2,7 @@
Package: matplotlib-py%type_pkg[python]
Version: 0.84
-Revision: 1
+Revision: 2
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
-------------------------------------------------------
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
