From: schwarze@mandoc.bsd.lv
To: source@mandoc.bsd.lv
Subject: mandoc: Simplify maintainer targets in OpenBSD: EQN and TBL variables no
Date: Wed, 8 Jan 2020 05:38:28 -0500 (EST) [thread overview]
Message-ID: <ba40aa1f2f3874a6@mandoc.bsd.lv> (raw)
Log Message:
-----------
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.
Modified Files:
--------------
mandoc/regress:
regress.pl
mandoc/regress/eqn:
Makefile.inc
mandoc/regress/man/TS:
Makefile
mandoc/regress/mdoc/Dd:
Makefile
mandoc/regress/tbl:
Makefile.inc
Revision Data
-------------
Index: Makefile.inc
===================================================================
RCS file: /home/cvs/mandoc/mandoc/regress/eqn/Makefile.inc,v
retrieving revision 1.2
retrieving revision 1.3
diff -Lregress/eqn/Makefile.inc -Lregress/eqn/Makefile.inc -u -p -r1.2 -r1.3
--- regress/eqn/Makefile.inc
+++ 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
Index: regress.pl
===================================================================
RCS file: /home/cvs/mandoc/mandoc/regress/regress.pl,v
retrieving revision 1.12
retrieving revision 1.13
diff -Lregress/regress.pl -Lregress/regress.pl -u -p -r1.12 -r1.13
--- regress/regress.pl
+++ regress/regress.pl
@@ -165,10 +165,9 @@ foreach my $module (qw(roff char mdoc ma
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;
Index: Makefile
===================================================================
RCS file: /home/cvs/mandoc/mandoc/regress/mdoc/Dd/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -Lregress/mdoc/Dd/Makefile -Lregress/mdoc/Dd/Makefile -u -p -r1.3 -r1.4
--- regress/mdoc/Dd/Makefile
+++ 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>
Index: Makefile
===================================================================
RCS file: /home/cvs/mandoc/mandoc/regress/man/TS/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lregress/man/TS/Makefile -Lregress/man/TS/Makefile -u -p -r1.1 -r1.2
--- regress/man/TS/Makefile
+++ regress/man/TS/Makefile
@@ -1,22 +1,13 @@
-# $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,
# and in the case of .TP indentation as well.
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>
Index: Makefile.inc
===================================================================
RCS file: /home/cvs/mandoc/mandoc/regress/tbl/Makefile.inc,v
retrieving revision 1.2
retrieving revision 1.3
diff -Lregress/tbl/Makefile.inc -Lregress/tbl/Makefile.inc -u -p -r1.2 -r1.3
--- regress/tbl/Makefile.inc
+++ 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"
--
To unsubscribe send an email to source+unsubscribe@mandoc.bsd.lv
reply other threads:[~2020-01-08 10:38 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ba40aa1f2f3874a6@mandoc.bsd.lv \
--to=schwarze@mandoc.bsd.lv \
--cc=source@mandoc.bsd.lv \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).