From 39d478672b8680bafd8d1dcbdaa3ab9ab5cc187d Mon Sep 17 00:00:00 2001
From: Ingo Schwarze <schwarze@openbsd.org>
Date: Wed, 8 Jan 2020 10:37:53 +0000
Subject: Simplify maintainer targets in OpenBSD: EQN and TBL variables no
 longer exist and NROFF/NOPTS were replaced with GROFF/GOPTS. This doesn't
 change how things work in the protable version of the test suite.

---
 regress/eqn/Makefile.inc |  4 +---
 regress/man/TS/Makefile  | 13 ++-----------
 regress/mdoc/Dd/Makefile |  4 ++--
 regress/regress.pl       |  5 ++---
 regress/tbl/Makefile.inc | 13 ++-----------
 5 files changed, 9 insertions(+), 30 deletions(-)

(limited to 'regress')

diff --git a/regress/eqn/Makefile.inc b/regress/eqn/Makefile.inc
index d1d69f34..2e98fb34 100644
--- a/regress/eqn/Makefile.inc
+++ b/regress/eqn/Makefile.inc
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.2 2015/02/03 19:37:25 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/man/TS/Makefile b/regress/man/TS/Makefile
index 1d20dc84..18f11705 100644
--- a/regress/man/TS/Makefile
+++ b/regress/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,14 +10,4 @@ LINT_TARGETS	= break
 
 SKIP_GROFF	= break
 
-
-# OpenBSD only: maintainer targets
-
-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/mdoc/Dd/Makefile b/regress/mdoc/Dd/Makefile
index 870d1cd9..e31b2730 100644
--- a/regress/mdoc/Dd/Makefile
+++ b/regress/mdoc/Dd/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2014/11/21 01:52:45 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/regress.pl b/regress/regress.pl
index d275a7ba..5e7927cb 100755
--- a/regress/regress.pl
+++ b/regress/regress.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/env perl
 #
-# $Id: regress.pl,v 1.12 2019/09/03 18:19:37 schwarze Exp $
+# $Id: regress.pl,v 1.13 2020/01/08 10:37:53 schwarze Exp $
 #
 # Copyright (c) 2017 Ingo Schwarze <schwarze@openbsd.org>
 #
@@ -165,10 +165,9 @@ foreach my $module (qw(roff char mdoc man tbl eqn)) {
 		my %subvars = (MOPTS => '');
 		parse_makefile "$module/$subdir/Makefile", \%subvars;
 		parse_makefile "$module/Makefile.inc", \%subvars;
+		delete $subvars{GOPTS};
 		delete $subvars{SKIP_GROFF};
 		delete $subvars{SKIP_GROFF_ASCII};
-		delete $subvars{TBL};
-		delete $subvars{EQN};
 		my @mandoc = ('../mandoc', split ' ', $subvars{MOPTS});
 		delete $subvars{MOPTS};
 		my @regress_testnames;
diff --git a/regress/tbl/Makefile.inc b/regress/tbl/Makefile.inc
index 95860d51..56c3f7f5 100644
--- a/regress/tbl/Makefile.inc
+++ b/regress/tbl/Makefile.inc
@@ -1,16 +1,7 @@
-# $OpenBSD: Makefile.inc,v 1.2 2015/02/03 19:37:25 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
-
-
-# OpenBSD only: maintainer targets
-
-.for t in ${REGRESS_TARGETS}
-${t}.out_ascii: ${t}.in
-	${TBL} ${.ALLSRC} | ${NROFF} ${NOPTS} -Tascii > ${.TARGET}
-.endfor
+GOPTS = -t
 
 .include "../Makefile.inc"
-- 
cgit v1.2.3-56-ge451