Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv12994

Modified Files:
        scipy-core-py.info scipy-core-py.patch scipy-py.info 
        matplotlib-py.info matplotlib-py.patch 
        matplotlib-basemap-py.info 
Added Files:
        scipy-py.patch 
Log Message:
New upstream version


--- NEW FILE: scipy-py.patch ---
--- scipy/Lib/sandbox/setup.py.orig     2006-09-08 10:34:46.000000000 -0600
+++ scipy/Lib/sandbox/setup.py  2006-09-08 10:36:48.000000000 -0600
@@ -32,43 +32,43 @@
     # check it in and screw other people up :-)
 
     # An example package:
-    #config.add_subpackage('exmplpackage')
+    #config.add_subpackage('exmplpackage')
 
     # Monte Carlo package
-    #config.add_subpackage('montecarlo')
+    #config.add_subpackage('montecarlo')
 
     # PySparse fork with NumPy compatibility
-    #config.add_subpackage('pysparse')
+    #config.add_subpackage('pysparse')
 
     # Robert Kern's corner:
-    #config.add_subpackage('rkern')
+    #config.add_subpackage('rkern')
 
     # ODRPACK
-    #config.add_subpackage('odr')
+    #config.add_subpackage('odr')
 
     # Delaunay triangulation and Natural Neighbor interpolation
-    #config.add_subpackage('delaunay')
+    config.add_subpackage('delaunay')
 
     # Gist-based plotting library for X11
-    #config.add_subpackage('xplt')
+    config.add_subpackage('xplt')
 
     # elementwise numerical expressions
-    #config.add_subpackage('numexpr')
+    config.add_subpackage('numexpr')
 
     # Statistical models
-    #config.add_subpackage('models')
+    config.add_subpackage('models')
 
     # Adaptation of Scientific.IO (2.4.9) to use NumPy
-    #config.add_subpackage('netcdf')
+    config.add_subpackage('netcdf')
 
     # Finite Difference Formulae package
-    #config.add_subpackage('fdfpack')
+    config.add_subpackage('fdfpack')
 
     # Package with useful constants and unit-conversions defined
-    #config.add_subpackage('constants')
+    config.add_subpackage('constants')
 
     # Interpolating between sparse samples
-    #config.add_subpackage('buildgrid')
+    config.add_subpackage('buildgrid')
     return config
 
 if __name__ == '__main__':

Index: matplotlib-py.patch
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/matplotlib-py.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- matplotlib-py.patch 7 Aug 2006 20:12:09 -0000       1.6
+++ matplotlib-py.patch 10 Sep 2006 14:50:15 -0000      1.7
@@ -10,12 +10,21 @@
      'freebsd4' : ['/usr/local', '/usr'],
      'freebsd5' : ['/usr/local', '/usr'],
      'freebsd6' : ['/usr/local', '/usr'],    
-@@ -333,44 +332,11 @@
-         print "Tcl/Tk v8.3 or later required\n"
-         sys.exit(1)
+@@ -333,57 +332,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()       
+-        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"
@@ -27,20 +36,24 @@
 -        o.tkv = ""
 -    else:
 -        tk.withdraw()
--        o.tcl_lib = os.path.join((tk.getvar('tcl_library')), '../')
--        o.tk_lib = os.path.join(str(tk.getvar('tk_library')), '../')
+-        o.tcl_lib = 
os.path.normpath(os.path.join(str(tk.getvar('tcl_library')), '../'))
+-        o.tk_lib = 
os.path.normpath(os.path.join(str(tk.getvar('tk_library')), '../'))
 -        o.tkv = str(Tkinter.TkVersion)[:3]
--        o.tcl_inc = os.path.join((tk.getvar('tcl_library')), 
--                    '../../include/tcl'+o.tkv)
+-        o.tcl_inc = 
os.path.normpath(os.path.join(str(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)        
+-            o.tcl_inc = 
os.path.normpath(os.path.join(str(tk.getvar('tcl_library')), 
+-                        '../../include'))
+-        o.tk_inc = 
os.path.normpath(os.path.join(str(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')
--
+-            o.tk_inc = 
os.path.normpath(os.path.join(str(tk.getvar('tk_library')), 
+-                        '../../include'))
+-            
+-        if ((not os.path.exists(os.path.join(o.tk_inc,'tk.h'))) and
+-            os.path.exists(os.path.join(o.tcl_inc,'tk.h'))):
+-            o.tk_inc = o.tcl_inc
+-            
 -        if not os.path.exists(o.tcl_inc):            
 -            # this is a hack for suse linux, which is broken
 -            if (sys.platform.startswith('linux') and
@@ -79,18 +92,17 @@
  
  # 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.
--#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
-@@ -185,22 +185,10 @@
+@@ -201,47 +201,20 @@
  build_enthought(ext_modules, packages)
  
  if BUILD_GTK:
@@ -110,13 +122,27 @@
 -    try: import Tkinter
 -    except ImportError: print 'TKAgg requires TkInter'
 -    else:
-         BUILD_AGG = 1
-         build_tkagg(ext_modules, packages, NUMERIX)
-         rc['backend'] = 'TkAgg'
-@@ -219,15 +207,6 @@
-         rc['backend'] = 'WXAgg'
- 
- if BUILD_GTKAGG:
+-        BUILD_AGG = 1
+-        build_tkagg(ext_modules, packages, NUMERIX)
+-        rc['backend'] = 'TkAgg'
++    BUILD_AGG = 1
++    build_tkagg(ext_modules, packages, NUMERIX)
++    rc['backend'] = 'TkAgg'
+         
+ 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"
+-        rc['backend'] = 'WXAgg'
+-
+-if BUILD_GTKAGG:
 -    try:
 -        import gtk
 -    except ImportError:
@@ -124,18 +150,21 @@
 -        BUILD_GTKAGG=0
 -    except RuntimeError:
 -        print 'pygtk present but import failed'
--
--if BUILD_GTKAGG:
++    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"
++    rc['backend'] = 'WXAgg'
+ 
+ if BUILD_GTKAGG:
      BUILD_AGG = 1
-     build_gtkagg(ext_modules, packages, NUMERIX)
-     rc['backend'] = 'GTKAgg'
-@@ -253,7 +232,8 @@
+@@ -270,6 +243,9 @@
  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')
++
+ 
  
  
- # packagers: set rc['numerix'] and rc['backend'] here to override the auto

Index: matplotlib-py.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/matplotlib-py.info,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- matplotlib-py.info  7 Aug 2006 20:12:09 -0000       1.8
+++ matplotlib-py.info  10 Sep 2006 14:50:15 -0000      1.9
@@ -1,20 +1,23 @@
 Info2: <<
 
 Package: matplotlib-py%type_pkg[python]
-Version: 0.87.3
+Version: 0.87.5
 Revision: 1001
 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) 
+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] (>= 
1.0-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: 9e961e90be07701ab6a99aa8cdc6b831
+Source-MD5: af3015ceae28ab385dbe9f30c6d2f83e
 Type: python (2.3 2.4)
 GCC: 4.0
 NoSetCPPFLAGS: True
 SetCPPFLAGS: -I%p/include/pygtk-2.0 -I%p/lib/freetype219/include/freetype2
 NoSetLDFLAGS: True
 SetLDFLAGS: -L%p/lib/freetype219/lib
-PatchScript: sed 's|@PREFIX@|%p|g' < %a/%{ni}.patch | sed 
's|@PYVER@|%type_pkg[python]|g' | patch -p1
+PatchScript: <<
+ sed 's|@PREFIX@|%p|g' < %a/%{ni}.patch | sed 's|@PYVER@|%type_pkg[python]|g' 
| patch -p1
+ perl -pi -e 's|tk_framework_found = 1|#tk_framework_found = 1|g' setupext.py
+<<
 Replaces: matplotlib-py24, matplotlib-py23
 CompileScript:  <<
  #!/bin/sh -ev

Index: matplotlib-basemap-py.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/matplotlib-basemap-py.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- matplotlib-basemap-py.info  11 Jun 2006 11:51:34 -0000      1.3
+++ matplotlib-basemap-py.info  10 Sep 2006 14:50:15 -0000      1.4
@@ -1,12 +1,12 @@
 Info2: <<
 
 Package: matplotlib-basemap-py%type_pkg[python]
-Version: 0.9
+Version: 0.9.2
 Revision: 1
 Maintainer: Jeffrey Whitaker <[EMAIL PROTECTED]>
 Depends: python%type_pkg[python], matplotlib-py%type_pkg[python] (>= 0.87.3), 
matplotlib-basemap-data (>= 0.9)
 Source: mirror:sourceforge:matplotlib/basemap-%v.tar.gz
-Source-MD5: f4101f64f7e8036a075e40a0d9ad57ba
+Source-MD5: 1b2f7f654c007ca5cd98fcd18b85df61
 Replaces: matplotlib-basemap-py23, matplotlib-basemap-py24
 Type: python (2.3 2.4)
 GCC: 4.0

Index: scipy-py.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/scipy-py.info,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- scipy-py.info       30 May 2006 14:42:30 -0000      1.6
+++ scipy-py.info       10 Sep 2006 14:50:15 -0000      1.7
@@ -1,15 +1,16 @@
 Info2: <<
 
 Package: scipy-py%type_pkg[python]
-Version: 0.4.9
+Version: 0.5.1
 Epoch: 1
 Revision: 1
 Maintainer: Jeffrey Whitaker <[EMAIL PROTECTED]>
 Type: python (2.3 2.4)
-Depends: scipy-core-py%type_pkg[python] (>= 0.9.8), python%type_pkg[python] | 
python%type_pkg[python]-nox, fftw3-shlibs (>= 3.1.1-1)
-BuildDepends: fftw3 (>= 3.1.1-1), g95 (>= 0.50-20060413)
+Depends: scipy-core-py%type_pkg[python] (>= 1.0-1), python%type_pkg[python] | 
python%type_pkg[python]-nox, fftw3-shlibs
+BuildDepends: fftw3, g95 (>= 0.90-1)
 Source: mirror:sourceforge:scipy/scipy-%v.tar.gz
-Source-MD5: bb1db6e0b60652ef26f92587c853a15f
+Source-MD5: 48442a427f0556ad2ad1721dd62e401c 
+Patch: %{ni}.patch
 CompileScript: <<
  %p/bin/python%type_raw[python] setup.py config_fc --fcompiler=g95 build
 <<

Index: scipy-core-py.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/scipy-core-py.info,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- scipy-core-py.info  30 May 2006 14:42:30 -0000      1.6
+++ scipy-core-py.info  10 Sep 2006 14:50:15 -0000      1.7
@@ -1,13 +1,13 @@
 Info2: <<
 
 Package: scipy-core-py%type_pkg[python]
-Version: 0.9.8
+Version: 1.0   
 Revision: 1
 Maintainer: Jeffrey Whitaker <[EMAIL PROTECTED]>
 Type: python (2.3 2.4)
 Depends: python%type_pkg[python] | python%type_pkg[python]-nox
-Source: mirror:sourceforge:numpy/numpy-%v.tar.gz
-Source-MD5: ca528d2b460a6567d70bb6bdf0dc1805
+Source: mirror:sourceforge:numpy/numpy-%vb5.tar.gz
+Source-MD5: 2451bc1751a9bc1c22452cd71f846982
 Patch: %{ni}.patch
 Conflicts: f2py-py%type_pkg[python], scipy-py%type_pkg[python] (<= 1:0.4)
 Replaces: f2py-py%type_pkg[python], scipy-py%type_pkg[python] (<= 1:0.4)

Index: scipy-core-py.patch
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/scipy-core-py.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- scipy-core-py.patch 30 May 2006 14:42:30 -0000      1.4
+++ scipy-core-py.patch 10 Sep 2006 14:50:15 -0000      1.5
@@ -1,15 +1,6 @@
 --- numpy/numpy/distutils/fcompiler/g95.py     2006-03-29 12:07:42.000000000 
-0700
 +++ numpy/numpy/distutils/fcompiler/g95.py.orig        2006-03-29 
12:04:01.000000000 -0700
-@@ -9,14 +9,16 @@
- class G95FCompiler(FCompiler):
- 
-     compiler_type = 'g95'
--    version_pattern = r'G95.*\(experimental\) \(g95!\) (?P<version>.*)\).*'
-+    version_pattern = r'G95 ((\(GCC[^\)]*(\)\)|\)))|)\s*'\
-+                      '(?P<version>[^\s*\)]+)'
- 
-     executables = {
-         'version_cmd'  : ["g95", "--version"],
+@@ -23,7 +23,8 @@
          'compiler_f77' : ["g95", "-ffixed-form"],
          'compiler_fix' : ["g95", "-ffixed-form"],
          'compiler_f90' : ["g95"],
@@ -19,11 +10,12 @@
          'archiver'     : ["ar", "-cr"],
          'ranlib'       : ["ranlib"]
          }
-@@ -27,7 +29,7 @@
+@@ -34,7 +35,8 @@
      def get_flags(self):
          return ['-fno-second-underscore']
      def get_flags_opt(self):
 -        return ['-O']
++        #return ['-O']
 +        return ['-O3 -funroll-loops']
      def get_flags_debug(self):
          return ['-g']


-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

Reply via email to