From nobody Sun Jan 23 16:13:54 2022 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 C34FA197E91E; Sun, 23 Jan 2022 16:13:54 +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 4JhdTZ4SHZz4rFH; Sun, 23 Jan 2022 16:13:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642954434; 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=3CbYmWzIkhn+v0ya9P3FzAM2pwCD13u8DFEJSDXZja0=; b=im0RUTAAimAIiDVUZhJrRDNIcXmpOyU4Pf1ffneGx0zupNCv+F3ZmIk3WV+oBf0RjUf4/L NcGGlukdHf6vaR2sPbxg4XMHFnjVjiijezuQUmbzbqvMqgeWNygxGz91v6VdQMZrQjy/jE PHiwWSujvM5+sk43Tk6rR2w3/VAxOlrbX2Bl5sGi4AxaqAG7Efb5OdPuTyexD/mG3qUmJm 3ciK4hnQxH5DZ14qdqKMslUWFrY4tyu/d9k+J8UPgQkQZf6PqBWddq9sCxemu4Lw5Jp6fK 0KSXJrNagpGVGZR7yD2xm27pRV0r19CtJsywYNxNTVX4GopDb/G/bM9lI2YrpA== 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 7134625818; Sun, 23 Jan 2022 16:13:54 +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 20NGDsZT057329; Sun, 23 Jan 2022 16:13:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20NGDsts057328; Sun, 23 Jan 2022 16:13:54 GMT (envelope-from git) Date: Sun, 23 Jan 2022 16:13:54 GMT Message-Id: <202201231613.20NGDsts057328@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: f59e54edb48e - main - math/bcal: Add a missing patch and depend on math/calc 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: 0mp X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f59e54edb48ec386b0051b7d9bcd75c392e78a17 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642954434; 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=3CbYmWzIkhn+v0ya9P3FzAM2pwCD13u8DFEJSDXZja0=; b=cSy+mkB3KD7DxnsjufnX3gZE/Bzr2Tvy8uJEvLeZFd6fwpiIKDo1pEMF0hnhKwOfJA+UnT yP+W4JA1ek54e7VK+eCnHLW7hJ5U6SPMRY+4KiJd64hx9u/JV7ZgCQ/EBDkd0hM/j/e5G7 FjpYb2hLlIxuYaOR91L1wYp3GNh8lmu+/mAoBEsWCTdjVcejSDNOC1hlnnJ982R/khqL5G 66QMbTlXHHrUNKBQR2l9pV8BRjkbBPEWeqxKX5wjpK4talq0Eo+L64uAghZYXO9S4eZzvF rYEVofr349aOelBElHdwFtZKr51/OloI6I9EDw/1v3h3Ip2j7BNDhmalF1XZhw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642954434; a=rsa-sha256; cv=none; b=Pp/9cJN8pTVEvJC9QltpMkGv5GpqYthUalTKqqEHOkCs3GTlCKg1Wdv7ye0N5NVKORRQ3u B/W8wzuGVcNko1EpDAyE9pz76huq1J4HvDAGH/vHDnUfnbtnvKJrmawjjlvk+hphT1h65P a/CwDaTtM/E6cZxxHp5XyQAlpD00b7Qv9d83AwDJ6r3UaoiFzcD7bdk7gPruUECeRis3Fn rFqa8MdmSivRFhctqImjTiIhZvGn1gKzcjZlrohV1K41+AA5hdwtHhYirRUwBdfR4RAcEX /LnU8x2R/MMerKubvivEmI8eBq8sChWfIELVh8tfjRp1XcXtOr8mpciMKgVbmw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/ports/commit/?id=f59e54edb48ec386b0051b7d9bcd75c392e78a17 commit f59e54edb48ec386b0051b7d9bcd75c392e78a17 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2022-01-23 16:11:50 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2022-01-23 16:11:50 +0000 math/bcal: Add a missing patch and depend on math/calc These changes should be a part of the previous commit. --- math/bcal/Makefile | 4 +++- math/bcal/files/patch-src_bcal.c | 11 +++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/math/bcal/Makefile b/math/bcal/Makefile index 3c60559bfbb6..9bc8f9e181e3 100644 --- a/math/bcal/Makefile +++ b/math/bcal/Makefile @@ -1,6 +1,7 @@ PORTNAME= bcal DISTVERSIONPREFIX= v DISTVERSION= 2.3 +PORTREVISION= 1 CATEGORIES= math MAINTAINER= 0mp@FreeBSD.org @@ -14,7 +15,8 @@ ONLY_FOR_ARCHS= amd64 powerpc64 powerpc64le # GNU bc must be used because bcal depends on some behaviors # specific to GNU bc. Run the test suite with the bc from the # base to see that some tests fail. -RUN_DEPENDS= ${LOCALBASE}/bin/bc:math/gnubc +RUN_DEPENDS= ${LOCALBASE}/bin/bc:math/gnubc \ + calc:math/calc TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} USES= gmake python:test,3.5+ readline diff --git a/math/bcal/files/patch-src_bcal.c b/math/bcal/files/patch-src_bcal.c new file mode 100644 index 000000000000..4805695cb1db --- /dev/null +++ b/math/bcal/files/patch-src_bcal.c @@ -0,0 +1,11 @@ +--- src/bcal.c.orig 2022-01-23 15:55:59 UTC ++++ src/bcal.c +@@ -179,7 +179,7 @@ static int try_bc(char *expr) + int pipe_pc[2], pipe_cp[2]; + size_t len; + ssize_t ret; +- char *ptr = cfg.calc ? "calc" : "bc"; ++ char *ptr = cfg.calc ? "calc" : "%%BC_CMD%%"; + + if (!expr) { + if (curexpr)