From nobody Sun Apr 28 17:33:41 2024 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VSD8P5LmLz5Jdc7; Sun, 28 Apr 2024 17:33:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VSD8P2wsyz51JN; Sun, 28 Apr 2024 17:33:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714325621; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9OBrP4zrksit/tr2C80gLKE+FQBC6q54oDCnBaCrNbA=; b=Le9VQoEJe6Z9VvJdYcdsn1jeQjGHjtLNdrmIHWRL4A2TLXKQcVpu5zuRrSNMpZ9ijGSlEl O4jvxRktAzM0KlqBsInP3jNcnddLmEADh0MZn96GI9v+97r9HJMyb2xLS3jlkj3XIUyUt6 pF9ARjAropB/iJcoYqNQyX7ZRxZd9pPsLTriRRadBSfLpTR4eDfyyZm9FCGc6lT86QZKaW q7j44MgFQum+tuTOU+S501oP1RjCkZvfUo+pFSQz0t6aonRV3HoCEFko29nDZGfuguCn7J Vb4KqazWuZ0uumxVk+v0oL7J8jGoHddZvMrNQVbza3MmViEJnb9S3/2cSCYVng== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714325621; a=rsa-sha256; cv=none; b=uALGNBy6Hh2sF0xf/3Pb6uTNLnokUtTc+K0AKEIuOaOJHDlAhBgAbbMnZVgcsJYMv3BHTC kFIy2kd/zUd1FTia/TPFhb3MP6+Vo6QdfcYf4lcQyQxeB89pe7pMvmJbkjQj8/IlD5dv1R jtbvnEGA66s7Gjhl0xsoKpFKZ9fkPDLhsGR4X78uh7zYt8f1r8gh3NPw/meAjhrGtNMmni V7SxxJjtZWUXNVUyZXbLjZwcvJ/Rdyq7LKKpG/ExxeIb8zwbZeFQOKAGzWB8M8eONQB1/c aR+kLX4zlDq2VzwMtP1q466V5D1RmrfjOJGYp4C6RgDMGko53N1hdL7qCrvL9Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714325621; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9OBrP4zrksit/tr2C80gLKE+FQBC6q54oDCnBaCrNbA=; b=KBKxKKFyV4dnxOHR+Q7tGWko9KQjU1RNxzSHyUyOnJCMOiapqiQ+FtRhlv9bWl0RVQFrU4 xnl27ZYPUWOMJFOjK+RrMJgYsPvJSEAnSZsRbmVAdjkoUjZkJ43EkcCiCGKQRNib2q1Bsm iGGn9xQ59VwWheJpidWdevSb+WsC2z+qWNq+5cn+XiU2vaFklNgHC3zfJTl4kQwmtMnejJ 7oCaOx545noZBG473vyFGZA0GpBu8eOhUtS76scNX741N//+RF1iqevAnPHr/bg3aX76WP anSGqNZIJ5tNM6NnaDXw1HTy++3PUxufqhT9MV1Hx7o9SgDs8f73/WiYBTcxYQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VSD8P2XZHzZZh; Sun, 28 Apr 2024 17:33:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43SHXfgB041095; Sun, 28 Apr 2024 17:33:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43SHXfUS041092; Sun, 28 Apr 2024 17:33:41 GMT (envelope-from git) Date: Sun, 28 Apr 2024 17:33:41 GMT Message-Id: <202404281733.43SHXfUS041092@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Yuri Victorovich Subject: git: 78931320522a - 2024Q2 - science/quantum-espresso: Remove wannier90 binaries, which fixes conflict for science/ocean List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-branches@freebsd.org Sender: owner-dev-commits-ports-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q2 X-Git-Reftype: branch X-Git-Commit: 78931320522adda89b0ecd022dcf18576aa6fe84 Auto-Submitted: auto-generated The branch 2024Q2 has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=78931320522adda89b0ecd022dcf18576aa6fe84 commit 78931320522adda89b0ecd022dcf18576aa6fe84 Author: Yuri Victorovich AuthorDate: 2024-04-12 02:47:27 +0000 Commit: Yuri Victorovich 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