Index: branches/2020Q4/devel/bmake/Makefile
===================================================================
--- branches/2020Q4/devel/bmake/Makefile	(revision 551487)
+++ branches/2020Q4/devel/bmake/Makefile	(revision 551488)
@@ -1,45 +1,49 @@
 # Created by: Mikolaj Golub <to.my.trociny@gmail.com>
 # $FreeBSD$
 
 PORTNAME=	bmake
 PORTVERSION=	20200902
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.netbsd.org/pub/NetBSD/misc/sjg/
 
 MAINTAINER=	trociny@FreeBSD.org
 COMMENT=	Portable version of NetBSD 'make' utility
 
 LICENSE=	BSD3CLAUSE
 
 PORTSCOUT=	skipv:200910007
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 MAKE_ENV+=	CONFIG_SITE=${CONFIG_SITE}
 
+.if defined(BATCH)
+EXTRA_PATCHES=	${FILESDIR}/extrapatch-unit-tests_Makefile
+.endif
+
 post-patch:	.SILENT
 	${REINPLACE_CMD} 's/^\.Nx/NetBSD/' ${WRKDIR}/bmake/bmake.1
 
 do-build:
 	${SETENV} ${MAKE_ENV} ${SH} ${WRKDIR}/bmake/boot-strap \
 		--with-default-sys-path='.../share/mk:${PREFIX}/share/mk' \
 		-m ${WRKDIR}/mk objdir=${WRKDIR}/obj prefix=${PREFIX}
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKDIR}/obj/bmake ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKDIR}/bmake/bmake.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
 	${SH} ${WRKSRC}/mk/install-mk -v ${STAGEDIR}${PREFIX}/share/mk
 	${CHMOD} -x ${STAGEDIR}${PREFIX}/share/mk/meta2deps.py
 	cd ${STAGEDIR}${PREFIX} ;					\
 	    ${FIND} share/mk -type f -o -type l				\
 		| ${SORT}						\
 		>${WRKDIR}/PLIST.share-mk
 	${ECHO_CMD} "r ${TMPPLIST}"			> ${WRKDIR}/ex.script
 	${ECHO_CMD} "/Insert PLIST.share-mk"		>> ${WRKDIR}/ex.script
 	${ECHO_CMD} "d"					>> ${WRKDIR}/ex.script
 	${ECHO_CMD} "r ${WRKDIR}/PLIST.share-mk"	>> ${WRKDIR}/ex.script
 	${ECHO_CMD} "x!"				>> ${WRKDIR}/ex.script
 	${CP} -p ${TMPPLIST} ${TMPPLIST}.pre-share-mk
 	cd ${WRKDIR} ; ex < ex.script
 
 .include <bsd.port.mk>
Index: branches/2020Q4/devel/bmake/files/extrapatch-unit-tests_Makefile
===================================================================
--- branches/2020Q4/devel/bmake/files/extrapatch-unit-tests_Makefile	(nonexistent)
+++ branches/2020Q4/devel/bmake/files/extrapatch-unit-tests_Makefile	(revision 551488)
@@ -0,0 +1,11 @@
+--- unit-tests/Makefile.orig	2020-10-05 03:28:18 UTC
++++ unit-tests/Makefile
+@@ -36,7 +36,7 @@
+ # src/tests/usr.bin/make/t_make.sh as well.
+ TESTS+=		# archive	# broken on FreeBSD, enabled in t_make.sh
+ TESTS+=		archive-suffix
+-TESTS+=		cmd-interrupt
++TESTS+=		# cmd-interrupt
+ TESTS+=		cmdline
+ TESTS+=		comment
+ TESTS+=		cond-cmp-numeric

Property changes on: branches/2020Q4/devel/bmake/files/extrapatch-unit-tests_Makefile
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2020Q4
===================================================================
--- branches/2020Q4	(revision 551487)
+++ branches/2020Q4	(revision 551488)

Property changes on: branches/2020Q4
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r551474