From 3af6d22bb3850ab2bac67287e3a3d3b0e32868e5 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 15 Apr 2024 21:41:07 +0200 Subject: Merging upstream version 6.7. Signed-off-by: Daniel Baumann --- share/mk/lint/man/_.mk | 11 +++--- share/mk/lint/man/man.mk | 69 ------------------------------------ share/mk/lint/man/mandoc.ignore.grep | 6 ++++ share/mk/lint/man/mandoc.mk | 53 +++++++++++++++++++++++++++ share/mk/lint/man/mdoc.mk | 44 ----------------------- share/mk/lint/man/tbl.mk | 48 +++++++++++++++++++++++++ 6 files changed, 111 insertions(+), 120 deletions(-) delete mode 100644 share/mk/lint/man/man.mk create mode 100644 share/mk/lint/man/mandoc.ignore.grep create mode 100644 share/mk/lint/man/mandoc.mk delete mode 100644 share/mk/lint/man/mdoc.mk create mode 100644 share/mk/lint/man/tbl.mk (limited to 'share/mk/lint/man') diff --git a/share/mk/lint/man/_.mk b/share/mk/lint/man/_.mk index 8bbc01c..67ff4b8 100644 --- a/share/mk/lint/man/_.mk +++ b/share/mk/lint/man/_.mk @@ -1,16 +1,13 @@ -######################################################################## -# Copyright 2021-2023, Alejandro Colomar -# SPDX-License-Identifier: GPL-3.0-or-later -######################################################################## +# Copyright 2021-2024, Alejandro Colomar +# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception ifndef MAKEFILE_LINT_MAN_INCLUDED MAKEFILE_LINT_MAN_INCLUDED := 1 -DEFAULT_MANDOCFLAGS := -Tlint -EXTRA_MANDOCFLAGS := -MANDOCFLAGS := $(DEFAULT_MANDOCFLAGS) $(EXTRA_MANDOCFLAGS) +.PHONY: lint-man +lint-man: lint-man-mandoc lint-man-tbl; endif # include guard diff --git a/share/mk/lint/man/man.mk b/share/mk/lint/man/man.mk deleted file mode 100644 index cb1bf53..0000000 --- a/share/mk/lint/man/man.mk +++ /dev/null @@ -1,69 +0,0 @@ -######################################################################## -# Copyright 2021-2023, Alejandro Colomar -# SPDX-License-Identifier: GPL-3.0-or-later -######################################################################## - - -ifndef MAKEFILE_LINT_MAN_MAN_INCLUDED -MAKEFILE_LINT_MAN_MAN_INCLUDED := 1 - - -include $(MAKEFILEDIR)/cmd.mk -include $(MAKEFILEDIR)/build/_.mk -include $(MAKEFILEDIR)/lint/_.mk -include $(MAKEFILEDIR)/lint/man/_.mk -include $(MAKEFILEDIR)/src.mk - - -mandoc_man_ignore_grep := $(DATAROOTDIR)/lint/mandoc/man.ignore.grep - -_LINT_man_mandoc :=$(patsubst $(MANDIR)/%,$(_MANDIR)/%.lint-man.mandoc.touch,$(NONSO_MAN)) -_LINT_man_tbl :=$(patsubst $(MANDIR)/%,$(_MANDIR)/%.lint-man.tbl.touch,$(NONSO_MAN)) - - -linters_man := mandoc tbl -lint_man := $(foreach x,$(linters_man),lint-man-$(x)) - - -$(_LINT_man_mandoc): $(_MANDIR)/%.lint-man.mandoc.touch: $(MANDIR)/% $(mandoc_man_ignore_grep) | $$(@D)/ - $(info LINT (mandoc) $@) - ! ($(MANDOC) -man $(MANDOCFLAGS) $< 2>&1 \ - | $(GREP) -v -f '$(mandoc_man_ignore_grep)' \ - ||:; \ - ) \ - | $(GREP) ^ >&2 - touch $@ - -$(_LINT_man_tbl): $(_MANDIR)/%.lint-man.tbl.touch: $(MANDIR)/% | $$(@D)/ - $(info LINT (tbl comment) $@) - if $(GREP) -q '^\.TS$$' $< && ! $(HEAD) -n1 $< | $(GREP) -q '\\" t$$'; \ - then \ - >&2 $(ECHO) "$<:1: missing '\\\" t' comment:"; \ - >&2 $(HEAD) -n1 <$<; \ - exit 1; \ - fi - if $(HEAD) -n1 $< | $(GREP) -q '\\" t$$' && ! $(GREP) -q '^\.TS$$' $<; \ - then \ - >&2 $(ECHO) "$<:1: spurious '\\\" t' comment:"; \ - >&2 $(HEAD) -n1 <$<; \ - exit 1; \ - fi - if $(TAIL) -n+2 <$< | $(GREP) -q '\\" t$$'; \ - then \ - >&2 $(ECHO) "$<: spurious '\\\" t' not in first line:"; \ - >&2 $(GREP) -n '\\" t$$' $< /dev/null; \ - exit 1; \ - fi - touch $@ - - -.PHONY: lint-man-mandoc -lint-man-mandoc: $(_LINT_man_mandoc); -.PHONY: lint-man-tbl -lint-man-tbl: $(_LINT_man_tbl); - -.PHONY: lint-man -lint-man: $(lint_man); - - -endif # include guard diff --git a/share/mk/lint/man/mandoc.ignore.grep b/share/mk/lint/man/mandoc.ignore.grep new file mode 100644 index 0000000..a2f91bc --- /dev/null +++ b/share/mk/lint/man/mandoc.ignore.grep @@ -0,0 +1,6 @@ +STYLE: lower case character in document title: +UNSUPP: ignoring macro in table: +WARNING: cannot parse date, using it verbatim: TH (date) +WARNING: empty block: UR +WARNING: missing date, using "": TH +WARNING: undefined escape, printing literally: \\\\ diff --git a/share/mk/lint/man/mandoc.mk b/share/mk/lint/man/mandoc.mk new file mode 100644 index 0000000..efa69ab --- /dev/null +++ b/share/mk/lint/man/mandoc.mk @@ -0,0 +1,53 @@ +# Copyright 2021-2024, Alejandro Colomar +# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception + + +ifndef MAKEFILE_LINT_MAN_MANDOC_INCLUDED +MAKEFILE_LINT_MAN_MANDOC_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/mandoc.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 := $(MAKEFILEDIR)/lint/man/mandoc.ignore.grep + + +$(_LINT_man_mandoc): $(_MANDIR)/%.lint-man.mandoc.touch: $(MANDIR)/% $(mandoc_man_ignore_grep) $(MK) | $$(@D)/ + $(info $(INFO_)MANDOC $@) + ! ($(MANDOC) -man $(MANDOCFLAGS) $< 2>&1 \ + | $(GREP) -v -f '$(mandoc_man_ignore_grep)' \ + || $(TRUE); \ + ) \ + | $(GREP) ^ >&2 + $(TOUCH) $@ + + +.PHONY: lint-man-mandoc +lint-man-mandoc: $(_LINT_man_mandoc); + + +endif # include guard diff --git a/share/mk/lint/man/mdoc.mk b/share/mk/lint/man/mdoc.mk deleted file mode 100644 index 9b5f5b4..0000000 --- a/share/mk/lint/man/mdoc.mk +++ /dev/null @@ -1,44 +0,0 @@ -######################################################################## -# Copyright 2023, Alejandro Colomar -# SPDX-License-Identifier: GPL-3.0-or-later -######################################################################## - - -ifndef MAKEFILE_LINT_MAN_MDOC_INCLUDED -MAKEFILE_LINT_MAN_MDOC_INCLUDED := 1 - - -include $(MAKEFILEDIR)/cmd.mk -include $(MAKEFILEDIR)/build/_.mk -include $(MAKEFILEDIR)/lint/_.mk -include $(MAKEFILEDIR)/lint/man/_.mk -include $(MAKEFILEDIR)/src.mk - - -mandoc_mdoc_ignore_grep := $(DATAROOTDIR)/lint/mandoc/mdoc.ignore.grep - -_LINT_mdoc_mandoc:=$(patsubst $(MANDIR)/%,$(_MANDIR)/%.lint-mdoc.mandoc.touch,$(NONSO_MDOC)) - - -linters_mdoc := mandoc -lint_mdoc := $(foreach x,$(linters_mdoc),lint-mdoc-$(x)) - - -$(_LINT_mdoc_mandoc): $(_MANDIR)/%.lint-mdoc.mandoc.touch: $(MANDIR)/% $(mandoc_mdoc_ignore_grep) | $$(@D)/ - $(info LINT (mandoc) $@) - ! ($(MANDOC) -mdoc $(MANDOCFLAGS) $< 2>&1 \ - | $(GREP) -v -f '$(mandoc_mdoc_ignore_grep)' \ - ||:; \ - ) \ - | $(GREP) ^ >&2 - touch $@ - - -.PHONY: $(lint_mdoc) -$(lint_mdoc): lint-mdoc-%: $$(_LINT_mdoc_%); - -.PHONY: lint-mdoc -lint-mdoc: $(lint_mdoc); - - -endif # include guard diff --git a/share/mk/lint/man/tbl.mk b/share/mk/lint/man/tbl.mk new file mode 100644 index 0000000..23e6eda --- /dev/null +++ b/share/mk/lint/man/tbl.mk @@ -0,0 +1,48 @@ +# Copyright 2021-2024, Alejandro Colomar +# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception + + +ifndef MAKEFILE_LINT_MAN_TBL_INCLUDED +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/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)/ + $(info $(INFO_)GREP $@) + if $(GREP) -q '^\.TS$$' $< && ! $(HEAD) -n1 $< | $(GREP) -q '\\" t$$'; \ + then \ + >&2 $(ECHO) "$<:1: missing '\\\" t' comment:"; \ + >&2 $(HEAD) -n1 <$<; \ + exit 1; \ + fi + if $(HEAD) -n1 $< | $(GREP) -q '\\" t$$' && ! $(GREP) -q '^\.TS$$' $<; \ + then \ + >&2 $(ECHO) "$<:1: spurious '\\\" t' comment:"; \ + >&2 $(HEAD) -n1 <$<; \ + exit 1; \ + fi + if $(TAIL) -n+2 <$< | $(GREP) -q '\\" t$$'; \ + then \ + >&2 $(ECHO) "$<: spurious '\\\" t' not in first line:"; \ + >&2 $(GREP) -n '\\" t$$' $< /dev/null; \ + exit 1; \ + fi + $(TOUCH) $@ + + +.PHONY: lint-man-tbl +lint-man-tbl: $(_LINT_man_tbl); + + +endif # include guard -- cgit v1.2.3