share/mk/: $SKIP_XFAIL: Add variable to allow skipping expected failures

Default to 'yes'.

Signed-off-by: Alejandro Colomar <alx@kernel.org>

13 files changed, 184 insertions, 298 deletions

diff --git a/GNUmakefile b/GNUmakefile
index 9fbe482e9b..2efa51bec9 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -138,6 +138,7 @@ $(MK):: ;
 help-variables:
 	$(info	$(INFO_)LINK_PAGES	How to install link pages.  [".so", "symlink"])
 	$(info	$(INFO_)Z		Install pages compressed.  ["", ".bz2", ".gz", ".lz", ".xz"])
+	$(info	$(INFO_)SKIP_XFAIL	Skip expected failures.  ["yes", "no"])
 	$(info	)
 	$(info	$(INFO_)DISTNAME	$$(git describe))
 	$(info	$(INFO_)DISTVERSION	/$$DISTNAME/s/man-pages-//)
diff --git a/share/mk/build/catman/troff.mk b/share/mk/build/catman/troff.mk
index 56c67697b8..7d302b83c6 100644
--- a/share/mk/build/catman/troff.mk
+++ b/share/mk/build/catman/troff.mk
@@ -11,9 +11,41 @@ include $(MAKEFILEDIR)/configure/build-depends/coreutils.mk
 include $(MAKEFILEDIR)/configure/build-depends/grep.mk
 include $(MAKEFILEDIR)/configure/build-depends/groff-base.mk
 include $(MAKEFILEDIR)/configure/src.mk
+include $(MAKEFILEDIR)/configure/xfail.mk
 include $(MAKEFILEDIR)/src.mk
 
 
+_XFAIL_CATMAN_MAN_set := \
+	$(_MANDIR)/man2/fanotify_init.2.cat.set \
+	$(_MANDIR)/man3/unlocked_stdio.3.cat.set \
+	$(_MANDIR)/man4/console_codes.4.cat.set \
+	$(_MANDIR)/man4/lirc.4.cat.set \
+	$(_MANDIR)/man5/proc_pid_smaps.5.cat.set \
+	$(_MANDIR)/man5/tzfile.5.cat.set \
+	$(_MANDIR)/man7/ascii.7.cat.set \
+	$(_MANDIR)/man7/bpf-helpers.7.cat.set \
+	$(_MANDIR)/man7/charsets.7.cat.set \
+	$(_MANDIR)/man7/iso_8859-1.7.cat.set \
+	$(_MANDIR)/man7/iso_8859-2.7.cat.set \
+	$(_MANDIR)/man7/iso_8859-3.7.cat.set \
+	$(_MANDIR)/man7/iso_8859-4.7.cat.set \
+	$(_MANDIR)/man7/iso_8859-5.7.cat.set \
+	$(_MANDIR)/man7/iso_8859-6.7.cat.set \
+	$(_MANDIR)/man7/iso_8859-7.7.cat.set \
+	$(_MANDIR)/man7/iso_8859-8.7.cat.set \
+	$(_MANDIR)/man7/iso_8859-9.7.cat.set \
+	$(_MANDIR)/man7/iso_8859-10.7.cat.set \
+	$(_MANDIR)/man7/iso_8859-11.7.cat.set \
+	$(_MANDIR)/man7/iso_8859-13.7.cat.set \
+	$(_MANDIR)/man7/iso_8859-14.7.cat.set \
+	$(_MANDIR)/man7/iso_8859-15.7.cat.set \
+	$(_MANDIR)/man7/iso_8859-16.7.cat.set \
+	$(_MANDIR)/man8/tzselect.8.cat.set \
+	$(_MANDIR)/man8/zdump.8.cat.set \
+	$(_MANDIR)/man8/zic.8.cat.set
+
+
+
 groff_man_ignore_grep := $(DATAROOTDIR)/lint/groff/man.ignore.grep
 
 
@@ -21,6 +53,11 @@ _CATMAN_MAN_set  := $(patsubst $(MANDIR)/%,$(_MANDIR)/%.cat.set,$(NONSO_MAN))
 _CATMAN_MDOC_set := $(patsubst $(MANDIR)/%,$(_MANDIR)/%.cat.set,$(NONSO_MDOC))
 
 
+ifeq ($(SKIP_XFAIL),yes)
+_CATMAN_MAN_set := $(filter-out $(_XFAIL_CATMAN_MAN_set), $(_CATMAN_MAN_set))
+endif
+
+
 $(_CATMAN_MAN_set): %.cat.set: %.cat.troff $(groff_man_ignore_grep) $(MK) | $$(@D)/
 	$(info	$(INFO_)TROFF		$@)
 	! ($(TROFF) -man $(TROFFFLAGS) $(NROFFFLAGS) <$< 2>&1 >$@ \
diff --git a/share/mk/build/pdf/troff.mk b/share/mk/build/pdf/troff.mk
index 71d541ebdc..5254d5db1f 100644
--- a/share/mk/build/pdf/troff.mk
+++ b/share/mk/build/pdf/troff.mk
@@ -10,13 +10,47 @@ include $(MAKEFILEDIR)/build/_.mk
 include $(MAKEFILEDIR)/configure/build-depends/grep.mk
 include $(MAKEFILEDIR)/configure/build-depends/groff-base.mk
 include $(MAKEFILEDIR)/configure/src.mk
+include $(MAKEFILEDIR)/configure/xfail.mk
 include $(MAKEFILEDIR)/src.mk
 
 
+_XFAIL_PDFMAN_MAN_set := \
+	$(_MANDIR)/man1/iconv.1.pdf.set \
+	$(_MANDIR)/man2/fanotify_init.2.pdf.set \
+	$(_MANDIR)/man2/syscall.2.pdf.set \
+	$(_MANDIR)/man3/newlocale.3.pdf.set \
+	$(_MANDIR)/man7/address_families.7.pdf.set \
+	$(_MANDIR)/man7/armscii-8.7.pdf.set \
+	$(_MANDIR)/man7/ascii.7.pdf.set \
+	$(_MANDIR)/man7/bpf-helpers.7.pdf.set \
+	$(_MANDIR)/man7/charsets.7.pdf.set \
+	$(_MANDIR)/man7/cp1251.7.pdf.set \
+	$(_MANDIR)/man7/iso_8859-2.7.pdf.set \
+	$(_MANDIR)/man7/iso_8859-3.7.pdf.set \
+	$(_MANDIR)/man7/iso_8859-4.7.pdf.set \
+	$(_MANDIR)/man7/iso_8859-5.7.pdf.set \
+	$(_MANDIR)/man7/iso_8859-6.7.pdf.set \
+	$(_MANDIR)/man7/iso_8859-7.7.pdf.set \
+	$(_MANDIR)/man7/iso_8859-8.7.pdf.set \
+	$(_MANDIR)/man7/iso_8859-10.7.pdf.set \
+	$(_MANDIR)/man7/iso_8859-11.7.pdf.set \
+	$(_MANDIR)/man7/iso_8859-13.7.pdf.set \
+	$(_MANDIR)/man7/iso_8859-14.7.pdf.set \
+	$(_MANDIR)/man7/iso_8859-16.7.pdf.set \
+	$(_MANDIR)/man7/koi8-r.7.pdf.set \
+	$(_MANDIR)/man7/koi8-u.7.pdf.set \
+	$(_MANDIR)/man7/vdso.7.pdf.set
+
+
 _PDFMAN_MAN_set  := $(patsubst $(MANDIR)/%,$(_MANDIR)/%.pdf.set,$(NONSO_MAN))
 _PDFMAN_MDOC_set := $(patsubst $(MANDIR)/%,$(_MANDIR)/%.pdf.set,$(NONSO_MDOC))
 
 
+ifeq ($(SKIP_XFAIL),yes)
+_PDFMAN_MAN_set := $(filter-out $(_XFAIL_PDFMAN_MAN_set), $(_PDFMAN_MAN_set))
+endif
+
+
 $(_PDFMAN_MAN_set): %.pdf.set: %.pdf.troff $(MK) | $$(@D)/
 	$(info	$(INFO_)TROFF		$@)
 	! ($(TROFF) -man -Tpdf $(TROFFFLAGS) <$< 2>&1 >$@) \
diff --git a/share/mk/build/ps/troff.mk b/share/mk/build/ps/troff.mk
index a382a6553b..1492821fbd 100644
--- a/share/mk/build/ps/troff.mk
+++ b/share/mk/build/ps/troff.mk
@@ -10,13 +10,47 @@ include $(MAKEFILEDIR)/build/_.mk
 include $(MAKEFILEDIR)/configure/build-depends/grep.mk
 include $(MAKEFILEDIR)/configure/build-depends/groff-base.mk
 include $(MAKEFILEDIR)/configure/src.mk
+include $(MAKEFILEDIR)/configure/xfail.mk
 include $(MAKEFILEDIR)/src.mk
 
 
+_XFAIL_PSMAN_MAN_set := \
+	$(_MANDIR)/man1/iconv.1.ps.set \
+	$(_MANDIR)/man2/fanotify_init.2.ps.set \
+	$(_MANDIR)/man2/syscall.2.ps.set \
+	$(_MANDIR)/man3/newlocale.3.ps.set \
+	$(_MANDIR)/man7/address_families.7.ps.set \
+	$(_MANDIR)/man7/armscii-8.7.ps.set \
+	$(_MANDIR)/man7/ascii.7.ps.set \
+	$(_MANDIR)/man7/bpf-helpers.7.ps.set \
+	$(_MANDIR)/man7/charsets.7.ps.set \
+	$(_MANDIR)/man7/cp1251.7.ps.set \
+	$(_MANDIR)/man7/iso_8859-2.7.ps.set \
+	$(_MANDIR)/man7/iso_8859-3.7.ps.set \
+	$(_MANDIR)/man7/iso_8859-4.7.ps.set \
+	$(_MANDIR)/man7/iso_8859-5.7.ps.set \
+	$(_MANDIR)/man7/iso_8859-6.7.ps.set \
+	$(_MANDIR)/man7/iso_8859-7.7.ps.set \
+	$(_MANDIR)/man7/iso_8859-8.7.ps.set \
+	$(_MANDIR)/man7/iso_8859-10.7.ps.set \
+	$(_MANDIR)/man7/iso_8859-11.7.ps.set \
+	$(_MANDIR)/man7/iso_8859-13.7.ps.set \
+	$(_MANDIR)/man7/iso_8859-14.7.ps.set \
+	$(_MANDIR)/man7/iso_8859-16.7.ps.set \
+	$(_MANDIR)/man7/koi8-r.7.ps.set \
+	$(_MANDIR)/man7/koi8-u.7.ps.set \
+	$(_MANDIR)/man7/vdso.7.ps.set
+
+
 _PSMAN_MAN_set := $(patsubst $(MANDIR)/%,$(_MANDIR)/%.ps.set,$(NONSO_MAN))
 _PSMAN_MDOC_set:= $(patsubst $(MANDIR)/%,$(_MANDIR)/%.ps.set,$(NONSO_MDOC))
 
 
+ifeq ($(SKIP_XFAIL),yes)
+_PSMAN_MAN_set := $(filter-out $(_XFAIL_PSMAN_MAN_set), $(_PSMAN_MAN_set))
+endif
+
+
 $(_PSMAN_MAN_set): %.ps.set: %.ps.troff $(MK) | $$(@D)/
 	$(info	$(INFO_)TROFF		$@)
 	! ($(TROFF) -man -Tps $(TROFFFLAGS) <$< 2>&1 >$@) \
diff --git a/share/mk/check/catman/grep.mk b/share/mk/check/catman/grep.mk
index e55579ce8e..fbf99bcdf5 100644
--- a/share/mk/check/catman/grep.mk
+++ b/share/mk/check/catman/grep.mk
@@ -6,12 +6,35 @@ ifndef MAKEFILE_CHECK_CATMAN_GREP_INCLUDED
 MAKEFILE_CHECK_CATMAN_GREP_INCLUDED := 1
 
 
+include $(MAKEFILEDIR)/build/_.mk
 include $(MAKEFILEDIR)/configure/build-depends/coreutils.mk
 include $(MAKEFILEDIR)/configure/build-depends/grep.mk
 include $(MAKEFILEDIR)/configure/build-depends/man.mk
+include $(MAKEFILEDIR)/configure/xfail.mk
+
+
+_XFAIL_CHECK_catman := \
+	$(_MANDIR)/man1/memusage.1.check-catman.touch \
+	$(_MANDIR)/man3/mallopt.3.check-catman.touch \
+	$(_MANDIR)/man4/smartpqi.4.check-catman.touch \
+	$(_MANDIR)/man4/veth.4.check-catman.touch \
+	$(_MANDIR)/man5/proc_buddyinfo.5.check-catman.touch \
+	$(_MANDIR)/man5/proc_pid_fdinfo.5.check-catman.touch \
+	$(_MANDIR)/man5/proc_pid_maps.5.check-catman.touch \
+	$(_MANDIR)/man5/proc_pid_mountinfo.5.check-catman.touch \
+	$(_MANDIR)/man5/proc_pid_net.5.check-catman.touch \
+	$(_MANDIR)/man5/proc_timer_stats.5.check-catman.touch \
+	$(_MANDIR)/man5/proc_version.5.check-catman.touch \
+	$(_MANDIR)/man5/slabinfo.5.check-catman.touch \
+	$(_MANDIR)/man7/keyrings.7.check-catman.touch \
+	$(_MANDIR)/man7/string_copying.7.check-catman.touch \
+	$(_MANDIR)/man7/uri.7.check-catman.touch
 
 
 _CHECK_catman := $(patsubst %.cat.grep,%.check-catman.touch,$(_CHECK_catman_grep))
+ifeq ($(SKIP_XFAIL),yes)
+_CHECK_catman := $(filter-out $(_XFAIL_CHECK_catman), $(_CHECK_catman))
+endif
 
 
 $(_CHECK_catman): %.check-catman.touch: %.cat.grep $(MK) | $$(@D)/
diff --git a/share/mk/configure/xfail.mk b/share/mk/configure/xfail.mk
new file mode 100644
index 0000000000..4003f92f9d
--- /dev/null
+++ b/share/mk/configure/xfail.mk
@@ -0,0 +1,18 @@
+# Copyright 2024 Alejandro Colomar <alx@kernel.org>
+# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception
+
+
+ifndef MAKEFILE_CONFIGURE_XFAIL_INCLUDED
+MAKEFILE_CONFIGURE_XFAIL_INCLUDED := 1
+
+
+SKIP_XFAIL := yes
+ifeq ($(SKIP_XFAIL),yes)
+else ifeq ($(SKIP_XFAIL),no)
+else
+$(warning "SKIP_XFAIL": "$(SKIP_XFAIL)")
+$(error Valid values for "SKIP_XFAIL": ["yes", "no"])
+endif
+
+
+endif  # include guard
diff --git a/share/mk/dist/check/_.mk b/share/mk/dist/check/_.mk
index 928a6ede7b..aecf97a9eb 100644
--- a/share/mk/dist/check/_.mk
+++ b/share/mk/dist/check/_.mk
@@ -20,7 +20,8 @@ _DISTCHECK_MANDIR  := $(_DISTCHECKBUILDDIR)/man
 _MAKE_OPTS = \
 	-C $< \
 	'builddir=$(_DISTCHECKBUILDDIR)' \
-	'DESTDIR=$(_DISTCHECKDESTDIR)'
+	'DESTDIR=$(_DISTCHECKDESTDIR)' \
+	'SKIP_XFAIL=yes'
 
 
 .PHONY: distcheck
diff --git a/share/mk/dist/check/build.mk b/share/mk/dist/check/build.mk
index de1df23faf..328fac7de9 100644
--- a/share/mk/dist/check/build.mk
+++ b/share/mk/dist/check/build.mk
@@ -15,167 +15,6 @@ include $(MAKEFILEDIR)/dist/check/_.mk
 include $(MAKEFILEDIR)/dist/tar.mk
 
 
-DISTCHECK_IGNORE_BUILD_CATMAN := \
-	$(_DISTCHECK_MANDIR)/man2/fanotify_init.2.cat \
-	$(_DISTCHECK_MANDIR)/man2/fanotify_init.2.cat.set \
-	$(_DISTCHECK_MANDIR)/man3/unlocked_stdio.3.cat \
-	$(_DISTCHECK_MANDIR)/man3/unlocked_stdio.3.cat.set \
-	$(_DISTCHECK_MANDIR)/man4/console_codes.4.cat \
-	$(_DISTCHECK_MANDIR)/man4/console_codes.4.cat.set \
-	$(_DISTCHECK_MANDIR)/man4/lirc.4.cat \
-	$(_DISTCHECK_MANDIR)/man4/lirc.4.cat.set \
-	$(_DISTCHECK_MANDIR)/man5/proc_pid_smaps.5.cat \
-	$(_DISTCHECK_MANDIR)/man5/proc_pid_smaps.5.cat.set \
-	$(_DISTCHECK_MANDIR)/man5/tzfile.5.cat \
-	$(_DISTCHECK_MANDIR)/man5/tzfile.5.cat.set \
-	$(_DISTCHECK_MANDIR)/man7/ascii.7.cat \
-	$(_DISTCHECK_MANDIR)/man7/ascii.7.cat.set \
-	$(_DISTCHECK_MANDIR)/man7/bpf-helpers.7.cat \
-	$(_DISTCHECK_MANDIR)/man7/bpf-helpers.7.cat.set \
-	$(_DISTCHECK_MANDIR)/man7/charsets.7.cat \
-	$(_DISTCHECK_MANDIR)/man7/charsets.7.cat.set \
-	$(_DISTCHECK_MANDIR)/man7/iso_8859-1.7.cat \
-	$(_DISTCHECK_MANDIR)/man7/iso_8859-1.7.cat.set \
-	$(_DISTCHECK_MANDIR)/man7/iso_8859-10.7.cat \
-	$(_DISTCHECK_MANDIR)/man7/iso_8859-10.7.cat.set \
-	$(_DISTCHECK_MANDIR)/man7/iso_8859-11.7.cat \
-	$(_DISTCHECK_MANDIR)/man7/iso_8859-11.7.cat.set \
-	$(_DISTCHECK_MANDIR)/man7/iso_8859-13.7.cat \
-	$(_DISTCHECK_MANDIR)/man7/iso_8859-13.7.cat.set \
-	$(_DISTCHECK_MANDIR)/man7/iso_8859-14.7.cat \
-	$(_DISTCHECK_MANDIR)/man7/iso_8859-14.7.cat.set \
-	$(_DISTCHECK_MANDIR)/man7/iso_8859-15.7.cat \
-	$(_DISTCHECK_MANDIR)/man7/iso_8859-15.7.cat.set \
-	$(_DISTCHECK_MANDIR)/man7/iso_8859-16.7.cat \
-	$(_DISTCHECK_MANDIR)/man7/iso_8859-16.7.cat.set \
-	$(_DISTCHECK_MANDIR)/man7/iso_8859-2.7.cat \
-	$(_DISTCHECK_MANDIR)/man7/iso_8859-2.7.cat.set \
-	$(_DISTCHECK_MANDIR)/man7/iso_8859-3.7.cat \
-	$(_DISTCHECK_MANDIR)/man7/iso_8859-3.7.cat.set \
-	$(_DISTCHECK_MANDIR)/man7/iso_8859-4.7.cat \
-	$(_DISTCHECK_MANDIR)/man7/iso_8859-4.7.cat.set \
-	$(_DISTCHECK_MANDIR)/man7/iso_8859-5.7.cat \
-	$(_DISTCHECK_MANDIR)/man7/iso_8859-5.7.cat.set \
-	$(_DISTCHECK_MANDIR)/man7/iso_8859-6.7.cat \
-	$(_DISTCHECK_MANDIR)/man7/iso_8859-6.7.cat.set \
-	$(_DISTCHECK_MANDIR)/man7/iso_8859-7.7.cat \
-	$(_DISTCHECK_MANDIR)/man7/iso_8859-7.7.cat.set \
-	$(_DISTCHECK_MANDIR)/man7/iso_8859-8.7.cat \
-	$(_DISTCHECK_MANDIR)/man7/iso_8859-8.7.cat.set \
-	$(_DISTCHECK_MANDIR)/man7/iso_8859-9.7.cat \
-	$(_DISTCHECK_MANDIR)/man7/iso_8859-9.7.cat.set \
-	$(_DISTCHECK_MANDIR)/man8/tzselect.8.cat \
-	$(_DISTCHECK_MANDIR)/man8/tzselect.8.cat.set \
-	$(_DISTCHECK_MANDIR)/man8/zdump.8.cat \
-	$(_DISTCHECK_MANDIR)/man8/zdump.8.cat.set \
-	$(_DISTCHECK_MANDIR)/man8/zic.8.cat \
-	$(_DISTCHECK_MANDIR)/man8/zic.8.cat.set
-
-DISTCHECK_IGNORE_BUILD_PS := \
-	$(_DISTCHECK_MANDIR)/man1/iconv.1.ps \
-	$(_DISTCHECK_MANDIR)/man1/iconv.1.ps.set \
-	$(_DISTCHECK_MANDIR)/man2/fanotify_init.2.ps \
-	$(_DISTCHECK_MANDIR)/man2/fanotify_init.2.ps.set \
-	$(_DISTCHECK_MANDIR)/man2/syscall.2.ps \
-	$(_DISTCHECK_MANDIR)/man2/syscall.2.ps.set \
-	$(_DISTCHECK_MANDIR)/man3/newlocale.3.ps \
-	$(_DISTCHECK_MANDIR)/man3/newlocale.3.ps.set \
-	$(_DISTCHECK_MANDIR)/man7/address_families.7.ps \
-	$(_DISTCHECK_MANDIR)/man7/address_families.7.ps.set \
-	$(_DISTCHECK_MANDIR)/man7/armscii-8.7.ps \
-	$(_DISTCHECK_MANDIR)/man7/armscii-8.7.ps.set \
-	$(_DISTCHECK_MANDIR)/man7/ascii.7.ps \
-	$(_DISTCHECK_MANDIR)/man7/ascii.7.ps.set \
-	$(_DISTCHECK_MANDIR)/man7/bpf-helpers.7.ps \
-	$(_DISTCHECK_MANDIR)/man7/bpf-helpers.7.ps.set \
-	$(_DISTCHECK_MANDIR)/man7/charsets.7.ps \
-	$(_DISTCHECK_MANDIR)/man7/charsets.7.ps.set \
-	$(_DISTCHECK_MANDIR)/man7/cp1251.7.ps \
-	$(_DISTCHECK_MANDIR)/man7/cp1251.7.ps.set \
-	$(_DISTCHECK_MANDIR)/man7/iso_8859-10.7.ps \
-	$(_DISTCHECK_MANDIR)/man7/iso_8859-10.7.ps.set \
-	$(_DISTCHECK_MANDIR)/man7/iso_8859-11.7.ps \
-	$(_DISTCHECK_MANDIR)/man7/iso_8859-11.7.ps.set \
-	$(_DISTCHECK_MANDIR)/man7/iso_8859-13.7.ps \
-	$(_DISTCHECK_MANDIR)/man7/iso_8859-13.7.ps.set \
-	$(_DISTCHECK_MANDIR)/man7/iso_8859-14.7.ps \
-	$(_DISTCHECK_MANDIR)/man7/iso_8859-14.7.ps.set \
-	$(_DISTCHECK_MANDIR)/man7/iso_8859-16.7.ps \
-	$(_DISTCHECK_MANDIR)/man7/iso_8859-16.7.ps.set \
-	$(_DISTCHECK_MANDIR)/man7/iso_8859-2.7.ps \
-	$(_DISTCHECK_MANDIR)/man7/iso_8859-2.7.ps.set \
-	$(_DISTCHECK_MANDIR)/man7/iso_8859-3.7.ps \
-	$(_DISTCHECK_MANDIR)/man7/iso_8859-3.7.ps.set \
-	$(_DISTCHECK_MANDIR)/man7/iso_8859-4.7.ps \
-	$(_DISTCHECK_MANDIR)/man7/iso_8859-4.7.ps.set \
-	$(_DISTCHECK_MANDIR)/man7/iso_8859-5.7.ps \
-	$(_DISTCHECK_MANDIR)/man7/iso_8859-5.7.ps.set \
-	$(_DISTCHECK_MANDIR)/man7/iso_8859-6.7.ps \
-	$(_DISTCHECK_MANDIR)/man7/iso_8859-6.7.ps.set \
-	$(_DISTCHECK_MANDIR)/man7/iso_8859-7.7.ps \
-	$(_DISTCHECK_MANDIR)/man7/iso_8859-7.7.ps.set \
-	$(_DISTCHECK_MANDIR)/man7/iso_8859-8.7.ps \
-	$(_DISTCHECK_MANDIR)/man7/iso_8859-8.7.ps.set \
-	$(_DISTCHECK_MANDIR)/man7/koi8-r.7.ps \
-	$(_DISTCHECK_MANDIR)/man7/koi8-r.7.ps.set \
-	$(_DISTCHECK_MANDIR)/man7/koi8-u.7.ps \
-	$(_DISTCHECK_MANDIR)/man7/koi8-u.7.ps.set \
-	$(_DISTCHECK_MANDIR)/man7/vdso.7.ps \
-	$(_DISTCHECK_MANDIR)/man7/vdso.7.ps.set
-
-DISTCHECK_IGNORE_BUILD_PDF := \
-	$(_DISTCHECK_MANDIR)/man1/iconv.1.pdf \
-	$(_DISTCHECK_MANDIR)/man1/iconv.1.pdf.set \
-	$(_DISTCHECK_MANDIR)/man2/fanotify_init.2.pdf \
-	$(_DISTCHECK_MANDIR)/man2/fanotify_init.2.pdf.set \
-	$(_DISTCHECK_MANDIR)/man2/syscall.2.pdf \
-	$(_DISTCHECK_MANDIR)/man2/syscall.2.pdf.set \
-	$(_DISTCHECK_MANDIR)/man3/newlocale.3.pdf \
-	$(_DISTCHECK_MANDIR)/man3/newlocale.3.pdf.set \
-	$(_DISTCHECK_MANDIR)/man7/address_families.7.pdf \
-	$(_DISTCHECK_MANDIR)/man7/address_families.7.pdf.set \
-	$(_DISTCHECK_MANDIR)/man7/armscii-8.7.pdf \
-	$(_DISTCHECK_MANDIR)/man7/armscii-8.7.pdf.set \
-	$(_DISTCHECK_MANDIR)/man7/ascii.7.pdf \
-	$(_DISTCHECK_MANDIR)/man7/ascii.7.pdf.set \
-	$(_DISTCHECK_MANDIR)/man7/bpf-helpers.7.pdf \
-	$(_DISTCHECK_MANDIR)/man7/bpf-helpers.7.pdf.set \
-	$(_DISTCHECK_MANDIR)/man7/charsets.7.pdf \
-	$(_DISTCHECK_MANDIR)/man7/charsets.7.pdf.set \
-	$(_DISTCHECK_MANDIR)/man7/cp1251.7.pdf \
-	$(_DISTCHECK_MANDIR)/man7/cp1251.7.pdf.set \
-	$(_DISTCHECK_MANDIR)/man7/iso_8859-10.7.pdf \
-	$(_DISTCHECK_MANDIR)/man7/iso_8859-10.7.pdf.set \
-	$(_DISTCHECK_MANDIR)/man7/iso_8859-11.7.pdf \
-	$(_DISTCHECK_MANDIR)/man7/iso_8859-11.7.pdf.set \
-	$(_DISTCHECK_MANDIR)/man7/iso_8859-13.7.pdf \
-	$(_DISTCHECK_MANDIR)/man7/iso_8859-13.7.pdf.set \
-	$(_DISTCHECK_MANDIR)/man7/iso_8859-14.7.pdf \
-	$(_DISTCHECK_MANDIR)/man7/iso_8859-14.7.pdf.set \
-	$(_DISTCHECK_MANDIR)/man7/iso_8859-16.7.pdf \
-	$(_DISTCHECK_MANDIR)/man7/iso_8859-16.7.pdf.set \
-	$(_DISTCHECK_MANDIR)/man7/iso_8859-2.7.pdf \
-	$(_DISTCHECK_MANDIR)/man7/iso_8859-2.7.pdf.set \
-	$(_DISTCHECK_MANDIR)/man7/iso_8859-3.7.pdf \
-	$(_DISTCHECK_MANDIR)/man7/iso_8859-3.7.pdf.set \
-	$(_DISTCHECK_MANDIR)/man7/iso_8859-4.7.pdf \
-	$(_DISTCHECK_MANDIR)/man7/iso_8859-4.7.pdf.set \
-	$(_DISTCHECK_MANDIR)/man7/iso_8859-5.7.pdf \
-	$(_DISTCHECK_MANDIR)/man7/iso_8859-5.7.pdf.set \
-	$(_DISTCHECK_MANDIR)/man7/iso_8859-6.7.pdf \
-	$(_DISTCHECK_MANDIR)/man7/iso_8859-6.7.pdf.set \
-	$(_DISTCHECK_MANDIR)/man7/iso_8859-7.7.pdf \
-	$(_DISTCHECK_MANDIR)/man7/iso_8859-7.7.pdf.set \
-	$(_DISTCHECK_MANDIR)/man7/iso_8859-8.7.pdf \
-	$(_DISTCHECK_MANDIR)/man7/iso_8859-8.7.pdf.set \
-	$(_DISTCHECK_MANDIR)/man7/koi8-r.7.pdf \
-	$(_DISTCHECK_MANDIR)/man7/koi8-r.7.pdf.set \
-	$(_DISTCHECK_MANDIR)/man7/koi8-u.7.pdf \
-	$(_DISTCHECK_MANDIR)/man7/koi8-u.7.pdf.set \
-	$(_DISTCHECK_MANDIR)/man7/vdso.7.pdf \
-	$(_DISTCHECK_MANDIR)/man7/vdso.7.pdf.set
-
-
 $(builddir)/distcheck.build-pre.touch: $(_DISTCHECKDIR)/$(DISTNAME) $(MK) | $$(@D)/
 	$(info	$(INFO_)MAKE		build-pre)
 	$(MAKE) $(_MAKE_OPTS) build-pre \
@@ -185,13 +24,6 @@ $(builddir)/distcheck.build-pre.touch: $(_DISTCHECKDIR)/$(DISTNAME) $(MK) | $$(@
 $(builddir)/distcheck.build-catman.touch: $(builddir)/distcheck.build-pre.touch
 $(builddir)/distcheck.build-catman.touch: $(_DISTCHECKDIR)/$(DISTNAME) $(MK) | $$(@D)/
 	$(info	$(INFO_)MAKE		build-catman)
-	$(MAKE) $(_MAKE_OPTS) -k build-catman \
-		'INFO_= build-catman -k:	' \
-		$(HIDE_ERR) \
-	|| $(TRUE)
-	$(MAKE) $(_MAKE_OPTS) -i nothing $(DISTCHECK_IGNORE_BUILD_CATMAN) \
-		'INFO_= build-catman -i:	' \
-		$(HIDE_ERR)
 	$(MAKE) $(_MAKE_OPTS) build-catman \
 		'INFO_= build-catman:		'
 	$(TOUCH) $@
@@ -199,13 +31,6 @@ $(builddir)/distcheck.build-catman.touch: $(_DISTCHECKDIR)/$(DISTNAME) $(MK) | $
 $(builddir)/distcheck.build-ps.touch: $(builddir)/distcheck.build-pre.touch
 $(builddir)/distcheck.build-ps.touch: $(_DISTCHECKDIR)/$(DISTNAME) $(MK) | $$(@D)/
 	$(info	$(INFO_)MAKE		build-ps)
-	$(MAKE) $(_MAKE_OPTS) -k build-ps \
-		'INFO_= build-ps -k:		' \
-		$(HIDE_ERR) \
-	|| $(TRUE)
-	$(MAKE) $(_MAKE_OPTS) -i nothing $(DISTCHECK_IGNORE_BUILD_PS) \
-		'INFO_= build-ps -i:		' \
-		$(HIDE_ERR)
 	$(MAKE) $(_MAKE_OPTS) build-ps \
 		'INFO_= build-ps:		'
 	$(TOUCH) $@
@@ -213,13 +38,6 @@ $(builddir)/distcheck.build-ps.touch: $(_DISTCHECKDIR)/$(DISTNAME) $(MK) | $$(@D
 $(builddir)/distcheck.build-pdf.touch: $(builddir)/distcheck.build-pre.touch
 $(builddir)/distcheck.build-pdf.touch: $(_DISTCHECKDIR)/$(DISTNAME) $(MK) | $$(@D)/
 	$(info	$(INFO_)MAKE		build-pdf)
-	$(MAKE) $(_MAKE_OPTS) -k build-pdf \
-		'INFO_= build-pdf -k:		' \
-		$(HIDE_ERR) \
-	|| $(TRUE)
-	$(MAKE) $(_MAKE_OPTS) -i nothing $(DISTCHECK_IGNORE_BUILD_PDF) \
-		'INFO_= build-pdf -i:		' \
-		$(HIDE_ERR)
 	$(MAKE) $(_MAKE_OPTS) build-pdf \
 		'INFO_= build-pdf:		'
 	$(TOUCH) $@
diff --git a/share/mk/dist/check/check.mk b/share/mk/dist/check/check.mk
index 12c0bdb642..446384d4ef 100644
--- a/share/mk/dist/check/check.mk
+++ b/share/mk/dist/check/check.mk
@@ -14,87 +14,10 @@ include $(MAKEFILEDIR)/configure/version.mk
 include $(MAKEFILEDIR)/dist/check/_.mk
 
 
-DISTCHECK_IGNORE_CHECK_CATMAN := \
-	$(_DISTCHECK_MANDIR)/man1/memusage.1.check-catman.touch \
-	$(_DISTCHECK_MANDIR)/man3/mallopt.3.check-catman.touch \
-	$(_DISTCHECK_MANDIR)/man3/unlocked_stdio.3.cat.grep \
-	$(_DISTCHECK_MANDIR)/man3/unlocked_stdio.3.check-catman.touch \
-	$(_DISTCHECK_MANDIR)/man4/console_codes.4.cat.grep \
-	$(_DISTCHECK_MANDIR)/man4/console_codes.4.check-catman.touch \
-	$(_DISTCHECK_MANDIR)/man4/lirc.4.cat.grep \
-	$(_DISTCHECK_MANDIR)/man4/lirc.4.check-catman.touch \
-	$(_DISTCHECK_MANDIR)/man4/smartpqi.4.check-catman.touch \
-	$(_DISTCHECK_MANDIR)/man4/veth.4.check-catman.touch \
-	$(_DISTCHECK_MANDIR)/man5/proc_buddyinfo.5.check-catman.touch \
-	$(_DISTCHECK_MANDIR)/man5/proc_pid_fdinfo.5.check-catman.touch \
-	$(_DISTCHECK_MANDIR)/man5/proc_pid_maps.5.check-catman.touch \
-	$(_DISTCHECK_MANDIR)/man5/proc_pid_mountinfo.5.check-catman.touch \
-	$(_DISTCHECK_MANDIR)/man5/proc_pid_net.5.check-catman.touch \
-	$(_DISTCHECK_MANDIR)/man5/proc_pid_smaps.5.cat.grep \
-	$(_DISTCHECK_MANDIR)/man5/proc_pid_smaps.5.check-catman.touch \
-	$(_DISTCHECK_MANDIR)/man5/proc_timer_stats.5.check-catman.touch \
-	$(_DISTCHECK_MANDIR)/man5/proc_version.5.check-catman.touch \
-	$(_DISTCHECK_MANDIR)/man5/slabinfo.5.check-catman.touch \
-	$(_DISTCHECK_MANDIR)/man5/tzfile.5.cat.grep \
-	$(_DISTCHECK_MANDIR)/man5/tzfile.5.check-catman.touch \
-	$(_DISTCHECK_MANDIR)/man7/ascii.7.cat.grep \
-	$(_DISTCHECK_MANDIR)/man7/ascii.7.check-catman.touch \
-	$(_DISTCHECK_MANDIR)/man7/bpf-helpers.7.cat.grep \
-	$(_DISTCHECK_MANDIR)/man7/bpf-helpers.7.check-catman.touch \
-	$(_DISTCHECK_MANDIR)/man7/charsets.7.cat.grep \
-	$(_DISTCHECK_MANDIR)/man7/charsets.7.check-catman.touch \
-	$(_DISTCHECK_MANDIR)/man7/iso_8859-1.7.cat.grep \
-	$(_DISTCHECK_MANDIR)/man7/iso_8859-1.7.check-catman.touch \
-	$(_DISTCHECK_MANDIR)/man7/iso_8859-10.7.cat.grep \
-	$(_DISTCHECK_MANDIR)/man7/iso_8859-10.7.check-catman.touch \
-	$(_DISTCHECK_MANDIR)/man7/iso_8859-11.7.cat.grep \
-	$(_DISTCHECK_MANDIR)/man7/iso_8859-11.7.check-catman.touch \
-	$(_DISTCHECK_MANDIR)/man7/iso_8859-13.7.cat.grep \
-	$(_DISTCHECK_MANDIR)/man7/iso_8859-13.7.check-catman.touch \
-	$(_DISTCHECK_MANDIR)/man7/iso_8859-14.7.cat.grep \
-	$(_DISTCHECK_MANDIR)/man7/iso_8859-14.7.check-catman.touch \
-	$(_DISTCHECK_MANDIR)/man7/iso_8859-15.7.cat.grep \
-	$(_DISTCHECK_MANDIR)/man7/iso_8859-15.7.check-catman.touch \
-	$(_DISTCHECK_MANDIR)/man7/iso_8859-16.7.cat.grep \
-	$(_DISTCHECK_MANDIR)/man7/iso_8859-16.7.check-catman.touch \
-	$(_DISTCHECK_MANDIR)/man7/iso_8859-2.7.cat.grep \
-	$(_DISTCHECK_MANDIR)/man7/iso_8859-2.7.check-catman.touch \
-	$(_DISTCHECK_MANDIR)/man7/iso_8859-3.7.cat.grep \
-	$(_DISTCHECK_MANDIR)/man7/iso_8859-3.7.check-catman.touch \
-	$(_DISTCHECK_MANDIR)/man7/iso_8859-4.7.cat.grep \
-	$(_DISTCHECK_MANDIR)/man7/iso_8859-4.7.check-catman.touch \
-	$(_DISTCHECK_MANDIR)/man7/iso_8859-5.7.cat.grep \
-	$(_DISTCHECK_MANDIR)/man7/iso_8859-5.7.check-catman.touch \
-	$(_DISTCHECK_MANDIR)/man7/iso_8859-6.7.cat.grep \
-	$(_DISTCHECK_MANDIR)/man7/iso_8859-6.7.check-catman.touch \
-	$(_DISTCHECK_MANDIR)/man7/iso_8859-7.7.cat.grep \
-	$(_DISTCHECK_MANDIR)/man7/iso_8859-7.7.check-catman.touch \
-	$(_DISTCHECK_MANDIR)/man7/iso_8859-8.7.cat.grep \
-	$(_DISTCHECK_MANDIR)/man7/iso_8859-8.7.check-catman.touch \
-	$(_DISTCHECK_MANDIR)/man7/iso_8859-9.7.cat.grep \
-	$(_DISTCHECK_MANDIR)/man7/iso_8859-9.7.check-catman.touch \
-	$(_DISTCHECK_MANDIR)/man7/keyrings.7.check-catman.touch \
-	$(_DISTCHECK_MANDIR)/man7/string_copying.7.check-catman.touch \
-	$(_DISTCHECK_MANDIR)/man7/uri.7.check-catman.touch \
-	$(_DISTCHECK_MANDIR)/man8/tzselect.8.cat.grep \
-	$(_DISTCHECK_MANDIR)/man8/tzselect.8.check-catman.touch \
-	$(_DISTCHECK_MANDIR)/man8/zdump.8.cat.grep \
-	$(_DISTCHECK_MANDIR)/man8/zdump.8.check-catman.touch \
-	$(_DISTCHECK_MANDIR)/man8/zic.8.cat.grep \
-	$(_DISTCHECK_MANDIR)/man8/zic.8.check-catman.touch
-
-
 $(builddir)/distcheck.check-catman.touch: \
 	$(builddir)/distcheck.build-catman.touch
 $(builddir)/distcheck.check-catman.touch: $(_DISTCHECKDIR)/$(DISTNAME) $(MK) | $$(@D)/
 	$(info	$(INFO_)MAKE		check-catman)
-	$(MAKE) $(_MAKE_OPTS) -k check-catman \
-		'INFO_= check-catman -k:	' \
-		$(HIDE_ERR) \
-	|| $(TRUE)
-	$(MAKE) $(_MAKE_OPTS) -i nothing $(DISTCHECK_IGNORE_CHECK_CATMAN) \
-		'INFO_= check-catman -i:	' \
-		$(HIDE_ERR)
 	$(MAKE) $(_MAKE_OPTS) check-catman \
 		'INFO_= check-catman:		'
 	$(TOUCH) $@
diff --git a/share/mk/dist/check/lint.mk b/share/mk/dist/check/lint.mk
index ae36f38665..2588d5724e 100644
--- a/share/mk/dist/check/lint.mk
+++ b/share/mk/dist/check/lint.mk
@@ -15,25 +15,8 @@ include $(MAKEFILEDIR)/configure/version.mk
 include $(MAKEFILEDIR)/dist/check/_.mk
 
 
-DISTCHECK_IGNORE_LINT_MAN := \
-	$(_DISTCHECK_MANDIR)/man3/pthread_cond_init.3.lint-man.mandoc.touch \
-	$(_DISTCHECK_MANDIR)/man3/pthread_key_create.3.lint-man.mandoc.touch \
-	$(_DISTCHECK_MANDIR)/man3/pthread_mutex_init.3.lint-man.mandoc.touch \
-	$(_DISTCHECK_MANDIR)/man5/dir_colors.5.lint-man.mandoc.touch \
-	$(_DISTCHECK_MANDIR)/man7/bpf-helpers.7.lint-man.mandoc.touch \
-	$(_DISTCHECK_MANDIR)/man7/uri.7.lint-man.mandoc.touch \
-	$(_DISTCHECK_MANDIR)/man8/zic.8.lint-man.mandoc.touch
-
-
 $(builddir)/distcheck.lint-man.touch: $(_DISTCHECKDIR)/$(DISTNAME) $(MK) | $$(@D)/
 	$(info	$(INFO_)MAKE		lint-man)
-	$(MAKE) $(_MAKE_OPTS) -k lint-man \
-		'INFO_= lint-man -k:		' \
-		$(HIDE_ERR) \
-	|| $(TRUE)
-	$(MAKE) $(_MAKE_OPTS) -i nothing $(DISTCHECK_IGNORE_LINT_MAN) \
-		'INFO_= lint-man -i:		' \
-		$(HIDE_ERR)
 	$(MAKE) $(_MAKE_OPTS) lint-man \
 		'INFO_= lint-man:		'
 	$(TOUCH) $@
diff --git a/share/mk/lint/man/_.mk b/share/mk/lint/man/_.mk
index d81d999b8b..67ff4b86f0 100644
--- a/share/mk/lint/man/_.mk
+++ b/share/mk/lint/man/_.mk
@@ -6,26 +6,8 @@ ifndef MAKEFILE_LINT_MAN_INCLUDED
 MAKEFILE_LINT_MAN_INCLUDED := 1
 
 
-include $(MAKEFILEDIR)/build/_.mk
-include $(MAKEFILEDIR)/configure/directory_variables.mk
-include $(MAKEFILEDIR)/src.mk
-
-
-linters_man := mandoc tbl
-
-
-$(foreach l, $(linters_man),                                                  \
-	$(eval _LINT_man_$(l) :=                                              \
-		$(patsubst $(MANDIR)/%, $(_MANDIR)/%.lint-man.$(l).touch,     \
-			$(NONSO_MAN))))
-
-
-$(foreach l, $(linters_man),                                                  \
-	$(eval .PHONY: lint-man-$(l)))
-$(foreach l, $(linters_man),                                                  \
-	$(eval lint-man-$(l): $(_LINT_man_$(l));))
 .PHONY: lint-man
-lint-man: $(foreach l, $(linters_man), lint-man-$(l));
+lint-man: lint-man-mandoc lint-man-tbl;
 
 
 endif  # include guard
diff --git a/share/mk/lint/man/mandoc.mk b/share/mk/lint/man/mandoc.mk
index cfabf3bd67..6210c83c2f 100644
--- a/share/mk/lint/man/mandoc.mk
+++ b/share/mk/lint/man/mandoc.mk
@@ -10,8 +10,27 @@ include $(MAKEFILEDIR)/build/_.mk
 include $(MAKEFILEDIR)/configure/build-depends/coreutils.mk
 include $(MAKEFILEDIR)/configure/build-depends/grep.mk
 include $(MAKEFILEDIR)/configure/build-depends/mandoc.mk
-include $(MAKEFILEDIR)/configure/directory_variables.mk
+include $(MAKEFILEDIR)/configure/src.mk
+include $(MAKEFILEDIR)/configure/xfail.mk
 include $(MAKEFILEDIR)/lint/man/_.mk
+include $(MAKEFILEDIR)/src.mk
+
+
+_XFAIL_LINT_man_mandoc := \
+	$(_MANDIR)/man3/pthread_cond_init.3.lint-man.mandoc.touch \
+	$(_MANDIR)/man3/pthread_key_create.3.lint-man.mandoc.touch \
+	$(_MANDIR)/man3/pthread_mutex_init.3.lint-man.mandoc.touch \
+	$(_MANDIR)/man5/dir_colors.5.lint-man.mandoc.touch \
+	$(_MANDIR)/man7/bpf-helpers.7.lint-man.mandoc.touch \
+	$(_MANDIR)/man7/uri.7.lint-man.mandoc.touch \
+	$(_MANDIR)/man8/zic.8.lint-man.mandoc.touch
+
+
+_LINT_man_mandoc := \
+	$(patsubst $(MANDIR)/%, $(_MANDIR)/%.lint-man.mandoc.touch, $(NONSO_MAN))
+ifeq ($(SKIP_XFAIL),yes)
+_LINT_man_mandoc := $(filter-out $(_XFAIL_LINT_man_mandoc), $(_LINT_man_mandoc))
+endif
 
 
 mandoc_man_ignore_grep := $(DATAROOTDIR)/lint/mandoc/man.ignore.grep
@@ -27,4 +46,8 @@ $(_LINT_man_mandoc): $(_MANDIR)/%.lint-man.mandoc.touch: $(MANDIR)/% $(mandoc_ma
 	$(TOUCH) $@
 
 
+.PHONY: lint-man-mandoc
+lint-man-mandoc: $(_LINT_man_mandoc);
+
+
 endif  # include guard
diff --git a/share/mk/lint/man/tbl.mk b/share/mk/lint/man/tbl.mk
index 751838023f..23e6eda4e3 100644
--- a/share/mk/lint/man/tbl.mk
+++ b/share/mk/lint/man/tbl.mk
@@ -9,8 +9,13 @@ MAKEFILE_LINT_MAN_TBL_INCLUDED := 1
 include $(MAKEFILEDIR)/build/_.mk
 include $(MAKEFILEDIR)/configure/build-depends/coreutils.mk
 include $(MAKEFILEDIR)/configure/build-depends/grep.mk
-include $(MAKEFILEDIR)/configure/directory_variables.mk
+include $(MAKEFILEDIR)/configure/src.mk
 include $(MAKEFILEDIR)/lint/man/_.mk
+include $(MAKEFILEDIR)/src.mk
+
+
+_LINT_man_tbl := \
+	$(patsubst $(MANDIR)/%, $(_MANDIR)/%.lint-man.tbl.touch, $(NONSO_MAN))
 
 
 $(_LINT_man_tbl): $(_MANDIR)/%.lint-man.tbl.touch: $(MANDIR)/% $(MK) | $$(@D)/
@@ -36,4 +41,8 @@ $(_LINT_man_tbl): $(_MANDIR)/%.lint-man.tbl.touch: $(MANDIR)/% $(MK) | $$(@D)/
 	$(TOUCH) $@
 
 
+.PHONY: lint-man-tbl
+lint-man-tbl: $(_LINT_man_tbl);
+
+
 endif  # include guard