Ticket #40600: Portfile-octopus.diff

Portfile

@@ -5 +5 @@
 PortGroup           active_variants 1.1
 
 name                octopus
-version             4.1.0
+version             4.1.1
 categories          science
 platforms           darwin
 license             GPL-2+
@@ -21 +21 @@
 homepage            http://www.tddft.org/programs/octopus
 master_sites        ${homepage}/download/${version}
 
-checksums           rmd160  636cf345f53a8d558a79258a257ed68a17488b76 \
-                    sha256  e367b2e594d8344085c8c424c8a31b4a7210b80e83c2d331ee602cc6fc7c838a
+checksums           rmd160  14dd5ce6677e5d6b303ebf311fd3d8f1538060f6 \
+                    sha256  0d16aa3265711fee5dffc5763830de7022ba1bcc9df6dd522264a7aa38401713
 
 depends_lib         port:atlas port:libxc port:fftw-3 port:gsl
 
@@ -31 +31 @@
                     --with-etsf-io-prefix=no --with-berkeleygw-prefix=no \
                     --with-arpack=no --with-libfm=no --with-pfft-prefix=no \
                     --with-pspio-prefix=no --with-nfft=no --with-blacs=no \
-                    --with-scalapack=no FCCPP="${configure.cc} -E -ansi" \
-                    --enable-utils
+                    --with-scalapack=no --enable-utils
 # 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 gcc48] && ![variant_isset openmpi] && ![variant_isset mpich]} {
     default_variants    +gcc47
@@ -43 +46 @@
 
 pre-fetch {
     set fortran unknown
-    set fortrans { gcc42 gcc43 gcc44 gcc45 gcc46 gcc47 gcc48 g95 }
+    set fortrans { gcc42 gcc43 gcc44 gcc45 gcc46 gcc47 gcc48 gcc49 g95 }
 
     foreach fc_name ${fortrans} {
         if { [variant_isset ${fc_name}] } {