Modified: trunk/dports/science/abinit/Portfile (145234 => 145235)

--- trunk/dports/science/abinit/Portfile	2016-01-29 07:11:18 UTC (rev 145234)
+++ trunk/dports/science/abinit/Portfile	2016-01-29 08:44:38 UTC (rev 145235)
@@ -39,10 +39,10 @@
 depends_lib-append  port:atlas
 
 compilers.choose    cc fc
-# g95 is not compatible with OpenMP
+# g95 is not compatible with OpenMP, and support will be removed in the next version
 mpi.setup           default require_fortran -g95
 
-configure.args-append  --with-linalg-flavor="atlas" --enable-gw-dpc --enable-fox
+configure.args-append  --with-linalg-flavor="atlas" --enable-gw-dpc
 configure.optflags  -O3
 
 use_parallel_build  yes
@@ -82,13 +82,13 @@
             set dft-flavor ${dft-flavor}+libxc
         }
     }
-    if { [variant_isset wannier90] } {
-        if { ${dft-flavor} eq "none" } {
-            set dft-flavor wannier90
-        } else {
-            set dft-flavor ${dft-flavor}+wannier90
-        }
-    }
+#    if { [variant_isset wannier90] } {
+#        if { ${dft-flavor} eq "none" } {
+#            set dft-flavor wannier90
+#        } else {
+#            set dft-flavor ${dft-flavor}+wannier90
+#        }
+#    }
     if { [variant_isset bigdft] } {
         if { ${dft-flavor} eq "none" } {
             set dft-flavor bigdft
@@ -107,6 +107,9 @@
 }
 
 destroot {
+    # only ok if we can select just the executables
+    #    eval file copy [glob ${worksrcpath}/src/98_main/*] ${destroot}${prefix}/bin
+
     xinstall -W ${worksrcpath}/src/98_main \
      abinit aim anaddb band2eps bsepostproc conducti cut3d \
      fftprof ioprof kss2wfk lapackprof macroave mrgddb \
@@ -124,7 +127,7 @@
 test.run            yes
 test.cmd            tests/runtests.py
 test.target         built-in fast
-# wannier90 test will probably fail.
+# wannier90 test will probably fail, version 2.0.x is not supported anyway
 
 pre-configure {
     configure.args-append  FCCPP="${configure.cc} -E -ansi"
@@ -151,7 +154,6 @@
 }
 
 variant threads description {Build with support for OpenMP threads} {
-    # not compatible with g95. What about threaded FFTW3?
     configure.args-append   --enable-openmp
     configure.fcflags-append -fopenmp
     configure.args-append   --with-linalg-libs="-L${prefix}/lib -ltatlas"
@@ -177,9 +179,10 @@
     configure.args-append   --with-libxc-incs="-I${prefix}/include"
 }
 
-variant wannier90 description {Build with support for Wannier90} {
-    depends_lib-append      port:wannier90
-}
+# abinit does not work with Wannier90 version 2.0.x currently
+#variant wannier90 description {Build with support for Wannier90} {
+#    depends_lib-append      port:wannier90
+#}
 
 # FIXME: the code's build system will download BigDFT itself, which is contrary to the
 # way MacPorts should work. Make a bigdft port to support this.