Give up on the illusion that the maintainer targets for regenerating the

desired output files could be run with an arbitrary roff(7) implementation;
in reality, it only makes sense to run them with groff(1).
Also, there is really no point in allowing the groff command line arguments
to be overridden; running these targets only makes sense with exactly the
right options.  So get rid of the fragile ?= and += construct for groff
options and make sure the options are always passed in a reasonable order.
Finally, use groff(1) directly rather than the shallow nroff(1) wrapper
because GNU nroff(1) does not support running the GNU eqn(1) preprocessor,
which will probably be needed soon, and also because it simplifies using
the GNU tbl(1) preprocessor.

5 files changed, 12 insertions, 31 deletions

diff --git a/regress/usr.bin/mandoc/Makefile.inc b/regress/usr.bin/mandoc/Makefile.inc
index 06cb40ee255..7c89c13860e 100644
--- a/regress/usr.bin/mandoc/Makefile.inc
+++ b/regress/usr.bin/mandoc/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.25 2019/09/03 18:17:50 schwarze Exp $
+# $OpenBSD: Makefile.inc,v 1.26 2020/01/08 10:17:14 schwarze Exp $
 
 .include "Makefile.sub"
 
@@ -6,6 +6,7 @@
 
 DIFF = diff -au
 MANDOC ?= mandoc
+MOPTS ?= -mandoc
 
 # --- lists of targets ---
 
@@ -194,13 +195,7 @@ lint-clean:
 
 # --- the groff program ---
 
-NROFF	 = /usr/local/bin/nroff -c
-
-.ifdef MOPTS
-NOPTS	?= ${MOPTS}
-.else
-NOPTS	?= -mandoc -Wall
-.endif
+GROFF	 = /usr/local/bin/groff ${GOPTS} -mtty-char ${MOPTS} -Wall -P-c
 
 # --- the list of targets ---
 
@@ -254,7 +249,7 @@ lint-out: obj-check ${_LINTOUTFILES}
 .  if empty(SKIP_ASCII:M${t}) && empty(SKIP_ASCII:MALL)
 .    if empty(SKIP_GROFF_ASCII:M${t})
 ${t}.out_ascii: ${t}.in
-	${NROFF} ${NOPTS} -Tascii ${.ALLSRC} > ${.TARGET}
+	${GROFF} -Tascii ${.ALLSRC} > ${.TARGET}
 .    else
 .PHONY: ${t}.out_ascii
 ${t}.out_ascii:
@@ -266,7 +261,7 @@ ${t}.out_ascii:
 .for t in ${UTF8_TARGETS}
 .  if empty(SKIP_GROFF_UTF8:M${t})
 ${t}.out_utf8: ${t}.in
-	${NROFF} ${NOPTS} -Tutf8 ${.ALLSRC} > ${.TARGET}
+	${GROFF} -Tutf8 ${.ALLSRC} > ${.TARGET}
 .  else
 .PHONY: ${t}.out_utf8
 ${t}.out_utf8:
diff --git a/regress/usr.bin/mandoc/eqn/Makefile.inc b/regress/usr.bin/mandoc/eqn/Makefile.inc
index 346400994a3..9474410c8a3 100644
--- a/regress/usr.bin/mandoc/eqn/Makefile.inc
+++ b/regress/usr.bin/mandoc/eqn/Makefile.inc
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.3 2017/03/08 22:53:35 schwarze Exp $
-
-EQN = /usr/local/bin/eqn
+# $OpenBSD: Makefile.inc,v 1.4 2020/01/08 10:17:15 schwarze Exp $
 
 SKIP_GROFF ?= ${REGRESS_TARGETS}
 SKIP_TMAN ?= ALL
diff --git a/regress/usr.bin/mandoc/man/TS/Makefile b/regress/usr.bin/mandoc/man/TS/Makefile
index 23a163b782b..18f11705f6a 100644
--- a/regress/usr.bin/mandoc/man/TS/Makefile
+++ b/regress/usr.bin/mandoc/man/TS/Makefile
@@ -1,7 +1,8 @@
-# $OpenBSD: Makefile,v 1.3 2015/01/30 21:28:21 schwarze Exp $
+# $OpenBSD: Makefile,v 1.4 2020/01/08 10:17:15 schwarze Exp $
 
 REGRESS_TARGETS	= break vspace
 LINT_TARGETS	= break
+GOPTS		= -t
 
 # groff-1.22.3 defect:
 # - Starting a table in next-line scope confuses font handling,
@@ -9,11 +10,4 @@ LINT_TARGETS	= break
 
 SKIP_GROFF	= break
 
-TBL=/usr/local/bin/tbl
-
-.for t in ${REGRESS_TARGETS}
-${t}.out_ascii: ${t}.in
-	${TBL} ${.ALLSRC} | ${NROFF} ${NOPTS} -Tascii > ${.TARGET}
-.endfor
-
 .include <bsd.regress.mk>
diff --git a/regress/usr.bin/mandoc/mdoc/Dd/Makefile b/regress/usr.bin/mandoc/mdoc/Dd/Makefile
index dea07a2782e..e31b2730bc8 100644
--- a/regress/usr.bin/mandoc/mdoc/Dd/Makefile
+++ b/regress/usr.bin/mandoc/mdoc/Dd/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2017/03/08 22:53:35 schwarze Exp $
+# $OpenBSD: Makefile,v 1.5 2020/01/08 10:17:15 schwarze Exp $
 
 REGRESS_TARGETS	 = badarg dupe late long manarg noarg order
 LINT_TARGETS	 = badarg dupe late long manarg noarg order
@@ -18,6 +18,6 @@ SKIP_GROFF	 = badarg long manarg noarg
 
 # Autodetection fails for late .Dd, so specify -mdoc explicitly.
 
-MOPTS		+= -mdoc
+MOPTS		 = -mdoc
 
 .include <bsd.regress.mk>
diff --git a/regress/usr.bin/mandoc/tbl/Makefile.inc b/regress/usr.bin/mandoc/tbl/Makefile.inc
index 61a73dc2196..56c3f7f5140 100644
--- a/regress/usr.bin/mandoc/tbl/Makefile.inc
+++ b/regress/usr.bin/mandoc/tbl/Makefile.inc
@@ -1,13 +1,7 @@
-# $OpenBSD: Makefile.inc,v 1.3 2017/03/08 22:53:36 schwarze Exp $
-
-TBL = /usr/local/bin/tbl
+# $OpenBSD: Makefile.inc,v 1.4 2020/01/08 10:17:15 schwarze Exp $
 
 SKIP_TMAN ?= ALL
 SKIP_MARKDOWN ?= ALL
-
-.for t in ${REGRESS_TARGETS}
-${t}.out_ascii: ${t}.in
-	${TBL} ${.ALLSRC} | ${NROFF} ${NOPTS} -Tascii > ${.TARGET}
-.endfor
+GOPTS = -t
 
 .include "../Makefile.inc"