git: 78931320522a - 2024Q2 - science/quantum-espresso: Remove wannier90 binaries, which fixes conflict for science/ocean

The branch 2024Q2 has been updated by yuri:

URL: https://cgit.FreeBSD.org/ports/commit/?id=78931320522adda89b0ecd022dcf18576aa6fe84

commit 78931320522adda89b0ecd022dcf18576aa6fe84
Author:     Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2024-04-12 02:47:27 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2024-04-28 17:33:35 +0000

    science/quantum-espresso: Remove wannier90 binaries, which fixes conflict for science/ocean
    
    Reported by:    fallout
    
    (cherry picked from commit f68ec59d68c3623e834d20189fe381f6af9d2cf6)
---
 science/quantum-espresso/Makefile  | 6 ++++++
 science/quantum-espresso/pkg-plist | 3 ---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/science/quantum-espresso/Makefile b/science/quantum-espresso/Makefile
index b289745df57d..bb9981633487 100644
--- a/science/quantum-espresso/Makefile
+++ b/science/quantum-espresso/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	quantum-espresso
 DISTVERSIONPREFIX=	qe-
 DISTVERSION=	7.3.1
+PORTREVISION=	1
 CATEGORIES=	science
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -69,6 +70,11 @@ post-extract:
 	@cd ${WRKSRC} && ${MKDIR} FoX && ${LN} -s ${LOCALBASE}/include FoX/finclude
 
 post-install:
+	# remove wannier90 binaries that come from the bundled wannier90 package (reported to the upstream vie e-mail on 2024-03-11)
+.for p in wannier90.x postw90.x w90chk2chk.x
+	${RM} ${STAGEDIR}${PREFIX}/bin/${p}
+.endfor
+	# strip binaries
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/*.x
 
 do-test:
diff --git a/science/quantum-espresso/pkg-plist b/science/quantum-espresso/pkg-plist
index da365848bae6..b77c5445d589 100644
--- a/science/quantum-espresso/pkg-plist
+++ b/science/quantum-espresso/pkg-plist
@@ -63,7 +63,6 @@ bin/plotproj.x
 bin/plotrho.x
 bin/pmw.x
 bin/postahc.x
-bin/postw90.x
 bin/pp.x
 bin/pp_disca.x
 bin/pp_spctrlfn.x
@@ -95,8 +94,6 @@ bin/turbo_magnon.x
 bin/turbo_spectrum.x
 bin/upfconv.x
 bin/virtual_v2.x
-bin/w90chk2chk.x
-bin/wannier90.x
 bin/wannier_ham.x
 bin/wannier_plot.x
 bin/wfck2r.x