From 0db324e2e5d9d3347ea0e93138372fb65aac09e6 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 15 Apr 2024 21:41:09 +0200 Subject: Merging upstream version 6.7. Signed-off-by: Daniel Baumann --- share/mk/build/catman/_.mk | 13 +++++ share/mk/build/catman/eqn.mk | 27 +++++++++++ share/mk/build/catman/grotty.mk | 25 ++++++++++ share/mk/build/catman/troff.ignore.grep | 3 ++ share/mk/build/catman/troff.mk | 85 +++++++++++++++++++++++++++++++++ 5 files changed, 153 insertions(+) create mode 100644 share/mk/build/catman/_.mk create mode 100644 share/mk/build/catman/eqn.mk create mode 100644 share/mk/build/catman/grotty.mk create mode 100644 share/mk/build/catman/troff.ignore.grep create mode 100644 share/mk/build/catman/troff.mk (limited to 'share/mk/build/catman') diff --git a/share/mk/build/catman/_.mk b/share/mk/build/catman/_.mk new file mode 100644 index 0000000..78aa862 --- /dev/null +++ b/share/mk/build/catman/_.mk @@ -0,0 +1,13 @@ +# Copyright 2021-2024, Alejandro Colomar +# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception + + +ifndef MAKEFILE_BUILD_CATMAN_INCLUDED +MAKEFILE_BUILD_CATMAN_INCLUDED := 1 + + +.PHONY: build-catman +build-catman: build-catman-grotty; + + +endif # include guard diff --git a/share/mk/build/catman/eqn.mk b/share/mk/build/catman/eqn.mk new file mode 100644 index 0000000..48b6e75 --- /dev/null +++ b/share/mk/build/catman/eqn.mk @@ -0,0 +1,27 @@ +# Copyright 2021-2024, Alejandro Colomar +# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception + + +ifndef MAKEFILE_BUILD_CATMAN_EQN_INCLUDED +MAKEFILE_BUILD_CATMAN_EQN_INCLUDED := 1 + + +include $(MAKEFILEDIR)/build/pre/tbl.mk +include $(MAKEFILEDIR)/configure/build-depends/grep.mk +include $(MAKEFILEDIR)/configure/build-depends/groff-base.mk + + +_CATMAN_troff := $(patsubst %.eqn,%.cat.troff,$(_MAN_eqn)) + + +$(_CATMAN_troff): %.cat.troff: %.eqn $(MK) | $$(@D)/ + $(info $(INFO_)EQN $@) + ! ($(EQN) -T$(NROFF_OUT_DEVICE) $(EQNFLAGS) <$< 2>&1 >$@) \ + | $(GREP) ^ >&2 + + +.PHONY: build-catman-eqn +build-catman-eqn: $(_CATMAN_troff); + + +endif # include guard diff --git a/share/mk/build/catman/grotty.mk b/share/mk/build/catman/grotty.mk new file mode 100644 index 0000000..7def414 --- /dev/null +++ b/share/mk/build/catman/grotty.mk @@ -0,0 +1,25 @@ +# Copyright 2021-2024, Alejandro Colomar +# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception + + +ifndef MAKEFILE_BUILD_CATMAN_GROTTY_INCLUDED +MAKEFILE_BUILD_CATMAN_GROTTY_INCLUDED := 1 + + +include $(MAKEFILEDIR)/build/catman/troff.mk +include $(MAKEFILEDIR)/configure/build-depends/groff-base.mk + + +_CATMAN := $(patsubst %.cat.set,%.cat,$(_CATMAN_MAN_set) $(_CATMAN_MDOC_set)) + + +$(_CATMAN): %.cat: %.cat.set $(MK) | $$(@D)/ + $(info $(INFO_)GROTTY $@) + $(GROTTY) $(GROTTYFLAGS) <$< >$@ + + +.PHONY: build-catman-grotty +build-catman-grotty: $(_CATMAN); + + +endif # include guard diff --git a/share/mk/build/catman/troff.ignore.grep b/share/mk/build/catman/troff.ignore.grep new file mode 100644 index 0000000..912eb57 --- /dev/null +++ b/share/mk/build/catman/troff.ignore.grep @@ -0,0 +1,3 @@ +style: .TH missing fifth argument and second argument +style: use of deprecated macro: .PD$ +style: use of deprecated macro: .UC$ diff --git a/share/mk/build/catman/troff.mk b/share/mk/build/catman/troff.mk new file mode 100644 index 0000000..c38ba17 --- /dev/null +++ b/share/mk/build/catman/troff.mk @@ -0,0 +1,85 @@ +# Copyright 2021-2024, Alejandro Colomar +# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception + + +ifndef MAKEFILE_BUILD_CATMAN_TROFF_INCLUDED +MAKEFILE_BUILD_CATMAN_TROFF_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/groff-base.mk +include $(MAKEFILEDIR)/configure/src.mk +include $(MAKEFILEDIR)/configure/xfail.mk +include $(MAKEFILEDIR)/src.mk + + +_XFAIL_CATMAN_MAN_set := \ + $(_MANDIR)/man2/fanotify_init.2.cat.set \ + $(_MANDIR)/man3/unlocked_stdio.3.cat.set \ + $(_MANDIR)/man4/console_codes.4.cat.set \ + $(_MANDIR)/man4/lirc.4.cat.set \ + $(_MANDIR)/man5/proc_pid_smaps.5.cat.set \ + $(_MANDIR)/man5/tzfile.5.cat.set \ + $(_MANDIR)/man7/ascii.7.cat.set \ + $(_MANDIR)/man7/bpf-helpers.7.cat.set \ + $(_MANDIR)/man7/charsets.7.cat.set \ + $(_MANDIR)/man7/iso_8859-1.7.cat.set \ + $(_MANDIR)/man7/iso_8859-2.7.cat.set \ + $(_MANDIR)/man7/iso_8859-3.7.cat.set \ + $(_MANDIR)/man7/iso_8859-4.7.cat.set \ + $(_MANDIR)/man7/iso_8859-5.7.cat.set \ + $(_MANDIR)/man7/iso_8859-6.7.cat.set \ + $(_MANDIR)/man7/iso_8859-7.7.cat.set \ + $(_MANDIR)/man7/iso_8859-8.7.cat.set \ + $(_MANDIR)/man7/iso_8859-9.7.cat.set \ + $(_MANDIR)/man7/iso_8859-10.7.cat.set \ + $(_MANDIR)/man7/iso_8859-11.7.cat.set \ + $(_MANDIR)/man7/iso_8859-13.7.cat.set \ + $(_MANDIR)/man7/iso_8859-14.7.cat.set \ + $(_MANDIR)/man7/iso_8859-15.7.cat.set \ + $(_MANDIR)/man7/iso_8859-16.7.cat.set \ + $(_MANDIR)/man8/tzselect.8.cat.set \ + $(_MANDIR)/man8/zdump.8.cat.set \ + $(_MANDIR)/man8/zic.8.cat.set + + + +troff_man_ignore_grep := $(MAKEFILEDIR)/build/catman/troff.ignore.grep + + +_CATMAN_MAN_set := $(patsubst $(MANDIR)/%,$(_MANDIR)/%.cat.set,$(NONSO_MAN)) +_CATMAN_MDOC_set := $(patsubst $(MANDIR)/%,$(_MANDIR)/%.cat.set,$(NONSO_MDOC)) + + +ifeq ($(SKIP_XFAIL),yes) +_CATMAN_MAN_set := $(filter-out $(_XFAIL_CATMAN_MAN_set), $(_CATMAN_MAN_set)) +endif + + +$(_CATMAN_MAN_set): %.cat.set: %.cat.troff $(troff_man_ignore_grep) $(MK) | $$(@D)/ + $(info $(INFO_)TROFF $@) + ! ($(TROFF) -man $(TROFFFLAGS) $(NROFFFLAGS) <$< 2>&1 >$@ \ + | $(GREP) -v -f '$(troff_man_ignore_grep)' \ + || $(TRUE); \ + ) \ + | $(GREP) ^ >&2 + +$(_CATMAN_MDOC_set): %.cat.set: %.cat.troff $(MK) | $$(@D)/ + $(info $(INFO_)TROFF $@) + ! ($(TROFF) -mdoc $(TROFFFLAGS) $(NROFFFLAGS) <$< 2>&1 >$@) \ + | $(GREP) ^ >&2 + + +.PHONY: build-catman-troff-man +build-catman-troff-man: $(_CATMAN_MAN_set); + +.PHONY: build-catman-troff-mdoc +build-catman-troff-mdoc: $(_CATMAN_MDOC_set); + +.PHONY: build-catman-troff +build-catman-troff: build-catman-troff-man build-catman-troff-mdoc; + + +endif # include guard -- cgit v1.2.3