Ticket #41504: Portfile-octopus.diff

Portfile

@@ -5 +5 @@
 PortGroup           active_variants 1.1
 
 name                octopus
-version             4.1.1
+version             4.1.2
 categories          science
 platforms           darwin
 license             GPL-2+
@@ -21 +21 @@
 homepage            http://www.tddft.org/programs/octopus
 master_sites        ${homepage}/download/${version}
 
-checksums           rmd160  14dd5ce6677e5d6b303ebf311fd3d8f1538060f6 \
-                    sha256  0d16aa3265711fee5dffc5763830de7022ba1bcc9df6dd522264a7aa38401713
+checksums           rmd160  0ce62e38bed99e436b83489375fe55e53e64a538 \
+                    sha256  c43ac301ff035caee667292841c5d9f166da986634cf2623e3f5a8aa86fe7a69
 
 depends_lib         port:atlas port:libxc port:fftw-3 port:gsl
 
@@ -35 +35 @@
 # configure will find and use these other libraries unless they are explicitly disabled
 configure.optflags  -O3
 
-pre-configure {
-    configure.args-append  FCCPP="${configure.cc} -E -ansi -x c"
-}
-
 default_variants +newuoa
 if {![variant_isset gcc46] && ![variant_isset gcc47] && ![variant_isset gcc48] && ![variant_isset openmpi] && ![variant_isset mpich]} {
     default_variants    +gcc48
@@ -74 +70 @@
             return -code error "Internal error: cannot determine Fortran compiler."
         }
     }
-    ui_msg "Fortran compiler is ${fortran}."
 
     if { ![active_variants libxc ${fortran}] } {
         ui_error "libxc must have been built with +${fortran}."
@@ -118 +113 @@
 
 variant gcc46 conflicts gcc47 gcc48 openmpi mpich description {Build with GCC 4.6} {
     configure.compiler  macports-gcc-4.6
+    configure.args-append  FCCPP="${configure.cpp} -ansi"
 }
 
 variant gcc47 conflicts gcc46 gcc48 openmpi mpich description {Build with GCC 4.7} {
     configure.compiler  macports-gcc-4.7
+    configure.args-append  FCCPP="${configure.cpp} -ansi"
 }
 
 variant gcc48 conflicts gcc46 gcc47 openmpi mpich description {Build with GCC 4.8} {
     configure.compiler  macports-gcc-4.8
+    configure.args-append  FCCPP="${configure.cpp} -ansi"
 }
 
 variant openmpi conflicts gcc46 gcc47 gcc48 mpich description {Build with OpenMPI} {
     configure.cc           openmpicc
     configure.fc           openmpif90
+    configure.args-append  FCCPP="${configure.cc} -E -ansi"
     configure.args-delete  --disable-mpi
     # an in-place allreduce of lxyz_inv in mesh_init.F90 leads to zeroes afterwards with MPI2
     configure.args-append  --enable-mpi --without-external_zoltan --disable-mpi2
@@ -141 +140 @@
 variant mpich conflicts gcc46 gcc47 gcc48 openmpi description {Build with MPICH} {
     configure.cc           mpicc-mp
     configure.fc           mpif90-mp
+    configure.args-append  FCCPP="${configure.cc} -E -ansi"
     configure.args-delete  --disable-mpi
     configure.args-append  --enable-mpi --without-external_zoltan
     test.env-append        MPIEXEC=${prefix}/bin/mpiexec-mp