[77555] trunk/dports/python
ram at macports.org
ram at macports.org
Sun Apr 3 11:22:32 PDT 2011
Revision: 77555
http://trac.macports.org/changeset/77555
Author: ram at macports.org
Date: 2011-04-03 11:22:29 -0700 (Sun, 03 Apr 2011)
Log Message:
-----------
python/py2{6,7}-numpy: tabs to spaces
Modified Paths:
--------------
trunk/dports/python/py26-numpy/Portfile
trunk/dports/python/py27-numpy/Portfile
Modified: trunk/dports/python/py26-numpy/Portfile
===================================================================
--- trunk/dports/python/py26-numpy/Portfile 2011-04-03 16:21:10 UTC (rev 77554)
+++ trunk/dports/python/py26-numpy/Portfile 2011-04-03 18:22:29 UTC (rev 77555)
@@ -62,17 +62,17 @@
variant gcc43 conflicts gcc44 gcc45 \
description {Use the gcc43 compiler (enables fortran linking)} {
- configure.compiler macports-gcc-4.3
+ configure.compiler macports-gcc-4.3
}
variant gcc44 conflicts gcc43 gcc45 \
description {Use the gcc44 compiler (enables fortran linking)} {
- configure.compiler macports-gcc-4.4
+ configure.compiler macports-gcc-4.4
}
variant gcc45 conflicts gcc43 gcc44 \
description {Use the gcc45 compiler (enables fortran linking)} {
- configure.compiler macports-gcc-4.5
+ configure.compiler macports-gcc-4.5
}
if {![variant_isset gcc43] && ![variant_isset gcc45]} {
@@ -121,52 +121,52 @@
reinplace "s|@@MPORTS_PYTHON@@|${python.bin}|" \
${worksrcpath}/numpy/f2py/setup.py
- if {[variant_isset universal] && [variant_isset atlas]} {
- # Prepare wrappers
- file copy -force ${filespath}/wrapper-template \
- ${worksrcpath}/c-wrapper
- file copy -force ${filespath}/wrapper-template \
- ${worksrcpath}/f-wrapper
- file copy -force ${filespath}/wrapper-template \
- ${worksrcpath}/cxx-wrapper
+ if {[variant_isset universal] && [variant_isset atlas]} {
+ # Prepare wrappers
+ file copy -force ${filespath}/wrapper-template \
+ ${worksrcpath}/c-wrapper
+ file copy -force ${filespath}/wrapper-template \
+ ${worksrcpath}/f-wrapper
+ file copy -force ${filespath}/wrapper-template \
+ ${worksrcpath}/cxx-wrapper
- if {[variant_isset gcc43]} {
- set CC "${prefix}/bin/gcc-mp-4.3"
- set CXX "${prefix}/bin/g++-mp-4.3"
- set F90 "${prefix}/bin/gfortran-mp-4.3"
- } elseif {[variant_isset gcc44]} {
- set CC "${prefix}/bin/gcc-mp-4.4"
- set CXX "${prefix}/bin/g++-mp-4.4"
- set F90 "${prefix}/bin/gfortran-mp-4.4"
- } elseif {[variant_isset gcc45]} {
- set CC "${prefix}/bin/gcc-mp-4.5"
- set CXX "${prefix}/bin/g++-mp-4.5"
- set F90 "${prefix}/bin/gfortran-mp-4.5"
- }
-
- reinplace "s|@@@|${CC}|" ${worksrcpath}/c-wrapper
- reinplace "s|---|\\\\.c|" ${worksrcpath}/c-wrapper
- reinplace "s|&&&|${prefix}|" ${worksrcpath}/c-wrapper
-
- reinplace "s|@@@|${CXX}|" ${worksrcpath}/cxx-wrapper
- reinplace "s#---#(\\\\.C|\\\\.cpp|\\\\.cc)#" \
- ${worksrcpath}/cxx-wrapper
- reinplace "s|&&&|${prefix}|" ${worksrcpath}/cxx-wrapper
-
- reinplace "s|@@@|${F90}|" ${worksrcpath}/f-wrapper
- reinplace "s|---|\\\\.f|" ${worksrcpath}/f-wrapper
- reinplace "s|&&&|${prefix}|" ${worksrcpath}/f-wrapper
+ if {[variant_isset gcc43]} {
+ set CC "${prefix}/bin/gcc-mp-4.3"
+ set CXX "${prefix}/bin/g++-mp-4.3"
+ set F90 "${prefix}/bin/gfortran-mp-4.3"
+ } elseif {[variant_isset gcc44]} {
+ set CC "${prefix}/bin/gcc-mp-4.4"
+ set CXX "${prefix}/bin/g++-mp-4.4"
+ set F90 "${prefix}/bin/gfortran-mp-4.4"
+ } elseif {[variant_isset gcc45]} {
+ set CC "${prefix}/bin/gcc-mp-4.5"
+ set CXX "${prefix}/bin/g++-mp-4.5"
+ set F90 "${prefix}/bin/gfortran-mp-4.5"
+ }
- build.env-append CC="${worksrcpath}/c-wrapper" \
- CXX="${worksrcpath}/cxx-wrapper" \
- F77="${worksrcpath}/f-wrapper" \
- F90="${worksrcpath}/f-wrapper"
+ reinplace "s|@@@|${CC}|" ${worksrcpath}/c-wrapper
+ reinplace "s|---|\\\\.c|" ${worksrcpath}/c-wrapper
+ reinplace "s|&&&|${prefix}|" ${worksrcpath}/c-wrapper
- destroot.env-append CC="${worksrcpath}/c-wrapper" \
- CXX="${worksrcpath}/cxx-wrapper" \
- F77="${worksrcpath}/f-wrapper" \
- F90="${worksrcpath}/f-wrapper"
- }
+ reinplace "s|@@@|${CXX}|" ${worksrcpath}/cxx-wrapper
+ reinplace "s#---#(\\\\.C|\\\\.cpp|\\\\.cc)#" \
+ ${worksrcpath}/cxx-wrapper
+ reinplace "s|&&&|${prefix}|" ${worksrcpath}/cxx-wrapper
+
+ reinplace "s|@@@|${F90}|" ${worksrcpath}/f-wrapper
+ reinplace "s|---|\\\\.f|" ${worksrcpath}/f-wrapper
+ reinplace "s|&&&|${prefix}|" ${worksrcpath}/f-wrapper
+
+ build.env-append CC="${worksrcpath}/c-wrapper" \
+ CXX="${worksrcpath}/cxx-wrapper" \
+ F77="${worksrcpath}/f-wrapper" \
+ F90="${worksrcpath}/f-wrapper"
+
+ destroot.env-append CC="${worksrcpath}/c-wrapper" \
+ CXX="${worksrcpath}/cxx-wrapper" \
+ F77="${worksrcpath}/f-wrapper" \
+ F90="${worksrcpath}/f-wrapper"
+ }
}
livecheck.type regex
Modified: trunk/dports/python/py27-numpy/Portfile
===================================================================
--- trunk/dports/python/py27-numpy/Portfile 2011-04-03 16:21:10 UTC (rev 77554)
+++ trunk/dports/python/py27-numpy/Portfile 2011-04-03 18:22:29 UTC (rev 77555)
@@ -61,17 +61,17 @@
variant gcc43 conflicts gcc44 gcc45 \
description {Use the gcc43 compiler (enables fortran linking)} {
- configure.compiler macports-gcc-4.3
+ configure.compiler macports-gcc-4.3
}
variant gcc44 conflicts gcc43 gcc45 \
description {Use the gcc44 compiler (enables fortran linking)} {
- configure.compiler macports-gcc-4.4
+ configure.compiler macports-gcc-4.4
}
variant gcc45 conflicts gcc43 gcc44 \
description {Use the gcc45 compiler (enables fortran linking)} {
- configure.compiler macports-gcc-4.5
+ configure.compiler macports-gcc-4.5
}
if {![variant_isset gcc43] && ![variant_isset gcc45]} {
@@ -120,52 +120,52 @@
reinplace "s|@@MPORTS_PYTHON@@|${python.bin}|" \
${worksrcpath}/numpy/f2py/setup.py
- if {[variant_isset universal] && [variant_isset atlas]} {
- # Prepare wrappers
- file copy -force ${filespath}/wrapper-template \
- ${worksrcpath}/c-wrapper
- file copy -force ${filespath}/wrapper-template \
- ${worksrcpath}/f-wrapper
- file copy -force ${filespath}/wrapper-template \
- ${worksrcpath}/cxx-wrapper
+ if {[variant_isset universal] && [variant_isset atlas]} {
+ # Prepare wrappers
+ file copy -force ${filespath}/wrapper-template \
+ ${worksrcpath}/c-wrapper
+ file copy -force ${filespath}/wrapper-template \
+ ${worksrcpath}/f-wrapper
+ file copy -force ${filespath}/wrapper-template \
+ ${worksrcpath}/cxx-wrapper
- if {[variant_isset gcc43]} {
- set CC "${prefix}/bin/gcc-mp-4.3"
- set CXX "${prefix}/bin/g++-mp-4.3"
- set F90 "${prefix}/bin/gfortran-mp-4.3"
- } elseif {[variant_isset gcc44]} {
- set CC "${prefix}/bin/gcc-mp-4.4"
- set CXX "${prefix}/bin/g++-mp-4.4"
- set F90 "${prefix}/bin/gfortran-mp-4.4"
- } elseif {[variant_isset gcc45]} {
- set CC "${prefix}/bin/gcc-mp-4.5"
- set CXX "${prefix}/bin/g++-mp-4.5"
- set F90 "${prefix}/bin/gfortran-mp-4.5"
- }
-
- reinplace "s|@@@|${CC}|" ${worksrcpath}/c-wrapper
- reinplace "s|---|\\\\.c|" ${worksrcpath}/c-wrapper
- reinplace "s|&&&|${prefix}|" ${worksrcpath}/c-wrapper
-
- reinplace "s|@@@|${CXX}|" ${worksrcpath}/cxx-wrapper
- reinplace "s#---#(\\\\.C|\\\\.cpp|\\\\.cc)#" \
- ${worksrcpath}/cxx-wrapper
- reinplace "s|&&&|${prefix}|" ${worksrcpath}/cxx-wrapper
-
- reinplace "s|@@@|${F90}|" ${worksrcpath}/f-wrapper
- reinplace "s|---|\\\\.f|" ${worksrcpath}/f-wrapper
- reinplace "s|&&&|${prefix}|" ${worksrcpath}/f-wrapper
+ if {[variant_isset gcc43]} {
+ set CC "${prefix}/bin/gcc-mp-4.3"
+ set CXX "${prefix}/bin/g++-mp-4.3"
+ set F90 "${prefix}/bin/gfortran-mp-4.3"
+ } elseif {[variant_isset gcc44]} {
+ set CC "${prefix}/bin/gcc-mp-4.4"
+ set CXX "${prefix}/bin/g++-mp-4.4"
+ set F90 "${prefix}/bin/gfortran-mp-4.4"
+ } elseif {[variant_isset gcc45]} {
+ set CC "${prefix}/bin/gcc-mp-4.5"
+ set CXX "${prefix}/bin/g++-mp-4.5"
+ set F90 "${prefix}/bin/gfortran-mp-4.5"
+ }
- build.env-append CC="${worksrcpath}/c-wrapper" \
- CXX="${worksrcpath}/cxx-wrapper" \
- F77="${worksrcpath}/f-wrapper" \
- F90="${worksrcpath}/f-wrapper"
+ reinplace "s|@@@|${CC}|" ${worksrcpath}/c-wrapper
+ reinplace "s|---|\\\\.c|" ${worksrcpath}/c-wrapper
+ reinplace "s|&&&|${prefix}|" ${worksrcpath}/c-wrapper
- destroot.env-append CC="${worksrcpath}/c-wrapper" \
- CXX="${worksrcpath}/cxx-wrapper" \
- F77="${worksrcpath}/f-wrapper" \
- F90="${worksrcpath}/f-wrapper"
- }
+ reinplace "s|@@@|${CXX}|" ${worksrcpath}/cxx-wrapper
+ reinplace "s#---#(\\\\.C|\\\\.cpp|\\\\.cc)#" \
+ ${worksrcpath}/cxx-wrapper
+ reinplace "s|&&&|${prefix}|" ${worksrcpath}/cxx-wrapper
+
+ reinplace "s|@@@|${F90}|" ${worksrcpath}/f-wrapper
+ reinplace "s|---|\\\\.f|" ${worksrcpath}/f-wrapper
+ reinplace "s|&&&|${prefix}|" ${worksrcpath}/f-wrapper
+
+ build.env-append CC="${worksrcpath}/c-wrapper" \
+ CXX="${worksrcpath}/cxx-wrapper" \
+ F77="${worksrcpath}/f-wrapper" \
+ F90="${worksrcpath}/f-wrapper"
+
+ destroot.env-append CC="${worksrcpath}/c-wrapper" \
+ CXX="${worksrcpath}/cxx-wrapper" \
+ F77="${worksrcpath}/f-wrapper" \
+ F90="${worksrcpath}/f-wrapper"
+ }
}
livecheck.type regex
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110403/2cc5dc36/attachment.html>
More information about the macports-changes
mailing list