git: 2d06844521ec - main - usr.bin/gh-bc: update for version 7.1.0

The branch main has been updated by se:

URL: https://cgit.FreeBSD.org/src/commit/?id=2d06844521ecd9e1298b53f13c18ffbfa97b1e28

commit 2d06844521ecd9e1298b53f13c18ffbfa97b1e28
Author:     Stefan Eßer <se@FreeBSD.org>
AuthorDate: 2025-09-11 14:42:42 +0000
Commit:     Stefan Eßer <se@FreeBSD.org>
CommitDate: 2025-09-11 14:42:42 +0000

    usr.bin/gh-bc: update for version 7.1.0
    
    Add extra defines required for bc-7.1.0 to the Makefiles.
---
 usr.bin/gh-bc/Makefile       | 6 +++++-
 usr.bin/gh-bc/tests/Makefile | 9 ++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/usr.bin/gh-bc/Makefile b/usr.bin/gh-bc/Makefile
index 0fdc687c0e50..9aa5116f6faa 100644
--- a/usr.bin/gh-bc/Makefile
+++ b/usr.bin/gh-bc/Makefile
@@ -4,6 +4,7 @@ PROG=		gh-bc
 PROGNAME=	bc
 
 BCDIR=		${SRCTOP}/contrib/${PROGNAME}
+VERSION!=	cat ${SRCTOP}/contrib/${PROGNAME}/VERSION.txt
 
 SRCS=		args.c bc.c bc_lex.c bc_parse.c data.c dc.c dc_lex.c dc_parse.c file.c history.c
 SRCS+=		lang.c lex.c main.c num.c opt.c parse.c program.c rand.c read.c vector.c  vm.c
@@ -31,6 +32,8 @@ CATALOGS+=	zh_CN.UTF-8 zh_CN.eucCN zh_CN.GB18030 zh_CN.GB2312 zh_CN.GBK
 NLSNAME=	bc
 NLSSRCDIR=	${BCDIR}/locales
 
+CFLAGS+=	-I${BCDIR}/include
+
 CFLAGS+=	-DBC_DEFAULT_BANNER=0
 CFLAGS+=	-DBC_DEFAULT_DIGIT_CLAMP=0
 CFLAGS+=	-DBC_DEFAULT_EXPR_EXIT=1
@@ -57,7 +60,8 @@ CFLAGS+=	-DBUILD_TYPE=A
 CFLAGS+=	-DMAINEXEC=${PROGNAME}
 CFLAGS+=	-DNDEBUG
 CFLAGS+=	-DNLSPATH=/usr/share/nls/%L/%N.cat
-CFLAGS+=	-I${BCDIR}/include
+
+CFLAGS+=	-DVERSION=${VERSION}
 
 # prevent floating point incompatibilities caused by -flto on some architectures
 .if ${MACHINE_ARCH} != riscv64
diff --git a/usr.bin/gh-bc/tests/Makefile b/usr.bin/gh-bc/tests/Makefile
index f3ef5a695e7d..f2c92aecb0a5 100644
--- a/usr.bin/gh-bc/tests/Makefile
+++ b/usr.bin/gh-bc/tests/Makefile
@@ -17,7 +17,8 @@ FILESfMODE=		0755
 FILESGROUPS+=		FILEStests
 FILEStestsPACKAGE=	${PACKAGE}
 FILEStestsDIR=		${TESTSDIR}/tests
-FILEStests!=		echo ${TEST_DIR}/tests/*.py ${TEST_DIR}/tests/*.sh ${TEST_DIR}/tests/*.txt
+FILEStests!=		echo ${TEST_DIR}/tests/*.py ${TEST_DIR}/tests/*.sed \
+				${TEST_DIR}/tests/*.sh ${TEST_DIR}/tests/*.txt
 FILEStestsMODE=		0755
 
 FILESGROUPS+=		FILESbc
@@ -56,10 +57,12 @@ PLAIN_TESTS_SH=		bc_tests dc_tests
 
 bc_tests.sh:
 	echo "#!/bin/sh" > ${.TARGET}
-	echo "env LANG=C ${TESTSDIR}/tests/all.sh bc 1 1 0 0 bc" >> ${.TARGET}
+	echo 'env LANG=C BC_TEST_OUTPUT_DIR=$$(pwd) \
+		${TESTSDIR}/tests/all.sh -n bc 1 1 0 0 bc' >> ${.TARGET}
 
 dc_tests.sh:
 	echo "#!/bin/sh" > ${.TARGET}
-	echo "env LANG=C ${TESTSDIR}/tests/all.sh dc 1 1 0 0 dc" >> ${.TARGET}
+	echo "env LANG=C BC_TEST_OUTPUT_DIR=\$pwd \
+		${TESTSDIR}/tests/all.sh -n dc 1 1 0 0 dc" >> ${.TARGET}
 
 .include <bsd.test.mk>