<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/f3581a42735347fa3794dc44aa3b657c154ebd0d">https://github.com/macports/macports-ports/commit/f3581a42735347fa3794dc44aa3b657c154ebd0d</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 f3581a4 quantum-espresso: Use .PHONY rather than changing Makefile target names, a better solution pointed out by Ryan.
</span>f3581a4 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit f3581a42735347fa3794dc44aa3b657c154ebd0d
</span>Author: David Strubbe <dstrubbe@macports.org>
AuthorDate: Wed Sep 12 12:07:50 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> quantum-espresso: Use .PHONY rather than changing Makefile target names, a better solution pointed out by Ryan.
</span>---
science/quantum-espresso/Portfile | 3 ---
science/quantum-espresso/files/patch-Makefile.diff | 30 +++++++---------------
2 files changed, 9 insertions(+), 24 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 4ea6c5d..1530630 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;'>@@ -95,9 +95,6 @@ pre-configure {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# the name of the target was patched to avoid confusion with a directory named 'install'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.target install_
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # libxc support appears to be very experimental for now, so we will not enable it
#post-configure {
# reinplace -W ${worksrcpath} "s|DFLAGS =|DFLAGS = -D__LIBXC|" make.inc
<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 7239d43..650900c 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,16 +1,18 @@
</span> --- Makefile.orig 2018-09-11 14:00:08.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile 2018-09-11 14:01:10.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -65,6 +65,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile 2018-09-11 19:41:22.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -65,6 +65,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
+all-j :
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(MAKE) pw && $(MAKE) pp_ && $(MAKE) ph && $(MAKE) ld1 && $(MAKE) upf && $(MAKE) cp && $(MAKE) neb_
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(MAKE) pw && $(MAKE) pp && $(MAKE) ph && $(MAKE) ld1 && $(MAKE) upf && $(MAKE) cp && $(MAKE) neb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++.PHONY: install pw pp neb
</span> +
pw : bindir libs mods libdavid libcg dftd3
if test -d PW ; then \
( cd PW ; $(MAKE) TLDEPS= all || exit 1) ; fi
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -74,10 +77,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -74,8 +79,9 @@
</span> ( cd CPV ; $(MAKE) TLDEPS= all || exit 1) ; fi
ph : pw lrmods
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,27 +22,13 @@
</span> + ( cd PHonon/Gamma && $(MAKE) all ; cd .. || exit 1 )
+ ( cd PHonon/FD && $(MAKE) all ; cd .. || exit 1 )
<span style='display:block; white-space:pre;background:#ffe0e0;'>--neb : pw
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+neb_ : pw
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ neb : pw
</span> if test -d NEB; then \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- (cd NEB; $(MAKE) all || exit 1) ; fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -85,7 +89,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test -d TDDFPT; then \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (cd TDDFPT; $(MAKE) all || exit 1) ; fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--pp : pw
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+pp_ : pw
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test -d PP ; then \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ( cd PP ; $(MAKE) TLDEPS= all || exit 1 ) ; fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -263,12 +267,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # - If the final directory does not exists it creates it
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -264,11 +270,11 @@
</span> #########################################################
<span style='display:block; white-space:pre;background:#ffe0e0;'>--install :
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install :
</span> - @if test -d bin ; then mkdir -p $(PREFIX)/bin ; \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+install_ :
</span> + @if test -d bin ; then mkdir -p $(DESTDIR)$(PREFIX)/bin ; \
for x in `find * ! -path "test-suite/*" -name *.x -type f` ; do \
- cp $$x $(PREFIX)/bin/ ; done ; \
</pre><pre style='margin:0'>
</pre>