From nobody Wed Dec 22 09:24:53 2021 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 F03CE18FE231; Wed, 22 Dec 2021 09:24:53 +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 4JJnwP4xCqz4T0Z; Wed, 22 Dec 2021 09:24:53 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 891F21A672; Wed, 22 Dec 2021 09:24:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BM9Or9x037071; Wed, 22 Dec 2021 09:24:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BM9OrEx037070; Wed, 22 Dec 2021 09:24:53 GMT (envelope-from git) Date: Wed, 22 Dec 2021 09:24:53 GMT Message-Id: <202112220924.1BM9OrEx037070@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: fffad4fbd2a6 - main - science/cantera: For OCTAVE option, fix .mex file path 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: owner-dev-commits-ports-main@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: fffad4fbd2a6e94cb8687288c14908decb536299 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640165093; 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=iG9Y/S1bs6WIXCfhW2VSOpATftfsGaOP/+pmqEP7fAI=; b=Vtt35i9VEl1LJmpgOzo6MjGee4CoG6znHggNWe0vWX9NylExkHwI7ngnpMtbMCG3jiTBrJ txVRDgPa36vJ9ReKr3hBecoaWY3HKEOq/7g56tQYZQowd5pdwRDO+rZyJsW44f7lxzvFt6 4TmOegkoD1jEzs73jCS+90ona9UWtj74DA10PBmtdNwYRt7jIXflugZExMV+3wuOrIDoGG LcyQTU0lDdeBVVXqpPCdqo2X8krJpkoushPs26YKD23RhI0g2Hl55Jo5HVEJN/YsEcSfKu 6sf/RTXLvduaScAhWRUqrTj9ZPZQFKokOkrtcVc/okuS2nzSB0Sj2WhJCfIlug== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640165093; a=rsa-sha256; cv=none; b=n8K7x3GAXVjOTy4j8AFprqJd4dfKTnL1qA6elOuwVrK51+n6+KmOv15qVHBEIbhzL8OBX8 VgXjhxTf66N3zJc+33Hg8OBjbgxjKwSw4TO/WhV9Wl/i9y4vkn6FReD0q6boWT5Y2tkcb5 pzzdqOLy+87O0GuMJHNGNtHYKdsshgf+WOMCyNP431P45rR0tDxE7MXGDqY9u9CMBKwQww NocMTba75FrhLQfvvuCuYeBC/rJHqMx2a3ysyXdK9dGNvKsLYcA8uxpeTJjiUpWE3B9Rfy c21BCpTWze786kkogSZgdnsiWNtQqXeVc9n+9z9DCB444tV8rI1T9R5apOhrfQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=fffad4fbd2a6e94cb8687288c14908decb536299 commit fffad4fbd2a6e94cb8687288c14908decb536299 Author: Yuri Victorovich AuthorDate: 2021-12-22 09:23:37 +0000 Commit: Yuri Victorovich CommitDate: 2021-12-22 09:24:51 +0000 science/cantera: For OCTAVE option, fix .mex file path ctmethods.mexa64 is installed by the project but ctmethods.mex is expected by octave. --- science/cantera/Makefile | 7 ++++++- science/cantera/pkg-plist | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/science/cantera/Makefile b/science/cantera/Makefile index d0bbc8967f23..e187a1157252 100644 --- a/science/cantera/Makefile +++ b/science/cantera/Makefile @@ -1,7 +1,7 @@ PORTNAME= cantera DISTVERSIONPREFIX= v DISTVERSION= 2.5.1-611 -PORTREVISION= 1 +PORTREVISION= 2 DISTVERSIONSUFFIX= -gc4d6ecc15 CATEGORIES= science # chemistry physics @@ -73,4 +73,9 @@ do-install: do-install-PYTHON-on: @${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/cantera/_cantera.cpython-${PYTHON_VER:S/.//}.so +post-install-OCTAVE-on: # adjust .mex file name + @${MV} \ + ${STAGEDIR}${PREFIX}/lib/cantera/matlab/toolbox/ctmethods.mexa64 \ + ${STAGEDIR}${PREFIX}/lib/cantera/matlab/toolbox/ctmethods.mex + .include diff --git a/science/cantera/pkg-plist b/science/cantera/pkg-plist index d160e74088a5..57b14f72a113 100644 --- a/science/cantera/pkg-plist +++ b/science/cantera/pkg-plist @@ -580,7 +580,7 @@ include/cantera/zerodim.h %%OCTAVE%%lib/cantera/matlab/toolbox/canteraVersion.m %%OCTAVE%%lib/cantera/matlab/toolbox/ck2cti.m %%OCTAVE%%lib/cantera/matlab/toolbox/cleanup.m -%%OCTAVE%%lib/cantera/matlab/toolbox/ctmethods.mexa64 +%%OCTAVE%%lib/cantera/matlab/toolbox/ctmethods.mex %%OCTAVE%%lib/cantera/matlab/toolbox/ctpath.m %%OCTAVE%%lib/cantera/matlab/toolbox/faradayconstant.m %%OCTAVE%%lib/cantera/matlab/toolbox/gasconstant.m