From bd98df4189acdacf2d930818cf60bb5840e2153a Mon Sep 17 00:00:00 2001 From: Alejandro Colomar Date: Wed, 10 Sep 2025 19:47:34 +0200 Subject: [PATCH] share/mk/: Merge handling of man(7) and mdoc(7) pages Signed-off-by: Alejandro Colomar --- share/mk/build/catman/troff.mk | 5 ++--- share/mk/build/examples/dir.mk | 4 ++-- share/mk/build/html/troff.mk | 5 ++--- share/mk/build/man/_.mk | 2 +- share/mk/build/man/mdoc.mk | 27 ------------------------- share/mk/build/man/{man.mk => nonso.mk} | 19 +++++++++-------- share/mk/build/pdf/pages/troff.mk | 5 ++--- share/mk/build/pre/preconv.mk | 5 ++--- share/mk/build/ps/troff.mk | 5 ++--- share/mk/lint/man/blank.mk | 5 ++--- share/mk/lint/man/mandoc.mk | 5 ++--- share/mk/lint/man/quote.mk | 5 ++--- share/mk/lint/man/tbl.mk | 4 ++-- share/mk/lint/man/ws.mk | 5 ++--- share/mk/src/man.mk | 11 +++------- 15 files changed, 37 insertions(+), 75 deletions(-) delete mode 100644 share/mk/build/man/mdoc.mk rename share/mk/build/man/{man.mk => nonso.mk} (53%) diff --git a/share/mk/build/catman/troff.mk b/share/mk/build/catman/troff.mk index c1623de92..eda2a5faf 100644 --- 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 bf76f7268..d27cba3b2 100644 --- 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 e2ff31938..1319ea10d 100644 --- 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 2f390647e..812e1596c 100644 --- 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 index e64af071c..000000000 --- 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 90e64e6f6..0bb235b26 100644 --- 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 af1a0f603..d1e7ea0f2 100644 --- 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 5b68d466f..213d481b3 100644 --- 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 960ae7a52..47fe145e2 100644 --- 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 5b3a07e69..ae8791c3f 100644 --- 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 78c13980c..3a3335467 100644 --- 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 6f7f5914a..28cae6533 100644 --- 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 a1a17c458..c9a0de91e 100644 --- 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 61f2eb7dc..eb1bb6c64 100644 --- 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 21e8a0f78..62a83f4e6 100644 --- 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 -- 2.47.3