diff --git a/usr.bin/gh-bc/Makefile b/usr.bin/gh-bc/Makefile
index bb44480b631c..77c5d8f1d270 100644
--- a/usr.bin/gh-bc/Makefile
+++ b/usr.bin/gh-bc/Makefile
@@ -1,127 +1,135 @@
 # $FreeBSD$
 
 .include <src.opts.mk>
 
 PROG=		gh-bc
 PROGNAME=	bc
 
 BCDIR=		${SRCTOP}/contrib/${PROGNAME}
 
 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
 SRCS+=		bc_help.c dc_help.c lib.c lib2.c
 
 LIBADD=		edit
 
 MAN=		bc.1 dc.1
 
 LINKS=		${BINDIR}/bc ${BINDIR}/dc
 
 .PATH:		${BCDIR}/src ${BCDIR}/gen ${BCDIR}/manuals ${.OBJDIR}
 
 CATALOGS=	en_US.UTF-8
 CATALOGS+=	de_DE.UTF-8 de_DE.ISO8859-1
 CATALOGS+=	es_ES.UTF-8 es_ES.ISO8859-1
 CATALOGS+=	fr_FR.UTF-8 fr_FR.ISO8859-1
 CATALOGS+=	ja_JP.UTF-8 ja_JP.eucJP
 CATALOGS+=	nl_NL.UTF-8 nl_NL.ISO8859-1
 CATALOGS+=	pl_PL.UTF-8 pl_PL.ISO8859-2
 CATALOGS+=	pt_PT.UTF-8 pt_PT.ISO8859-1
 CATALOGS+=	ru_RU.UTF-8 ru_RU.ISO8859-5 ru_RU.CP1251 ru_RU.CP866 ru_RU.KOI8-R
 CATALOGS+=	zh_CN.UTF-8 zh_CN.eucCN zh_CN.GB18030 zh_CN.GB2312 zh_CN.GBK
 
 NLSNAME=	bc
 NLSSRCDIR=	${BCDIR}/locales
 
-CFLAGS+=	-DMAINEXEC=${PROGNAME}
-CFLAGS+=	-DNLSPATH=/usr/share/nls/%L/%N.cat
-CFLAGS+=	-DBUILD_TYPE=A
+CFLAGS=-g -O0
 CFLAGS+=	-DBC_DEFAULT_BANNER=0
+CFLAGS+=	-DBC_DEFAULT_DIGIT_CLAMP=0
+CFLAGS+=	-DBC_DEFAULT_EXPR_EXIT=1
 CFLAGS+=	-DBC_DEFAULT_PROMPT=0
-CFLAGS+=	-DBC_DEFAULT_SIGINT_RESET
-CFLAGS+=	-DBC_DEFAULT_TTY_MODE
-CFLAGS+=	-DBC_ENABLED
-CFLAGS+=	-DBC_ENABLE_EDITLINE
-CFLAGS+=	-DBC_ENABLE_EXTRA_MATH
+CFLAGS+=	-DBC_DEFAULT_SIGINT_RESET=1
+CFLAGS+=	-DBC_DEFAULT_TTY_MODE=1
+CFLAGS+=	-DBC_ENABLED=1
+CFLAGS+=	-DBC_ENABLE_AFL=0
+CFLAGS+=	-DBC_ENABLE_EDITLINE=1
+CFLAGS+=	-DBC_ENABLE_EXTRA_MATH=1
+CFLAGS+=	-DBC_ENABLE_HISTORY=1
 CFLAGS+=	-DBC_ENABLE_LIBRARY=0
-CFLAGS+=	-DBC_ENABLE_LONG_OPTIONS
-CFLAGS+=	-DBC_ENABLE_HISTORY
-CFLAGS+=	-DBC_ENABLE_PROMPT
-CFLAGS+=	-DBC_ENABLE_RAND
+CFLAGS+=	-DBC_ENABLE_MEMCHECK=0
+CFLAGS+=	-DBC_ENABLE_NLS=1
+CFLAGS+=	-DBC_EXCLUDE_EXTRA_MATH=0
+
+CFLAGS+=	-DDC_DEFAULT_DIGIT_CLAMP=0
+CFLAGS+=	-DDC_DEFAULT_EXPR_EXIT=1
 CFLAGS+=	-DDC_DEFAULT_PROMPT=0
-CFLAGS+=	-DDC_DEFAULT_SIGINT_RESET
+CFLAGS+=	-DDC_DEFAULT_SIGINT_RESET=1
 CFLAGS+=	-DDC_DEFAULT_TTY_MODE=0
-CFLAGS+=	-DDC_ENABLED
+CFLAGS+=	-DDC_ENABLED=1
+
+CFLAGS+=	-DBUILD_TYPE=A
+CFLAGS+=	-DMAINEXEC=${PROGNAME}
 CFLAGS+=	-DNDEBUG
+CFLAGS+=	-DNLSPATH=/usr/share/nls/%L/%N.cat
 CFLAGS+=	-I${BCDIR}/include
 
 .if ${MK_NLS_CATALOGS} == "no"
 CFLAGS+=	-DBC_ENABLE_NLS=0
 MAN_SRC_BC=	bc/N.1
 MAN_SRC_DC=	dc/N.1
 .else
 CFLAGS+=	-DBC_ENABLE_NLS=1
 MAN_SRC_BC=	bc/A.1
 MAN_SRC_DC=	dc/A.1
 
 # prevent floating point incompatibilities caused by -flto on some architectures
 .if ${MACHINE_ARCH:Mmips*} == "" && ${MACHINE_ARCH} != powerpc64 && \
 	${MACHINE_ARCH} != riscv64
-CFLAGS+=	-flto
+#CFLAGS+=	-flto
 .endif
 
-HAS_TESTS=
+HAS_TESTS=	yes
 SUBDIR.${MK_TESTS}+= tests
 
 .for catalog in ${CATALOGS}
 NLS+=           ${catalog:C/.*://}
 NLSSRCFILES_${catalog:C/.*://}= ${catalog:C/.*://}.msg
 .endfor
 
 NLSLINKS_en_US.UTF-8+=	en_AU.UTF-8 en_CA.UTF-8 en_GB.UTF-8 en_IE.UTF-8 \
 			en_NZ.UTF-8 C
 NLSLINKS_en_US.UTF-8+=	en_AU.US-ASCII en_CA.US-ASCII en_GB.US-ASCII \
 			en_NZ.US-ASCII
 NLSLINKS_en_US.UTF-8+=	en_AU.ISO8859-1 en_CA.ISO8859-1 en_GB.ISO8859-1 \
 			en_NZ.ISO8859-1 en_US.ISO8859-1
 NLSLINKS_en_US.UTF-8+=	en_AU.ISO8859-15 en_CA.ISO8859-15 en_GB.ISO8859-15 \
 			en_NZ.ISO8859-15 en_US.ISO8859-15
 
 NLSLINKS_de_DE.UTF-8+=	de_AT.UTF-8 de_CH.UTF-8
 NLSLINKS_de_DE.ISO8859-1+= de_AT.ISO8859-1 de_CH.ISO8859-1
 NLSLINKS_de_DE.ISO8859-1+= de_AT.ISO8859-15 de_CH.ISO8859-15 de_DE.ISO8859-15
 
 NLSLINKS_es_ES.ISO8859-1+= es_ES.ISO8859-15
 
 NLSLINKS_fr_FR.UTF-8+=	fr_BE.UTF-8 fr_CA.UTF-8 fr_CH.UTF-8
 NLSLINKS_fr_FR.ISO8859-1+= fr_BE.ISO8859-1 fr_CA.ISO8859-1 fr_CH.ISO8859-1
 NLSLINKS_fr_FR.ISO8859-1+= fr_BE.ISO8859-15 fr_CA.ISO8859-15 fr_CH.ISO8859-15 \
 			fr_FR.ISO8859-15
 
 NLSLINKS_nl_NL.ISO8859-1+= nl_BE.ISO8859-1
 NLSLINKS_nl_NL.ISO8859-1+= nl_BE.ISO8859-15 nl_NL.ISO8859-15
 
 NLSLINKS_pt_PT.UTF-8+=	pt_BR.UTF-8
 NLSLINKS_pt_PT.ISO8859-1+= pt_BR.ISO8859-1
 NLSLINKS_pt_PT.ISO8859-1+= pt_PT.ISO8859-15
 .endif
 
 lib.c:		lib.bc Makefile
 		cd ${BCDIR} && sh gen/strgen.sh gen/lib.bc ${.OBJDIR}/lib.c 0 bc_lib bc_lib_name 1 1
 
 lib2.c:		lib2.bc Makefile
 		cd ${BCDIR} && sh gen/strgen.sh gen/lib2.bc ${.OBJDIR}/lib2.c 0 bc_lib2 bc_lib2_name 1 1
 
 bc_help.c:	bc_help.txt Makefile
 		cd ${BCDIR} && sh gen/strgen.sh gen/bc_help.txt ${.OBJDIR}/bc_help.c 0 bc_help
 
 dc_help.c:	dc_help.txt Makefile
 		cd ${BCDIR} && sh gen/strgen.sh gen/dc_help.txt ${.OBJDIR}/dc_help.c 0 dc_help
 
 bc.1:
 		${CP} ${BCDIR}/manuals/${MAN_SRC_BC} ${.OBJDIR}/bc.1
 
 dc.1:
 		${CP} ${BCDIR}/manuals/${MAN_SRC_DC} ${.OBJDIR}/dc.1
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/gh-bc/tests/Makefile b/usr.bin/gh-bc/tests/Makefile
index 338deb41c534..bdd00186137e 100644
--- a/usr.bin/gh-bc/tests/Makefile
+++ b/usr.bin/gh-bc/tests/Makefile
@@ -1,67 +1,67 @@
 # $FreeBSD$
 
 .include <bsd.own.mk>
 
 PACKAGE=		tests
 
 TEST_DIR=		${SRCTOP}/contrib/bc
 
 TESTSDIR=		${TESTSBASE}/usr.bin/gh-bc
 
 .PATH:			${SRCTOP}/tests
 
 FILESGROUPS+=		FILESf
 FILESfPACKAGE=		${PACKAGE}
 FILESfDIR=		${TESTSDIR}/scripts
 FILESf=			${TEST_DIR}/scripts/functions.sh
 FILESfMODE=		0755
 
 FILESGROUPS+=		FILEStests
 FILEStestsPACKAGE=	${PACKAGE}
 FILEStestsDIR=		${TESTSDIR}/tests
 FILEStests!=		echo ${TEST_DIR}/tests/*.py ${TEST_DIR}/tests/*.sh ${TEST_DIR}/tests/*.txt
 FILEStestsMODE=		0755
 
 FILESGROUPS+=		FILESbc
 FILESbcPACKAGE=		${PACKAGE}
 FILESbcDIR=		${TESTSDIR}/tests/bc
 FILESbc!=		echo ${TEST_DIR}/tests/bc/*.*
 
 FILESGROUPS+=		FILESbc_errors
 FILESbc_errorsPACKAGE=	${PACKAGE}
 FILESbc_errorsDIR=	${TESTSDIR}/tests/bc/errors
 FILESbc_errors!=	echo ${TEST_DIR}/tests/bc/errors/*.*
 
 FILESGROUPS+=		FILESbc_scripts
 FILESbc_scriptsPACKAGE=	${PACKAGE}
 FILESbc_scriptsDIR=	${TESTSDIR}/tests/bc/scripts
 FILESbc_scripts!=	echo ${TEST_DIR}/tests/bc/scripts/*.*
 FILESbc_scriptsMODE=	0755
 
 FILESGROUPS+=		FILESdc
 FILESdcPACKAGE=		${PACKAGE}
 FILESdcDIR=		${TESTSDIR}/tests/dc
 FILESdc!=		echo ${TEST_DIR}/tests/dc/*.*
 
 FILESGROUPS+=		FILESdc_errors
 FILESdc_errorsPACKAGE=	${PACKAGE}
 FILESdc_errorsDIR=	${TESTSDIR}/tests/dc/errors
 FILESdc_errors!=	echo ${TEST_DIR}/tests/dc/errors/*.*
 
 FILESGROUPS+=		FILESdc_scripts
 FILESdc_scriptsPACKAGE=	${PACKAGE}
 FILESdc_scriptsDIR=	${TESTSDIR}/tests/dc/scripts
 FILESdc_scripts!=	echo ${TEST_DIR}/tests/dc/scripts/*.*
 FILESdc_scriptsMODE=	0755
 
 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 ${TESTSDIR}/tests/all.sh bc 1 1 0 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 ${TESTSDIR}/tests/all.sh dc 1 1 0 0 0 dc" >> ${.TARGET}
 
 .include <bsd.test.mk>