Ticket #34370: Portfile.diff

Portfile

@@ -114 +114 @@
         file delete ${destroot}${prefix}/share/info/fftw3.info-3
         file delete ${destroot}${prefix}/share/info/fftw3.info-4
         file delete ${destroot}${prefix}/share/info/fftw3.info-5
+
+        if {[variant_isset mpich2] || [variant_isset openmpi]} {
+          file delete ${destroot}${prefix}/include/fftw3-mpi.f03
+          file delete ${destroot}${prefix}/include/fftw3-mpi.h
+          file delete ${destroot}${prefix}/include/fftw3l-mpi.f03
+        }
     }
 }
 
@@ -155 +161 @@
         file delete ${destroot}${prefix}/share/info/fftw3.info-3
         file delete ${destroot}${prefix}/share/info/fftw3.info-4
         file delete ${destroot}${prefix}/share/info/fftw3.info-5
+
+        if {[variant_isset mpich2] || [variant_isset openmpi]} {
+          file delete ${destroot}${prefix}/include/fftw3-mpi.f03
+          file delete ${destroot}${prefix}/include/fftw3-mpi.h
+          file delete ${destroot}${prefix}/include/fftw3l-mpi.f03
+        }
     }
 }
 
@@ -174 +186 @@
 
 variant gcc43 description {compile using gcc43 toolchain} conflicts gcc42 gcc44 gcc45 gcc46 gcc47 g95 {
     depends_lib-append    port:gcc43
-    configure.compiler    macports-mp-4.3
+    configure.compiler    macports-gcc-4.3
     configure.args-delete --disable-fortran
     if { ${os.arch} == "i386" } {
         lappend merger_configure_args(ppc)     "--disable-fortran"
@@ -187 +199 @@
 
 variant gcc44 description {compile using gcc44 toolchain} conflicts gcc42 gcc43 gcc45 gcc46 gcc47 g95 {
     depends_lib-append    port:gcc44
-    configure.compiler    macports-mp-4.4
+    configure.compiler    macports-gcc-4.4
     configure.args-delete --disable-fortran
     if { ${os.arch} == "i386" } {
         lappend merger_configure_args(ppc)     "--disable-fortran"
@@ -200 +212 @@
 
 variant gcc45 description {compile using gcc45 toolchain} conflicts gcc42 gcc43 gcc44 gcc46 gcc47 g95 {
     depends_lib-append    port:gcc45
-    configure.compiler    macports-mp-4.5
+    configure.compiler    macports-gcc-4.5
     configure.args-delete --disable-fortran
     if { ${os.arch} == "i386" } {
         lappend merger_configure_args(ppc)     "--disable-fortran"
@@ -213 +225 @@
 
 variant gcc46 description {compile using gcc46 toolchain} conflicts gcc42 gcc43 gcc44 gcc45 gcc47 g95 {
     depends_lib-append    port:gcc46
-    configure.compiler    macports-mp-4.6
+    configure.compiler    macports-gcc-4.6
     configure.args-delete --disable-fortran
     if { ${os.arch} == "i386" } {
         lappend merger_configure_args(ppc)     "--disable-fortran"
@@ -226 +238 @@
 
 variant gcc47 description {compile using gcc47 toolchain} conflicts gcc42 gcc43 gcc44 gcc45 gcc46 g95 {
     depends_lib-append    port:gcc47
-    configure.compiler    macports-mp-4.7
+    configure.compiler    macports-gcc-4.7
     configure.args-delete --disable-fortran
     if { ${os.arch} == "i386" } {
         lappend merger_configure_args(ppc)     "--disable-fortran"
@@ -260 +272 @@
 }
 
 variant mpich2 description {compile FFTW MPI library with MPICH2} conflicts openmpi {
-    depends_lib-append      port:mpich2
+    depends_lib-append      path:bin/mpicc:mpich2
     configure.env           MPICC=${prefix}/bin/mpicc
     configure.args-append   --enable-mpi
 }