mirmake: also rename mirmake's `install' binary.

[Paolo Vincenzo Olivo <vms%retrobsd.ddns.net@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Paolo Vincenzo Olivo <vms%retrobsd.ddns.net@localhost>
Pushed By:	vms
Date:		Wed Jul 12 21:25:51 2023 +0200
Changeset:	9fdb90bf03b937bbc8a22a65e96ed009c9f52156

Modified Files:
	mirmake/MESSAGE
	mirmake/Makefile
	mirmake/PLIST

Log Message:
mirmake: also rename mirmake's `install' binary.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=9fdb90bf03b937bbc8a22a65e96ed009c9f52156

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 mirmake/MESSAGE  |  4 ++--
 mirmake/Makefile | 26 ++++++++++++++------------
 mirmake/PLIST    |  4 ++--
 3 files changed, 18 insertions(+), 16 deletions(-)

diffs:
diff --git a/mirmake/MESSAGE b/mirmake/MESSAGE
index ad09a283ab..55ed638c7b 100644
--- a/mirmake/MESSAGE
+++ b/mirmake/MESSAGE
@@ -2,7 +2,7 @@
 $NetBSD$
 
 All binaries provided by MirMake have been installed at ${PREFIX}/bin,
-by preprending a m* (e.g. mbmake, mtsort..), to avoid conflicts with
-bmake and other native utilities.
+by preprending a m* (e.g. mbmake, minstall...), to avoid conflicts
+with bmake and other native utilities.
 
 ===========================================================================
diff --git a/mirmake/Makefile b/mirmake/Makefile
index 66ce18d134..2bbbbd3e40 100644
--- a/mirmake/Makefile
+++ b/mirmake/Makefile
@@ -42,12 +42,14 @@ SUBST_MESSAGE.paths=	Include pkgsrc PREFIX in searched paths.
 
 SUBST_CLASSES+=		bins
 SUBST_STAGE.bins=	pre-configure
-SUBST_FILES.bins=	dist/scripts/Build.sh dist/scripts/Copy.sh \
-			dist/src/share/mk/bsd.lib.mk dist/src/share/mk/sys.mk
+SUBST_FILES.bins=	dist/scripts/Build.sh dist/scripts/Copy.sh	\
+			dist/scripts/sys.mk.ed dist/src/share/mk/sys.mk	\
+			dist/src/share/mk/bsd.lib.mk
 .for i in lndir lorder mkdep tsort
 SUBST_FILES.bins+=	dist/src/usr.bin/m${i}/*
 .endfor
 SUBST_MESSAGE.bins=	Resolving conflicts with native tools
+SUBST_SED.bins+=	-e 's|binstall|minstall|g'
 SUBST_SED.bins+=	-e 's|lndir|mlndir|g'
 SUBST_SED.bins+=	-e 's|lorder|mlorder|g'
 SUBST_SED.bins+=	-e 's|mkdep|mmkdep|g'
@@ -72,18 +74,18 @@ MAKE_ENV+=	LIBS=${LIBS:Q}
 MAKE_ENV+=	OVERRIDE_MKSH=${MKSH}
 
 post-extract:
-	${RUN}cd ${WRKSRC}/dist/src/usr.bin && \
-		for i in lndir tsort;  do  \
-			${MV} $$i/$$i.c $$i/m$$i.c; \
-			${MV} $$i/$$i.1 $$i/m$$i.1; \
-			${MV} $$i m$$i; \
+	${RUN}cd ${WRKSRC}/dist/src/usr.bin &&		\
+		for i in lndir tsort;  do		\
+			${MV} $$i/$$i.c $$i/m$$i.c;	\
+			${MV} $$i/$$i.1 $$i/m$$i.1;	\
+			${MV} $$i m$$i;			\
 	done && \
-		for i in lorder mkdep ;  do  \
-			${MV} $$i/$$i.sh $$i/m$$i.sh; \
-			${MV} $$i/$$i.1 $$i/m$$i.1; \
-			${MV} $$i m$$i; \
+		for i in lorder mkdep ;  do		\
+			${MV} $$i/$$i.sh $$i/m$$i.sh;	\
+			${MV} $$i/$$i.1 $$i/m$$i.1;	\
+			${MV} $$i m$$i;			\
 	done
-	${RUN}cd ${WRKSRC}/dist/scripts && \
+	${RUN}cd ${WRKSRC}/dist/scripts &&		\
 		${MV} mkdep.sh.ed mmkdep.sh.ed
 
 do-build:
diff --git a/mirmake/PLIST b/mirmake/PLIST
index 8c22f36905..048d5720ab 100644
--- a/mirmake/PLIST
+++ b/mirmake/PLIST
@@ -1,12 +1,12 @@
 @comment $NetBSD$
-bin/binstall
 bin/mbmake
+bin/minstall
 bin/mlndir
 bin/mlorder
 bin/mmkdep
 bin/mtsort
-man/man1/binstall.1
 man/man1/mbmake.1
+man/man1/minstall.1
 man/man1/mlndir.1
 man/man1/mlorder.1
 man/man1/mmkdep.1