[macports-changes] [19417] trunk/dports/python
source_changes at macosforge.org
source_changes at macosforge.org
Wed Sep 6 02:50:52 PDT 2006
Revision: 19417
Author: erickt at macports.org
Date: 2006-09-06 02:50:50 -0700 (Wed, 06 Sep 2006)
Log Message:
-----------
version bump
made py-numpy depend on gcc42 on intel machines, but remain depending
on gcc41 as I can't get gcc42 to build
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
Modified: trunk/dports/python/py-numpy/Portfile
===================================================================
--- trunk/dports/python/py-numpy/Portfile 2006-09-06 07:48:51 UTC (rev 19416)
+++ trunk/dports/python/py-numpy/Portfile 2006-09-06 09:50:50 UTC (rev 19417)
@@ -4,8 +4,8 @@
PortGroup python24 1.0
name py-numpy
-version 1.0b4
-revision 1
+version 1.0b5
+revision 0
categories python
platforms darwin
maintainers erickt at macports.org
@@ -16,17 +16,33 @@
master_sites sourceforge:numpy
distname numpy-${version}
-checksums md5 bdfee192112938600b41754ff1c3b6a8 \
- sha1 220b664b272bbac02ec821b2757f9342135a3a3d
+checksums md5 2451bc1751a9bc1c22452cd71f846982 \
+ sha1 001797105ba9924f50dc1115b5d5eaf1673e4d30 \
+ rmd160 994baabc9df870dcdf5fbf62b1789e0d5fcb417b
-depends_build port:gcc41
-depends_lib lib:fftw:fftw-3
+depends_lib-append lib:fftw:fftw-3
patchfiles patch-gnu.py \
patch-system_info.py
-post-patch {
- 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
+
+variant darwin powerpc {
+ depends_build-append port:gcc41
+
+ post-patch {
+ reinplace "s:MACPORTS_FORTRAN:gfortran-dp-4.1:g" ${worksrcpath}/numpy/distutils/fcompiler/gnu.py
+ reinplace "s:MACPORTS_PREFIX:${prefix}:g" ${worksrcpath}/numpy/distutils/system_info.py
+ reinplace "s:MACPORTS_GCCPORT:gcc41:g" ${worksrcpath}/numpy/distutils/system_info.py
+ }
}
-build.pre_args config_fc --f90exec ${prefix}/bin/gfortran-dp-4.1 --fcompiler gnu95
+variant darwin intel {
+ depends_build-append port:gcc42
+
+ post-patch {
+ reinplace "s:MACPORTS_FORTRAN:gfortran-dp-4.2:g" ${worksrcpath}/numpy/distutils/fcompiler/gnu.py
+ reinplace "s:MACPORTS_PREFIX:${prefix}:g" ${worksrcpath}/numpy/distutils/system_info.py
+ reinplace "s:MACPORTS_GCCPORT:gcc42:g" ${worksrcpath}/numpy/distutils/system_info.py
+ }
+}
Modified: trunk/dports/python/py-numpy/files/patch-gnu.py
===================================================================
--- trunk/dports/python/py-numpy/files/patch-gnu.py 2006-09-06 07:48:51 UTC (rev 19416)
+++ trunk/dports/python/py-numpy/files/patch-gnu.py 2006-09-06 09:50:50 UTC (rev 19417)
@@ -5,7 +5,7 @@
# GNU Fortran 95 (GCC) 4.2.0 20060218 (experimental)
- for fc_exe in map(find_executable,['gfortran','f95']):
-+ for fc_exe in map(find_executable,['gfortran-dp-4.1','f95']):
++ for fc_exe in map(find_executable,['MACPORTS_FORTRAN','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-06 07:48:51 UTC (rev 19416)
+++ trunk/dports/python/py-numpy/files/patch-system_info.py 2006-09-06 09:50:50 UTC (rev 19417)
@@ -5,17 +5,17 @@
default_x11_include_dirs = []
else:
- default_lib_dirs = ['/usr/local/lib', '/opt/lib', '/usr/lib',
-+ default_lib_dirs = ['DPORT_PREFIX/lib', 'DPORT_PREFIX/lib/gcc41', '/usr/local/lib', '/opt/lib', '/usr/lib',
++ default_lib_dirs = ['MACPORTS_PREFIX/lib', 'MACPORTS_PREFIX/lib/MACPORTS_GCCPORT', '/usr/local/lib', '/opt/lib', '/usr/lib',
'/opt/local/lib', '/sw/lib']
- default_include_dirs = ['/usr/local/include',
-+ default_include_dirs = ['DPORT_PREFIX/include', 'DPORT_PREFIX/include/gcc41', '/usr/local/include',
++ default_include_dirs = ['MACPORTS_PREFIX/include', 'MACPORTS_PREFIX/include/MACPORTS_GCCPORT', '/usr/local/include',
'/opt/include', '/usr/include',
'/opt/local/include', '/sw/include']
default_src_dirs = ['.','/usr/local/src', '/opt/src','/sw/src']
- default_x11_lib_dirs = ['/usr/X11R6/lib','/usr/X11/lib','/usr/lib']
- default_x11_include_dirs = ['/usr/X11R6/include','/usr/X11/include',
-+ default_x11_lib_dirs = ['DPORT_PREFIX/lib', '/usr/X11R6/lib','/usr/X11/lib','/usr/lib']
-+ default_x11_include_dirs = ['DPORT_PREFIX/include/X11', '/usr/X11R6/include','/usr/X11/include',
++ default_x11_lib_dirs = ['MACPORTS_PREFIX/lib', '/usr/X11R6/lib','/usr/X11/lib','/usr/lib']
++ default_x11_include_dirs = ['MACPORTS_PREFIX/include/X11', '/usr/X11R6/include','/usr/X11/include',
'/usr/include']
if os.path.join(sys.prefix, 'lib') not in default_lib_dirs:
Modified: trunk/dports/python/py-scipy/Portfile
===================================================================
--- trunk/dports/python/py-scipy/Portfile 2006-09-06 07:48:51 UTC (rev 19416)
+++ trunk/dports/python/py-scipy/Portfile 2006-09-06 09:50:50 UTC (rev 19417)
@@ -4,8 +4,8 @@
PortGroup python24 1.0
name py-scipy
-version 0.5.0
-revision 1
+version 0.5.1
+revision 0
categories python
platforms darwin
maintainers erickt at macports.org
@@ -16,8 +16,9 @@
master_sites sourceforge:scipy
distname scipy-${version}
-checksums md5 7e9a632dc0d8b7c9459baf11a7b85fd4 \
- sha1 be6c04e3e464b1215a8334a714386b2b4f93bb33
+checksums md5 48442a427f0556ad2ad1721dd62e401c \
+ sha1 bed9be244fc73c96a252184cfc14653035832f7e \
+ rmd160 60a184b57f50e9bef78843cbe96542aee43ac386
depends_lib lib:gnuplot:gnuplot \
port:py-numpy
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20060906/212d3474/attachment.html
More information about the macports-changes
mailing list