<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/c24b3c0bedbaac54c918d5366223782fc917a634">https://github.com/macports/macports-ports/commit/c24b3c0bedbaac54c918d5366223782fc917a634</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 c24b3c0 quantum-espresso: Update to 6.4.1. Some updates to patches needed.
</span>c24b3c0 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit c24b3c0bedbaac54c918d5366223782fc917a634
</span>Author: David Strubbe <dstrubbe@macports.org>
AuthorDate: Thu Oct 24 19:27:39 2019 -0700
<span style='display:block; white-space:pre;color:#404040;'> quantum-espresso: Update to 6.4.1. Some updates to patches needed.
</span>---
science/quantum-espresso/Portfile | 11 +++----
science/quantum-espresso/files/patch-Makefile.diff | 37 +++++++++++-----------
.../files/patch-install-m4-x_ac_qe_f90.m4.diff | 2 +-
.../files/patch-install-m4-x_ac_qe_mpif90.m4.diff | 35 ++++++++++----------
4 files changed, 41 insertions(+), 44 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/quantum-espresso/Portfile b/science/quantum-espresso/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 14bfaa9..b4f7dfc 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/quantum-espresso/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/quantum-espresso/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,8 +5,7 @@ PortGroup mpi 1.0
</span> PortGroup linear_algebra 1.0
name quantum-espresso
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 6.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 6.4.1
</span> categories science
platforms darwin
license GPL-2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,9 +20,9 @@ long_description An integrated suite of open-source computer codes for electr
</span>
homepage http://www.quantum-espresso.org
master_sites https://gitlab.com/QEF/q-e/-/archive/qe-${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 2c2e20c94e3d0a48e1a78509d74efa5b7e0e36c5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 4067c8fffa957aabbd5cf2439e2fcb6cf3752325393c67a17d99fd09edf8689c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 86418701
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 792ecd97ee33fab46faa9a653cbee9bed18d5999 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 b0d7e9f617b848753ad923d8c6ca5490d5d82495f82b032b71a0ff2f2e9cfa08 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 83100337
</span>
depends_lib-append port:fftw-3
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -132,4 +131,4 @@ build.target all-j
</span>
livecheck.type regex
livecheck.url ${homepage}/news-events/news/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex Version (\[0-9.\]+) of Quantum ESPRESSO is available for download.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.regex QUANTUM ESPRESSO V.(\[0-9.\]+)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/quantum-espresso/files/patch-Makefile.diff b/science/quantum-espresso/files/patch-Makefile.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 650900c..f25b075 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/quantum-espresso/files/patch-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/quantum-espresso/files/patch-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- Makefile.orig 2018-09-11 14:00:08.000000000 -0700
+++ Makefile 2018-09-11 19:41:22.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -65,6 +65,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -70,6 +70,11 @@
</span> # If "|| exit 1" is not present, the error code from make in subdirectories
# is not returned and make goes on even if compilation has failed
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,33 +9,32 @@
</span> +
+.PHONY: install pw pp neb
+
<span style='display:block; white-space:pre;background:#ffe0e0;'>- pw : bindir libs mods libdavid libcg dftd3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pw : pwlibs
</span> if test -d PW ; then \
( cd PW ; $(MAKE) TLDEPS= all || exit 1) ; fi
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -74,8 +79,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -80,8 +83,9 @@
</span> ( cd CPV ; $(MAKE) TLDEPS= all || exit 1) ; fi
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ph : pw lrmods
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ph : phlibs
</span> - if test -d PHonon; then \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- (cd PHonon; $(MAKE) all || exit 1) ; fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ( cd PHonon/PH && $(MAKE) all ; cd .. || exit 1 )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ( cd PHonon/Gamma && $(MAKE) all ; cd .. || exit 1 )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ( cd PHonon/FD && $(MAKE) all ; cd .. || exit 1 )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ( cd PHonon; $(MAKE) TLDEPS= all || exit 1) ; fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ( cd PHonon/PH && $(MAKE) TLDEPS= all ; cd .. || exit 1 )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ( cd PHonon/Gamma && $(MAKE) TLDEPS= all ; cd .. || exit 1 )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ( cd PHonon/FD && $(MAKE) TLDEPS= all ; cd .. || exit 1 )
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- neb : pw
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test -d NEB; then \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -264,11 +270,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #########################################################
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ hp : hplibs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test -d HP; then \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -296,10 +296,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #############################################################
</span>
install :
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- @if test -d bin ; then mkdir -p $(PREFIX)/bin ; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ @if test -d bin ; then mkdir -p $(DESTDIR)$(PREFIX)/bin ; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- mkdir -p $(PREFIX)/bin ; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mkdir -p $(DESTDIR)$(PREFIX)/bin ; \
</span> for x in `find * ! -path "test-suite/*" -name *.x -type f` ; do \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- cp $$x $(PREFIX)/bin/ ; done ; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cp $$x $(DESTDIR)$(PREFIX)/bin/ ; done ; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- @echo 'Quantum ESPRESSO binaries installed in $(PREFIX)/bin'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ @echo 'Quantum ESPRESSO binaries installed in $(DESTDIR)$(PREFIX)/bin'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cp -v $$x $(PREFIX)/bin/ ; done
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cp -v $$x $(DESTDIR)$(PREFIX)/bin/ ; done
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- @echo -e '\nQuantum ESPRESSO binaries are installed in $(PREFIX)/bin\n'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ @echo -e '\nQuantum ESPRESSO binaries installed in $(DESTDIR)$(PREFIX)/bin\n'
</span>
#########################################################
# Run test-suite for numerical regression testing
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/quantum-espresso/files/patch-install-m4-x_ac_qe_f90.m4.diff b/science/quantum-espresso/files/patch-install-m4-x_ac_qe_f90.m4.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 9b81612..8885298 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/quantum-espresso/files/patch-install-m4-x_ac_qe_f90.m4.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/quantum-espresso/files/patch-install-m4-x_ac_qe_f90.m4.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- install/m4/x_ac_qe_f90.m4.orig 2016-04-21 14:04:19.000000000 -0400
+++ install/m4/x_ac_qe_f90.m4 2016-04-21 14:56:02.000000000 -0400
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -306,6 +306,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -262,6 +262,18 @@
</span> test_fflags="`echo $f90flags | sed 's/\$([[^)]]*)//g'`"
fi
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/quantum-espresso/files/patch-install-m4-x_ac_qe_mpif90.m4.diff b/science/quantum-espresso/files/patch-install-m4-x_ac_qe_mpif90.m4.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index c6950d2..6ee9206 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/quantum-espresso/files/patch-install-m4-x_ac_qe_mpif90.m4.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/quantum-espresso/files/patch-install-m4-x_ac_qe_mpif90.m4.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,20 +1,19 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- install/m4/x_ac_qe_mpif90.m4.orig 2016-04-21 13:58:16.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ install/m4/x_ac_qe_mpif90.m4 2016-04-21 13:58:48.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -110,7 +110,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mpif90=$f90
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # clear cached values (not sure when and why this is needed)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- unset FC ac_cv_prog_ac_ct_FC ac_cv_fc_compiler_gnu ac_cv_prog_fc_g
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ unset ac_cv_prog_ac_ct_FC ac_cv_fc_compiler_gnu ac_cv_prog_fc_g
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test "$mpif90" = "" ; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mpif90="$try_mpif90 $f90"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_PROG_FC($mpif90)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -205,8 +205,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # check if serial and parallel compiler are the same
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test "$f90" != "$f90_in_mpif90"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_MSG_WARN([parallel compiler $mpif90 uses $f90_in_mpif90, but serial compiler $f90 was detected])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AC_MSG_WARN([assuming F90=$f90_in_mpif90, discarding $f90])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- f90=$f90_in_mpif90
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- install/m4/x_ac_qe_mpif90.m4.orig 2019-10-24 07:06:22.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ install/m4/x_ac_qe_mpif90.m4 2019-10-24 07:06:38.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -87,7 +87,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # check Fortran 90 compiler
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # clear cached values
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-unset FC ac_cv_prog_ac_ct_FC ac_cv_fc_compiler_gnu ac_cv_prog_fc_g
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++unset ac_cv_prog_ac_ct_FC ac_cv_fc_compiler_gnu ac_cv_prog_fc_g
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test "$use_parallel" -eq 0 ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # serial case - use F90 if set
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -161,7 +161,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_MSG_WARN([parallel and serial compiler are the same])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- f90=$f90_in_mpif90
</span> ;;
esac
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_FC_SRCEXT(f90)
</span></pre><pre style='margin:0'>
</pre>