Merging upstream version 6.8.

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

8 files changed, 39 insertions, 39 deletions

diff --git a/share/mk/dist/_.mk b/share/mk/dist/_.mk
index f6d8669..f79f465 100644
--- a/share/mk/dist/_.mk
+++ b/share/mk/dist/_.mk
@@ -6,8 +6,8 @@ ifndef MAKEFILE_DIST_INCLUDED
 MAKEFILE_DIST_INCLUDED := 1
 
 
-include $(MAKEFILEDIR)/configure/build-depends/coreutils.mk
-include $(MAKEFILEDIR)/configure/directory_variables.mk
+include $(MAKEFILEDIR)/configure/build-depends/coreutils/install.mk
+include $(MAKEFILEDIR)/configure/directory_variables/build.mk
 
 
 _DISTDIR := $(builddir)/dist
diff --git a/share/mk/dist/check/_.mk b/share/mk/dist/check/_.mk
index a24b8f8..d0a3b5d 100644
--- a/share/mk/dist/check/_.mk
+++ b/share/mk/dist/check/_.mk
@@ -6,8 +6,8 @@ ifndef MAKEFILE_DIST_CHECK_INCLUDED
 MAKEFILE_DIST_CHECK_INCLUDED := 1
 
 
-include $(MAKEFILEDIR)/configure/build-depends/coreutils.mk
-include $(MAKEFILEDIR)/configure/directory_variables.mk
+include $(MAKEFILEDIR)/configure/build-depends/coreutils/realpath.mk
+include $(MAKEFILEDIR)/configure/directory_variables/build.mk
 include $(MAKEFILEDIR)/configure/version.mk
 
 
@@ -33,8 +33,11 @@ distcheck-%: $(_DISTCHECKSRCDIR) $(MK) | $$(@D)/
 .PHONY: distcheck
 distcheck: distcheck-diffoscope
 distcheck: $(_DISTCHECKSRCDIR) $(MK)
-	$(info	$(INFO_)MAKE		lint build check install dist)
-	$(MAKE) $(_MAKE_OPTS) lint build check install dist \
+	$(info	$(INFO_)MAKE		lint build install dist)
+	$(MAKE) $(_MAKE_OPTS) lint build install dist \
+		'INFO_= distcheck:	'
+	$(info	$(INFO_)MAKE		check)
+	$(MAKE) $(_MAKE_OPTS) check \
 		'INFO_= distcheck:	'
 
 
diff --git a/share/mk/dist/check/diffoscope.mk b/share/mk/dist/check/diffoscope.mk
index 33bcf30..14058cb 100644
--- a/share/mk/dist/check/diffoscope.mk
+++ b/share/mk/dist/check/diffoscope.mk
@@ -6,9 +6,9 @@ ifndef MAKEFILE_DIST_CHECK_DIFFOSCOPE_INCLUDED
 MAKEFILE_DIST_CHECK_DIFFOSCOPE_INCLUDED := 1
 
 
-include $(MAKEFILEDIR)/configure/build-depends/coreutils.mk
-include $(MAKEFILEDIR)/configure/build-depends/diffoscope.mk
-include $(MAKEFILEDIR)/configure/directory_variables.mk
+include $(MAKEFILEDIR)/configure/build-depends/coreutils/touch.mk
+include $(MAKEFILEDIR)/configure/build-depends/diffoscope/diffoscope.mk
+include $(MAKEFILEDIR)/configure/directory_variables/build.mk
 include $(MAKEFILEDIR)/dist/check/dist.mk
 include $(MAKEFILEDIR)/dist/tar.mk
 
diff --git a/share/mk/dist/check/dist.mk b/share/mk/dist/check/dist.mk
index ecd565b..1e28b06 100644
--- a/share/mk/dist/check/dist.mk
+++ b/share/mk/dist/check/dist.mk
@@ -6,7 +6,6 @@ ifndef MAKEFILE_DIST_CHECK_DIST_INCLUDED
 MAKEFILE_DIST_CHECK_DIST_INCLUDED := 1
 
 
-include $(MAKEFILEDIR)/configure/build-depends/sed.mk
 include $(MAKEFILEDIR)/configure/version.mk
 include $(MAKEFILEDIR)/dist/check/_.mk
 include $(MAKEFILEDIR)/dist/check/tar.mk
diff --git a/share/mk/dist/check/tar.mk b/share/mk/dist/check/tar.mk
index bd28ce5..33f4cb0 100644
--- a/share/mk/dist/check/tar.mk
+++ b/share/mk/dist/check/tar.mk
@@ -6,8 +6,10 @@ ifndef MAKEFILE_DIST_CHECK_TAR_INCLUDED
 MAKEFILE_DIST_CHECK_TAR_INCLUDED := 1
 
 
-include $(MAKEFILEDIR)/configure/build-depends/coreutils.mk
-include $(MAKEFILEDIR)/configure/build-depends/tar.mk
+include $(MAKEFILEDIR)/configure/build-depends/coreutils/cp.mk
+include $(MAKEFILEDIR)/configure/build-depends/coreutils/rm.mk
+include $(MAKEFILEDIR)/configure/build-depends/coreutils/touch.mk
+include $(MAKEFILEDIR)/configure/build-depends/tar/tar.mk
 include $(MAKEFILEDIR)/configure/version.mk
 include $(MAKEFILEDIR)/dist/check/_.mk
 include $(MAKEFILEDIR)/dist/tar.mk
diff --git a/share/mk/dist/files.mk b/share/mk/dist/files.mk
index bc3f7ff..d5de946 100644
--- a/share/mk/dist/files.mk
+++ b/share/mk/dist/files.mk
@@ -6,18 +6,21 @@ ifndef MAKEFILE_DIST_FILES_INCLUDED
 MAKEFILE_DIST_FILES_INCLUDED := 1
 
 
-include $(MAKEFILEDIR)/configure/build-depends/coreutils.mk
-include $(MAKEFILEDIR)/configure/build-depends/git.mk
-include $(MAKEFILEDIR)/configure/build-depends/grep.mk
-include $(MAKEFILEDIR)/configure/build-depends/sed.mk
+include $(MAKEFILEDIR)/configure/build-depends/coreutils/cp.mk
+include $(MAKEFILEDIR)/configure/build-depends/coreutils/echo.mk
+include $(MAKEFILEDIR)/configure/build-depends/coreutils/install.mk
+include $(MAKEFILEDIR)/configure/build-depends/coreutils/test.mk
+include $(MAKEFILEDIR)/configure/build-depends/git/git.mk
+include $(MAKEFILEDIR)/configure/build-depends/grep/grep.mk
+include $(MAKEFILEDIR)/configure/build-depends/sed/sed.mk
 include $(MAKEFILEDIR)/configure/verbose.mk
 include $(MAKEFILEDIR)/configure/version.mk
 include $(MAKEFILEDIR)/dist/_.mk
 
 
 DISTFILES    := $(shell $(DISTFILESCMD) | $(SED) 's,:,\\:,g')
-_DISTFILES   := $(patsubst $(srcdir)/%,$(_DISTDIR)/%,$(DISTFILES))
-_DISTPAGES   := $(filter $(_DISTDIR)/man%,$(_DISTFILES))
+_DISTFILES   := $(patsubst $(srcdir)/%, $(_DISTDIR)/%, $(DISTFILES))
+_DISTPAGES   := $(filter $(_DISTDIR)/man/%, $(_DISTFILES))
 _DISTVERSION := $(_DISTDIR)/share/mk/configure/version.mk
 _DISTOTHERS  := $(filter-out $(_DISTPAGES) $(_DISTVERSION), $(_DISTFILES))
 
@@ -27,11 +30,9 @@ FORCE_DISTVERSION := \
 		if $(TEST) -f $(_DISTVERSION); then \
 			<$(_DISTVERSION) \
 			$(GREP) \
-				-e '^DISTVERSION :=' \
-				-e '^DISTNAME :=' \
+				-e '^VERSION :=' \
 				-e '^DISTDATE :=' \
-			| $(SED) '/^DISTVERSION := $(DISTVERSION)$$/d' \
-			| $(SED) '/^DISTNAME := $(DISTNAME)$$/d' \
+			| $(SED) '/^VERSION := $(VERSION)$$/d' \
 			| $(SED) '/^DISTDATE := $(DISTDATE)$$/d' \
 			| $(GREP) ^ $(HIDE_ERR) >&2 \
 			&& $(ECHO) FORCE; \
@@ -39,18 +40,14 @@ FORCE_DISTVERSION := \
 	)
 
 
-$(_DISTPAGES): $(_DISTDIR)/man%: $(srcdir)/man% $(MK) | $$(@D)/
+$(_DISTPAGES): $(_DISTDIR)/man/%: $(srcdir)/man/% $(MK) | $$(@D)/
 	$(info	$(INFO_)SED		$@)
-	<$< \
-	$(SED) "/^.TH/s/(date)/$$($(GIT) log --format=%cs -1 -- $< $(HIDE_ERR))/" \
-	| $(SED) '/^.TH/s/(unreleased)/$(DISTVERSION)/' \
-	| $(INSTALL_DATA) -T /dev/stdin $@
+	$(SED) "/^\.TH/s/(date)/$$($(MANPAGEDATECMD))/" <$< >$@
 
 $(_DISTVERSION): $(MAKEFILEDIR)/configure/version.mk $(MK) $(FORCE_DISTVERSION) | $$(@D)/
 	$(info	$(INFO_)SED		$@)
 	<$< \
-	$(SED) 's/^DISTVERSION *:=.*/DISTVERSION := $(DISTVERSION)/' \
-	| $(SED) 's/^DISTNAME *:=.*/DISTNAME := $(DISTNAME)/' \
+	$(SED) 's/^VERSION *:=.*/VERSION := $(VERSION)/' \
 	| $(SED) 's/^DISTDATE *:=.*/DISTDATE := $(DISTDATE)/' \
 	| $(INSTALL_DATA) -T /dev/stdin $@
 
diff --git a/share/mk/dist/tar.mk b/share/mk/dist/tar.mk
index a87557f..532bd22 100644
--- a/share/mk/dist/tar.mk
+++ b/share/mk/dist/tar.mk
@@ -6,11 +6,10 @@ ifndef MAKEFILE_DIST_TAR_INCLUDED
 MAKEFILE_DIST_TAR_INCLUDED := 1
 
 
-include $(MAKEFILEDIR)/configure/build-depends/coreutils.mk
-include $(MAKEFILEDIR)/configure/build-depends/findutils.mk
-include $(MAKEFILEDIR)/configure/build-depends/git.mk
-include $(MAKEFILEDIR)/configure/build-depends/sed.mk
-include $(MAKEFILEDIR)/configure/build-depends/tar.mk
+include $(MAKEFILEDIR)/configure/build-depends/coreutils/sort.mk
+include $(MAKEFILEDIR)/configure/build-depends/findutils/xargs.mk
+include $(MAKEFILEDIR)/configure/build-depends/sed/sed.mk
+include $(MAKEFILEDIR)/configure/build-depends/tar/tar.mk
 include $(MAKEFILEDIR)/configure/version.mk
 include $(MAKEFILEDIR)/dist/_.mk
 include $(MAKEFILEDIR)/dist/files.mk
diff --git a/share/mk/dist/z.mk b/share/mk/dist/z.mk
index b4b34fc..d7ffb7f 100644
--- a/share/mk/dist/z.mk
+++ b/share/mk/dist/z.mk
@@ -6,11 +6,11 @@ ifndef MAKEFILE_DIST_Z_INCLUDED
 MAKEFILE_DIST_Z_INCLUDED := 1
 
 
-include $(MAKEFILEDIR)/configure/build-depends/bzip2.mk
-include $(MAKEFILEDIR)/configure/build-depends/coreutils.mk
-include $(MAKEFILEDIR)/configure/build-depends/gzip.mk
-include $(MAKEFILEDIR)/configure/build-depends/lzip.mk
-include $(MAKEFILEDIR)/configure/build-depends/xz-utils.mk
+include $(MAKEFILEDIR)/configure/build-depends/bzip2/bzip2.mk
+include $(MAKEFILEDIR)/configure/build-depends/coreutils/touch.mk
+include $(MAKEFILEDIR)/configure/build-depends/gzip/gzip.mk
+include $(MAKEFILEDIR)/configure/build-depends/lzip/lzip.mk
+include $(MAKEFILEDIR)/configure/build-depends/xz-utils/xz.mk
 include $(MAKEFILEDIR)/dist/tar.mk