<!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>[125404] trunk/dports/science/wannier90</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/125404">125404</a></dd>
<dt>Author</dt> <dd>dstrubbe@macports.org</dd>
<dt>Date</dt> <dd>2014-09-16 16:01:33 -0700 (Tue, 16 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>wannier90: update to 2.0.0. Make a make.sys since there is not a default one anymore. Add patch to enable parallel build. Install new executables. Enable tests. Remove unneeded Fortran compiler types.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportssciencewannier90Portfile">trunk/dports/science/wannier90/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/dports/science/wannier90/files/</li>
<li><a href="#trunkdportssciencewannier90filespatchutilityw90povMakefilediff">trunk/dports/science/wannier90/files/patch-utility-w90pov-Makefile.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportssciencewannier90Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/wannier90/Portfile (125403 => 125404)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/wannier90/Portfile 2014-09-16 22:57:33 UTC (rev 125403)
+++ trunk/dports/science/wannier90/Portfile 2014-09-16 23:01:33 UTC (rev 125404)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> PortGroup compilers 1.0
</span><span class="cx">
</span><span class="cx"> name wannier90
</span><del>-version 1.2
</del><ins>+version 2.0.0
</ins><span class="cx"> categories science
</span><span class="cx"> platforms darwin
</span><span class="cx"> license GPL-2+
</span><span class="lines">@@ -21,30 +21,42 @@
</span><span class="cx"> homepage http://www.wannier.org/
</span><span class="cx"> master_sites ${homepage}code/
</span><span class="cx">
</span><del>-checksums rmd160 4a8035ed4faf5256ad66aa9fe23ac32a86b3abf4 \
- sha1 b4caaddb6e91afe673c122507e92c6b5fbc7689f
</del><ins>+checksums rmd160 58a58f75fd9ebb08965f7c87dd9fdb90dbaa20fc \
+ sha1 1d257c542327cdcf7481450170fb5887a90673a0
</ins><span class="cx">
</span><ins>+# TODO: enable use of Accelerate instead (will need f2c or veclibfort)
</ins><span class="cx"> depends_lib port:atlas
</span><span class="cx">
</span><del>-use_configure no
</del><ins>+# fixes dependencies to enable parallel build
+patchfiles patch-utility-w90pov-Makefile.diff
</ins><span class="cx">
</span><ins>+configure {
+ file copy ${worksrcpath}/config/make.sys.macosx ${worksrcpath}/make.sys
+}
+
+# TODO: enable use of MPI
</ins><span class="cx"> pre-build {
</span><del>- build.args F90=${configure.f90} FCOPTS="-O3" LDOPTS="-O3"
</del><ins>+ build.args F90=${configure.f90} FCOPTS="-O3" LDOPTS="-O3" COMMS="" MPIF90=""
</ins><span class="cx"> if {[variant_isset threads]} {
</span><span class="cx"> build.args-append LIBS="-L${prefix}/lib -ltatlas"
</span><span class="cx"> } else {
</span><span class="cx"> build.args-append LIBS="-L${prefix}/lib -lsatlas"
</span><span class="cx"> }
</span><ins>+ build.target all w90pov w90vdw
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-use_parallel_build no
</del><ins>+use_parallel_build yes
</ins><span class="cx">
</span><span class="cx"> destroot {
</span><del>- xinstall ${worksrcpath}/wannier90.x ${destroot}${prefix}/bin/
- xinstall ${worksrcpath}/libwannier.a ${destroot}${prefix}/lib/
</del><ins>+ xinstall ${worksrcpath}/wannier90.x ${destroot}${prefix}/bin/
+ xinstall ${worksrcpath}/postw90.x ${destroot}${prefix}/bin/
+ xinstall ${worksrcpath}/w90chk2chk.x ${destroot}${prefix}/bin/
+ xinstall ${worksrcpath}/utility/w90pov/w90pov ${destroot}${prefix}/bin/
+ xinstall ${worksrcpath}/utility/w90vdw/w90vdw.x ${destroot}${prefix}/bin/
+ xinstall ${worksrcpath}/libwannier.a ${destroot}${prefix}/lib/
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-compilers.choose fc f77 f90
</del><ins>+compilers.choose f90
</ins><span class="cx"> compilers.setup require_fortran
</span><span class="cx">
</span><span class="cx"> if {![fortran_variant_isset]} {
</span><span class="lines">@@ -53,6 +65,11 @@
</span><span class="cx">
</span><span class="cx"> variant threads description {Build with threaded ATLAS} {}
</span><span class="cx">
</span><ins>+test.run yes
+post-test {
+ ui_notice "Examine the file ${worksrcpath}/tests/wantest.log."
+}
+
</ins><span class="cx"> livecheck.type regex
</span><span class="cx"> livecheck.url [lindex ${master_sites} 0]
</span><span class="cx"> livecheck.regex ${name}-(\[0-9.\]+)${extract.suffix}
</span></span></pre></div>
<a id="trunkdportssciencewannier90filespatchutilityw90povMakefilediff"></a>
<div class="addfile"><h4>Added: trunk/dports/science/wannier90/files/patch-utility-w90pov-Makefile.diff (0 => 125404)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/wannier90/files/patch-utility-w90pov-Makefile.diff (rev 0)
+++ trunk/dports/science/wannier90/files/patch-utility-w90pov-Makefile.diff 2014-09-16 23:01:33 UTC (rev 125404)
</span><span class="lines">@@ -0,0 +1,20 @@
</span><ins>+--- utility/w90pov/Makefile.orig 2014-09-16 14:48:52.000000000 -0400
++++ utility/w90pov/Makefile 2014-09-16 14:51:17.000000000 -0400
+@@ -60,7 +60,7 @@
+ @cp $(subst $(OBJ),$(SRC),$(subst .o,.f90,$@)) $(OBJ)/
+ @cd $(OBJ) ; $(F90) $(FCOPTS) -c $(subst $(OBJ)/,./,$(subst .o,.f90,$@))
+
+-$(OBJ)/io.o: $(SRC)/io.f90
++$(OBJ)/io.o: $(SRC)/io.f90 $(OBJ)/general.o
+ @echo ".compiling file $(subst $(OBJ),$(SRC),$(subst .o,.f90,$@))"
+ @rm -f $@
+ @cp $(subst $(OBJ),$(SRC),$(subst .o,.f90,$@)) $(OBJ)/
+@@ -72,7 +72,7 @@
+ @cp $(subst $(OBJ),$(SRC),$(subst .o,.c,$@)) $(OBJ)/
+ @cd $(OBJ) ; $(CC) $(CFLAGS) -c $(subst $(OBJ)/,./,$(subst .o,.c,$@))
+
+-$(OBJ)/driver.o: $(GENMODS) $(SRC)/driver.f90
++$(OBJ)/driver.o: $(GENMODS) $(SRC)/driver.f90 $(OBJ)/general.o $(OBJ)/io.o
+ @echo ".compiling file $(subst $(OBJ),$(SRC),$(subst .o,.f90,$@))"
+ @rm -f $@
+ @cp $(subst $(OBJ),$(SRC),$(subst .o,.f90,$@)) $(OBJ)/
</ins></span></pre>
</div>
</div>
</body>
</html>