From 3d08cd331c1adcf0d917392f7e527b3f00511748 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 24 May 2024 06:52:22 +0200 Subject: Merging upstream version 6.8. Signed-off-by: Daniel Baumann --- share/mk/lint/man/mandoc.ignore.grep | 1 - share/mk/lint/man/mandoc.mk | 16 ++++++------ share/mk/lint/man/tbl.mk | 48 +++++++++++++++++++----------------- 3 files changed, 33 insertions(+), 32 deletions(-) (limited to 'share/mk/lint/man') diff --git a/share/mk/lint/man/mandoc.ignore.grep b/share/mk/lint/man/mandoc.ignore.grep index a2f91bc..c4a023a 100644 --- a/share/mk/lint/man/mandoc.ignore.grep +++ b/share/mk/lint/man/mandoc.ignore.grep @@ -1,6 +1,5 @@ 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 index efa69ab..2a3f914 100644 --- a/share/mk/lint/man/mandoc.mk +++ b/share/mk/lint/man/mandoc.mk @@ -7,13 +7,12 @@ 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)/build/man/man.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 include $(MAKEFILEDIR)/configure/xfail.mk -include $(MAKEFILEDIR)/lint/man/_.mk -include $(MAKEFILEDIR)/src.mk _XFAIL_LINT_man_mandoc := \ @@ -26,8 +25,7 @@ _XFAIL_LINT_man_mandoc := \ $(_MANDIR)/man8/zic.8.lint-man.mandoc.touch -_LINT_man_mandoc := \ - $(patsubst $(MANDIR)/%, $(_MANDIR)/%.lint-man.mandoc.touch, $(NONSO_MAN)) +_LINT_man_mandoc := $(patsubst %, %.lint-man.mandoc.touch, $(_NONSO_MAN)) ifeq ($(SKIP_XFAIL),yes) _LINT_man_mandoc := $(filter-out $(_XFAIL_LINT_man_mandoc), $(_LINT_man_mandoc)) endif @@ -36,7 +34,7 @@ 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)/ +$(_LINT_man_mandoc): %.lint-man.mandoc.touch: % $(mandoc_man_ignore_grep) $(MK) | $$(@D)/ $(info $(INFO_)MANDOC $@) ! ($(MANDOC) -man $(MANDOCFLAGS) $< 2>&1 \ | $(GREP) -v -f '$(mandoc_man_ignore_grep)' \ diff --git a/share/mk/lint/man/tbl.mk b/share/mk/lint/man/tbl.mk index 23e6eda..cb2dd46 100644 --- a/share/mk/lint/man/tbl.mk +++ b/share/mk/lint/man/tbl.mk @@ -6,34 +6,38 @@ 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 +include $(MAKEFILEDIR)/build/man/man.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 +include $(MAKEFILEDIR)/configure/build-depends/coreutils/tail.mk +include $(MAKEFILEDIR)/configure/build-depends/coreutils/touch.mk +include $(MAKEFILEDIR)/configure/build-depends/grep/grep.mk -_LINT_man_tbl := \ - $(patsubst $(MANDIR)/%, $(_MANDIR)/%.lint-man.tbl.touch, $(NONSO_MAN)) +_LINT_man_tbl := $(patsubst %, %.lint-man.tbl.touch, $(_NONSO_MAN)) -$(_LINT_man_tbl): $(_MANDIR)/%.lint-man.tbl.touch: $(MANDIR)/% $(MK) | $$(@D)/ +$(_LINT_man_tbl): %.lint-man.tbl.touch: % $(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; \ + $(HEAD) -n1 <$< \ + | if $(GREP) '\\" t$$' >/dev/null; then \ + $(CAT) <$< \ + | if ! $(GREP) '^\.TS$$' >/dev/null; then \ + >&2 $(ECHO) "$<:1: spurious '\\\" t' comment:"; \ + >&2 $(HEAD) -n1 <$<; \ + exit 1; \ + fi; \ + else \ + $(CAT) <$< \ + | if $(GREP) '^\.TS$$' >/dev/null; then \ + >&2 $(ECHO) "$<:1: missing '\\\" t' comment:"; \ + >&2 $(HEAD) -n1 <$<; \ + exit 1; \ + fi; \ fi - if $(TAIL) -n+2 <$< | $(GREP) -q '\\" t$$'; \ - then \ + $(TAIL) -n+2 <$< \ + | if $(GREP) '\\" t$$' >/dev/null; then \ >&2 $(ECHO) "$<: spurious '\\\" t' not in first line:"; \ >&2 $(GREP) -n '\\" t$$' $< /dev/null; \ exit 1; \ -- cgit v1.2.3