From nobody Fri Apr 12 03:02:03 2024 X-Original-To: dev-commits-ports-main@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 4VG1Z32S9pz5GhZx; Fri, 12 Apr 2024 03:02:03 +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 4VG1Z31Z2tz4ZkG; Fri, 12 Apr 2024 03:02:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712890923; 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=y/tJ9U35952+HSBX47CE3/xannYbgjlipVOJv4Oobvc=; b=cppV+ztjIy1HYe6oVQBExr6kPW92oe9dPT75xbD8vJNaPp/IsAOPcQHRQmPmATOPxOTz9G SkdQcHpg3xLSNtZ1Er1VaoTllcjmHO2mAm4ymiwfNYNiaR5xBOMW8xNFPGKzDXLTXOkhJj dj0VCxgXfXUdfirp3KKL0LdJuhqTwxYwQuhoSrqE+azDRwDQ3/QGjKbuxjkzF8yK/Eq+P3 b8gBCXJMUb+F761BQx7v4FJArK1P6lYgtE9UtevhTgKX3X7lB7KEP2TxVL0qPiLi58Yi15 oRXR5GBAlRTFH9oiP2K0KN+x4aROOujPi7WTutizdoDt9CuvDkX7jWk8s7QCrA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712890923; a=rsa-sha256; cv=none; b=MGyr2vP9jki3KZQpDQPHYXhbkF+CVsQBlyXrt76P14WCPn8FIWLNgRPdtK3FaEP+3ipCEP 6qpj9zCZyf0foMx8QUW7jsVlzeX1U1i9px0S2kNKs7hi1CC2wrEJDty1+gCSYjqWgiktPY FWb8BQ1Fckr0QJCrMy58hNkaNoqAC7KMX1NEZpIknGFlzSoG6dxsi4BxlaKodg+2EX5QLk 8rfopSWmmsTZ+9cisun2ue77Oz7HI8SXEHrQ68jNyABsJ0Tejy6oxK6nhy//6yysPtYcQe GLY537r2kh5lL+aKEFdxMkUShblhwY6QGmtN7ESC4Se79wYPAjFBWn/8mUDQXg== 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=1712890923; 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=y/tJ9U35952+HSBX47CE3/xannYbgjlipVOJv4Oobvc=; b=pjL5B7tMuiOVqsiModUb7762NdEONVddgbYpQ+mw8br72Ad8fI8oDOG9z9r0z1U0p2XgKb sb9HjVkuXzagi8fajmdnEDVMnH/XgWEPFab72AOzKVIHNDGySisHwu7ojNKordl2qUxx9f 4EbvgHLKcqT9isLpjArECh2l8xrbf1sAGWxhN3ufZC3WzkKDV+1WVtcisbgbZMPzNYOfxQ e3hcC2rdFvYs6ZSFD15KLdz1/rj/kKT4VJVXN+3LsQ/goHGN9tAOLEeu08e8ivRhD2AGEQ 5rU1ncuRMkJChQoIap9KNeNsOMb5gi6/a8Kqn4Jez+BWOASpTcRSQ/v+I6hTAw== 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 4VG1Z30xPfzXrq; Fri, 12 Apr 2024 03:02:03 +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 43C323mQ036051; Fri, 12 Apr 2024 03:02:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43C323Is036048; Fri, 12 Apr 2024 03:02:03 GMT (envelope-from git) Date: Fri, 12 Apr 2024 03:02:03 GMT Message-Id: <202404120302.43C323Is036048@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: f68ec59d68c3 - main - science/quantum-espresso: Remove wannier90 binaries, which fixes conflict for science/ocean List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: dev-commits-ports-main+owner@freebsd.org X-BeenThere: dev-commits-ports-main@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/main X-Git-Reftype: branch X-Git-Commit: f68ec59d68c3623e834d20189fe381f6af9d2cf6 Auto-Submitted: auto-generated The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=f68ec59d68c3623e834d20189fe381f6af9d2cf6 commit f68ec59d68c3623e834d20189fe381f6af9d2cf6 Author: Yuri Victorovich AuthorDate: 2024-04-12 02:47:27 +0000 Commit: Yuri Victorovich CommitDate: 2024-04-12 03:01:49 +0000 science/quantum-espresso: Remove wannier90 binaries, which fixes conflict for science/ocean Reported by: fallout --- 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