[macports-changes] [19388] trunk/dports/python
source_changes at macosforge.org
source_changes at macosforge.org
Sat Sep 2 14:06:13 PDT 2006
Revision: 19388
Author: erickt at macports.org
Date: 2006-09-02 14:06:09 -0700 (Sat, 02 Sep 2006)
Log Message:
-----------
updated py-numpy to 1.0b4
moved py-scipy version 0.3.2 into py-scipy03, and updated py-scipy to 0.5.0.
Since 0.5.0 should be backwards compatible with 0.4.6, I removed the
py-scipy04 package
Modified Paths:
--------------
trunk/dports/python/py-numpy/Portfile
trunk/dports/python/py-numpy/files/patch-gnu.py
trunk/dports/python/py-numpy/files/patch-system_info.py
trunk/dports/python/py-scipy/Portfile
Added Paths:
-----------
trunk/dports/python/py-scipy03/
trunk/dports/python/py-scipy03/Portfile
trunk/dports/python/py-scipy03/files/
trunk/dports/python/py-scipy03/files/patch-gnufcompiler.py
Removed Paths:
-------------
trunk/dports/python/py-scipy/files/
trunk/dports/python/py-scipy04/
Modified: trunk/dports/python/py-numpy/Portfile
===================================================================
--- trunk/dports/python/py-numpy/Portfile 2006-09-02 19:49:02 UTC (rev 19387)
+++ trunk/dports/python/py-numpy/Portfile 2006-09-02 21:06:09 UTC (rev 19388)
@@ -3,29 +3,29 @@
PortSystem 1.0
PortGroup python24 1.0
-name py-numpy
-version 0.9.5
-categories python
-platforms darwin
-maintainers erickt at dslextreme.com
-description The core utilities for the scientific library scipy for Python
-long_description ${description}
+name py-numpy
+version 1.0b4
+categories python
+platforms darwin
+maintainers erickt at macports.org
+description The core utilities for the scientific library scipy for Python
+long_description ${description}
-homepage http://numeric.scipy.org/
-master_sites sourceforge:numpy
-distname numpy-${version}
+homepage http://numeric.scipy.org/
+master_sites sourceforge:numpy
+distname numpy-${version}
-checksums md5 47fe186078c5e1f68b37e0ffc4994178
+checksums md5 bdfee192112938600b41754ff1c3b6a8 \
+ sha1 220b664b272bbac02ec821b2757f9342135a3a3d
-depends_build port:gcc41
-depends_lib-append lib:fftw:fftw-3
+depends_build port:gcc41
+depends_lib lib:fftw:fftw-3
-patchfiles patch-gnu.py \
- patch-system_info.py
+patchfiles patch-gnu.py \
+ patch-system_info.py
post-patch {
- reinplace "s:DPORT_PREFIX:${prefix}:g" ${worksrcpath}/numpy/distutils/system_info.py
+ reinplace "s:DPORT_PREFIX:${prefix}:g" ${worksrcpath}/numpy/distutils/system_info.py
}
build.pre_args config_fc --f90exec ${prefix}/bin/gfortran-dp-4.1 --fcompiler gnu95
-build.args build
Modified: trunk/dports/python/py-numpy/files/patch-gnu.py
===================================================================
--- trunk/dports/python/py-numpy/files/patch-gnu.py 2006-09-02 19:49:02 UTC (rev 19387)
+++ trunk/dports/python/py-numpy/files/patch-gnu.py 2006-09-02 21:06:09 UTC (rev 19388)
@@ -1,22 +1,11 @@
---- numpy/distutils/fcompiler/gnu.py.old 2006-01-29 02:10:27.000000000 -0800
-+++ numpy/distutils/fcompiler/gnu.py 2006-01-29 02:10:59.000000000 -0800
-@@ -107,8 +107,8 @@
- opt.append('gcc')
- if g2c is not None:
- opt.append(g2c)
-- if sys.platform == 'darwin':
-- opt.append('cc_dynamic')
-+ #if sys.platform == 'darwin':
-+ # opt.append('cc_dynamic')
- return opt
+--- numpy/distutils/fcompiler/gnu.py.old 2006-09-02 13:00:19.000000000 -0700
++++ numpy/distutils/fcompiler/gnu.py 2006-09-02 13:00:51.000000000 -0700
+@@ -245,7 +245,7 @@
+ # OS X: GNU Fortran 95 (GCC) 4.1.0
+ # GNU Fortran 95 (GCC) 4.2.0 20060218 (experimental)
- def get_flags_debug(self):
-@@ -216,7 +216,7 @@
- # 'gfortran --version' results:
- # Debian: GNU Fortran 95 (GCC 4.0.3 20051023 (prerelease) (Debian 4.0.2-3))
-
- for fc_exe in map(find_executable,['gfortran','f95']):
-+ for fc_exe in map(find_executable,['gfortran-dp-4.0','f95']):
++ for fc_exe in map(find_executable,['gfortran-dp-4.1','f95']):
if os.path.isfile(fc_exe):
break
executables = {
Modified: trunk/dports/python/py-numpy/files/patch-system_info.py
===================================================================
--- trunk/dports/python/py-numpy/files/patch-system_info.py 2006-09-02 19:49:02 UTC (rev 19387)
+++ trunk/dports/python/py-numpy/files/patch-system_info.py 2006-09-02 21:06:09 UTC (rev 19388)
@@ -1,6 +1,6 @@
---- numpy/distutils/system_info.py.orig 2006-02-15 21:50:00.000000000 -0800
-+++ numpy/distutils/system_info.py 2006-02-20 13:10:31.000000000 -0800
-@@ -129,14 +129,14 @@
+--- numpy/distutils/system_info.py.old 2006-09-02 13:02:31.000000000 -0700
++++ numpy/distutils/system_info.py 2006-09-02 13:04:09.000000000 -0700
+@@ -137,14 +137,14 @@
default_x11_lib_dirs = []
default_x11_include_dirs = []
else:
Modified: trunk/dports/python/py-scipy/Portfile
===================================================================
--- trunk/dports/python/py-scipy/Portfile 2006-09-02 19:49:02 UTC (rev 19387)
+++ trunk/dports/python/py-scipy/Portfile 2006-09-02 21:06:09 UTC (rev 19388)
@@ -1,28 +1,27 @@
-# $Id: Portfile,v 1.2 2006/04/06 06:22:37 blb Exp $
+# $Id: Portfile,v 1.2 2006/05/06 21:52:21 erickt Exp $
PortSystem 1.0
-PortGroup python24 1.0
+PortGroup python24 1.0
-name py-scipy
-version 0.3.2
-categories python
-platforms darwin
-description An opensource library of scientific tools for Python
-maintainers erickt at dslextreme.com
+name py-scipy
+version 0.5.0
+categories python
+platforms darwin
+maintainers erickt at macports.org
+description An opensource library of scientific tools for Python
+long_description ${description}
-homepage http://www.scipy.org/
-master_sites ${homepage}/download/scipy/src/
-distname SciPy_complete-${version}
-patchfiles patch-gnufcompiler.py
+homepage http://www.scipy.org/
+master_sites sourceforge:scipy
+distname scipy-${version}
-checksums md5 5ae2280ab2c4c653cb0ff8479e81284a
+checksums md5 7e9a632dc0d8b7c9459baf11a7b85fd4 \
+ sha1 be6c04e3e464b1215a8334a714386b2b4f93bb33
-depends_lib-append lib:gnuplot:gnuplot \
- lib:fftw:fftw \
- lib:py-numeric:py-numeric \
- lib:py-f2py:py-f2py \
- lib:g77:gcc34
+depends_lib lib:gnuplot:gnuplot \
+ port:py-numpy
-use_configure no
-worksrcdir ${distname}
-build.env LDFLAGS="-L${prefix}/lib"
+worksrcdir ${distname}
+
+build.env CCFLAGS="-I${prefix}/include -L${prefix}/lib -I${prefix}/gcc41"
+build.pre_args config_fc --f90exec gfortran-dp-4.1 --fcompiler gnu95
Added: trunk/dports/python/py-scipy03/Portfile
===================================================================
--- trunk/dports/python/py-scipy03/Portfile (rev 0)
+++ trunk/dports/python/py-scipy03/Portfile 2006-09-02 21:06:09 UTC (rev 19388)
@@ -0,0 +1,28 @@
+# $Id: Portfile,v 1.2 2006/04/06 06:22:37 blb Exp $
+
+PortSystem 1.0
+PortGroup python24 1.0
+
+name py-scipy
+version 0.3.2
+categories python
+platforms darwin
+description An opensource library of scientific tools for Python
+maintainers erickt at dslextreme.com
+
+homepage http://www.scipy.org/
+master_sites ${homepage}/download/scipy/src/
+distname SciPy_complete-${version}
+patchfiles patch-gnufcompiler.py
+
+checksums md5 5ae2280ab2c4c653cb0ff8479e81284a
+
+depends_lib-append lib:gnuplot:gnuplot \
+ lib:fftw:fftw \
+ lib:py-numeric:py-numeric \
+ lib:py-f2py:py-f2py \
+ lib:g77:gcc34
+
+use_configure no
+worksrcdir ${distname}
+build.env LDFLAGS="-L${prefix}/lib"
Added: trunk/dports/python/py-scipy03/files/patch-gnufcompiler.py
===================================================================
--- trunk/dports/python/py-scipy03/files/patch-gnufcompiler.py (rev 0)
+++ trunk/dports/python/py-scipy03/files/patch-gnufcompiler.py 2006-09-02 21:06:09 UTC (rev 19388)
@@ -0,0 +1,28 @@
+--- scipy_core/scipy_distutils/gnufcompiler.py Wed Feb 18 01:51:39 2004
++++ scipy_core/scipy_distutils/gnufcompiler.py Thu Mar 4 06:28:32 2004
+@@ -27,7 +27,7 @@
+ 'compiler_f77' : [fc_exe,"-Wall","-fno-second-underscore"],
+ 'compiler_f90' : None,
+ 'compiler_fix' : None,
+- 'linker_so' : [fc_exe],
++ 'linker_so' : ['gcc -bundle -flat_namespace -undefined suppress'],
+ 'archiver' : ["ar", "-cr"],
+ 'ranlib' : ["ranlib"],
+ }
+@@ -52,7 +52,7 @@
+ # This is when Python is from Apple framework
+ opt.extend(["-Wl,-framework","-Wl,Python"])
+ #else we are running in Fink python.
+- opt.extend(["-lcc_dynamic","-bundle"])
++# opt.extend(["-lcc_dynamic","-bundle"])
+ else:
+ opt.append("-shared")
+ if sys.platform[:5]=='sunos':
+@@ -94,6 +94,7 @@
+ opt.extend(['gcc',g2c])
+ else:
+ opt.append(g2c)
++ opt.append('cc_dynamic')
+ return opt
+
+ def get_flags_debug(self):
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20060902/6abc8702/attachment.html
More information about the macports-changes
mailing list