<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[145379] trunk/dports/science/abinit/Portfile</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/145379">145379</a></dd>
<dt>Author</dt> <dd>dstrubbe@macports.org</dd>
<dt>Date</dt> <dd>2016-02-03 11:17:18 -0800 (Wed, 03 Feb 2016)</dd>
</dl>

<h3>Log Message</h3>
<pre>abinit: Use variant-selected C++ compiler too. Fix configure args for etsf_io and g95. Use built-in targets for destroot, and install pkgconfig too. Enable libxc and etsf_io tests when those libraries are linked. Comments.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsscienceabinitPortfile">trunk/dports/science/abinit/Portfile</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsscienceabinitPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/abinit/Portfile (145378 => 145379)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/abinit/Portfile        2016-02-03 15:37:37 UTC (rev 145378)
+++ trunk/dports/science/abinit/Portfile        2016-02-03 19:17:18 UTC (rev 145379)
</span><span class="lines">@@ -6,7 +6,7 @@
</span><span class="cx"> 
</span><span class="cx"> name                abinit
</span><span class="cx"> version             7.10.5
</span><del>-revision            2
</del><ins>+revision            3
</ins><span class="cx"> categories          science
</span><span class="cx"> platforms           darwin
</span><span class="cx"> license             GPL-3
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> # or vecLibFort, or OpenBLAS(-devel)
</span><span class="cx"> depends_lib-append  port:atlas
</span><span class="cx"> 
</span><del>-compilers.choose    cc fc
</del><ins>+compilers.choose    cc cxx fc
</ins><span class="cx"> # g95 is not compatible with OpenMP, and support will be removed in the next version
</span><span class="cx"> mpi.setup           default require_fortran -g95
</span><span class="cx"> 
</span><span class="lines">@@ -67,11 +67,16 @@
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     if { [variant_isset etsf_io] } {
</span><del>-            configure.args-append  --with-trio-flavor=&quot;netcdf+etsf_io&quot;
-        } elseif { [variant_isset netcdf] } {
-            configure.args-append  --with-trio-flavor=&quot;netcdf&quot;
-        } else {
-            configure.args-append  --with-trio-flavor=&quot;none&quot;
</del><ins>+        configure.args-append  --with-trio-flavor=&quot;netcdf+etsf_io&quot;
+        if { [variant_isset g95] } {
+            configure.args-append   --with-etsf-io-incs=&quot;-I${prefix}/include/g95&quot;
+         } else {
+             configure.args-append   --with-etsf-io-incs=&quot;-I${prefix}/include/gcc&quot;
+         }
+    } elseif { [variant_isset netcdf] } {
+        configure.args-append  --with-trio-flavor=&quot;netcdf&quot;
+    } else {
+        configure.args-append  --with-trio-flavor=&quot;none&quot;
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     set dft-flavor &quot;none&quot;
</span><span class="lines">@@ -106,21 +111,9 @@
</span><span class="cx">     configure.args-append  --with-dft-flavor=&quot;${dft-flavor}&quot;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-destroot {
-    # only ok if we can select just the executables
-    #    eval file copy [glob ${worksrcpath}/src/98_main/*] ${destroot}${prefix}/bin
</del><ins>+# install binaries and pkgconfig but the very large number of test files
+destroot.target   install-exec install-data-local
</ins><span class="cx"> 
</span><del>-    xinstall -W ${worksrcpath}/src/98_main \
-     abinit aim anaddb band2eps bsepostproc conducti cut3d \
-     fftprof ioprof kss2wfk lapackprof macroave mrgddb \
-     mrggkk mrgscr optic ujdet vdw_kernelgen \
-     ${destroot}${prefix}/bin
-    if { [variant_isset atompaw] } {
-        xinstall -W ${worksrcpath}/fallbacks/exports/bin \
-         atompaw-abinit ${destroot}${prefix}/bin
-    }
-}
-
</del><span class="cx"> #universal variant not allowed for libxc/etsf_io
</span><span class="cx"> universal_variant   no
</span><span class="cx"> 
</span><span class="lines">@@ -165,18 +158,24 @@
</span><span class="cx">     compilers.enforce_fortran netcdf-fortran
</span><span class="cx">     configure.args-append   --with-netcdf-incs=&quot;-I${prefix}/include&quot;
</span><span class="cx">     configure.args-append   --with-netcdf-libs=&quot;-L${prefix}/lib -lnetcdf -lnetcdff&quot;
</span><ins>+    # check compatibility with MPI?
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> variant etsf_io requires netcdf description {Build with support for ETSF_IO transferable I/O} {
</span><span class="cx">     depends_lib-append      port:etsf_io
</span><span class="cx">     compilers.enforce_fortran etsf_io
</span><del>-    configure.args-append   --with-etsf-io-incs=&quot;-I${prefix}/include/gcc&quot;
</del><ins>+    test.target-append      etsf_io
</ins><span class="cx"> }
</span><span class="cx"> 
</span><ins>+# add support for gsl, yaml?
+
</ins><span class="cx"> variant libxc description {Build with support for libXC exchange-correlation library} {
</span><span class="cx">     depends_lib-append      port:libxc
</span><span class="cx">     compilers.enforce_fortran libxc
</span><span class="cx">     configure.args-append   --with-libxc-incs=&quot;-I${prefix}/include&quot;
</span><ins>+    # update below when libxc 2.2.x is enabled
+    configure.args-append   --with-libxc-libs=&quot;-L${prefix}/lib -lxc&quot;
+    test.target-append      libxc
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> # abinit does not work with Wannier90 version 2.0.x currently
</span></span></pre>
</div>
</div>

</body>
</html>