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

[adfernandes at macports.org]

Revision: 59261
          http://trac.macports.org/changeset/59261
Author:   adfernandes at macports.org
Date:     2009-10-12 14:37:09 -0700 (Mon, 12 Oct 2009)
Log Message:
-----------
Fixes #22029

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

Modified: trunk/dports/python/py26-scientific/Portfile
===================================================================
--- trunk/dports/python/py26-scientific/Portfile	2009-10-12 21:21:55 UTC (rev 59260)
+++ trunk/dports/python/py26-scientific/Portfile	2009-10-12 21:37:09 UTC (rev 59261)
@@ -6,6 +6,7 @@
 
 name            py26-scientific
 version         2.8
+revision        1
 categories      python science
 platforms       darwin
 maintainers     adfernandes openmaintainer
@@ -26,7 +27,7 @@
 depends_lib     port:netcdf \
                 port:py26-numeric
 
-build.env    	CPPFLAGS="-I${prefix}/include/python${python.branch} \
+build.env    	CPPFLAGS="-I${python.include} \
 	            -I${worksrcpath}/Include" \
                 NETCDF_PREFIX=${prefix}
 
@@ -49,19 +50,19 @@
 }
 
 variant mpi description {Enable lammpi support} {
-    depends_lib-append  port:lammpi
+    depends_lib-append  port:lammpi port:py26-numpy
     post-build {
-        reinplace "s|%s %s -o mpipython|${prefix}/bin/%s -o mpipython -I${prefix}/include/python${python.branch} -I${worksrcpath}/Include|g" \
+        reinplace "s|^from Scientific import N|#from Scientific import N|g" \
 			${worksrcpath}/Src/MPI/compile.py
-        reinplace "s|-L%s -lpython%s|-L/Library/Frameworks/Python.framework/Versions/${python.branch}/lib -L%s -lpython.%s|g" \
+        reinplace "s|^if N.package ==|if \"NumPy\" ==|g" \
 			${worksrcpath}/Src/MPI/compile.py
-        reinplace "s|cfgDict\\\[\'LINK|#cfgDict\\\[\'LINK|g" \
+        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
         system "cd ${worksrcpath}/Src/MPI && ${prefix}/bin/python${python.branch} compile.py"
     }
-
     post-destroot {
-        xinstall ${worksrcpath}/Src/MPI/mpipython ${destroot}${prefix}/bin
+        xinstall ${worksrcpath}/Src/MPI/mpipython ${destroot}${python.prefix}/bin
+        ln -s ${python.prefix}/bin/mpipython ${destroot}${prefix}/bin/mpipython${python.branch}
     }
 }
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20091012/8c0faf7f/attachment.html>