[59361] trunk/dports/python/py26-scientific/Portfile

[adfernandes at macports.org]

Revision: 59361
          http://trac.macports.org/changeset/59361
Author:   adfernandes at macports.org
Date:     2009-10-13 17:05:35 -0700 (Tue, 13 Oct 2009)
Log Message:
-----------
Closes #22033

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

Modified: trunk/dports/python/py26-scientific/Portfile
===================================================================
--- trunk/dports/python/py26-scientific/Portfile	2009-10-13 23:54:05 UTC (rev 59360)
+++ trunk/dports/python/py26-scientific/Portfile	2009-10-14 00:05:35 UTC (rev 59361)
@@ -6,7 +6,7 @@
 
 name            py26-scientific
 version         2.8
-revision        1
+revision        2
 categories      python science
 platforms       darwin
 maintainers     adfernandes openmaintainer
@@ -25,7 +25,7 @@
                 rmd160 0501829586253fe3986458529c436b6d93e6667f
 
 depends_lib     port:netcdf \
-                port:py26-numeric
+                port:py26-numpy
 
 build.env    	CPPFLAGS="-I${python.include} \
 	            -I${worksrcpath}/Include" \
@@ -50,14 +50,11 @@
 }
 
 variant mpi description {Enable lammpi support} {
-    depends_lib-append  port:lammpi port:py26-numpy
+    depends_lib-append  port:lammpi
+    patchfiles-append patch-Src-MPI-compile.py.diff
     post-build {
-        reinplace "s|^from Scientific import N|#from Scientific import N|g" \
-			${worksrcpath}/Src/MPI/compile.py
-        reinplace "s|^if N.package ==|if \"NumPy\" ==|g" \
-			${worksrcpath}/Src/MPI/compile.py
-        reinplace "s|%s %s -o mpipython|${prefix}/bin/%s %s ${prefix}/lib/libmpi.a ${prefix}/lib/liblam.a -o mpipython|g" \
-			${worksrcpath}/Src/MPI/compile.py
+        reinplace "s|@prefix@|${prefix}|g" ${worksrcpath}/Src/MPI/compile.py
+        reinplace "s|@worksrcpath@|${worksrcpath}|g" ${worksrcpath}/Src/MPI/compile.py
         system "cd ${worksrcpath}/Src/MPI && ${prefix}/bin/python${python.branch} compile.py"
     }
     post-destroot {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20091013/4125024d/attachment.html>