Merging upstream version 6.7.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

3 files changed, 76 insertions, 181 deletions

diff --git a/share/mk/install/_.mk b/share/mk/install/_.mk
index 751ab97..bb39de3 100644
--- a/share/mk/install/_.mk
+++ b/share/mk/install/_.mk
@@ -1,29 +1,20 @@
-########################################################################
-# Copyright 2021-2022, Alejandro Colomar <alx@kernel.org>
-# SPDX-License-Identifier: GPL-3.0-or-later
-########################################################################
+# Copyright 2021-2024, Alejandro Colomar <alx@kernel.org>
+# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception
 
 
 ifndef MAKEFILE_INSTALL_INCLUDED
 MAKEFILE_INSTALL_INCLUDED := 1
 
 
-include $(MAKEFILEDIR)/cmd.mk
+include $(MAKEFILEDIR)/configure/build-depends/coreutils.mk
 
 
-DESTDIR :=
-prefix  := /usr/local
-
-datarootdir := $(prefix)/share
-docdir      := $(datarootdir)/doc
-
-
-$(DESTDIR)%/:
-	+$(info INSTALL	$@)
+%/:
+	+$(info	$(INFO_)MKDIR		$@)
 	+$(INSTALL_DIR) $@
 
 %-rm:
-	$(info RM	$*)
+	$(info	$(INFO_)RM		$*)
 	$(RM) $*
 
 
diff --git a/share/mk/install/html.mk b/share/mk/install/html.mk
index 97e00ce..047df90 100644
--- a/share/mk/install/html.mk
+++ b/share/mk/install/html.mk
@@ -1,28 +1,27 @@
-########################################################################
-# Copyright 2021-2022, Alejandro Colomar <alx@kernel.org>
-# SPDX-License-Identifier: GPL-3.0-or-later
-########################################################################
+# Copyright 2021-2024, Alejandro Colomar <alx@kernel.org>
+# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception
 
 
 ifndef MAKEFILE_INSTALL_HTML_INCLUDED
 MAKEFILE_INSTALL_HTML_INCLUDED := 1
 
 
-include $(MAKEFILEDIR)/build/html.mk
+include $(MAKEFILEDIR)/build/_.mk
+include $(MAKEFILEDIR)/build/html/post-grohtml.mk
+include $(MAKEFILEDIR)/configure/build-depends/coreutils.mk
+include $(MAKEFILEDIR)/configure/directory_variables.mk
 include $(MAKEFILEDIR)/install/_.mk
 
 
-htmldir  := $(docdir)
-htmldir_ := $(htmldir)/man
-_htmldir := $(DESTDIR)$(htmldir_)
+_htmldir := $(DESTDIR)$(htmldir)
 
 
-_htmlpages      := $(patsubst $(_HTMLDIR)/%,$(_htmldir)/%,$(_HTMLPAGES))
+_htmlpages      := $(patsubst $(_MANDIR)/%,$(_htmldir)/%,$(_HTMLMAN))
 _htmlpages_rm   := $(addsuffix -rm,$(wildcard $(_htmlpages)))
 
 
-$(_htmlpages): $(_htmldir)/%: $(_HTMLDIR)/% | $$(@D)/
-	$(info INSTALL	$@)
+$(_htmlpages): $(_htmldir)/%: $(_MANDIR)/% $(MK) | $$(@D)/
+	$(info	$(INFO_)INSTALL		$@)
 	$(INSTALL_DATA) -T $< $@
 
 
diff --git a/share/mk/install/man.mk b/share/mk/install/man.mk
index a135788..65c1ea5 100644
--- a/share/mk/install/man.mk
+++ b/share/mk/install/man.mk
@@ -1,139 +1,60 @@
-########################################################################
-# Copyright 2021-2023, Alejandro Colomar <alx@kernel.org>
-# SPDX-License-Identifier: GPL-3.0-or-later
-########################################################################
+# Copyright 2021-2024, Alejandro Colomar <alx@kernel.org>
+# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception
 
 
 ifndef MAKEFILE_INSTALL_MAN_INCLUDED
 MAKEFILE_INSTALL_MAN_INCLUDED := 1
 
 
-include $(MAKEFILEDIR)/cmd.mk
-include $(MAKEFILEDIR)/compress.mk
+include $(MAKEFILEDIR)/configure/build-depends/bzip2.mk
+include $(MAKEFILEDIR)/configure/build-depends/coreutils.mk
+include $(MAKEFILEDIR)/configure/build-depends/findutils.mk
+include $(MAKEFILEDIR)/configure/build-depends/grep.mk
+include $(MAKEFILEDIR)/configure/build-depends/gzip.mk
+include $(MAKEFILEDIR)/configure/build-depends/lzip.mk
+include $(MAKEFILEDIR)/configure/build-depends/moreutils.mk
+include $(MAKEFILEDIR)/configure/build-depends/sed.mk
+include $(MAKEFILEDIR)/configure/build-depends/xz-utils.mk
+include $(MAKEFILEDIR)/configure/directory_variables.mk
+include $(MAKEFILEDIR)/configure/z.mk
 include $(MAKEFILEDIR)/install/_.mk
 include $(MAKEFILEDIR)/src.mk
 
 
-LINK_PAGES := .so
-ifeq ($(LINK_PAGES),.so)
-else ifeq ($(LINK_PAGES),symlink)
-else
-$(warning "LINK_PAGES": "$(LINK_PAGES)")
-$(error Valid values for "LINK_PAGES": [".so", "symlink"])
-endif
+_mandir := $(DESTDIR)$(mandir)
+$(foreach s, $(MANSECTIONS),                                                  \
+	$(eval _man$(s)dir := $(DESTDIR)$(man$(s)dir)))
+
+$(foreach s, $(MANSECTIONS),                                                  \
+	$(eval _man$(s)pages :=                                               \
+		$(patsubst $(MAN$(s)DIR)/%.$(s), $(_man$(s)dir)/%$(man$(s)ext)$(Z), \
+			$(MAN$(s)PAGES))))
+$(foreach s, $(MANSECTIONS),                                                  \
+	$(eval _man$(s)intropage :=                                           \
+		$(patsubst $(MAN$(s)DIR)/%.$(s), $(_man$(s)dir)/%$(man$(s)ext)$(Z), \
+			$(MAN$(s)INTROPAGE))))
+_manintropages := $(foreach s, $(MANSECTIONS), $(_man$(s)intropage))
+_manpages := $(_manintropages) $(foreach s, $(MANSECTIONS), $(_man$(s)pages))
+
+_manintropages_rm := $(addsuffix -rm, $(wildcard $(_manintropages)))
+$(foreach s, $(MANSECTIONS),                                                  \
+	$(eval _man$(s)pages_rm :=                                            \
+		$(addsuffix -rm,                                              \
+			$(wildcard $(_man$(s)pages)))))
 
 
-mandir      := $(datarootdir)/man
-man1dir     := $(mandir)/man1
-man2dir     := $(mandir)/man2
-man2typedir := $(mandir)/man2type
-man3dir     := $(mandir)/man3
-man3constdir:= $(mandir)/man3const
-man3headdir := $(mandir)/man3head
-man3typedir := $(mandir)/man3type
-man4dir     := $(mandir)/man4
-man5dir     := $(mandir)/man5
-man6dir     := $(mandir)/man6
-man7dir     := $(mandir)/man7
-man8dir     := $(mandir)/man8
-man1ext     := .1$(Z)
-man2ext     := .2$(Z)
-man2typeext := .2type$(Z)
-man3ext     := .3$(Z)
-man3constext:= .3const$(Z)
-man3headext := .3head$(Z)
-man3typeext := .3type$(Z)
-man4ext     := .4$(Z)
-man5ext     := .5$(Z)
-man6ext     := .6$(Z)
-man7ext     := .7$(Z)
-man8ext     := .8$(Z)
-
-
-_mandir       := $(DESTDIR)$(mandir)
-_man1dir      := $(DESTDIR)$(man1dir)
-_man2dir      := $(DESTDIR)$(man2dir)
-_man2typedir  := $(DESTDIR)$(man2typedir)
-_man3dir      := $(DESTDIR)$(man3dir)
-_man3constdir := $(DESTDIR)$(man3constdir)
-_man3headdir  := $(DESTDIR)$(man3headdir)
-_man3typedir  := $(DESTDIR)$(man3typedir)
-_man4dir      := $(DESTDIR)$(man4dir)
-_man5dir      := $(DESTDIR)$(man5dir)
-_man6dir      := $(DESTDIR)$(man6dir)
-_man7dir      := $(DESTDIR)$(man7dir)
-_man8dir      := $(DESTDIR)$(man8dir)
-
-_man1pages      := $(patsubst $(MANDIR)/man1/%,$(_man1dir)/%$(Z),$(MAN1PAGES))
-_man2pages      := $(patsubst $(MANDIR)/man2/%,$(_man2dir)/%$(Z),$(MAN2PAGES))
-_man2typepages  := $(patsubst $(MANDIR)/man2type/%,$(_man2typedir)/%$(Z),$(MAN2TYPEPAGES))
-_man3pages      := $(patsubst $(MANDIR)/man3/%,$(_man3dir)/%$(Z),$(MAN3PAGES))
-_man3constpages := $(patsubst $(MANDIR)/man3const/%,$(_man3constdir)/%$(Z),$(MAN3CONSTPAGES))
-_man3headpages  := $(patsubst $(MANDIR)/man3head/%,$(_man3headdir)/%$(Z),$(MAN3HEADPAGES))
-_man3typepages  := $(patsubst $(MANDIR)/man3type/%,$(_man3typedir)/%$(Z),$(MAN3TYPEPAGES))
-_man4pages      := $(patsubst $(MANDIR)/man4/%,$(_man4dir)/%$(Z),$(MAN4PAGES))
-_man5pages      := $(patsubst $(MANDIR)/man5/%,$(_man5dir)/%$(Z),$(MAN5PAGES))
-_man6pages      := $(patsubst $(MANDIR)/man6/%,$(_man6dir)/%$(Z),$(MAN6PAGES))
-_man7pages      := $(patsubst $(MANDIR)/man7/%,$(_man7dir)/%$(Z),$(MAN7PAGES))
-_man8pages      := $(patsubst $(MANDIR)/man8/%,$(_man8dir)/%$(Z),$(MAN8PAGES))
-_manpages       := $(_man1pages) \
-                   $(_man2pages) $(_man2typepages) \
-                   $(_man3pages) $(_man3constpages) $(_man3headpages) $(_man3typepages) \
-                   $(_man4pages) \
-                   $(_man5pages) \
-                   $(_man6pages) \
-                   $(_man7pages) \
-                   $(_man8pages)
-
-_man1pages_rm     := $(addsuffix -rm,$(wildcard $(_man1pages)))
-_man2pages_rm     := $(addsuffix -rm,$(wildcard $(_man2pages)))
-_man2typepages_rm := $(addsuffix -rm,$(wildcard $(_man2typepages)))
-_man3pages_rm     := $(addsuffix -rm,$(wildcard $(_man3pages)))
-_man3constpages_rm:= $(addsuffix -rm,$(wildcard $(_man3constpages)))
-_man3headpages_rm := $(addsuffix -rm,$(wildcard $(_man3headpages)))
-_man3typepages_rm := $(addsuffix -rm,$(wildcard $(_man3typepages)))
-_man4pages_rm     := $(addsuffix -rm,$(wildcard $(_man4pages)))
-_man5pages_rm     := $(addsuffix -rm,$(wildcard $(_man5pages)))
-_man6pages_rm     := $(addsuffix -rm,$(wildcard $(_man6pages)))
-_man7pages_rm     := $(addsuffix -rm,$(wildcard $(_man7pages)))
-_man8pages_rm     := $(addsuffix -rm,$(wildcard $(_man8pages)))
-
-MAN_SECTIONS     := 1 2 2type 3 3const 3head 3type 4 5 6 7 8
-install_manX     := $(foreach x,$(MAN_SECTIONS),install-man$(x))
-uninstall_manX   := $(foreach x,$(MAN_SECTIONS),uninstall-man$(x))
-
-
-$(_man1pages):      $(_man1dir)/%$(Z):      $(MANDIR)/man1/%      | $$(@D)/
-$(_man2pages):      $(_man2dir)/%$(Z):      $(MANDIR)/man2/%      | $$(@D)/
-$(_man2typepages):  $(_man2typedir)/%$(Z):  $(MANDIR)/man2type/%  | $$(@D)/
-$(_man3pages):      $(_man3dir)/%$(Z):      $(MANDIR)/man3/%      | $$(@D)/
-$(_man3constpages): $(_man3constdir)/%$(Z): $(MANDIR)/man3const/% | $$(@D)/
-$(_man3headpages):  $(_man3headdir)/%$(Z):  $(MANDIR)/man3head/%  | $$(@D)/
-$(_man3typepages):  $(_man3typedir)/%$(Z):  $(MANDIR)/man3type/%  | $$(@D)/
-$(_man4pages):      $(_man4dir)/%$(Z):      $(MANDIR)/man4/%      | $$(@D)/
-$(_man5pages):      $(_man5dir)/%$(Z):      $(MANDIR)/man5/%      | $$(@D)/
-$(_man6pages):      $(_man6dir)/%$(Z):      $(MANDIR)/man6/%      | $$(@D)/
-$(_man7pages):      $(_man7dir)/%$(Z):      $(MANDIR)/man7/%      | $$(@D)/
-$(_man8pages):      $(_man8dir)/%$(Z):      $(MANDIR)/man8/%      | $$(@D)/
+$(foreach s, $(MANSECTIONS),                                                  \
+	$(eval $(_man$(s)pages) $(_man$(s)intropage):                         \
+		$(_man$(s)dir)/%$(man$(s)ext)$(Z):                            \
+			$(MAN$(s)DIR)/%.$(s) $(MK) | $$$$(@D)/))
 
 
 $(_manpages):
-	$(info INSTALL	$@)
-	$(INSTALL_DATA) -T $< $@
-	$(SED) -i \
-		-e '/^\.so /s, man1/\(.*\)\.1$$, $(notdir $(man1dir))/\1$(man1ext),' \
-		-e '/^\.so /s, man2/\(.*\)\.2$$, $(notdir $(man2dir))/\1$(man2ext),' \
-		-e '/^\.so /s, man2type/\(.*\)\.2type$$, $(notdir $(man2typedir))/\1$(man2typeext),' \
-		-e '/^\.so /s, man3/\(.*\)\.3$$, $(notdir $(man3dir))/\1$(man3ext),' \
-		-e '/^\.so /s, man3const/\(.*\)\.3const$$, $(notdir $(man3constdir))/\1$(man3constext),' \
-		-e '/^\.so /s, man3head/\(.*\)\.3head$$, $(notdir $(man3headdir))/\1$(man3headext),' \
-		-e '/^\.so /s, man3type/\(.*\)\.3type$$, $(notdir $(man3typedir))/\1$(man3typeext),' \
-		-e '/^\.so /s, man4/\(.*\)\.4$$, $(notdir $(man4dir))/\1$(man4ext),' \
-		-e '/^\.so /s, man5/\(.*\)\.5$$, $(notdir $(man5dir))/\1$(man5ext),' \
-		-e '/^\.so /s, man6/\(.*\)\.6$$, $(notdir $(man6dir))/\1$(man6ext),' \
-		-e '/^\.so /s, man7/\(.*\)\.7$$, $(notdir $(man7dir))/\1$(man7ext),' \
-		-e '/^\.so /s, man8/\(.*\)\.8$$, $(notdir $(man8dir))/\1$(man8ext),' \
-		$@
+	$(info	$(INFO_)INSTALL		$@)
+	<$< \
+	$(SED) $(foreach s, $(MANSECTIONS), \
+		-e '/^\.so /s, man$(s)/\(.*\)\.$(s)$$, $(notdir $(man$(s)dir))/\1$(man$(s)ext)$(Z),') \
+	| $(INSTALL_DATA) -T /dev/stdin $@
 ifeq ($(LINK_PAGES),symlink)
 	if $(GREP) '^\.so ' <$@ >/dev/null; then \
 		$(GREP) '^\.so ' <$@ \
@@ -148,55 +69,39 @@ ifeq ($(Z),.bz2)
 	fi
 else ifeq ($(Z),.gz)
 	if ! $(TEST) -L $@; then \
-		$(GZIP) $(GZIPFLAGS) - <$@ \
+		$(GZIP) $(GZIPFLAGS) <$@ \
 		| $(SPONGE) $@; \
 	fi
 else ifeq ($(Z),.lz)
 	if ! $(TEST) -L $@; then \
-		$(LZIP) $(LZIPFLAGS) - <$@ \
+		$(LZIP) $(LZIPFLAGS) <$@ \
 		| $(SPONGE) $@; \
 	fi
 else ifeq ($(Z),.xz)
 	if ! $(TEST) -L $@; then \
-		$(XZ) $(XZFLAGS) - <$@ \
+		$(XZ) $(XZFLAGS) <$@ \
 		| $(SPONGE) $@; \
 	fi
 endif
 
 
-.PHONY: install-man1
-install-man1:      $(_man1pages);
-.PHONY: install-man2
-install-man2:      $(_man2pages);
-.PHONY: install-man2type
-install-man2type:  $(_man2typepages);
-.PHONY: install-man3
-install-man3:      $(_man3pages);
-.PHONY: install-man3const
-install-man3const: $(_man3constpages);
-.PHONY: install-man3head
-install-man3head:  $(_man3headpages);
-.PHONY: install-man3type
-install-man3type:  $(_man3typepages);
-.PHONY: install-man4
-install-man4:      $(_man4pages);
-.PHONY: install-man5
-install-man5:      $(_man5pages);
-.PHONY: install-man6
-install-man6:      $(_man6pages);
-.PHONY: install-man7
-install-man7:      $(_man7pages);
-.PHONY: install-man8
-install-man8:      $(_man8pages);
-
+.PHONY: install-manintro
+install-manintro:  $(_manintropages);
+$(foreach s, $(MANSECTIONS),                                                  \
+	$(eval .PHONY: install-man$(s)))
+$(foreach s, $(MANSECTIONS),                                                  \
+	$(eval install-man$(s): $(_man$(s)pages);))
 .PHONY: install-man
-install-man: $(install_manX);
-
-.PHONY: $(uninstall_manX)
-$(uninstall_manX): uninstall-man%: $$(_man%pages_rm);
-
+install-man: install-manintro $(foreach s, $(MANSECTIONS), install-man$(s));
+
+.PHONY: uninstall-manintro
+uninstall-manintro: $(_manintropages_rm);
+$(foreach s, $(MANSECTIONS),                                                  \
+	$(eval .PHONY: uninstall-man$(s)))
+$(foreach s, $(MANSECTIONS),                                                  \
+	$(eval uninstall-man$(s): $(_man$(s)pages_rm);))
 .PHONY: uninstall-man
-uninstall-man: $(uninstall_manX);
+uninstall-man: uninstall-manintro $(foreach s, $(MANSECTIONS), uninstall-man$(s));
 
 
 endif  # include guard