6 files changed, 9 insertions, 57 deletions
diff --git a/share/mk/lint/_.mk b/share/mk/lint/_.mk
index 48d02fa359..0f2808c4d8 100644
--- a/share/mk/lint/_.mk
+++ b/share/mk/lint/_.mk
@@ -7,7 +7,7 @@ MAKEFILE_LINT_INCLUDED := 1
 
 
 .PHONY: lint
-lint: lint-c lint-man lint-mdoc;
+lint: lint-c lint-man;
 
 
 endif  # include guard
diff --git a/share/mk/lint/man/mandoc.ignore.grep b/share/mk/lint/man/mandoc.ignore.grep
index c4a023a50a..a51f6f5c98 100644
--- a/share/mk/lint/man/mandoc.ignore.grep
+++ b/share/mk/lint/man/mandoc.ignore.grep
@@ -1,5 +1,10 @@
 STYLE: lower case character in document title:
+STYLE: legacy man(7) date format: Dd
+STYLE: lower case character in document title: Dt
+STYLE: operating system explicitly specified: Os
+STYLE: referenced manual not found: Xr
 UNSUPP: ignoring macro in table:
 WARNING: empty block: UR
 WARNING: missing date, using "": TH
 WARNING: undefined escape, printing literally: \\\\
+WARNING: cross reference to self: Xr
diff --git a/share/mk/lint/man/mandoc.mk b/share/mk/lint/man/mandoc.mk
index c6da404596..4af43a9bc8 100644
--- a/share/mk/lint/man/mandoc.mk
+++ b/share/mk/lint/man/mandoc.mk
@@ -8,6 +8,7 @@ MAKEFILE_LINT_MAN_MANDOC_INCLUDED := 1
 
 include $(MAKEFILEDIR)/build/_.mk
 include $(MAKEFILEDIR)/build/man/man.mk
+include $(MAKEFILEDIR)/build/man/mdoc.mk
 include $(MAKEFILEDIR)/configure/build-depends/coreutils/touch.mk
 include $(MAKEFILEDIR)/configure/build-depends/coreutils/true.mk
 include $(MAKEFILEDIR)/configure/build-depends/grep/grep.mk
@@ -34,7 +35,7 @@ _XFAIL_LINT_man_mandoc := \
 	$(_MANDIR)/man8/zic.8.lint-man.mandoc.touch
 
 
-_LINT_man_mandoc := $(patsubst %, %.lint-man.mandoc.touch, $(_NONSO_MAN))
+_LINT_man_mandoc := $(patsubst %, %.lint-man.mandoc.touch, $(_NONSO_MAN) $(_NONSO_MDOC))
 ifeq ($(SKIP_XFAIL),yes)
 _LINT_man_mandoc := $(filter-out $(_XFAIL_LINT_man_mandoc), $(_LINT_man_mandoc))
 endif
@@ -45,7 +46,7 @@ mandoc_man_ignore_grep := $(MAKEFILEDIR)/lint/man/mandoc.ignore.grep
 
 $(_LINT_man_mandoc): %.lint-man.mandoc.touch: % $(mandoc_man_ignore_grep) $(MK) | $$(@D)/
 	$(info	$(INFO_)MANDOC		$@)
-	! ($(MANDOC) -man $(MANDOCFLAGS) $< 2>&1 \
+	! ($(MANDOC) $(MANDOCFLAGS) $< 2>&1 \
 	   | $(GREP) -v -f '$(mandoc_man_ignore_grep)' \
 	   || $(TRUE); \
 	) \
diff --git a/share/mk/lint/mdoc/_.mk b/share/mk/lint/mdoc/_.mk
deleted file mode 100644
index d151a8004a..0000000000
--- a/share/mk/lint/mdoc/_.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2023-2024, Alejandro Colomar <alx@kernel.org>
-# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception
-
-
-ifndef MAKEFILE_LINT_MDOC_INCLUDED
-MAKEFILE_LINT_MDOC_INCLUDED := 1
-
-
-.PHONY: lint-mdoc
-lint-mdoc: lint-mdoc-mandoc;
-
-
-endif  # include guard
diff --git a/share/mk/lint/mdoc/mandoc.ignore.grep b/share/mk/lint/mdoc/mandoc.ignore.grep
deleted file mode 100644
index 4c73c592ba..0000000000
--- a/share/mk/lint/mdoc/mandoc.ignore.grep
+++ /dev/null
@@ -1,5 +0,0 @@
-STYLE: legacy man(7) date format: Dd
-STYLE: lower case character in document title: Dt
-STYLE: operating system explicitly specified: Os
-STYLE: referenced manual not found: Xr
-WARNING: cross reference to self: Xr
diff --git a/share/mk/lint/mdoc/mandoc.mk b/share/mk/lint/mdoc/mandoc.mk
deleted file mode 100644
index 3a9e2cc9ee..0000000000
--- a/share/mk/lint/mdoc/mandoc.mk
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2023-2024, Alejandro Colomar <alx@kernel.org>
-# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception
-
-
-ifndef MAKEFILE_LINT_MDOC_MANDOC_INCLUDED
-MAKEFILE_LINT_MDOC_MANDOC_INCLUDED := 1
-
-
-include $(MAKEFILEDIR)/build/man/mdoc.mk
-include $(MAKEFILEDIR)/configure/build-depends/coreutils/touch.mk
-include $(MAKEFILEDIR)/configure/build-depends/coreutils/true.mk
-include $(MAKEFILEDIR)/configure/build-depends/grep/grep.mk
-include $(MAKEFILEDIR)/configure/build-depends/mandoc/mandoc.mk
-
-
-_LINT_mdoc_mandoc := $(patsubst %, %.lint-mdoc.mandoc.touch, $(_NONSO_MDOC))
-
-
-mandoc_mdoc_ignore_grep := $(MAKEFILEDIR)/lint/mdoc/mandoc.ignore.grep
-
-
-$(_LINT_mdoc_mandoc): %.lint-mdoc.mandoc.touch: % $(mandoc_mdoc_ignore_grep) $(MK) | $$(@D)/
-	$(info	$(INFO_)MANDOC		$@)
-	! ($(MANDOC) -mdoc $(MANDOCFLAGS) $< 2>&1 \
-	   | $(GREP) -v -f '$(mandoc_mdoc_ignore_grep)' \
-	   || $(TRUE); \
-	) \
-	| $(GREP) ^ >&2
-	$(TOUCH) $@
-
-
-.PHONY: lint-mdoc-mandoc
-lint-mdoc-mandoc: $(_LINT_mdoc_mandoc);
-
-
-endif  # include guard