25 files changed, 7 insertions, 24 deletions
diff --git a/regress/mdoc/Op/Makefile b/regress/mdoc/Op/Makefile
index 2f3eeafb..ab934a4e 100644
--- a/regress/mdoc/Op/Makefile
+++ b/regress/mdoc/Op/Makefile
@@ -2,7 +2,6 @@
 
 REGRESS_TARGETS	= break broken punct
 LINT_TARGETS	= break broken
-MARKDOWN_TARGETS = break broken punct
 
 SKIP_GROFF	= break
 SKIP_ASCII	= break
diff --git a/regress/mdoc/Os/Makefile b/regress/mdoc/Os/Makefile
index bef971bf..b3e0fe06 100644
--- a/regress/mdoc/Os/Makefile
+++ b/regress/mdoc/Os/Makefile
@@ -2,7 +2,6 @@
 
 REGRESS_TARGETS	 = dupe late long missing
 LINT_TARGETS	 = dupe late missing
-MARKDOWN_TARGETS = dupe late long missing
 
 SKIP_GROFF	 = long
 
diff --git a/regress/mdoc/Ox/Makefile b/regress/mdoc/Ox/Makefile
index 44c7d855..8c9fac07 100644
--- a/regress/mdoc/Ox/Makefile
+++ b/regress/mdoc/Ox/Makefile
@@ -1,6 +1,5 @@
 # $OpenBSD: Makefile,v 1.3 2012/07/18 16:55:54 schwarze Exp $
 
 REGRESS_TARGETS	 = keep
-MARKDOWN_TARGETS = keep
 
 .include <bsd.regress.mk>
diff --git a/regress/mdoc/Pa/Makefile b/regress/mdoc/Pa/Makefile
index 1c9cadc7..5f939fd3 100644
--- a/regress/mdoc/Pa/Makefile
+++ b/regress/mdoc/Pa/Makefile
@@ -1,7 +1,6 @@
 # $OpenBSD: Makefile,v 1.4 2014/08/21 12:56:24 schwarze Exp $
 
 REGRESS_TARGETS	= font punct
-MARKDOWN_TARGETS = font punct
 
 # XXX The FILES target doesn't currently work.
 
diff --git a/regress/mdoc/Pf/Makefile b/regress/mdoc/Pf/Makefile
index 7a9c9218..c222abf1 100644
--- a/regress/mdoc/Pf/Makefile
+++ b/regress/mdoc/Pf/Makefile
@@ -2,6 +2,5 @@
 
 REGRESS_TARGETS	= spacing
 LINT_TARGETS	= spacing
-MARKDOWN_TARGETS = spacing
 
 .include <bsd.regress.mk>
diff --git a/regress/mdoc/Pp/Makefile b/regress/mdoc/Pp/Makefile
index c51ed473..04e1bc3b 100644
--- a/regress/mdoc/Pp/Makefile
+++ b/regress/mdoc/Pp/Makefile
@@ -2,6 +2,5 @@
 
 REGRESS_TARGETS	 = arg
 LINT_TARGETS	 = arg
-MARKDOWN_TARGETS = arg
 
 .include <bsd.regress.mk>
diff --git a/regress/mdoc/Qq/Makefile b/regress/mdoc/Qq/Makefile
index 9068940e..263752b9 100644
--- a/regress/mdoc/Qq/Makefile
+++ b/regress/mdoc/Qq/Makefile
@@ -1,6 +1,5 @@
 # $OpenBSD: Makefile,v 1.1.1.1 2011/12/04 03:09:25 schwarze Exp $
 
 REGRESS_TARGETS	 = empty
-MARKDOWN_TARGETS = empty
 
 .include <bsd.regress.mk>
diff --git a/regress/mdoc/Rs/Makefile b/regress/mdoc/Rs/Makefile
index 374b386a..3732dc0a 100644
--- a/regress/mdoc/Rs/Makefile
+++ b/regress/mdoc/Rs/Makefile
@@ -3,7 +3,6 @@
 REGRESS_TARGETS	 = allch args break empty three_authors
 UTF8_TARGETS	 = allch break empty three_authors
 LINT_TARGETS	 = allch args empty
-MARKDOWN_TARGETS = allch args break empty three_authors
 
 # groff-1.22.3 defect:
 # - arguments after .Rs cause the macro to be ignored
diff --git a/regress/mdoc/Rv/Makefile b/regress/mdoc/Rv/Makefile
index 60fb1de7..ad804eec 100644
--- a/regress/mdoc/Rv/Makefile
+++ b/regress/mdoc/Rv/Makefile
@@ -2,11 +2,14 @@
 
 REGRESS_TARGETS	 = args noname nostd
 LINT_TARGETS	 = noname nostd
-MARKDOWN_TARGETS = args nostd
 
 # groff-1.22.2 defect:
 # - .Rv without -std produces no output
 
 SKIP_GROFF	 = nostd
 
+# ugly name section output, do not test this for now
+
+SKIP_MARKDOWN	?= noname
+
 .include <bsd.regress.mk>
diff --git a/regress/mdoc/Sh/Makefile b/regress/mdoc/Sh/Makefile
index e6070870..a1db1161 100644
--- a/regress/mdoc/Sh/Makefile
+++ b/regress/mdoc/Sh/Makefile
@@ -4,8 +4,6 @@ REGRESS_TARGETS	 = badNAME before empty emptyNAME first nohead order
 REGRESS_TARGETS	+= orderNAME punctNAME subbefore
 LINT_TARGETS	 = badNAME before empty emptyNAME first nohead order
 LINT_TARGETS	+= orderNAME punctNAME subbefore
-MARKDOWN_TARGETS  = badNAME before empty emptyNAME first nohead order
-MARKDOWN_TARGETS += orderNAME punctNAME subbefore
 
 SKIP_GROFF	= subbefore first empty
 SKIP_ASCII	= first
diff --git a/regress/mdoc/Sm/Makefile b/regress/mdoc/Sm/Makefile
index d6feafe0..197b1d74 100644
--- a/regress/mdoc/Sm/Makefile
+++ b/regress/mdoc/Sm/Makefile
@@ -2,7 +2,6 @@
 
 REGRESS_TARGETS	= noarg badarg scope spacing-No spacing-Op twoarg
 LINT_TARGETS	= badarg twoarg
-MARKDOWN_TARGETS = noarg badarg scope spacing-No spacing-Op twoarg
 
 SKIP_TMAN ?= scope
 
diff --git a/regress/mdoc/Sq/Makefile b/regress/mdoc/Sq/Makefile
index d4c41e6e..755b036a 100644
--- a/regress/mdoc/Sq/Makefile
+++ b/regress/mdoc/Sq/Makefile
@@ -1,6 +1,5 @@
 # $OpenBSD: Makefile,v 1.1.1.1 2011/12/04 03:09:25 schwarze Exp $
 
 REGRESS_TARGETS  = empty
-MARKDOWN_TARGETS = empty
 
 .include <bsd.regress.mk>
diff --git a/regress/mdoc/St/Makefile b/regress/mdoc/St/Makefile
index 488467de..a1bde7e1 100644
--- a/regress/mdoc/St/Makefile
+++ b/regress/mdoc/St/Makefile
@@ -2,7 +2,6 @@
 
 REGRESS_TARGETS	 = badargs call
 LINT_TARGETS	 = badargs call
-MARKDOWN_TARGETS = badargs call
 
 # groff-1.22.3 defect:
 # - If the first argument of .St is the name of another macro,
diff --git a/regress/mdoc/Sx/Makefile b/regress/mdoc/Sx/Makefile
index e13130c1..1be2a84a 100644
--- a/regress/mdoc/Sx/Makefile
+++ b/regress/mdoc/Sx/Makefile
@@ -2,6 +2,5 @@
 
 REGRESS_TARGETS = noarg font
 LINT_TARGETS	= noarg
-MARKDOWN_TARGETS = noarg font
 
 .include <bsd.regress.mk>
diff --git a/regress/mdoc/Sy/Makefile b/regress/mdoc/Sy/Makefile
index 6448fb44..36c1859b 100644
--- a/regress/mdoc/Sy/Makefile
+++ b/regress/mdoc/Sy/Makefile
@@ -2,6 +2,5 @@
 
 REGRESS_TARGETS = noarg font punct
 LINT_TARGETS	= noarg punct
-MARKDOWN_TARGETS = noarg font punct
 
 .include <bsd.regress.mk>
diff --git a/regress/mdoc/Tn/Makefile b/regress/mdoc/Tn/Makefile
index e13130c1..1be2a84a 100644
--- a/regress/mdoc/Tn/Makefile
+++ b/regress/mdoc/Tn/Makefile
@@ -2,6 +2,5 @@
 
 REGRESS_TARGETS = noarg font
 LINT_TARGETS	= noarg
-MARKDOWN_TARGETS = noarg font
 
 .include <bsd.regress.mk>
diff --git a/regress/mdoc/Ud/Makefile b/regress/mdoc/Ud/Makefile
index 741a6326..9bc871ee 100644
--- a/regress/mdoc/Ud/Makefile
+++ b/regress/mdoc/Ud/Makefile
@@ -2,6 +2,5 @@
 
 REGRESS_TARGETS	 = arg
 LINT_TARGETS	 = arg
-MARKDOWN_TARGETS = arg
 
 .include <bsd.regress.mk>
diff --git a/regress/mdoc/Ux/Makefile b/regress/mdoc/Ux/Makefile
index 05a3316d..c945b5e6 100644
--- a/regress/mdoc/Ux/Makefile
+++ b/regress/mdoc/Ux/Makefile
@@ -1,6 +1,5 @@
 # $OpenBSD: Makefile,v 1.2 2013/12/22 14:06:29 schwarze Exp $
 
 REGRESS_TARGETS = spacing eos
-MARKDOWN_TARGETS = spacing eos
 
 .include <bsd.regress.mk>
diff --git a/regress/mdoc/Va/Makefile b/regress/mdoc/Va/Makefile
index a45efa7b..3d426934 100644
--- a/regress/mdoc/Va/Makefile
+++ b/regress/mdoc/Va/Makefile
@@ -2,6 +2,5 @@
 
 REGRESS_TARGETS	= basic font noarg
 LINT_TARGETS	= noarg
-MARKDOWN_TARGETS = basic font noarg
 
 .include <bsd.regress.mk>
diff --git a/regress/mdoc/Vt/Makefile b/regress/mdoc/Vt/Makefile
index b6d9f2b2..d1f0a9bd 100644
--- a/regress/mdoc/Vt/Makefile
+++ b/regress/mdoc/Vt/Makefile
@@ -2,6 +2,5 @@
 
 REGRESS_TARGETS = noarg spacing font child
 LINT_TARGETS	= noarg
-MARKDOWN_TARGETS = noarg spacing font child
 
 .include <bsd.regress.mk>
diff --git a/regress/mdoc/Xr/Makefile b/regress/mdoc/Xr/Makefile
index 618081f2..98887f84 100644
--- a/regress/mdoc/Xr/Makefile
+++ b/regress/mdoc/Xr/Makefile
@@ -2,6 +2,5 @@
 
 REGRESS_TARGETS	 = args
 LINT_TARGETS	 = args
-MARKDOWN_TARGETS = args
 
 .include <bsd.regress.mk>
diff --git a/regress/mdoc/blank/Makefile b/regress/mdoc/blank/Makefile
index 8a43c0c8..7dfd0287 100644
--- a/regress/mdoc/blank/Makefile
+++ b/regress/mdoc/blank/Makefile
@@ -2,8 +2,8 @@
 
 REGRESS_TARGETS = line comment list
 LINT_TARGETS	= line comment list
-MARKDOWN_TARGETS = comment list
 
 SKIP_TMAN = list
+SKIP_MARKDOWN ?= line
 
 .include <bsd.regress.mk>
diff --git a/regress/mdoc/break/Makefile b/regress/mdoc/break/Makefile
index 7e708169..b4c3b219 100644
--- a/regress/mdoc/break/Makefile
+++ b/regress/mdoc/break/Makefile
@@ -2,7 +2,6 @@
 
 REGRESS_TARGETS	= brokenbreaker twice tail two notopen
 LINT_TARGETS	= brokenbreaker twice tail two notopen
-MARKDOWN_TARGETS = brokenbreaker twice tail two notopen
 
 # It's hard to keep stuff together in next-line scope.
 
diff --git a/regress/roff/Makefile.inc b/regress/roff/Makefile.inc
index 6b294ca9..9b05b274 100644
--- a/regress/roff/Makefile.inc
+++ b/regress/roff/Makefile.inc
@@ -1,5 +1,6 @@
 # $OpenBSD: Makefile.inc,v 1.3 2015/02/03 19:37:25 schwarze Exp $
 
 SKIP_TMAN ?= ALL
+SKIP_MARKDOWN ?= ALL
 
 .include "../Makefile.inc"
diff --git a/regress/tbl/Makefile.inc b/regress/tbl/Makefile.inc
index 3d862dd4..95860d51 100644
--- a/regress/tbl/Makefile.inc
+++ b/regress/tbl/Makefile.inc
@@ -3,6 +3,7 @@
 TBL = /usr/local/bin/tbl
 
 SKIP_TMAN ?= ALL
+SKIP_MARKDOWN ?= ALL
 
 
 # OpenBSD only: maintainer targets