share/mk/: $(info ...): Make output more consistent

Signed-off-by: Alejandro Colomar <alx@kernel.org>

38 files changed, 65 insertions, 66 deletions

diff --git a/share/mk/build/_.mk b/share/mk/build/_.mk
index 91fbb68277..8c5e72f739 100644
--- a/share/mk/build/_.mk
+++ b/share/mk/build/_.mk
@@ -20,7 +20,7 @@ build: build-book build-catman build-html build-pdf build-ps build-ex;
 
 .PHONY: clean
 clean:
-	$(info RM -rf	$(builddir))
+	$(info	RM -rf		$(builddir))
 	$(RM) -rf $(builddir)
 
 
diff --git a/share/mk/build/book.mk b/share/mk/build/book.mk
index 3ca47bc70a..6465d7b697 100644
--- a/share/mk/build/book.mk
+++ b/share/mk/build/book.mk
@@ -22,7 +22,7 @@ _LMB     := $(_MANDIR)/man-pages.pdf
 
 
 $(_LMB): $(MANPAGES) $(wildcard $(LMBDIR)/* $(LMBDIR)/*/*) | $$(@D)/
-	$(info	Build	$@)
+	$(info	Build		$@)
 	$(BUILDLMB) $(MANDIR) \
 	| $(SPONGE) $@
 
diff --git a/share/mk/build/catman/eqn.mk b/share/mk/build/catman/eqn.mk
index 373036665f..c88d833bb2 100644
--- a/share/mk/build/catman/eqn.mk
+++ b/share/mk/build/catman/eqn.mk
@@ -15,7 +15,7 @@ _CATMAN_troff := $(patsubst %.eqn,%.cat.troff,$(_MAN_eqn))
 
 
 $(_CATMAN_troff): %.cat.troff: %.eqn $(MK) | $$(@D)/
-	$(info	EQN	$@)
+	$(info	EQN		$@)
 	! ($(EQN) -T$(NROFF_OUT_DEVICE) $(EQNFLAGS) <$< 2>&1 >$@) \
 	| $(GREP) ^ >&2
 
diff --git a/share/mk/build/catman/grotty.mk b/share/mk/build/catman/grotty.mk
index da4a2d26b4..825e81d543 100644
--- a/share/mk/build/catman/grotty.mk
+++ b/share/mk/build/catman/grotty.mk
@@ -14,7 +14,7 @@ _CATMAN := $(patsubst %.cat.set,%.cat,$(_CATMAN_MAN_set) $(_CATMAN_MDOC_set))
 
 
 $(_CATMAN): %.cat: %.cat.set $(MK) | $$(@D)/
-	$(info	GROTTY	$@)
+	$(info	GROTTY		$@)
 	$(GROTTY) $(GROTTYFLAGS) <$< >$@
 
 
diff --git a/share/mk/build/catman/troff.mk b/share/mk/build/catman/troff.mk
index 19f7982670..4bd0c252cd 100644
--- a/share/mk/build/catman/troff.mk
+++ b/share/mk/build/catman/troff.mk
@@ -22,7 +22,7 @@ _CATMAN_MDOC_set := $(patsubst $(MANDIR)/%,$(_MANDIR)/%.cat.set,$(NONSO_MDOC))
 
 
 $(_CATMAN_MAN_set): %.cat.set: %.cat.troff $(groff_man_ignore_grep) $(MK) | $$(@D)/
-	$(info	TROFF	$@)
+	$(info	TROFF		$@)
 	! ($(TROFF) -man $(TROFFFLAGS) $(NROFFFLAGS) <$< 2>&1 >$@ \
 	   | $(GREP) -v -f '$(groff_man_ignore_grep)' \
 	   || $(TRUE); \
@@ -30,7 +30,7 @@ $(_CATMAN_MAN_set): %.cat.set: %.cat.troff $(groff_man_ignore_grep) $(MK) | $$(@
 	| $(GREP) ^ >&2
 
 $(_CATMAN_MDOC_set): %.cat.set: %.cat.troff $(MK) | $$(@D)/
-	$(info	TROFF	$@)
+	$(info	TROFF		$@)
 	! ($(TROFF) -mdoc $(TROFFFLAGS) $(NROFFFLAGS) <$< 2>&1 >$@) \
 	| $(GREP) ^ >&2
 
diff --git a/share/mk/build/examples/_.mk b/share/mk/build/examples/_.mk
index 96de0a31bf..fe5e933752 100644
--- a/share/mk/build/examples/_.mk
+++ b/share/mk/build/examples/_.mk
@@ -16,7 +16,7 @@ _PAGEEXDIRS := $(patsubst $(MANDIR)/%,$(_MANDIR)/%.d/,$(NONSO_MAN))
 
 
 $(_PAGEEXDIRS):
-	+$(info	MKDIR	$@)
+	+$(info	MKDIR		$@)
 	+$(MKDIR) -p $@
 	+$(TOUCH) $@
 
diff --git a/share/mk/build/examples/cc.mk b/share/mk/build/examples/cc.mk
index edadf22db3..6385176842 100644
--- a/share/mk/build/examples/cc.mk
+++ b/share/mk/build/examples/cc.mk
@@ -15,7 +15,7 @@ _UNITS_ex_o := $(patsubst %.c,%.o,$(_UNITS_ex_c))
 
 
 $(_UNITS_ex_o): %.o: %.c $(MK)
-	$(info	CC	$@)
+	$(info	CC		$@)
 	$(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $<
 
 
diff --git a/share/mk/build/examples/ld.mk b/share/mk/build/examples/ld.mk
index 0dbb4b2df6..9915a81546 100644
--- a/share/mk/build/examples/ld.mk
+++ b/share/mk/build/examples/ld.mk
@@ -14,7 +14,7 @@ _UNITS_ex_bin := $(patsubst %.o,%,$(_UNITS_ex_o))
 
 
 $(_UNITS_ex_bin): %: %.o $(MK)
-	$(info	LD	$@)
+	$(info	LD		$@)
 	$(LD) $(LDFLAGS) -o $@ $< $(LDLIBS)
 
 
diff --git a/share/mk/build/examples/src.mk b/share/mk/build/examples/src.mk
index cd3246d421..8ffa9aeee2 100644
--- a/share/mk/build/examples/src.mk
+++ b/share/mk/build/examples/src.mk
@@ -34,7 +34,7 @@ _UNITS_ex_c := $(filter %.c,$(_UNITS_ex_src))
 $(_UNITS_ex_src): $$(patsubst $(_MANDIR)/%.d,$(MANDIR)/%,$$(@D)) $(MK) | $$(@D)/
 $(_UNITS_ex_c):   $$(filter $$(@D)/%.h,$(_UNITS_ex_h))
 $(_UNITS_ex_src):
-	$(info SED	$@)
+	$(info	SED		$@)
 	<$< \
 	$(SED) -n \
 		-e '/^\.TH/,/^\.SH/{/^\.SH/!p}' \
diff --git a/share/mk/build/html.mk b/share/mk/build/html.mk
index 1b1f8c65aa..e16b9abadc 100644
--- a/share/mk/build/html.mk
+++ b/share/mk/build/html.mk
@@ -25,7 +25,7 @@ _HTMLPAGES := $(patsubst $(MANDIR)/%,$(_HTMLDIR)/%$(htmlext),$(MANPAGES))
 #  make MAN2HTMLFLAGS=whatever html
 # The sed removes the lines "Content-type: text/html\n\n"
 $(_HTMLPAGES): $(_HTMLDIR)/%$(htmlext): $(MANDIR)/% $(MK) | $$(@D)/
-	$(info MAN2HTML	$@)
+	$(info	MAN2HTML	$@)
 	$(MAN2HTML) $(MAN2HTMLFLAGS) $< \
 	| $(SED) -e 1,2d >$@
 
diff --git a/share/mk/build/pdf/eqn.mk b/share/mk/build/pdf/eqn.mk
index d3dda1305e..9fbb002ec1 100644
--- a/share/mk/build/pdf/eqn.mk
+++ b/share/mk/build/pdf/eqn.mk
@@ -15,7 +15,7 @@ _PDFMAN_troff := $(patsubst %.eqn,%.pdf.troff,$(_MAN_eqn))
 
 
 $(_PDFMAN_troff): %.pdf.troff: %.eqn $(MK) | $$(@D)/
-	$(info	EQN	$@)
+	$(info	EQN		$@)
 	! ($(EQN) -Tpdf $(EQNFLAGS) <$< 2>&1 >$@) \
 	| $(GREP) ^ >&2
 
diff --git a/share/mk/build/pdf/gropdf.mk b/share/mk/build/pdf/gropdf.mk
index 2a088f7633..0f63573380 100644
--- a/share/mk/build/pdf/gropdf.mk
+++ b/share/mk/build/pdf/gropdf.mk
@@ -14,7 +14,7 @@ _PDFMAN := $(patsubst %.pdf.set,%.pdf,$(_PDFMAN_MAN_set) $(_PDFMAN_MDOC_set))
 
 
 $(_PDFMAN): %.pdf: %.pdf.set $(MK) | $$(@D)/
-	$(info	GROPDF	$@)
+	$(info	GROPDF		$@)
 	$(GROPDF) $(GROPDFFLAGS) <$< >$@
 
 
diff --git a/share/mk/build/pdf/troff.mk b/share/mk/build/pdf/troff.mk
index 424cf33277..f08332d932 100644
--- a/share/mk/build/pdf/troff.mk
+++ b/share/mk/build/pdf/troff.mk
@@ -18,12 +18,12 @@ _PDFMAN_MDOC_set := $(patsubst $(MANDIR)/%,$(_MANDIR)/%.pdf.set,$(NONSO_MDOC))
 
 
 $(_PDFMAN_MAN_set): %.pdf.set: %.pdf.troff $(MK) | $$(@D)/
-	$(info	TROFF	$@)
+	$(info	TROFF		$@)
 	! ($(TROFF) -man -Tpdf $(TROFFFLAGS) <$< 2>&1 >$@) \
 	| $(GREP) ^ >&2
 
 $(_PDFMAN_MDOC_set): %.pdf.set: %.pdf.troff $(MK) | $$(@D)/
-	$(info	TROFF	$@)
+	$(info	TROFF		$@)
 	! ($(TROFF) -mdoc -Tpdf $(TROFFFLAGS) <$< 2>&1 >$@) \
 	| $(GREP) ^ >&2
 
diff --git a/share/mk/build/pre/preconv.mk b/share/mk/build/pre/preconv.mk
index 436c4a362d..71794d35d5 100644
--- a/share/mk/build/pre/preconv.mk
+++ b/share/mk/build/pre/preconv.mk
@@ -16,7 +16,7 @@ _MAN_tbl := $(patsubst $(MANDIR)/%,$(_MANDIR)/%.tbl,$(NONSO_MAN) $(NONSO_MDOC))
 
 
 $(_MAN_tbl): $(_MANDIR)/%.tbl: $(MANDIR)/% $(MK) | $$(@D)/
-	$(info	PRECONV	$@)
+	$(info	PRECONV		$@)
 	$(PRECONV) $(PRECONVFLAGS) $< >$@
 
 
diff --git a/share/mk/build/pre/tbl.mk b/share/mk/build/pre/tbl.mk
index 58f9d74594..195af087ec 100644
--- a/share/mk/build/pre/tbl.mk
+++ b/share/mk/build/pre/tbl.mk
@@ -14,7 +14,7 @@ _MAN_eqn := $(patsubst %.tbl,%.eqn,$(_MAN_tbl))
 
 
 $(_MAN_eqn): %.eqn: %.tbl $(MK) | $$(@D)/
-	$(info	TBL	$@)
+	$(info	TBL		$@)
 	$(TBL) <$< >$@
 
 
diff --git a/share/mk/build/ps/eqn.mk b/share/mk/build/ps/eqn.mk
index 3bf9fd1a85..d73b66944b 100644
--- a/share/mk/build/ps/eqn.mk
+++ b/share/mk/build/ps/eqn.mk
@@ -15,7 +15,7 @@ _PSMAN_troff := $(patsubst %.eqn,%.ps.troff,$(_MAN_eqn))
 
 
 $(_PSMAN_troff): %.ps.troff: %.eqn $(MK) | $$(@D)/
-	$(info	EQN	$@)
+	$(info	EQN		$@)
 	! ($(EQN) -Tps $(EQNFLAGS) <$< 2>&1 >$@) \
 	| $(GREP) ^ >&2
 
diff --git a/share/mk/build/ps/grops.mk b/share/mk/build/ps/grops.mk
index e31096d943..398f68d016 100644
--- a/share/mk/build/ps/grops.mk
+++ b/share/mk/build/ps/grops.mk
@@ -14,7 +14,7 @@ _PSMAN := $(patsubst %.ps.set,%.ps,$(_PSMAN_MAN_set) $(_PSMAN_MDOC_set))
 
 
 $(_PSMAN): %.ps: %.ps.set $(MK) | $$(@D)/
-	$(info	GROPS	$@)
+	$(info	GROPS		$@)
 	$(GROPS) $(GROPSFLAGS) <$< >$@
 
 
diff --git a/share/mk/build/ps/troff.mk b/share/mk/build/ps/troff.mk
index b271b6ac1e..9d02547e21 100644
--- a/share/mk/build/ps/troff.mk
+++ b/share/mk/build/ps/troff.mk
@@ -18,12 +18,12 @@ _PSMAN_MDOC_set:= $(patsubst $(MANDIR)/%,$(_MANDIR)/%.ps.set,$(NONSO_MDOC))
 
 
 $(_PSMAN_MAN_set): %.ps.set: %.ps.troff $(MK) | $$(@D)/
-	$(info	TROFF	$@)
+	$(info	TROFF		$@)
 	! ($(TROFF) -man -Tps $(TROFFFLAGS) <$< 2>&1 >$@) \
 	| $(GREP) ^ >&2
 
 $(_PSMAN_MDOC_set): %.ps.set: %.ps.troff $(MK) | $$(@D)/
-	$(info	TROFF	$@)
+	$(info	TROFF		$@)
 	! ($(TROFF) -mdoc -Tps $(TROFFFLAGS) <$< 2>&1 >$@) \
 	| $(GREP) ^ >&2
 
diff --git a/share/mk/check/catman/col.mk b/share/mk/check/catman/col.mk
index c1563a2c4d..7fd7667867 100644
--- a/share/mk/check/catman/col.mk
+++ b/share/mk/check/catman/col.mk
@@ -14,7 +14,7 @@ _CHECK_catman_grep := $(patsubst %.cat,%.cat.grep,$(_CATMAN))
 
 
 $(_CHECK_catman_grep): %.grep: % $(MK) | $$(@D)/
-	$(info	COL	$@)
+	$(info	COL		$@)
 	$(COL) $(COLFLAGS) <$< >$@
 
 
diff --git a/share/mk/check/catman/grep.mk b/share/mk/check/catman/grep.mk
index 702b3142c7..974fba2769 100644
--- a/share/mk/check/catman/grep.mk
+++ b/share/mk/check/catman/grep.mk
@@ -15,7 +15,7 @@ _CHECK_catman := $(patsubst %.cat.grep,%.check-catman.touch,$(_CHECK_catman_grep
 
 
 $(_CHECK_catman): %.check-catman.touch: %.cat.grep $(MK) | $$(@D)/
-	$(info	GREP	$@)
+	$(info	GREP		$@)
 	! $(GREP) -n '.\{$(MANWIDTH)\}.' $< /dev/null >&2
 	$(TOUCH) $@
 
diff --git a/share/mk/configure/build-depends/moreutils.mk b/share/mk/configure/build-depends/moreutils.mk
index 155d75a324..88ec677a97 100644
--- a/share/mk/configure/build-depends/moreutils.mk
+++ b/share/mk/configure/build-depends/moreutils.mk
@@ -7,7 +7,6 @@ MAKEFILE_CONFIGURE_BUILD_DEPENDS_MOREUTILS_INCLUDED := 1
 
 
 SPONGE := sponge
-TS     := ts
 
 
 endif  # include guard
diff --git a/share/mk/dist/_.mk b/share/mk/dist/_.mk
index b0d5682f15..bba45cebb1 100644
--- a/share/mk/dist/_.mk
+++ b/share/mk/dist/_.mk
@@ -14,7 +14,7 @@ _DISTDIR := $(builddir)/dist
 
 
 $(builddir)/dist/%/:
-	+$(info	INSTALL	$@)
+	+$(info	MKDIR		$@)
 	+$(INSTALL_DIR) $@
 
 
diff --git a/share/mk/dist/check/all.mk b/share/mk/dist/check/all.mk
index b32c10936f..2043e6eac5 100644
--- a/share/mk/dist/check/all.mk
+++ b/share/mk/dist/check/all.mk
@@ -7,7 +7,7 @@ MAKEFILE_DIST_CHECK_ALL_INCLUDED := 1
 
 
 include $(MAKEFILEDIR)/configure/build-depends/coreutils.mk
-include $(MAKEFILEDIR)/configure/build-depends/moreutils.mk
+include $(MAKEFILEDIR)/configure/build-depends/sed.mk
 include $(MAKEFILEDIR)/configure/directory_variables.mk
 include $(MAKEFILEDIR)/configure/version.mk
 include $(MAKEFILEDIR)/dist/check/tar.mk
@@ -24,7 +24,7 @@ $(builddir)/distcheck.all.touch: \
 $(builddir)/distcheck.all.touch: $(TMPDIR1)/$(DISTNAME) | $$(@D)/
 	#$(info	MAKE		all)
 	#$(MAKE) -C $< all \
-	#| $(TS) 'MAKE all:'
+	#| $(SED)   's,^,MAKE all:		,'
 	$(TOUCH) $@
 
 
diff --git a/share/mk/dist/check/build.mk b/share/mk/dist/check/build.mk
index fd08782bf4..8f48dfa4bf 100644
--- a/share/mk/dist/check/build.mk
+++ b/share/mk/dist/check/build.mk
@@ -8,7 +8,7 @@ MAKEFILE_DIST_CHECK_BUILD_INCLUDED := 1
 
 include $(MAKEFILEDIR)/build/_.mk
 include $(MAKEFILEDIR)/configure/build-depends/coreutils.mk
-include $(MAKEFILEDIR)/configure/build-depends/moreutils.mk
+include $(MAKEFILEDIR)/configure/build-depends/sed.mk
 include $(MAKEFILEDIR)/configure/directory_variables.mk
 include $(MAKEFILEDIR)/configure/verbose.mk
 include $(MAKEFILEDIR)/configure/version.mk
@@ -174,58 +174,58 @@ DISTCHECK_IGNORE_BUILD_PDF := \
 $(builddir)/distcheck.build-pre.touch: $(TMPDIR1)/$(DISTNAME) | $$(@D)/
 	$(info	MAKE		build-pre)
 	$(MAKE) -C $< build-pre \
-	| $(TS) 'MAKE build-pre:'
+	| $(SED)   's,^,MAKE build-pre:		,'
 	$(TOUCH) $@
 
 $(builddir)/distcheck.build-catman.touch: $(builddir)/distcheck.build-pre.touch
 $(builddir)/distcheck.build-catman.touch: $(TMPDIR1)/$(DISTNAME) | $$(@D)/
 	$(info	MAKE		build-catman)
 	$(MAKE) -C $< -k build-catman $(HIDE_ERR) \
-	| $(TS) 'MAKE build-catman (-k $(HIDE_ERR)):' \
+	| $(SED)   's,^,MAKE build-catman -k:	,' \
 	|| $(TRUE)
 	$(MAKE) -C $< -i nothing $(DISTCHECK_IGNORE_BUILD_CATMAN) $(HIDE_ERR) \
-	| $(TS) 'MAKE build-catman (-i $(HIDE_ERR)):'
+	| $(SED)   's,^,MAKE build-catman -i:	,'
 	$(MAKE) -C $< build-catman \
-	| $(TS) 'MAKE build-catman:'
+	| $(SED)   's,^,MAKE build-catman:	,'
 	$(TOUCH) $@
 
 $(builddir)/distcheck.build-ps.touch: $(builddir)/distcheck.build-pre.touch
 $(builddir)/distcheck.build-ps.touch: $(TMPDIR1)/$(DISTNAME) | $$(@D)/
 	$(info	MAKE		build-ps)
 	$(MAKE) -C $< -k build-ps $(HIDE_ERR) \
-	| $(TS) 'MAKE build-ps (-k $(HIDE_ERR)):' \
+	| $(SED)   's,^,MAKE build-ps -k:	,' \
 	|| $(TRUE)
 	$(MAKE) -C $< -i nothing $(DISTCHECK_IGNORE_BUILD_PS) $(HIDE_ERR) \
-	| $(TS) 'MAKE build-ps (-i $(HIDE_ERR)):'
+	| $(SED)   's,^,MAKE build-ps -i:	,'
 	$(MAKE) -C $< build-ps \
-	| $(TS) 'MAKE build-ps:'
+	| $(SED)   's,^,MAKE build-ps:		,'
 	$(TOUCH) $@
 
 $(builddir)/distcheck.build-pdf.touch: $(builddir)/distcheck.build-pre.touch
 $(builddir)/distcheck.build-pdf.touch: $(TMPDIR1)/$(DISTNAME) | $$(@D)/
 	$(info	MAKE		build-pdf)
 	$(MAKE) -C $< -k build-pdf $(HIDE_ERR) \
-	| $(TS) 'MAKE build-pdf (-k $(HIDE_ERR)):' \
+	| $(SED)   's,^,MAKE build-pdf -k:	,' \
 	|| $(TRUE)
 	$(MAKE) -C $< -i nothing $(DISTCHECK_IGNORE_BUILD_PDF) $(HIDE_ERR) \
-	| $(TS) 'MAKE build-pdf (-i $(HIDE_ERR)):'
+	| $(SED)   's,^,MAKE build-pdf -i:	,'
 	$(MAKE) -C $< build-pdf \
-	| $(TS) 'MAKE build-pdf:'
+	| $(SED)   's,^,MAKE build-pdf:		,'
 	$(TOUCH) $@
 
 $(builddir)/distcheck.build-html.touch: $(TMPDIR1)/$(DISTNAME) | $$(@D)/
 	$(info	MAKE		build-html)
 	$(MAKE) -C $< build-html \
-	| $(TS) 'MAKE build-html:'
+	| $(SED)   's,^,MAKE build-html:	,'
 	$(TOUCH) $@
 
 $(builddir)/distcheck.build-book.touch: $(TMPDIR1)/$(DISTNAME) | $$(@D)/
 	$(info	MAKE		build-book)
 	$(MAKE) -C $< -k build-book $(HIDE_ERR) \
-	| $(TS) 'MAKE build-book ($(HIDE_ERR)):' \
+	| $(SED)   's,^,MAKE build-book:	,' \
 	|| $(TRUE)
 	$(MAKE) -C $< build-book \
-	| $(TS) 'MAKE build-book:'
+	| $(SED)   's,^,MAKE build-book:	,'
 	$(TOUCH) $@
 
 
diff --git a/share/mk/dist/check/check.mk b/share/mk/dist/check/check.mk
index 8a11f829ca..56bf20ccfe 100644
--- a/share/mk/dist/check/check.mk
+++ b/share/mk/dist/check/check.mk
@@ -7,7 +7,7 @@ MAKEFILE_DIST_CHECK_CHECK_INCLUDED := 1
 
 
 include $(MAKEFILEDIR)/configure/build-depends/coreutils.mk
-include $(MAKEFILEDIR)/configure/build-depends/moreutils.mk
+include $(MAKEFILEDIR)/configure/build-depends/sed.mk
 include $(MAKEFILEDIR)/configure/build-depends/tar.mk
 include $(MAKEFILEDIR)/configure/directory_variables.mk
 include $(MAKEFILEDIR)/configure/verbose.mk
@@ -89,12 +89,12 @@ $(builddir)/distcheck.check-catman.touch: \
 $(builddir)/distcheck.check-catman.touch: $(TMPDIR1)/$(DISTNAME) | $$(@D)/
 	$(info	MAKE		check-catman)
 	$(MAKE) -C $< -k check-catman $(HIDE_ERR) \
-	| $(TS) 'MAKE check-catman (-k $(HIDE_ERR)):' \
+	| $(SED)   's,^,MAKE check-catman -k:	,' \
 	|| $(TRUE)
 	$(MAKE) -C $< -i nothing $(DISTCHECK_IGNORE_CHECK_CATMAN) $(HIDE_ERR) \
-	| $(TS) 'MAKE check-catman (-i $(HIDE_ERR)):'
+	| $(SED)   's,^,MAKE check-catman -i:	,'
 	$(MAKE) -C $< check-catman \
-	| $(TS) 'MAKE check-catman:'
+	| $(SED)   's,^,MAKE check-catman:	,'
 	$(TOUCH) $@
 
 $(builddir)/distcheck.check.touch: \
@@ -102,7 +102,7 @@ $(builddir)/distcheck.check.touch: \
 $(builddir)/distcheck.check.touch: $(TMPDIR1)/$(DISTNAME) | $$(@D)/
 	$(info	MAKE		check)
 	$(MAKE) -C $< check \
-	| $(TS) 'MAKE check:'
+	| $(SED)   's,^,MAKE check:		,'
 	$(TOUCH) $@
 
 
diff --git a/share/mk/dist/check/dist.mk b/share/mk/dist/check/dist.mk
index f573ed8c9f..d2df21f844 100644
--- a/share/mk/dist/check/dist.mk
+++ b/share/mk/dist/check/dist.mk
@@ -6,7 +6,7 @@ ifndef MAKEFILE_DIST_CHECK_DIST_INCLUDED
 MAKEFILE_DIST_CHECK_DIST_INCLUDED := 1
 
 
-include $(MAKEFILEDIR)/configure/build-depends/moreutils.mk
+include $(MAKEFILEDIR)/configure/build-depends/sed.mk
 include $(MAKEFILEDIR)/configure/version.mk
 include $(MAKEFILEDIR)/dist/check/tar.mk
 
@@ -17,7 +17,7 @@ REDIST  := $(TMPDIR1)/$(DISTNAME)/.tmp/$(DISTNAME).tar
 $(REDIST): %/.tmp/$(DISTNAME).tar: % | $$(@D)/
 	$(info	MAKE		dist)
 	$(MAKE) -C $< dist \
-	| $(TS) 'MAKE dist:'
+	| $(SED)   's,^,MAKE dist:		,'
 
 
 endif  # include guard
diff --git a/share/mk/dist/check/install.mk b/share/mk/dist/check/install.mk
index 3fe9d6b3ba..56835498a8 100644
--- a/share/mk/dist/check/install.mk
+++ b/share/mk/dist/check/install.mk
@@ -7,7 +7,7 @@ MAKEFILE_DIST_CHECK_INSTALL_INCLUDED := 1
 
 
 include $(MAKEFILEDIR)/configure/build-depends/coreutils.mk
-include $(MAKEFILEDIR)/configure/build-depends/moreutils.mk
+include $(MAKEFILEDIR)/configure/build-depends/sed.mk
 include $(MAKEFILEDIR)/configure/directory_variables.mk
 include $(MAKEFILEDIR)/configure/version.mk
 include $(MAKEFILEDIR)/dist/check/tar.mk
@@ -16,7 +16,7 @@ include $(MAKEFILEDIR)/dist/check/tar.mk
 $(builddir)/distcheck.install.touch: $(TMPDIR1)/$(DISTNAME) | $$(@D)/
 	$(info	MAKE		install)
 	$(MAKE) -C $< install DESTDIR=$(TMPDIR2) \
-	| $(TS) 'MAKE install:'
+	| $(SED)   's,^,MAKE install:		,'
 	$(TOUCH) $@
 
 
diff --git a/share/mk/dist/check/lint.mk b/share/mk/dist/check/lint.mk
index 66f32997b7..e3177ec06c 100644
--- a/share/mk/dist/check/lint.mk
+++ b/share/mk/dist/check/lint.mk
@@ -8,7 +8,7 @@ MAKEFILE_DIST_CHECK_LINT_INCLUDED := 1
 
 include $(MAKEFILEDIR)/build/_.mk
 include $(MAKEFILEDIR)/configure/build-depends/coreutils.mk
-include $(MAKEFILEDIR)/configure/build-depends/moreutils.mk
+include $(MAKEFILEDIR)/configure/build-depends/sed.mk
 include $(MAKEFILEDIR)/configure/directory_variables.mk
 include $(MAKEFILEDIR)/configure/verbose.mk
 include $(MAKEFILEDIR)/configure/version.mk
@@ -28,18 +28,18 @@ DISTCHECK_IGNORE_LINT_MAN := \
 $(builddir)/distcheck.lint-man.touch: $(TMPDIR1)/$(DISTNAME) | $$(@D)/
 	$(info	MAKE		lint-man)
 	$(MAKE) -C $< -k lint-man $(HIDE_ERR) \
-	| $(TS) 'MAKE lint-man (-k $(HIDE_ERR)):' \
+	| $(SED)   's,^,MAKE lint-man -k:	,' \
 	|| $(TRUE)
 	$(MAKE) -C $< -i nothing $(DISTCHECK_IGNORE_LINT_MAN) $(HIDE_ERR) \
-	| $(TS) 'MAKE lint-man (-i $(HIDE_ERR)):'
+	| $(SED)   's,^,MAKE lint-man -i:	,'
 	$(MAKE) -C $< lint-man \
-	| $(TS) 'MAKE lint-man:'
+	| $(SED)   's,^,MAKE lint-man:		,'
 	$(TOUCH) $@
 
 $(builddir)/distcheck.lint-mdoc.touch: $(TMPDIR1)/$(DISTNAME) | $$(@D)/
 	$(info	MAKE		lint-mdoc)
 	$(MAKE) -C $< lint-mdoc \
-	| $(TS) 'MAKE lint-mdoc:'
+	| $(SED)   's,^,MAKE lint-mdoc:		,'
 	$(TOUCH) $@
 
 
diff --git a/share/mk/dist/tar.mk b/share/mk/dist/tar.mk
index 1df54d96d0..8c18a3f0e2 100644
--- a/share/mk/dist/tar.mk
+++ b/share/mk/dist/tar.mk
@@ -19,7 +19,7 @@ DISTFILE := $(builddir)/$(DISTNAME).tar
 
 
 $(DISTFILE): $(_DISTFILES) $(MK) | $$(@D)/
-	$(info TAR	$@)
+	$(info	TAR		$@)
 	$(TAR) $(TARFLAGS) -cf $@ -T /dev/null
 	$(DISTFILESCMD) \
 	| $(SED) 's,^$(srcdir)/,$(_DISTDIR)/,' \
diff --git a/share/mk/dist/z.mk b/share/mk/dist/z.mk
index 791cd03fe4..e06ff210cd 100644
--- a/share/mk/dist/z.mk
+++ b/share/mk/dist/z.mk
@@ -19,7 +19,7 @@ compression := bz2 gz lz xz
 
 define DISTFILE_z_rule
 $(DISTFILE).$(2): %.$(2): % $(MK) | $$$$(@D)/
-	$$(info	$(1)	$$@)
+	$$(info	$(1)		$$@)
 	$($(1)) $($(1)FLAGS) -kf $$<
 	$(TOUCH) $$@
 endef
diff --git a/share/mk/install/_.mk b/share/mk/install/_.mk
index bddaff25e2..a44a3d81b5 100644
--- a/share/mk/install/_.mk
+++ b/share/mk/install/_.mk
@@ -12,11 +12,11 @@ include $(MAKEFILEDIR)/configure/build-depends/coreutils.mk
 
 
 %/:
-	+$(info	MKDIR	$@)
+	+$(info	MKDIR		$@)
 	+$(INSTALL_DIR) $@
 
 %-rm:
-	$(info	RM	$*)
+	$(info	RM		$*)
 	$(RM) $*
 
 
diff --git a/share/mk/install/html.mk b/share/mk/install/html.mk
index a0b71d7515..a4d7d25f7f 100644
--- a/share/mk/install/html.mk
+++ b/share/mk/install/html.mk
@@ -22,7 +22,7 @@ _htmlpages_rm   := $(addsuffix -rm,$(wildcard $(_htmlpages)))
 
 
 $(_htmlpages): $(_htmldir)/%: $(_HTMLDIR)/% $(MK) | $$(@D)/
-	$(info	INSTALL	$@)
+	$(info	INSTALL		$@)
 	$(INSTALL_DATA) -T $< $@
 
 
diff --git a/share/mk/install/man.mk b/share/mk/install/man.mk
index be10d7df2f..bec9d20020 100644
--- a/share/mk/install/man.mk
+++ b/share/mk/install/man.mk
@@ -52,7 +52,7 @@ $(foreach s, $(MANSECTIONS),                                                  \
 
 
 $(_manpages):
-	$(info INSTALL	$@)
+	$(info	INSTALL		$@)
 	<$< \
 	$(SED) $(foreach s, $(MANSECTIONS), \
 		-e '/^\.so /s, man$(s)/\(.*\)\.$(s)$$, $(notdir $(man$(s)dir))/\1$(man$(s)ext)$(Z),') \
diff --git a/share/mk/lint/c/clang-tidy.mk b/share/mk/lint/c/clang-tidy.mk
index c48fb85aff..3939227901 100644
--- a/share/mk/lint/c/clang-tidy.mk
+++ b/share/mk/lint/c/clang-tidy.mk
@@ -15,7 +15,7 @@ include $(MAKEFILEDIR)/lint/_.mk
 
 
 $(_LINT_c_clang-tidy): %.lint-c.clang-tidy.touch: %.c $(MK)
-	$(info CLANG_TIDY	$@)
+	$(info	CLANG_TIDY	$@)
 	$(CLANG_TIDY) $(CLANG_TIDYFLAGS) $< -- $(CPPFLAGS) $(CLANGFLAGS) 2>&1 \
 	| $(SED) '/generated\.$$/d' >&2
 	$(TOUCH) $@
diff --git a/share/mk/lint/c/iwyu.mk b/share/mk/lint/c/iwyu.mk
index f33db5638f..e2e4de103f 100644
--- a/share/mk/lint/c/iwyu.mk
+++ b/share/mk/lint/c/iwyu.mk
@@ -16,7 +16,7 @@ include $(MAKEFILEDIR)/lint/_.mk
 
 
 $(_LINT_c_iwyu): %.lint-c.iwyu.touch: %.c $(MK)
-	$(info LINT (iwyu)	$@)
+	$(info	IWYU		$@)
 	! ($(IWYU) $(IWYUFLAGS) $(CPPFLAGS) $(CLANGFLAGS) $< 2>&1 \
 	   | $(SED) -n '/should add these lines:/,$$p' \
 	   | $(TAC) \
diff --git a/share/mk/lint/man/mandoc.mk b/share/mk/lint/man/mandoc.mk
index 7ef22b1352..69558de8de 100644
--- a/share/mk/lint/man/mandoc.mk
+++ b/share/mk/lint/man/mandoc.mk
@@ -18,7 +18,7 @@ mandoc_man_ignore_grep := $(DATAROOTDIR)/lint/mandoc/man.ignore.grep
 
 
 $(_LINT_man_mandoc): $(_MANDIR)/%.lint-man.mandoc.touch: $(MANDIR)/% $(mandoc_man_ignore_grep) $(MK) | $$(@D)/
-	$(info LINT (mandoc)	$@)
+	$(info	MANDOC		$@)
 	! ($(MANDOC) -man $(MANDOCFLAGS) $< 2>&1 \
 	   | $(GREP) -v -f '$(mandoc_man_ignore_grep)' \
 	   || $(TRUE); \
diff --git a/share/mk/lint/man/tbl.mk b/share/mk/lint/man/tbl.mk
index 27ffa49be3..feea1dd847 100644
--- a/share/mk/lint/man/tbl.mk
+++ b/share/mk/lint/man/tbl.mk
@@ -14,7 +14,7 @@ include $(MAKEFILEDIR)/lint/man/_.mk
 
 
 $(_LINT_man_tbl): $(_MANDIR)/%.lint-man.tbl.touch: $(MANDIR)/% $(MK) | $$(@D)/
-	$(info LINT (tbl comment)	$@)
+	$(info	GREP		$@)
 	if $(GREP) -q '^\.TS$$' $< && ! $(HEAD) -n1 $< | $(GREP) -q '\\" t$$'; \
 	then \
 		>&2 $(ECHO) "$<:1: missing '\\\" t' comment:"; \
diff --git a/share/mk/lint/mdoc/mandoc.mk b/share/mk/lint/mdoc/mandoc.mk
index 3a0abbb8f2..9071b1537d 100644
--- a/share/mk/lint/mdoc/mandoc.mk
+++ b/share/mk/lint/mdoc/mandoc.mk
@@ -20,7 +20,7 @@ mandoc_mdoc_ignore_grep := $(DATAROOTDIR)/lint/mandoc/mdoc.ignore.grep
 
 
 $(_LINT_mdoc_mandoc): $(_MANDIR)/%.lint-mdoc.mandoc.touch: $(MANDIR)/% $(mandoc_mdoc_ignore_grep) | $$(@D)/
-	$(info LINT (mandoc)	$@)
+	$(info	MANDOC		$@)
 	! ($(MANDOC) -mdoc $(MANDOCFLAGS) $< 2>&1 \
 	   | $(GREP) -v -f '$(mandoc_mdoc_ignore_grep)' \
 	   || $(TRUE); \