[59794] trunk/dports/python/py26-numpy/Portfile

[jameskyle at macports.org]

Revision: 59794
          http://trac.macports.org/changeset/59794
Author:   jameskyle at macports.org
Date:     2009-10-22 11:05:46 -0700 (Thu, 22 Oct 2009)
Log Message:
-----------
Cleaned up Portfile formatting.
Correctly removed ATLAS environment from destroot phase. Ticket #22200

Modified Paths:
--------------
    trunk/dports/python/py26-numpy/Portfile

Modified: trunk/dports/python/py26-numpy/Portfile
===================================================================
--- trunk/dports/python/py26-numpy/Portfile	2009-10-22 13:54:01 UTC (rev 59793)
+++ trunk/dports/python/py26-numpy/Portfile	2009-10-22 18:05:46 UTC (rev 59794)
@@ -2,7 +2,7 @@
 # $Id$
 
 PortSystem              1.0
-PortGroup  python26 1.0
+PortGroup               python26 1.0
 
 name                    py26-numpy
 version                 1.3.0
@@ -29,20 +29,20 @@
                         port:atlas \
                         port:gcc43
 
-configure.compiler  macports-gcc-4.3
+configure.compiler      macports-gcc-4.3
 
-build.env-append    CC="${prefix}/bin/gcc-mp-4.3" \
-                    CXX="${prefix}/bin/g++-mp-4.3" \
-                    ATLAS=${prefix}/lib \
-                    LAPACK=${prefix}/lib \
-                    BLAS=${prefix}/lib
-                    
-destroot.env-append CC="${prefix}/bin/gcc-mp-4.3" \
-                    CXX="${prefix}/bin/g++-mp-4.3" \
-                    ATLAS=${prefix}/lib \
-                    LAPACK=${prefix}/lib \
-                    BLAS=${prefix}/lib                    
-           
+build.env-append        CC="${prefix}/bin/gcc-mp-4.3" \
+                        CXX="${prefix}/bin/g++-mp-4.3" \
+                        ATLAS=${prefix}/lib \
+                        LAPACK=${prefix}/lib \
+                        BLAS=${prefix}/lib
+
+destroot.env-append     CC="${prefix}/bin/gcc-mp-4.3" \
+                        CXX="${prefix}/bin/g++-mp-4.3" \
+                        ATLAS=${prefix}/lib \
+                        LAPACK=${prefix}/lib \
+                        BLAS=${prefix}/lib
+
 post-patch {
     reinplace "s|@@MPORTS_PYTHON_LIBRARY@@|${python.lib}|" ${worksrcpath}/numpy/distutils/fcompiler/g95.py
     reinplace "s|@@MPORTS_PYTHON@@|${python.bin}|" ${worksrcpath}/numpy/f2py/setup.py
@@ -53,13 +53,13 @@
     ln -s ${python.prefix}/bin/f2py ${destroot}${prefix}/bin/f2py-${branch}
 }
 
-variant no_gcc43 description {"Do not use the gcc43 compiler"} {  
+variant no_gcc43 description {"Do not use the gcc43 compiler"} {
     depends_lib-delete port:gcc43
     configure.compiler gcc-4.0
-    
-    build.env-delete CC="${prefix}/bin/gcc-mp-4.3" \
-                     CXX="${prefix}/bin/g++-mp-4.3"
-                     
+
+    build.env-delete    CC="${prefix}/bin/gcc-mp-4.3" \
+                        CXX="${prefix}/bin/g++-mp-4.3"
+
     destroot.env-delete CC="${prefix}/bin/gcc-mp-4.3" \
                         CXX="${prefix}/bin/g++-mp-4.3"
 }
@@ -68,10 +68,11 @@
     build.env-delete    ATLAS=${prefix}/lib \
                         LAPACK=${prefix}/lib \
                         BLAS=${prefix}/lib
-    build.env-delete    ATLAS=${prefix}/lib \
+
+    destroot.env-delete ATLAS=${prefix}/lib \
                         LAPACK=${prefix}/lib \
-                        BLAS=${prefix}/lib                   
-    depends_lib-delete port:atlas                    
+                        BLAS=${prefix}/lib
+    depends_lib-delete  port:atlas
 }
 variant universal {
     patchfiles-append  patch-numpyconfig.h.in.diff patch-setup.py.diff
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20091022/00a3f8d9/attachment.html>