<pre style='margin:0'>
David Strubbe (dstrubbe) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/830b84f00060024d91a9c434d5c18c3e49162c67">https://github.com/macports/macports-ports/commit/830b84f00060024d91a9c434d5c18c3e49162c67</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 830b84f wannier90: Update to 2.1.0.
</span>830b84f is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 830b84f00060024d91a9c434d5c18c3e49162c67
</span>Author: David Strubbe <dstrubbe@macports.org>
AuthorDate: Tue Jul 3 23:27:41 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> wannier90: Update to 2.1.0.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Patches incorporated upstream and no longer needed. Test phases reports success on its own without needed to write a file or notes.
</span>---
science/wannier90/Portfile | 19 ++++------
.../wannier90/files/patch-src-parameters.F90.diff | 41 ----------------------
.../files/patch-utility-w90pov-Makefile.diff | 20 -----------
3 files changed, 6 insertions(+), 74 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/wannier90/Portfile b/science/wannier90/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index aafecad..6674af8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/wannier90/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/wannier90/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,8 +5,7 @@ PortGroup compilers 1.0
</span> PortGroup linear_algebra 1.0
name wannier90
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.0.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.1.0
</span> categories science
platforms darwin
license GPL-2+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,15 +21,13 @@ long_description Wannier90 uses inputs from an electronic-structure code \
</span> homepage http://www.wannier.org
master_sites ${homepage}/code/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 357909e686b4b414d8afd8bb8ef90e71c7519708 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha1 17af3f22a2623dc4d2c183dae7a5c63a6f0941bb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# fixes dependencies to enable parallel build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-utility-w90pov-Makefile.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-src-parameters.F90.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 a650304810c8cf35a2942d074657d749e11d28a7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha1 40cf6607b5a8b960482251ba747382fbe0106f59 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 ee90108d4bc4aa6a1cf16d72abebcb3087cf6c1007d22dda269eb7e7076bddca \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 57264711
</span>
configure {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- file copy ${worksrcpath}/config/make.sys.macosx ${worksrcpath}/make.sys
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file copy ${worksrcpath}/config/make.inc.macosx ${worksrcpath}/make.inc
</span> }
# TODO: enable use of MPI
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -62,10 +59,6 @@ compilers.setup require_fortran
</span> variant threads requires atlas description {Build with threaded ATLAS} {}
test.run yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-test {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${worksrcpath} "cat tests/wantest.log"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_notice "Compare the 'Standard' and 'Current' values in the log to assess test runs."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
livecheck.type regex
livecheck.url ${homepage}/download.html
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/wannier90/files/patch-src-parameters.F90.diff b/science/wannier90/files/patch-src-parameters.F90.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index a69cf8c..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/wannier90/files/patch-src-parameters.F90.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,41 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/parameters.F90.orig 2016-02-13 01:01:54.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/parameters.F90 2016-02-13 01:01:54.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1387,7 +1387,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dis_spheres_first_wann = 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- call param_get_keyword('dis_spheres_first_wann',found,i_value=dis_spheres_first_wann)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ( dis_spheres_first_wann < 1 ) call io_error('Error: dis_spheres_first_wann must be greater than 0')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if ( dis_spheres_first_wann > num_bands-num_wann+1 ) &
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if ( dis_spheres_first_wann > num_bands-num_wann+1 .and. num_bands > 0 ) &
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- call io_error('Error: dis_spheres_first_wann is larger than num_bands-num_wann+1')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dis_spheres_num = 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- call param_get_keyword('dis_spheres_num',found,i_value=dis_spheres_num)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2744,7 +2744,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- write(stdout,'(1x,a46,10x,f8.3,13x,a1)') '| Minimum energy range for DOS plot :',boltz_dos_energy_min,'|'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- write(stdout,'(1x,a46,10x,f8.3,13x,a1)') '| Maximum energy range for DOS plot :',boltz_dos_energy_max,'|'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- write(stdout,'(1x,a46,10x,f8.3,13x,a1)') '| Energy step for DOS plot :',boltz_dos_energy_step,'|'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if(boltz_dos_adpt_smr.eqv.adpt_smr .and. boltz_dos_adpt_smr_fac==adpt_smr_fac .and. boltz_dos_adpt_smr_max==adpt_smr_max &
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if(boltz_dos_adpt_smr.eqv.adpt_smr .and. boltz_dos_adpt_smr_fac==adpt_smr_fac &
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ .and. boltz_dos_adpt_smr_max==adpt_smr_max &
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- .and. boltz_dos_smr_fixed_en_width==smr_fixed_en_width .and. smr_index==boltz_dos_smr_index) then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- write(stdout,'(1x,a78)') '| Using global smearing parameters |'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3004,7 +3005,18 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- deallocate( dos_project, stat=ierr )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (ierr/=0) call io_error('Error in deallocating dos_project in param_dealloc')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if( allocated( fermi_energy_list ) ) then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ deallocate( fermi_energy_list, stat=ierr )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (ierr/=0) call io_error('Error in deallocating fermi_energy_list in param_dealloc')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if( allocated( kubo_freq_list ) ) then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ deallocate( kubo_freq_list, stat=ierr )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (ierr/=0) call io_error('Error in deallocating kubo_freq_list in param_dealloc')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if( allocated( dis_spheres ) ) then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ deallocate( dis_spheres, stat=ierr )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (ierr/=0) call io_error('Error in deallocating dis_spheres in param_dealloc')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/wannier90/files/patch-utility-w90pov-Makefile.diff b/science/wannier90/files/patch-utility-w90pov-Makefile.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 1b09947..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/wannier90/files/patch-utility-w90pov-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,20 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- utility/w90pov/Makefile.orig 2014-09-16 14:48:52.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ utility/w90pov/Makefile 2014-09-16 14:51:17.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -60,7 +60,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @cp $(subst $(OBJ),$(SRC),$(subst .o,.f90,$@)) $(OBJ)/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @cd $(OBJ) ; $(F90) $(FCOPTS) -c $(subst $(OBJ)/,./,$(subst .o,.f90,$@))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--$(OBJ)/io.o: $(SRC)/io.f90
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+$(OBJ)/io.o: $(SRC)/io.f90 $(OBJ)/general.o
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @echo ".compiling file $(subst $(OBJ),$(SRC),$(subst .o,.f90,$@))"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @rm -f $@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @cp $(subst $(OBJ),$(SRC),$(subst .o,.f90,$@)) $(OBJ)/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -72,7 +72,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @cp $(subst $(OBJ),$(SRC),$(subst .o,.c,$@)) $(OBJ)/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @cd $(OBJ) ; $(CC) $(CFLAGS) -c $(subst $(OBJ)/,./,$(subst .o,.c,$@))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--$(OBJ)/driver.o: $(GENMODS) $(SRC)/driver.f90
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+$(OBJ)/driver.o: $(GENMODS) $(SRC)/driver.f90 $(OBJ)/general.o $(OBJ)/io.o
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @echo ".compiling file $(subst $(OBJ),$(SRC),$(subst .o,.f90,$@))"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @rm -f $@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @cp $(subst $(OBJ),$(SRC),$(subst .o,.f90,$@)) $(OBJ)/
</span></pre><pre style='margin:0'>
</pre>