diff --git a/math/bcal/Makefile b/math/bcal/Makefile
index cfee627fc9a9..3c60559bfbb6 100644
--- a/math/bcal/Makefile
+++ b/math/bcal/Makefile
@@ -1,40 +1,49 @@
 PORTNAME=	bcal
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.2
+DISTVERSION=	2.3
 CATEGORIES=	math
 
 MAINTAINER=	0mp@FreeBSD.org
 COMMENT=	Storage expression, unit conversion & address offset CLI calculator
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 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
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR}
 
 USES=		gmake python:test,3.5+ readline
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	jarun
 
 MAKE_ARGS=	CFLAGS_OPTIMIZATION=
 
 PLIST_FILES=	bin/bcal \
 		share/man/man1/bcal.1.gz
 
 PORTDOCS=	CHANGELOG README.md
 
 OPTIONS_DEFINE=	DOCS
 
+_BC_CMD=	${LOCALBASE}/bin/bc
+
+post-patch:
+	${REINPLACE_CMD} 's|%%BC_CMD%%|${_BC_CMD}|g' ${WRKSRC}/src/bcal.c
+
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/bcal
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}/${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 do-test:
 	cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m pytest -v test.py
 
 .include <bsd.port.mk>
diff --git a/math/bcal/distinfo b/math/bcal/distinfo
index 20ab1ae17f75..acc1ebc5ad30 100644
--- a/math/bcal/distinfo
+++ b/math/bcal/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1580558453
-SHA256 (jarun-bcal-v2.2_GH0.tar.gz) = 506d17d6df35fad636d3ced425afee5921cd2b21242099b78b369cfcb5716e23
-SIZE (jarun-bcal-v2.2_GH0.tar.gz) = 34437
+TIMESTAMP = 1642952426
+SHA256 (jarun-bcal-v2.3_GH0.tar.gz) = e295b022e5187079b4cc5310447da5c787cb6bade86936dabf34a42bb85348ba
+SIZE (jarun-bcal-v2.3_GH0.tar.gz) = 36111