Modified: trunk/dports/python/py-numpy/Portfile (91458 => 91459)
--- trunk/dports/python/py-numpy/Portfile 2012-04-02 16:39:59 UTC (rev 91458)
+++ trunk/dports/python/py-numpy/Portfile 2012-04-02 17:07:43 UTC (rev 91459)
@@ -143,37 +143,24 @@
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"
- } elseif {[variant_isset gcc46]} {
- set CC "${prefix}/bin/gcc-mp-4.6"
- set CXX "${prefix}/bin/g++-mp-4.6"
- set F90 "${prefix}/bin/gfortran-mp-4.6"
- }
-
- reinplace "s|@@@|${CC}|" ${worksrcpath}/c-wrapper
+ reinplace "s|@@@|${configure.cc}|" ${worksrcpath}/c-wrapper
reinplace "s|---|\\\\.c|" ${worksrcpath}/c-wrapper
reinplace "s|&&&|${prefix}|" ${worksrcpath}/c-wrapper
- reinplace "s|@@@|${CXX}|" ${worksrcpath}/cxx-wrapper
+ reinplace "s|@@@|${configure.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|@@@|${configure.f90}|" ${worksrcpath}/f-wrapper
reinplace "s|---|\\\\.f|" ${worksrcpath}/f-wrapper
reinplace "s|&&&|${prefix}|" ${worksrcpath}/f-wrapper
+ configure.cc ${worksrcpath}/c-wrapper
+ configure.cxx ${worksrcpath}/cxx-wrapper
+ configure.f77 ${worksrcpath}/f-wrapper
+ configure.f90 ${worksrcpath}/f-wrapper
+
build.env-append CC="${worksrcpath}/c-wrapper" \
CXX="${worksrcpath}/cxx-wrapper" \
F77="${worksrcpath}/f-wrapper" \