Modified: trunk/dports/science/openmpi/Portfile (32417 => 32418)

--- trunk/dports/science/openmpi/Portfile	2007-12-30 15:56:48 UTC (rev 32417)
+++ trunk/dports/science/openmpi/Portfile	2007-12-30 16:14:26 UTC (rev 32418)
@@ -4,6 +4,7 @@
 
 name			openmpi
 version			1.2.4
+revision		1
 categories		science parallel net
 platforms		darwin
 maintainers		mww
@@ -39,17 +40,21 @@
 build.dir	${configure.dir}
 
 destroot.dir	${build.dir}
+set wrappers	{mpicc mpicxx mpic++}
 post-destroot {
-	foreach bin { mpicc mpirun } {
+	foreach bin {mpirun mpiexec} {
 		system "cd ${destroot}${prefix}/bin \
-			&& ln -sf ${prefix}/lib/${name}/bin/${bin} open${bin}"
+			&& ln -sf ${prefix}/lib/${name}/bin/orterun open${bin}" 
 	}
+	foreach bin ${wrappers} {
+		system "cd ${destroot}${prefix}/bin \
+			&& ln -sf ${prefix}/lib/${name}/bin/opal_wrapper open${bin}" 
+		system "cd ${destroot}${prefix}/share/${name} \
+		&& ln -sf ${prefix}/share/${name}/${bin}-wrapper-data.txt \
+			open${bin}-wrapper-data.txt"
+	}
 }
 
-platform darwin 8 {
-	configure.compiler	gcc-4.0
-}
-
 variant fortran {
         configure.args-delete --disable-f77 --disable-f90
         configure.args-append --enable-f77 --enable-f90
@@ -59,8 +64,19 @@
         # gcc42. Too bad that the actual gfortran binary in gcc42 is called
         # gfortran-mp-4.2, otherwise we could just say bin:gfortran:gcc42.
         depends_build port:gcc42
+	lappend wrappers mpif77 mpif90
 }
 
+variant g95 {
+	configure.args-delete --disable-f77 --disable-f90
+	configure.args-append --enable-f77 --enable-f90
+	configure.f77	${prefix}/bin/g95
+	configure.fc	${prefix}/bin/g95
+	depends_build	port:g95
+	lappend wrappers mpif77 mpif90
+}
+
 livecheck.check	regex
 livecheck.url	http://www.open-mpi.org/software/
 livecheck.regex	openmpi-(\[0-9\.\]+).tar.bz2
+