share/mk/: Merge handling of man(7) and mdoc(7) pages

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

diff --git a/share/mk/build/catman/troff.mk b/share/mk/build/catman/troff.mk
index c1623de929549a7a9e252866a621091d202cdf16..eda2a5fafeb26e526ff35f3f394512546efe28e0 100644 (file)
--- a/share/mk/build/catman/troff.mk
+++ b/share/mk/build/catman/troff.mk
@@ -7,8 +7,7 @@ MAKEFILE_BUILD_CATMAN_TROFF_INCLUDED := 1
 
 
 include $(MAKEFILEDIR)/build/_.mk
-include $(MAKEFILEDIR)/build/man/man.mk
-include $(MAKEFILEDIR)/build/man/mdoc.mk
+include $(MAKEFILEDIR)/build/man/nonso.mk
 include $(MAKEFILEDIR)/configure/build-depends/coreutils/true.mk
 include $(MAKEFILEDIR)/configure/build-depends/grep/grep.mk
 include $(MAKEFILEDIR)/configure/build-depends/groff-base/nroff.mk
@@ -19,7 +18,7 @@ include $(MAKEFILEDIR)/configure/xfail.mk
 ext := .cat.set
 xfail := $(MAKEFILEDIR)/build/catman/troff.xfail
 
-tgts := $(patsubst %, %$(ext), $(_NONSO_MAN) $(_NONSO_MDOC))
+tgts := $(patsubst %, %$(ext), $(_NONSO))
 ifeq ($(SKIP_XFAIL),yes)
 tgts := $(filter-out $(patsubst %, $(_MANDIR)/%$(ext), $(file < $(xfail))), $(tgts))
 endif

diff --git a/share/mk/build/examples/dir.mk b/share/mk/build/examples/dir.mk
index bf76f72680de0db2ef505b11f6c5599669693193..d27cba3b26b0261e7d1fb5aae672aa682e734bcc 100644 (file)
--- a/share/mk/build/examples/dir.mk
+++ b/share/mk/build/examples/dir.mk
@@ -6,12 +6,12 @@ ifndef MAKEFILE_BUILD_EX_DIR_INCLUDED
 MAKEFILE_BUILD_EX_DIR_INCLUDED := 1
 
 
-include $(MAKEFILEDIR)/build/man/man.mk
+include $(MAKEFILEDIR)/build/man/nonso.mk
 include $(MAKEFILEDIR)/configure/build-depends/coreutils/mkdir.mk
 include $(MAKEFILEDIR)/configure/build-depends/coreutils/touch.mk
 
 
-_PAGEEXDIRS := $(patsubst %, %.d/, $(_NONSO_MAN))
+_PAGEEXDIRS := $(patsubst %, %.d/, $(_NONSO))
 
 
 $(_PAGEEXDIRS):

diff --git a/share/mk/build/html/troff.mk b/share/mk/build/html/troff.mk
index e2ff319385bacb3bd8396a2a96034c277c22c93c..1319ea10d809da0f9946fed0162056f32b1bc786 100644 (file)
--- a/share/mk/build/html/troff.mk
+++ b/share/mk/build/html/troff.mk
@@ -7,8 +7,7 @@ MAKEFILE_BUILD_HTML_TROFF_INCLUDED := 1
 
 
 include $(MAKEFILEDIR)/build/_.mk
-include $(MAKEFILEDIR)/build/man/man.mk
-include $(MAKEFILEDIR)/build/man/mdoc.mk
+include $(MAKEFILEDIR)/build/man/nonso.mk
 include $(MAKEFILEDIR)/configure/build-depends/grep/grep.mk
 include $(MAKEFILEDIR)/configure/build-depends/groff-base/troff.mk
 include $(MAKEFILEDIR)/configure/xfail.mk
@@ -17,7 +16,7 @@ include $(MAKEFILEDIR)/configure/xfail.mk
 ext := .html.set
 xfail := $(MAKEFILEDIR)/build/html/troff.xfail
 
-tgts := $(patsubst %, %$(ext), $(_NONSO_MAN) $(_NONSO_MDOC))
+tgts := $(patsubst %, %$(ext), $(_NONSO))
 ifeq ($(SKIP_XFAIL),yes)
 tgts := $(filter-out $(patsubst %, $(_MANDIR)/%$(ext), $(file < $(xfail))), $(tgts))
 endif

diff --git a/share/mk/build/man/_.mk b/share/mk/build/man/_.mk
index 2f390647e2448357f64f339facdecb900e37fd40..812e1596ccb129bab25af6e306a90e8da50b521c 100644 (file)
--- a/share/mk/build/man/_.mk
+++ b/share/mk/build/man/_.mk
@@ -15,7 +15,7 @@ _MANPAGES := $(patsubst $(MANDIR)/%, $(_MANDIR)/%, $(MANPAGES))
 
 
 .PHONY: build-man
-build-man: build-man-man build-man-mdoc build-man-so;
+build-man: build-man-nonso build-man-so;
 
 
 endif  # include guard

diff --git a/share/mk/build/man/mdoc.mk b/share/mk/build/man/mdoc.mk
deleted file mode 100644 (file)
index e64af07..0000000
--- a/share/mk/build/man/mdoc.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright, the authors of the Linux man-pages project
-# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception
-
-
-ifndef MAKEFILE_BUILD_MAN_MDOC_INCLUDED
-MAKEFILE_BUILD_MAN_MDOC_INCLUDED := 1
-
-
-include $(MAKEFILEDIR)/build/_.mk
-include $(MAKEFILEDIR)/configure/build-depends/coreutils/cp.mk
-include $(MAKEFILEDIR)/configure/directory_variables/src.mk
-include $(MAKEFILEDIR)/src/man.mk
-
-
-_NONSO_MDOC := $(patsubst $(MANDIR)/%, $(_MANDIR)/%, $(NONSO_MDOC))
-
-
-$(_NONSO_MDOC): $(_MANDIR)/%: $(MANDIR)/% $(MK) | $$(@D)/
-       $(info  $(INFO_)CP              $@)
-       $(CP) -T $< $@
-
-
-.PHONY: build-man-mdoc
-build-man-mdoc: $(_NONSO_MDOC)
-
-
-endif  # include guard

diff --git a/share/mk/build/man/man.mk b/share/mk/build/man/nonso.mk
similarity index 53%
rename from share/mk/build/man/man.mk
rename to share/mk/build/man/nonso.mk
index 90e64e6f6cae46894c792f9d247881d747eb156e..0bb235b260d1264b7a68adf486f4782846e583b6 100644 (file)
--- a/share/mk/build/man/man.mk
+++ b/share/mk/build/man/nonso.mk
@@ -2,8 +2,8 @@
 # SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception
 
 
-ifndef MAKEFILE_BUILD_MAN_MAN_INCLUDED
-MAKEFILE_BUILD_MAN_MAN_INCLUDED := 1
+ifndef MAKEFILE_BUILD_MAN_NONSO_INCLUDED
+MAKEFILE_BUILD_MAN_NONSO_INCLUDED := 1
 
 
 include $(MAKEFILEDIR)/build/_.mk
@@ -15,18 +15,21 @@ include $(MAKEFILEDIR)/configure/version.mk
 include $(MAKEFILEDIR)/src/man.mk
 
 
-_NONSO_MAN := $(patsubst $(MANDIR)/%, $(_MANDIR)/%, $(NONSO_MAN))
+_NONSO := $(patsubst $(MANDIR)/%, $(_MANDIR)/%, $(NONSO))
 
 
-$(_NONSO_MAN): $(_MANDIR)/%: $(MANDIR)/% $(MK) | $$(@D)/
+$(_NONSO): $(_MANDIR)/%: $(MANDIR)/% $(MK) | $$(@D)/
        $(info  $(INFO_)SED             $@)
        <$< \
-       $(SED) "/^\.TH/s/(date)/$$($(MANPAGEDATECMD))/" \
-       | $(SED) '/^\.TH/s/(unreleased)/$(DISTVERSION)/' >$@
+       $(SED) "/^\.TH /s/(date)/$$($(MANPAGEDATECMD))/" \
+       | $(SED) '/^\.TH /s/(unreleased)/$(DISTVERSION)/' \
+       | $(SED) '/^\.Dd /s/$$Mdocdate$$'"/$$($(MANPAGEDATECMD))/" \
+       | $(SED) '/^\.Os /s/(unreleased)/$(DISTVERSION)/' \
+       >$@
 
 
-.PHONY: build-man-man
-build-man-man: $(_NONSO_MAN)
+.PHONY: build-man-nonso
+build-man-nonso: $(_NONSO)
 
 
 endif  # include guard

diff --git a/share/mk/build/pdf/pages/troff.mk b/share/mk/build/pdf/pages/troff.mk
index af1a0f6039bb711cdb248884e5be960008b921df..d1e7ea0f2d849337bcdd43f4bde8b37692e0b425 100644 (file)
--- a/share/mk/build/pdf/pages/troff.mk
+++ b/share/mk/build/pdf/pages/troff.mk
@@ -7,8 +7,7 @@ MAKEFILE_BUILD_PDF_PAGES_TROFF_INCLUDED := 1
 
 
 include $(MAKEFILEDIR)/build/_.mk
-include $(MAKEFILEDIR)/build/man/man.mk
-include $(MAKEFILEDIR)/build/man/mdoc.mk
+include $(MAKEFILEDIR)/build/man/nonso.mk
 include $(MAKEFILEDIR)/configure/build-depends/grep/grep.mk
 include $(MAKEFILEDIR)/configure/build-depends/groff-base/troff.mk
 include $(MAKEFILEDIR)/configure/xfail.mk
@@ -17,7 +16,7 @@ include $(MAKEFILEDIR)/configure/xfail.mk
 ext := .pdf.set
 xfail := $(MAKEFILEDIR)/build/pdf/pages/troff.xfail
 
-tgts := $(patsubst %, %$(ext), $(_NONSO_MAN) $(_NONSO_MDOC))
+tgts := $(patsubst %, %$(ext), $(_NONSO))
 ifeq ($(SKIP_XFAIL),yes)
 tgts := $(filter-out $(patsubst %, $(_MANDIR)/%$(ext), $(shell cat $(xfail))), $(tgts))
 endif

diff --git a/share/mk/build/pre/preconv.mk b/share/mk/build/pre/preconv.mk
index 5b68d466f9b434db54c27f1fcc111b8b9b3f40d7..213d481b3a9762345668f60f9771eaa909603cd5 100644 (file)
--- a/share/mk/build/pre/preconv.mk
+++ b/share/mk/build/pre/preconv.mk
@@ -6,15 +6,14 @@ ifndef MAKEFILE_BUILD_PRE_PRECONV_INCLUDED
 MAKEFILE_BUILD_PRE_PRECONV_INCLUDED := 1
 
 
-include $(MAKEFILEDIR)/build/man/man.mk
-include $(MAKEFILEDIR)/build/man/mdoc.mk
+include $(MAKEFILEDIR)/build/man/nonso.mk
 include $(MAKEFILEDIR)/configure/build-depends/groff-base/preconv.mk
 
 
 ext := .tbl
 
 
-_MAN_tbl := $(patsubst %, %$(ext), $(_NONSO_MAN) $(_NONSO_MDOC))
+_MAN_tbl := $(patsubst %, %$(ext), $(_NONSO))
 
 
 $(_MAN_tbl): %$(ext): % $(MK) | $$(@D)/

diff --git a/share/mk/build/ps/troff.mk b/share/mk/build/ps/troff.mk
index 960ae7a52477ebf0ee9d67c40a5cb7dcb390a26e..47fe145e2b44814a104c3646510aa2d8a4a47002 100644 (file)
--- a/share/mk/build/ps/troff.mk
+++ b/share/mk/build/ps/troff.mk
@@ -7,8 +7,7 @@ MAKEFILE_BUILD_PS_TROFF_INCLUDED := 1
 
 
 include $(MAKEFILEDIR)/build/_.mk
-include $(MAKEFILEDIR)/build/man/man.mk
-include $(MAKEFILEDIR)/build/man/mdoc.mk
+include $(MAKEFILEDIR)/build/man/nonso.mk
 include $(MAKEFILEDIR)/configure/build-depends/grep/grep.mk
 include $(MAKEFILEDIR)/configure/build-depends/groff-base/troff.mk
 include $(MAKEFILEDIR)/configure/xfail.mk
@@ -17,7 +16,7 @@ include $(MAKEFILEDIR)/configure/xfail.mk
 ext := .ps.set
 xfail := $(MAKEFILEDIR)/build/ps/troff.xfail
 
-tgts := $(patsubst %, %$(ext), $(_NONSO_MAN) $(_NONSO_MDOC))
+tgts := $(patsubst %, %$(ext), $(_NONSO))
 ifeq ($(SKIP_XFAIL),yes)
 tgts := $(filter-out $(patsubst %, $(_MANDIR)/%$(ext), $(file < $(xfail))), $(tgts))
 endif

diff --git a/share/mk/lint/man/blank.mk b/share/mk/lint/man/blank.mk
index 5b3a07e695d94abda5cfc8e8667a51ccb8174de9..ae8791c3f5cd37c82e13323dd74431c2a2450220 100644 (file)
--- a/share/mk/lint/man/blank.mk
+++ b/share/mk/lint/man/blank.mk
@@ -6,8 +6,7 @@ ifndef MAKEFILE_LINT_MAN_BLANK_INCLUDED
 MAKEFILE_LINT_MAN_BLANK_INCLUDED := 1
 
 
-include $(MAKEFILEDIR)/build/man/man.mk
-include $(MAKEFILEDIR)/build/man/mdoc.mk
+include $(MAKEFILEDIR)/build/man/nonso.mk
 include $(MAKEFILEDIR)/configure/build-depends/coreutils/cat.mk
 include $(MAKEFILEDIR)/configure/build-depends/coreutils/echo.mk
 include $(MAKEFILEDIR)/configure/build-depends/coreutils/touch.mk
@@ -17,7 +16,7 @@ include $(MAKEFILEDIR)/configure/build-depends/grep/grep.mk
 ext := .lint-man.blank.touch
 xfail := $(MAKEFILEDIR)/lint/man/blank.xfail
 
-tgts := $(patsubst %, %$(ext), $(_NONSO_MAN) $(_NONSO_MDOC))
+tgts := $(patsubst %, %$(ext), $(_NONSO))
 ifeq ($(SKIP_XFAIL),yes)
 tgts := $(filter-out $(patsubst %, $(_MANDIR)/%$(ext), $(file < $(xfail))), $(tgts))
 endif

diff --git a/share/mk/lint/man/mandoc.mk b/share/mk/lint/man/mandoc.mk
index 78c13980cfb4ee651107d2723a8ff15a4b2f8fa9..3a33354672736d9fe8993b6e0e3ae5cd88e7aae8 100644 (file)
--- a/share/mk/lint/man/mandoc.mk
+++ b/share/mk/lint/man/mandoc.mk
@@ -7,8 +7,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)/build/man/nonso.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
@@ -19,7 +18,7 @@ include $(MAKEFILEDIR)/configure/xfail.mk
 ext := .lint-man.mandoc.touch
 xfail := $(MAKEFILEDIR)/lint/man/mandoc.xfail
 
-tgts := $(patsubst %, %$(ext), $(_NONSO_MAN) $(_NONSO_MDOC))
+tgts := $(patsubst %, %$(ext), $(_NONSO))
 ifeq ($(SKIP_XFAIL),yes)
 tgts := $(filter-out $(patsubst %, $(_MANDIR)/%$(ext), $(file < $(xfail))), $(tgts))
 endif

diff --git a/share/mk/lint/man/quote.mk b/share/mk/lint/man/quote.mk
index 6f7f5914aecc6eae6cd9d7f26c1eecfed3204ecb..28cae6533070303b28c810b5c64cd291181d4dcb 100644 (file)
--- a/share/mk/lint/man/quote.mk
+++ b/share/mk/lint/man/quote.mk
@@ -6,8 +6,7 @@ ifndef MAKEFILE_LINT_MAN_QUOTE_INCLUDED
 MAKEFILE_LINT_MAN_QUOTE_INCLUDED := 1
 
 
-include $(MAKEFILEDIR)/build/man/man.mk
-include $(MAKEFILEDIR)/build/man/mdoc.mk
+include $(MAKEFILEDIR)/build/man/nonso.mk
 include $(MAKEFILEDIR)/configure/build-depends/coreutils/cat.mk
 include $(MAKEFILEDIR)/configure/build-depends/coreutils/echo.mk
 include $(MAKEFILEDIR)/configure/build-depends/coreutils/touch.mk
@@ -17,7 +16,7 @@ include $(MAKEFILEDIR)/configure/build-depends/grep/grep.mk
 ext := .lint-man.quote.touch
 xfail := $(MAKEFILEDIR)/lint/man/quote.xfail
 
-tgts := $(patsubst %, %$(ext), $(_NONSO_MAN) $(_NONSO_MDOC))
+tgts := $(patsubst %, %$(ext), $(_NONSO))
 ifeq ($(SKIP_XFAIL),yes)
 tgts := $(filter-out $(patsubst %, $(_MANDIR)/%$(ext), $(file < $(xfail))), $(tgts))
 endif

diff --git a/share/mk/lint/man/tbl.mk b/share/mk/lint/man/tbl.mk
index a1a17c458fa64845ba41d84f7f6c07059922433e..c9a0de91ec6b8ddffbcb054536407bb97598a46e 100644 (file)
--- a/share/mk/lint/man/tbl.mk
+++ b/share/mk/lint/man/tbl.mk
@@ -6,7 +6,7 @@ ifndef MAKEFILE_LINT_MAN_TBL_INCLUDED
 MAKEFILE_LINT_MAN_TBL_INCLUDED := 1
 
 
-include $(MAKEFILEDIR)/build/man/man.mk
+include $(MAKEFILEDIR)/build/man/nonso.mk
 include $(MAKEFILEDIR)/configure/build-depends/coreutils/cat.mk
 include $(MAKEFILEDIR)/configure/build-depends/coreutils/echo.mk
 include $(MAKEFILEDIR)/configure/build-depends/coreutils/head.mk
@@ -16,7 +16,7 @@ include $(MAKEFILEDIR)/configure/build-depends/grep/grep.mk
 
 
 ext := .lint-man.tbl.touch
-tgts := $(patsubst %, %$(ext), $(_NONSO_MAN))
+tgts := $(patsubst %, %$(ext), $(_NONSO))
 
 
 $(tgts): %$(ext): % $(MK) | $$(@D)/

diff --git a/share/mk/lint/man/ws.mk b/share/mk/lint/man/ws.mk
index 61f2eb7dccba7ce5450049abfb04a8c160f6b7bc..eb1bb6c6415218a7bea5b74e1f77ac5031b198f2 100644 (file)
--- a/share/mk/lint/man/ws.mk
+++ b/share/mk/lint/man/ws.mk
@@ -6,8 +6,7 @@ ifndef MAKEFILE_LINT_MAN_WS_INCLUDED
 MAKEFILE_LINT_MAN_WS_INCLUDED := 1
 
 
-include $(MAKEFILEDIR)/build/man/man.mk
-include $(MAKEFILEDIR)/build/man/mdoc.mk
+include $(MAKEFILEDIR)/build/man/nonso.mk
 include $(MAKEFILEDIR)/configure/build-depends/coreutils/cat.mk
 include $(MAKEFILEDIR)/configure/build-depends/coreutils/echo.mk
 include $(MAKEFILEDIR)/configure/build-depends/coreutils/touch.mk
@@ -17,7 +16,7 @@ include $(MAKEFILEDIR)/configure/build-depends/grep/grep.mk
 ext := .lint-man.ws.touch
 xfail := $(MAKEFILEDIR)/lint/man/ws.xfail
 
-tgts := $(patsubst %, %$(ext), $(_NONSO_MAN) $(_NONSO_MDOC))
+tgts := $(patsubst %, %$(ext), $(_NONSO))
 ifeq ($(SKIP_XFAIL),yes)
 tgts := $(filter-out $(patsubst %, $(_MANDIR)/%$(ext), $(file < $(xfail))), $(tgts))
 endif

diff --git a/share/mk/src/man.mk b/share/mk/src/man.mk
index 21e8a0f78cbf54d8f299162c9c0759899221ad1f..62a83f4e6ab0bfb9ae580df54b5c1709d3a792c0 100644 (file)
--- a/share/mk/src/man.mk
+++ b/share/mk/src/man.mk
@@ -42,17 +42,12 @@ $(foreach s, $(MANSECTIONS),                                                  \
                                $(MANINTROPAGES)))))
 
 
-NONSO_MAN := $(shell $(FIND) $(MANDIR)/* -type f \
+NONSO := $(shell $(FIND) $(MANDIR)/* -type f \
                | $(GREP) -E '$(MANEXT)' \
-               | $(XARGS) $(GREP) -l '^\.TH ' \
+               | $(XARGS) $(GREP) -l -e '^\.TH ' -e '^\.Dt ' \
                | $(SORTMAN) \
                | $(SED) 's,:,\\:,g')
-NONSO_MDOC := $(shell $(FIND) $(MANDIR)/* -type f \
-               | $(GREP) -E '$(MANEXT)' \
-               | $(XARGS) $(GREP) -l '^\.Dt ' \
-               | $(SORTMAN) \
-               | $(SED) 's,:,\\:,g')
-SO_MAN := $(filter-out $(NONSO_MAN) $(NONSO_MDOC), $(MANPAGES))
+SO_MAN := $(filter-out $(NONSO), $(MANPAGES))
 
 
 endif  # include guard