bluhm@ has been pointing out for a long time that the mandoc test suite

was quite nasty in hiding most of the commands being run with '@',
hindering debugging in case anything failed.  In particular, it hindered
debugging that had to start from the log of a bulk regress run.

So, finally, resolve this issue by removing almost all these '@'s.
This commit does not change any of the test commands.

If you want to be sure that you don't miss failures, run something like:
make regress 2>&1 | tee make.log ; grep -B1 FAILED make.log

4 files changed, 311 insertions, 283 deletions

diff --git a/regress/usr.bin/mandoc/Makefile.inc b/regress/usr.bin/mandoc/Makefile.inc
index 326c548b4f4..dcbd7fc48bb 100644
--- a/regress/usr.bin/mandoc/Makefile.inc
+++ b/regress/usr.bin/mandoc/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.28 2020/07/21 15:12:07 schwarze Exp $
+# $OpenBSD: Makefile.inc,v 1.29 2020/07/30 21:32:19 schwarze Exp $
 
 .include "Makefile.sub"
 
@@ -77,53 +77,53 @@ htmlval: ${_HTMLVALS}
 		.out_ascii .out_lint .out_utf8
 
 .in.mandoc_ascii:
-	@${MANDOC} ${MOPTS} -Ios=OpenBSD -Tascii ${.IMPSRC} > ${.TARGET}
+	${MANDOC} ${MOPTS} -Ios=OpenBSD -Tascii ${.IMPSRC} > ${.TARGET}
 
 .mandoc_ascii.diff_ascii:
-	@${DIFF} ${.CURDIR}/${.IMPSRC:S/mandoc_ascii$/out_ascii/} ${.IMPSRC}
+	${DIFF} ${.CURDIR}/${.IMPSRC:S/mandoc_ascii$/out_ascii/} ${.IMPSRC}
 
 .in.mandoc_tag:
-	@${MAN} -l ${MOPTS} -Ios=OpenBSD -Tascii \
+	${MAN} -l ${MOPTS} -Ios=OpenBSD -Tascii \
 	    -O outfilename=${.TARGET:S/tag$/ascii/},tagfilename=${.TARGET} \
 	    ${.IMPSRC}
 
 .mandoc_tag.diff_tag:
-	@${DIFF} ${.CURDIR}/${.IMPSRC:S/mandoc_tag$/out_tag/} ${.IMPSRC}
-	@${DIFF} ${.CURDIR}/${.IMPSRC:S/mandoc_tag$/out_ascii/} \
+	${DIFF} ${.CURDIR}/${.IMPSRC:S/mandoc_tag$/out_tag/} ${.IMPSRC}
+	${DIFF} ${.CURDIR}/${.IMPSRC:S/mandoc_tag$/out_ascii/} \
 	    ${.IMPSRC:S/mandoc_tag$/mandoc_ascii/}
 
 .in.mandoc_utf8:
-	@${MANDOC} ${MOPTS} -Ios=OpenBSD -Tutf8 ${.IMPSRC} > ${.TARGET}
+	${MANDOC} ${MOPTS} -Ios=OpenBSD -Tutf8 ${.IMPSRC} > ${.TARGET}
 
 .mandoc_utf8.diff_utf8:
-	@${DIFF} ${.CURDIR}/${.IMPSRC:S/mandoc_utf8$/out_utf8/} ${.IMPSRC}
+	${DIFF} ${.CURDIR}/${.IMPSRC:S/mandoc_utf8$/out_utf8/} ${.IMPSRC}
 
 .in.mandoc_html:
-	@${MANDOC} ${MOPTS} -Thtml ${.IMPSRC} | \
+	${MANDOC} ${MOPTS} -Thtml ${.IMPSRC} | \
 		sed -n '/BEGINTEST/,/ENDTEST/p' | sed '1d;$$d' > ${.TARGET}
 
 .mandoc_html.diff_html:
-	@${DIFF} ${.CURDIR}/${.IMPSRC:S/mandoc_html$/out_html/} ${.IMPSRC}
+	${DIFF} ${.CURDIR}/${.IMPSRC:S/mandoc_html$/out_html/} ${.IMPSRC}
 
 .in.mandoc_markdown:
-	@${MANDOC} ${MOPTS} -Ios=OpenBSD -Tmarkdown ${.IMPSRC} > ${.TARGET}
+	${MANDOC} ${MOPTS} -Ios=OpenBSD -Tmarkdown ${.IMPSRC} > ${.TARGET}
 
 .mandoc_markdown.diff_markdown:
-	@${DIFF} ${.CURDIR}/${.IMPSRC:S/mandoc_markdown$/out_markdown/} \
+	${DIFF} ${.CURDIR}/${.IMPSRC:S/mandoc_markdown$/out_markdown/} \
 		${.IMPSRC}
 
 .in.in_man:
-	@${MANDOC} ${MOPTS} -Ios=OpenBSD -Tman ${.IMPSRC} > ${.TARGET}
+	${MANDOC} ${MOPTS} -Ios=OpenBSD -Tman ${.IMPSRC} > ${.TARGET}
 
 .in_man.mandoc_man:
-	@${MANDOC} -man -Tascii -Omdoc ${.IMPSRC} > ${.TARGET}
+	${MANDOC} -man -Tascii -Omdoc ${.IMPSRC} > ${.TARGET}
 
 .in.mandoc_lint:
-	@-${MANDOC} ${MOPTS} -Ios=OpenBSD -Tlint -Wall ${.IMPSRC} 2>&1 | \
+	-${MANDOC} ${MOPTS} -Ios=OpenBSD -Tlint -Wall ${.IMPSRC} 2>&1 | \
 		sed -E 's/^mandoc: \/[^:]+\//mandoc: /' > ${.TARGET}
 
 .mandoc_lint.diff_lint:
-	@${DIFF} ${.CURDIR}/${.IMPSRC:S/mandoc_lint$/out_lint/} ${.IMPSRC}
+	${DIFF} ${.CURDIR}/${.IMPSRC:S/mandoc_lint$/out_lint/} ${.IMPSRC}
 
 # --- single-file targets ---
 
@@ -131,7 +131,7 @@ htmlval: ${_HTMLVALS}
 .  if empty(SKIP_ASCII:MALL) && empty(SKIP_ASCII:M${t})
 .    if empty(SKIP_TMAN:MALL) && empty(SKIP_TMAN:M${t})
 ${t}.diff_man: ${t}.mandoc_man
-	@${DIFF} ${.CURDIR}/${t}.out_ascii ${.ALLSRC}
+	${DIFF} ${.CURDIR}/${t}.out_ascii ${.ALLSRC}
 .    else
 ${t}.diff_man:
 .    endif
@@ -144,7 +144,7 @@ ${t}: ${t}.diff_tag ${t}.diff_man
 ${t}:
 .  endif
 ${t}.validate_html: ${t}.in
-	@-${MANDOC} ${MOPTS} -Thtml ${.ALLSRC} | validate
+	-${MANDOC} ${MOPTS} -Thtml ${.ALLSRC} | validate
 .endfor
 
 .for t in ${TAG_TARGETS}
@@ -175,32 +175,32 @@ clean: ${_CLEAN_TARGETS}
 
 ascii-clean:
 .if !empty(_ASCIIFILES)
-	@rm -f ${_ASCIIFILES} ${_TAGFILES}
+	rm -f ${_ASCIIFILES} ${_TAGFILES}
 .endif
 
 utf8-clean:
 .if !empty(_UTF8FILES)
-	@rm -f ${_UTF8FILES}
+	rm -f ${_UTF8FILES}
 .endif
 
 html-clean:
 .if !empty(_HTMLFILES)
-	@rm -f ${_HTMLFILES}
+	rm -f ${_HTMLFILES}
 .endif
 
 markdown-clean:
 .if !empty(_MARKDOWNFILES)
-	@rm -f ${_MARKDOWNFILES}
+	rm -f ${_MARKDOWNFILES}
 .endif
 
 tman-clean:
 .if !empty(_MANFILES)
-	@rm -f ${_MANFILES}
+	rm -f ${_MANFILES}
 .endif
 
 lint-clean:
 .if !empty(_LINTFILES)
-	@rm -f ${_LINTFILES}
+	rm -f ${_LINTFILES}
 .endif
 
 .PHONY: ${_ASCIIDIFFS} ${_TAGDIFFS} ${_UTF8DIFFS} ${_HTMLDIFFS} \
diff --git a/regress/usr.bin/mandoc/db/run/Makefile b/regress/usr.bin/mandoc/db/run/Makefile
index e98247babb8..75d3752b885 100644
--- a/regress/usr.bin/mandoc/db/run/Makefile
+++ b/regress/usr.bin/mandoc/db/run/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2017/08/23 12:25:02 schwarze Exp $
+# $OpenBSD: Makefile,v 1.8 2020/07/30 21:32:19 schwarze Exp $
 #
 # Copyright (c) 2016 Ingo Schwarze <schwarze@openbsd.org>
 #
@@ -48,30 +48,30 @@ CLEANFILES +=	binedit dbm_dump makeinodes
 
 .for NAME in ${DO_TESTS}
 ${NAME}: ${NAME}.dout ${NAME}.derr
-	@test \! -s ${NAME}.derr
-	@diff -u ${.CURDIR}/../out/${NAME}.dout ${NAME}.dout
+	test \! -s ${NAME}.derr
+	diff -u ${.CURDIR}/../out/${NAME}.dout ${NAME}.dout
 .endfor
 
 .for NAME in ${DOE_TESTS}
 ${NAME}: ${NAME}.dout ${NAME}.derr
-	@test -s ${NAME}.derr
-	@diff -u ${.CURDIR}/../out/${NAME}.dout ${NAME}.dout
+	test -s ${NAME}.derr
+	diff -u ${.CURDIR}/../out/${NAME}.dout ${NAME}.dout
 .endfor
 
 .for NAME in ${DE_TESTS}
 ${NAME}: ${NAME}.dout ${NAME}.derr
-	@test -s ${NAME}.derr
-	@test \! -s ${NAME}.dout
+	test -s ${NAME}.derr
+	test \! -s ${NAME}.dout
 .endfor
 
 diff.derr: all.derr
-	@diff -u ${.CURDIR}/../out/all.derr all.derr
+	diff -u ${.CURDIR}/../out/all.derr all.derr
 
 diff.mout: all.mout
-	@diff -u ${.CURDIR}/../out/all.mout all.mout
+	diff -u ${.CURDIR}/../out/all.mout all.mout
 
 diff.merr: all.merr
-	@diff -u ${.CURDIR}/../out/all.merr all.merr
+	diff -u ${.CURDIR}/../out/all.merr all.merr
 
 .PHONY: ${REGRESS_TARGETS}
 
@@ -86,410 +86,438 @@ cleandir_local:
 
 .for NAME in ${DOB_TESTS}
 ${NAME}.dout ${NAME}.derr: dbm_dump ${NAME}.db
-	@./dbm_dump ${NAME}.db > ${NAME}.dout 2> ${NAME}.derr
+	./dbm_dump ${NAME}.db > ${NAME}.dout 2> ${NAME}.derr
 .endfor
 
 .for NAME in ${DE_TESTS}
 ${NAME}.dout ${NAME}.derr: dbm_dump ${NAME}.db
-	@if ./dbm_dump ${NAME}.db > ${NAME}.dout 2> ${NAME}.derr; \
+	if ./dbm_dump ${NAME}.db > ${NAME}.dout 2> ${NAME}.derr; \
 		then false; else true; fi
 .endfor
 
 all.derr: ${DEB_TESTS:C/$/.derr/}
-	@for f in ${DEB_TESTS}; \
+	for f in ${DEB_TESTS}; \
 		do printf "\n>>> $$f\n"; cat $$f.derr; done > $@
 
 
 # === RUNNING MAKEWHATIS AND MAN =======================================
 
 empty.mout empty.merr:
-	@rm -rf man
-	@mkdir man
-	@makewhatis man
-	@if man -kM man something > empty.mout 2> empty.merr; \
+	@echo creating $@
+	rm -rf man
+	mkdir man
+	makewhatis man
+	if man -kM man something > empty.mout 2> empty.merr; \
 		then false; else test $$? -eq 5; fi
-	@rmdir man
+	rmdir man
 
 onepage.db onepage.mout: ${.CURDIR}/../man/empty.1
-	@rm -rf man
-	@mkdir -p man/man1
-	@cp ${.CURDIR}/../man/empty.1 man/man1/
-	@makewhatis man
-	@man -kM man title > onepage.mout
-	@cp man/mandoc.db onepage.db
-	@rm -rf onepage.dir
-	@mv man onepage.dir
+	@echo creating $@
+	rm -rf man
+	mkdir -p man/man1
+	cp ${.CURDIR}/../man/empty.1 man/man1/
+	makewhatis man
+	man -kM man title > onepage.mout
+	cp man/mandoc.db onepage.db
+	rm -rf onepage.dir
+	mv man onepage.dir
 
 twopages.db twopages.mout: ${.CURDIR}/../man/empty.1
-	@rm -rf man
-	@mkdir -p man/man1
-	@cp ${.CURDIR}/../man/empty.1 man/man1/
-	@cp ${.CURDIR}/../man/empty.1 man/man1/second.1
-	@makewhatis man
-	@(echo "> second"; man -wM man second | sed 's#.*/man/##'; \
+	@echo creating $@
+	rm -rf man
+	mkdir -p man/man1
+	cp ${.CURDIR}/../man/empty.1 man/man1/
+	cp ${.CURDIR}/../man/empty.1 man/man1/second.1
+	makewhatis man
+	(echo "> second"; man -wM man second | sed 's#.*/man/##'; \
 	  echo "> empty"; man -wM man empty | sed 's#.*/man/##') \
 	  > twopages.mout
-	@cp man/mandoc.db twopages.db
-	@rm -rf twopages.dir
-	@mv man twopages.dir
+	cp man/mandoc.db twopages.db
+	rm -rf twopages.dir
+	mv man twopages.dir
 
 threepages.db threepages.mout: ${.CURDIR}/../man/empty.1
-	@rm -rf man
-	@mkdir -p man/man1
-	@cp ${.CURDIR}/../man/empty.1 man/man1/
-	@cp ${.CURDIR}/../man/empty.1 man/man1/second.1
-	@cp ${.CURDIR}/../man/empty.1 man/man1/third.1
-	@makewhatis man
-	@(echo "> second"; man -wM man second | sed 's#.*/man/##'; \
+	@echo creating $@
+	rm -rf man
+	mkdir -p man/man1
+	cp ${.CURDIR}/../man/empty.1 man/man1/
+	cp ${.CURDIR}/../man/empty.1 man/man1/second.1
+	cp ${.CURDIR}/../man/empty.1 man/man1/third.1
+	makewhatis man
+	(echo "> second"; man -wM man second | sed 's#.*/man/##'; \
 	  echo "> third"; man -wM man third | sed 's#.*/man/##'; \
 	  echo "> empty"; man -wM man empty | sed 's#.*/man/##') \
 	  > threepages.mout
-	@cp man/mandoc.db threepages.db
-	@rm -rf threepages.dir
-	@mv man threepages.dir
+	cp man/mandoc.db threepages.db
+	rm -rf threepages.dir
+	mv man threepages.dir
 
 threemacros.db threemacros.mout: ${.CURDIR}/../man/empty.1
-	@rm -rf man
-	@mkdir -p man/man1
-	@cp ${.CURDIR}/../man/empty.1 man/man1/
-	@printf ".Sh SEE ALSO\n.Xr one 1\n.Xr two 2\n.Xr three 3" \
+	@echo creating $@
+	rm -rf man
+	mkdir -p man/man1
+	cp ${.CURDIR}/../man/empty.1 man/man1/
+	printf ".Sh SEE ALSO\n.Xr one 1\n.Xr two 2\n.Xr three 3" \
 		>> man/man1/empty.1
-	@makewhatis man
-	@(echo "> Xr=one"; man -kwM man Xr=one | sed 's#.*/man/##'; \
+	makewhatis man
+	(echo "> Xr=one"; man -kwM man Xr=one | sed 's#.*/man/##'; \
 	  echo "> Xr~^t"; man -kM man -O Xr Xr~^t;) > threemacros.mout
-	@cp man/mandoc.db threemacros.db
-	@rm -rf threemacros.dir
-	@mv man threemacros.dir
+	cp man/mandoc.db threemacros.db
+	rm -rf threemacros.dir
+	mv man threemacros.dir
 
 sortpages.db sortpages.mout: makeinodes ${.CURDIR}/../man/empty.1
-	@rm -rf man
-	@./makeinodes
-	@cat ${.CURDIR}/../man/empty.1 >> man/man1/1
-	@cat ${.CURDIR}/../man/empty.1 >> man/man1/2
-	@mv man/man1/1 man/man1/one.1
-	@mv man/man1/2 man/man1/two.1
-	@makewhatis man
-	@man -kM man Nm=empty > sortpages.mout
-	@mv man/mandoc.db sortpages.db
-	@rm -rf man
+	@echo creating $@
+	rm -rf man
+	./makeinodes
+	cat ${.CURDIR}/../man/empty.1 >> man/man1/1
+	cat ${.CURDIR}/../man/empty.1 >> man/man1/2
+	mv man/man1/1 man/man1/one.1
+	mv man/man1/2 man/man1/two.1
+	makewhatis man
+	man -kM man Nm=empty > sortpages.mout
+	mv man/mandoc.db sortpages.db
+	rm -rf man
 
 sortpages_rev.db sortpages_rev.mout: makeinodes ${.CURDIR}/../man/empty.1
-	@rm -rf man
-	@./makeinodes
-	@cat ${.CURDIR}/../man/empty.1 >> man/man1/1
-	@cat ${.CURDIR}/../man/empty.1 >> man/man1/2
-	@mv man/man1/2 man/man1/one.1
-	@mv man/man1/1 man/man1/two.1
-	@makewhatis man
-	@man -kM man Nm=empty > sortpages_rev.mout
-	@mv man/mandoc.db sortpages_rev.db
-	@rm -rf man
+	@echo creating $@
+	rm -rf man
+	./makeinodes
+	cat ${.CURDIR}/../man/empty.1 >> man/man1/1
+	cat ${.CURDIR}/../man/empty.1 >> man/man1/2
+	mv man/man1/2 man/man1/one.1
+	mv man/man1/1 man/man1/two.1
+	makewhatis man
+	man -kM man Nm=empty > sortpages_rev.mout
+	mv man/mandoc.db sortpages_rev.db
+	rm -rf man
 
 so.db so.mout: makeinodes ${.CURDIR}/../man/empty.1
-	@rm -rf man
-	@./makeinodes
-	@cat ${.CURDIR}/../man/empty.1 >> man/man1/1
-	@echo ".so man1/one.1" >> man/man1/2
-	@mv man/man1/1 man/man1/one.1
-	@mv man/man1/2 man/man1/two.1
-	@makewhatis man
-	@man -wM man two | sed 's#.*/man/##' > so.mout
-	@mv man/mandoc.db so.db
-	@rm -rf man
+	@echo creating $@
+	rm -rf man
+	./makeinodes
+	cat ${.CURDIR}/../man/empty.1 >> man/man1/1
+	echo ".so man1/one.1" >> man/man1/2
+	mv man/man1/1 man/man1/one.1
+	mv man/man1/2 man/man1/two.1
+	makewhatis man
+	man -wM man two | sed 's#.*/man/##' > so.mout
+	mv man/mandoc.db so.db
+	rm -rf man
 
 so_rev.db so_rev.mout: makeinodes ${.CURDIR}/../man/empty.1
-	@rm -rf man
-	@./makeinodes
-	@cat ${.CURDIR}/../man/empty.1 >> man/man1/2
-	@echo ".so man1/one.1" >> man/man1/1
-	@mv man/man1/2 man/man1/one.1
-	@mv man/man1/1 man/man1/two.1
-	@makewhatis man
-	@man -wM man two | sed 's#.*/man/##' > so_rev.mout
-	@mv man/mandoc.db so_rev.db
-	@rm -rf man
+	@echo creating $@
+	rm -rf man
+	./makeinodes
+	cat ${.CURDIR}/../man/empty.1 >> man/man1/2
+	echo ".so man1/one.1" >> man/man1/1
+	mv man/man1/2 man/man1/one.1
+	mv man/man1/1 man/man1/two.1
+	makewhatis man
+	man -wM man two | sed 's#.*/man/##' > so_rev.mout
+	mv man/mandoc.db so_rev.db
+	rm -rf man
 
 sortnames.db sortnames.mout: ${.CURDIR}/../man/sortnames.1
-	@rm -rf man
-	@mkdir -p man/man1
-	@cp ${.CURDIR}/../man/sortnames.1 man/man1/
-	@ln man/man1/sortnames.1 man/man1/link.1
-	@makewhatis man
-	@man -kM man Nm=onlysyn > sortnames.mout
-	@mv man/mandoc.db sortnames.db
-	@rm -rf man
+	@echo creating $@
+	rm -rf man
+	mkdir -p man/man1
+	cp ${.CURDIR}/../man/sortnames.1 man/man1/
+	ln man/man1/sortnames.1 man/man1/link.1
+	makewhatis man
+	man -kM man Nm=onlysyn > sortnames.mout
+	mv man/mandoc.db sortnames.db
+	rm -rf man
 
 twosect.db twosect.mout: ${.CURDIR}/../man/empty.1
-	@rm -rf man
-	@mkdir -p man/man1
-	@mkdir -p man/man8
-	@cp ${.CURDIR}/../man/empty.1 man/man1/
-	@ln man/man1/empty.1 man/man8/empty.8
-	@makewhatis man
-	@man -kM man -s 1 title > twosect.mout
-	@mv man/mandoc.db twosect.db
-	@rm -rf man
+	@echo creating $@
+	rm -rf man
+	mkdir -p man/man1
+	mkdir -p man/man8
+	cp ${.CURDIR}/../man/empty.1 man/man1/
+	ln man/man1/empty.1 man/man8/empty.8
+	makewhatis man
+	man -kM man -s 1 title > twosect.mout
+	mv man/mandoc.db twosect.db
+	rm -rf man
 
 twoarch.db twoarch.mout: ${.CURDIR}/../man/empty.1
-	@rm -rf man
-	@mkdir -p man/man1/i386
-	@mkdir -p man/man1/amd64
-	@cp ${.CURDIR}/../man/empty.1 man/man1/i386
-	@ln man/man1/i386/empty.1 man/man1/amd64/empty.1
-	@makewhatis man
-	@man -kM man -S i386 title > twoarch.mout
-	@mv man/mandoc.db twoarch.db
-	@rm -rf man
+	@echo creating $@
+	rm -rf man
+	mkdir -p man/man1/i386
+	mkdir -p man/man1/amd64
+	cp ${.CURDIR}/../man/empty.1 man/man1/i386
+	ln man/man1/i386/empty.1 man/man1/amd64/empty.1
+	makewhatis man
+	man -kM man -S i386 title > twoarch.mout
+	mv man/mandoc.db twoarch.db
+	rm -rf man
 
 threearch.db threearch.mout: ${.CURDIR}/../man/empty.1
-	@rm -rf man
-	@mkdir -p man/man1/amd64
-	@mkdir -p man/man1/i386
-	@mkdir -p man/man1/sgi
-	@cp ${.CURDIR}/../man/empty.1 man/man1/amd64/
-	@cp ${.CURDIR}/../man/empty.1 man/man1/i386/
-	@cp ${.CURDIR}/../man/empty.1 man/man1/sgi/
-	@makewhatis man
-	@(echo "> amd64"; man -wM man -S amd64 empty | sed 's#.*/man/##'; \
+	@echo creating $@
+	rm -rf man
+	mkdir -p man/man1/amd64
+	mkdir -p man/man1/i386
+	mkdir -p man/man1/sgi
+	cp ${.CURDIR}/../man/empty.1 man/man1/amd64/
+	cp ${.CURDIR}/../man/empty.1 man/man1/i386/
+	cp ${.CURDIR}/../man/empty.1 man/man1/sgi/
+	makewhatis man
+	(echo "> amd64"; man -wM man -S amd64 empty | sed 's#.*/man/##'; \
 	  echo "> i386"; man -wM man -S i386 empty | sed 's#.*/man/##'; \
 	  echo "> sgi"; man -wM man -S sgi empty | sed 's#.*/man/##') \
 	  > threearch.mout
-	@cp man/mandoc.db threearch.db
-	@rm -rf threearch.dir
-	@mv man threearch.dir
+	cp man/mandoc.db threearch.db
+	rm -rf threearch.dir
+	mv man threearch.dir
 
 fn.db fn.mout: ${.CURDIR}/../man/fn.3
-	@rm -rf man
-	@mkdir -p man/man3
-	@cp ${.CURDIR}/../man/fn.3 man/man3/
-	@makewhatis man
-	@(echo "> fn_type"; man -kwM man Ft=fn_type | sed 's#.*/man/##'; \
+	@echo creating $@
+	rm -rf man
+	mkdir -p man/man3
+	cp ${.CURDIR}/../man/fn.3 man/man3/
+	makewhatis man
+	(echo "> fn_type"; man -kwM man Ft=fn_type | sed 's#.*/man/##'; \
 	  echo "> fn_func"; man -kwM man Fn=fn_func | sed 's#.*/man/##'; \
 	  echo "> fn_arg";  man -kwM man Fa=fn_arg  | sed 's#.*/man/##'; \
 	  echo "> fo_type"; man -kwM man Ft=fo_type | sed 's#.*/man/##'; \
 	  echo "> fo_func"; man -kwM man Fn=fo_func 2>&1 | sed 's#.*/man/##'; \
 	  echo "> fo_arg";  man -kwM man Fa=fo_arg  | sed 's#.*/man/##') \
 	  > fn.mout
-	@mv man/mandoc.db fn.db
-	@rm -rf man
+	mv man/mandoc.db fn.db
+	rm -rf man
 
 in.db in.mout: ${.CURDIR}/../man/in.3
-	@rm -rf man
-	@mkdir -p man/man3
-	@cp ${.CURDIR}/../man/in.3 man/man3/
-	@makewhatis man
-	@(echo "> In"; man -kwM man In=in.h | sed 's#.*/man/##'; \
+	@echo creating $@
+	rm -rf man
+	mkdir -p man/man3
+	cp ${.CURDIR}/../man/in.3 man/man3/
+	makewhatis man
+	(echo "> In"; man -kwM man In=in.h | sed 's#.*/man/##'; \
 	  echo "> Fd"; man -kwM man In=fd.h | sed 's#.*/man/##') \
 	  > in.mout
-	@mv man/mandoc.db in.db
-	@rm -rf man
+	mv man/mandoc.db in.db
+	rm -rf man
 
 va.db va.mout: ${.CURDIR}/../man/va.3
-	@rm -rf man
-	@mkdir -p man/man3
-	@cp ${.CURDIR}/../man/va.3 man/man3/
-	@makewhatis man
-	@(echo "> b2"; man -kwM man Va='block vt_two' | sed 's#.*/man/##'; \
+	@echo creating $@
+	rm -rf man
+	mkdir -p man/man3
+	cp ${.CURDIR}/../man/va.3 man/man3/
+	makewhatis man
+	(echo "> b2"; man -kwM man Va='block vt_two' | sed 's#.*/man/##'; \
 	  echo "> t1"; man -kwM man Vt='vt_one' | sed 's#.*/man/##'; \
 	  echo "> a1"; man -kwM man Va='va_one'  | sed 's#.*/man/##'; \
 	  echo "> t2"; man -kwM man Vt='struct vt_two' | sed 's#.*/man/##'; \
 	  echo "> a2"; man -kwM man Va='int va_two'  | sed 's#.*/man/##') \
 	  > va.mout
-	@mv man/mandoc.db va.db
-	@rm -rf man
+	mv man/mandoc.db va.db
+	rm -rf man
 
 sh.db sh.mout: ${.CURDIR}/../man/sh.1
-	@rm -rf man
-	@mkdir -p man/man1
-	@cp ${.CURDIR}/../man/sh.1 man/man1/
-	@makewhatis man
-	@(echo "> Sh"; man -kwM man Sh=sh_title | sed 's#.*/man/##'; \
+	@echo creating $@
+	rm -rf man
+	mkdir -p man/man1
+	cp ${.CURDIR}/../man/sh.1 man/man1/
+	makewhatis man
+	(echo "> Sh"; man -kwM man Sh=sh_title | sed 's#.*/man/##'; \
 	  echo "> Ss"; man -kwM man Ss=ss_title | sed 's#.*/man/##') \
 	  > sh.mout
-	@mv man/mandoc.db sh.db
-	@rm -rf man
+	mv man/mandoc.db sh.db
+	rm -rf man
 
 xr.db xr.mout: ${.CURDIR}/../man/xr.1
-	@rm -rf man
-	@mkdir -p man/man1
-	@cp ${.CURDIR}/../man/xr.1 man/man1/
-	@makewhatis man
-	@(echo "> bare"; man -kwM man 'Xr~^bare$$' | sed 's#.*/man/##'; \
+	@echo creating $@
+	rm -rf man
+	mkdir -p man/man1
+	cp ${.CURDIR}/../man/xr.1 man/man1/
+	makewhatis man
+	(echo "> bare"; man -kwM man 'Xr~^bare$$' | sed 's#.*/man/##'; \
 	  echo "> page"; man -kwM man 'Xr=page(1)' | sed 's#.*/man/##') \
 	  > xr.mout
-	@mv man/mandoc.db xr.db
-	@rm -rf man
+	mv man/mandoc.db xr.db
+	rm -rf man
 
 badname0.mout badname0.merr: badname0.db
-	@rm -rf man
-	@cp -pR onepage.dir man
-	@cp badname0.db man/mandoc.db
-	@man -wM man empty > badname0.mout 2> badname0.merr
-	@rm -rf man
+	@echo creating $@
+	rm -rf man
+	cp -pR onepage.dir man
+	cp badname0.db man/mandoc.db
+	man -wM man empty > badname0.mout 2> badname0.merr
+	rm -rf man
 
 badname.mout badname.merr: badname.db
-	@rm -rf man
-	@cp -pR threepages.dir man
-	@cp badname.db man/mandoc.db
-	@man -wM man empty > badname.mout 2> badname.merr
-	@rm -rf man
+	@echo creating $@
+	rm -rf man
+	cp -pR threepages.dir man
+	cp badname.db man/mandoc.db
+	man -wM man empty > badname.mout 2> badname.merr
+	rm -rf man
 
 badsect0.mout badsect0.merr: badsect0.db
-	@rm -rf man
-	@cp -pR onepage.dir man
-	@cp badsect0.db man/mandoc.db
-	@man -wM man -s 1 empty > badsect0.mout 2> badsect0.merr
-	@rm -rf man
+	@echo creating $@
+	rm -rf man
+	cp -pR onepage.dir man
+	cp badsect0.db man/mandoc.db
+	man -wM man -s 1 empty > badsect0.mout 2> badsect0.merr
+	rm -rf man
 
 badsect.mout badsect.merr: badsect.db
-	@rm -rf man
-	@cp -pR threepages.dir man
-	@cp badsect.db man/mandoc.db
-	@man -wM man -s 1 empty > badsect.mout 2> badsect.merr
-	@rm -rf man
+	@echo creating $@
+	rm -rf man
+	cp -pR threepages.dir man
+	cp badsect.db man/mandoc.db
+	man -wM man -s 1 empty > badsect.mout 2> badsect.merr
+	rm -rf man
 
 badarch0.mout badarch0.merr: badarch0.db
-	@rm -rf man
-	@cp -pR threearch.dir man
-	@cp badarch0.db man/mandoc.db
-	@man -wM man -S amd64 empty > badarch0.mout 2> badarch0.merr
-	@rm -rf man
+	@echo creating $@
+	rm -rf man
+	cp -pR threearch.dir man
+	cp badarch0.db man/mandoc.db
+	man -wM man -S amd64 empty > badarch0.mout 2> badarch0.merr
+	rm -rf man
 
 badarch.mout badarch.merr: badarch.db
-	@rm -rf man
-	@cp -pR threearch.dir man
-	@cp badarch.db man/mandoc.db
-	@man -wM man -S i386 empty > badarch.mout 2> badarch.merr
-	@rm -rf man
+	@echo creating $@
+	rm -rf man
+	cp -pR threearch.dir man
+	cp badarch.db man/mandoc.db
+	man -wM man -S i386 empty > badarch.mout 2> badarch.merr
+	rm -rf man
 
 baddesc0.mout baddesc0.merr: baddesc0.db
-	@rm -rf man
-	@cp -pR onepage.dir man
-	@cp baddesc0.db man/mandoc.db
-	@man -kM man empty > baddesc0.mout 2> baddesc0.merr
-	@rm -rf man
+	@echo creating $@
+	rm -rf man
+	cp -pR onepage.dir man
+	cp baddesc0.db man/mandoc.db
+	man -kM man empty > baddesc0.mout 2> baddesc0.merr
+	rm -rf man
 
 baddesc.mout baddesc0.merr: baddesc.db
-	@rm -rf man
-	@cp -pR threepages.dir man
-	@cp baddesc.db man/mandoc.db
-	@man -kM man empty > baddesc.mout 2> baddesc.merr
-	@rm -rf man
+	@echo creating $@
+	rm -rf man
+	cp -pR threepages.dir man
+	cp baddesc.db man/mandoc.db
+	man -kM man empty > baddesc.mout 2> baddesc.merr
+	rm -rf man
 
 badfile0.mout badfile0.merr: badfile0.db
-	@rm -rf man
-	@cp -pR onepage.dir man
-	@cp badfile0.db man/mandoc.db
-	@man -wM man empty > badfile0.mout 2> badfile0.merr
-	@rm -rf man
+	@echo creating $@
+	rm -rf man
+	cp -pR onepage.dir man
+	cp badfile0.db man/mandoc.db
+	man -wM man empty > badfile0.mout 2> badfile0.merr
+	rm -rf man
 
 badfile.mout badfile.merr: badfile.db
-	@rm -rf man
-	@cp -pR threepages.dir man
-	@cp badfile.db man/mandoc.db
-	@man -wM man empty > badfile.mout 2> badfile.merr
-	@rm -rf man
+	@echo creating $@
+	rm -rf man
+	cp -pR threepages.dir man
+	cp badfile.db man/mandoc.db
+	man -wM man empty > badfile.mout 2> badfile.merr
+	rm -rf man
 
 all.mout: ${MOB_TESTS:C/$/.mout/}
-	@for f in ${MOB_TESTS}; \
+	for f in ${MOB_TESTS}; \
 		do printf "\n>>> $$f\n"; cat $$f.mout || true; done > $@
 
 all.merr: ${MEB_TESTS:C/$/.merr/}
-	@for f in ${MEB_TESTS}; \
+	for f in ${MEB_TESTS}; \
 		do printf "\n>>> $$f\n"; cat $$f.merr || true; done > $@
 
 
 # === RUNNING BINEDIT ==================================================
 
 padipage.db: binedit twopages.db
-	@./binedit c16rw1f < twopages.db > $@
+	./binedit c16rw1f < twopages.db > $@
 
 padfpage.db: binedit twopages.db
-	@./binedit c16rw1s20c20w0w0w0w0w0f < twopages.db > $@
+	./binedit c16rw1s20c20w0w0w0w0w0f < twopages.db > $@
 
 padmpage.db: binedit threepages.db
-	@./binedit c16rw2c20s20c20w0w0w0w0w0f < threepages.db > $@
+	./binedit c16rw2c20s20c20w0w0w0w0w0f < threepages.db > $@
 
 badname0.db: binedit onepage.db
-	@./binedit c20rw-1f < onepage.db > $@
+	./binedit c20rw-1f < onepage.db > $@
 
 badname.db: binedit threepages.db
-	@./binedit c40rw-1f < threepages.db > $@
+	./binedit c40rw-1f < threepages.db > $@
 
 badsect0.db: binedit onepage.db
-	@./binedit c24rw-1f < onepage.db > $@
+	./binedit c24rw-1f < onepage.db > $@
 
 badsect.db: binedit threepages.db
-	@./binedit c44rw-1f < threepages.db > $@
+	./binedit c44rw-1f < threepages.db > $@
 
 badarch0.db: binedit threearch.db
-	@./binedit c28rw-1f < threearch.db > $@
+	./binedit c28rw-1f < threearch.db > $@
 
 badarch.db: binedit threearch.db
-	@./binedit c48rw-1f < threearch.db > $@
+	./binedit c48rw-1f < threearch.db > $@
 
 baddesc0.db: binedit onepage.db
-	@./binedit c32rw-1f < onepage.db > $@
+	./binedit c32rw-1f < onepage.db > $@
 
 baddesc.db: binedit threepages.db
-	@./binedit c52rw-1f < threepages.db > $@
+	./binedit c52rw-1f < threepages.db > $@
 
 badfile0.db: binedit onepage.db
-	@./binedit c36rw-1f < onepage.db > $@
+	./binedit c36rw-1f < onepage.db > $@
 
 badfile.db: binedit threepages.db
-	@./binedit c56rw-1f < threepages.db > $@
+	./binedit c56rw-1f < threepages.db > $@
 
 padmacros.db: binedit onepage.db
-	@./binedit c16rw0f < onepage.db > $@
+	./binedit c16rw0f < onepage.db > $@
 
 padimacro.db: binedit onepage.db
-	@./binedit c8rdwri4wac4s4c136rwi4ww0f < onepage.db > $@
+	./binedit c8rdwri4wac4s4c136rwi4ww0f < onepage.db > $@
 
 padmmacro.db: binedit onepage.db
-	@./binedit c8rdwri4wac8s4c132rwi4ww0f < onepage.db > $@
+	./binedit c8rdwri4wac8s4c132rwi4ww0f < onepage.db > $@
 
 padientry.db: binedit threemacros.db
-	@./binedit c8rdwac4rdwarw2f < threemacros.db > $@
+	./binedit c8rdwac4rdwarw2f < threemacros.db > $@
 
 padfentry.db: binedit threemacros.db
-	@./binedit c8rdwac4rdwarw2s8c16w0w0f < threemacros.db > $@
+	./binedit c8rdwac4rdwarw2s8c16w0w0f < threemacros.db > $@
 
 padmentry.db: binedit threemacros.db
-	@./binedit c8rdwac4rdwarw2c8s8c8w0w0f < threemacros.db > $@
+	./binedit c8rdwac4rdwarw2c8s8c8w0w0f < threemacros.db > $@
 
 padfmagic.db: binedit onepage.db
-	@./binedit c12rdi4waw0f < onepage.db > $@
+	./binedit c12rdi4waw0f < onepage.db > $@
 
 nonexistent.db:
-	@rm -rf nonexistent.db
+	rm -rf nonexistent.db
 
 short.db:
-	@echo 'sho' > $@
+	echo 'sho' > $@
 
 badimagic.db: binedit onepage.db
-	@./binedit riwf < onepage.db > $@
+	./binedit riwf < onepage.db > $@
 
 badversion.db: binedit onepage.db
-	@./binedit c4riwf < onepage.db > $@
+	./binedit c4riwf < onepage.db > $@
 
 badmacrosp.db: binedit onepage.db
-	@./binedit c8rw1000f < onepage.db > $@
+	./binedit c8rw1000f < onepage.db > $@
 
 badendp.db: binedit onepage.db
-	@./binedit c12riwf < onepage.db > $@
+	./binedit c12riwf < onepage.db > $@
 
 badnpages.db: binedit onepage.db
-	@./binedit c16rw-1f < onepage.db > $@
+	./binedit c16rw-1f < onepage.db > $@
 
 badnmacros.db: binedit onepage.db
-	@./binedit c8rdwariwf < onepage.db > $@
+	./binedit c8rdwariwf < onepage.db > $@
 
 badmacrop.db: binedit onepage.db
-	@./binedit c8rdwac4rw1000f < onepage.db > $@
+	./binedit c8rdwac4rw1000f < onepage.db > $@
 
 badfmagic.db: binedit onepage.db
-	@./binedit c12rdwariwf < onepage.db > $@
+	./binedit c12rdwariwf < onepage.db > $@
 
 
 # === GETTING ACCESS TO THE UTILITIES ==================================
diff --git a/regress/usr.bin/mandoc/eqn/Makefile.inc b/regress/usr.bin/mandoc/eqn/Makefile.inc
index 9474410c8a3..bc872bb13d8 100644
--- a/regress/usr.bin/mandoc/eqn/Makefile.inc
+++ b/regress/usr.bin/mandoc/eqn/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.4 2020/01/08 10:17:15 schwarze Exp $
+# $OpenBSD: Makefile.inc,v 1.5 2020/07/30 21:32:19 schwarze Exp $
 
 SKIP_GROFF ?= ${REGRESS_TARGETS}
 SKIP_TMAN ?= ALL
@@ -8,7 +8,7 @@ _FULLHTMLFILES = ${HTML_TARGETS:S/$/.html/}
 
 html-clean:
 .if !empty(_FULLHTMLFILES)
-	@rm -f ${_HTMLFILES} ${_FULLHTMLFILES}
+	rm -f ${_HTMLFILES} ${_FULLHTMLFILES}
 .endif
 
 .for t in ${HTML_TARGETS}
@@ -20,5 +20,5 @@ ${t}.out_html: ${t}.in
 .include "../Makefile.inc"
 
 .in.mandoc_html:
-	@${MANDOC} ${MOPTS} -Thtml ${.IMPSRC} > ${.TARGET:S/mandoc_html$/html/}
-	@${.CURDIR}/../extract.pl < ${.TARGET:S/mandoc_html$/html/} > ${.TARGET}
+	${MANDOC} ${MOPTS} -Thtml ${.IMPSRC} > ${.TARGET:S/mandoc_html$/html/}
+	${.CURDIR}/../extract.pl < ${.TARGET:S/mandoc_html$/html/} > ${.TARGET}
diff --git a/regress/usr.bin/mandoc/roff/de/Makefile b/regress/usr.bin/mandoc/roff/de/Makefile
index 86ea8c8c56c..7f40d403c04 100644
--- a/regress/usr.bin/mandoc/roff/de/Makefile
+++ b/regress/usr.bin/mandoc/roff/de/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2019/04/21 23:45:50 schwarze Exp $
+# $OpenBSD: Makefile,v 1.14 2020/07/30 21:32:19 schwarze Exp $
 
 REGRESS_TARGETS	 = append cond empty escname factorial
 REGRESS_TARGETS	+= indir infinite startde tab TH Dd
@@ -26,17 +26,17 @@ groff-clean: groff-clean-opt
 # --- local rules ---
 
 ascii-diff-opt: TH.mandoc_ascii_opt Dd.mandoc_ascii_opt
-	@${DIFF} ${.CURDIR}/TH.out_ascii_opt TH.mandoc_ascii_opt
-	@${DIFF} ${.CURDIR}/Dd.out_ascii_opt Dd.mandoc_ascii_opt
+	${DIFF} ${.CURDIR}/TH.out_ascii_opt TH.mandoc_ascii_opt
+	${DIFF} ${.CURDIR}/Dd.out_ascii_opt Dd.mandoc_ascii_opt
 
 TH.mandoc_ascii_opt: TH.in
-	@${MANDOC} -Ios=OpenBSD -Tascii -man ${.ALLSRC} > ${.TARGET}
+	${MANDOC} -Ios=OpenBSD -Tascii -man ${.ALLSRC} > ${.TARGET}
 
 Dd.mandoc_ascii_opt: Dd.in
-	@${MANDOC} -Ios=OpenBSD -Tascii -mdoc ${.ALLSRC} > ${.TARGET}
+	${MANDOC} -Ios=OpenBSD -Tascii -mdoc ${.ALLSRC} > ${.TARGET}
 
 ascii-clean-opt:
-	@rm -f TH.mandoc_ascii_opt Dd.mandoc_ascii_opt
+	rm -f TH.mandoc_ascii_opt Dd.mandoc_ascii_opt
 
 TH.out_ascii_opt: TH.in
 	/usr/local/bin/nroff -c -man -Tascii ${.ALLSRC} > ${.TARGET}