CVS commit: pkgsrc/shells/mksh

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Fri Jul 10 11:24:24 UTC 2020

Modified Files:
        pkgsrc/shells/mksh: Makefile

Log Message:
mksh: Don't set PKG_SHELL when used for bootstrap.

This can cause circular problems where the +INSTALL script requires the shell
itself, but also avoids issues trying to add to /etc/shells during bootstrap
where it may not be appropriate, or done outside of the context of where the
bootstrap tarball will finally be installed.

Users who use mksh as a bootstrap shell can simply add to /etc/shells manually
after installing or extracting the bootstrap as required.

While here remove unnecessary extra indents.


To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 pkgsrc/shells/mksh/Makefile

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

Modified files:

Index: pkgsrc/shells/mksh/Makefile
diff -u pkgsrc/shells/mksh/Makefile:1.40 pkgsrc/shells/mksh/Makefile:1.41
--- pkgsrc/shells/mksh/Makefile:1.40    Mon Jul  6 10:11:34 2020
+++ pkgsrc/shells/mksh/Makefile Fri Jul 10 11:24:24 2020
@@ -1,26 +1,36 @@
-# $NetBSD: Makefile,v 1.40 2020/07/06 10:11:34 jperkin Exp $
+# $NetBSD: Makefile,v 1.41 2020/07/10 11:24:24 jperkin Exp $
 
-DISTNAME=                      mksh-R59b
-PKGNAME=                       ${DISTNAME:S/-R/-/}
-CATEGORIES=                    shells
-MASTER_SITES=                  # maintained locally
-DISTFILES=                     # empty
-
-MAINTAINER=                    jperkin%pkgsrc.org@localhost
-HOMEPAGE=                      http://mirbsd.de/mksh
-COMMENT=                       MirBSD Korn Shell
-LICENSE=                       miros
-
-BOOTSTRAP_PKG=                 yes
-NO_CHECKSUM=                   yes
-
-WRKSRC=                                ${WRKDIR}/mksh
-
-PKG_SHELL=                     bin/mksh
-
-LIBS.Interix+=                 -lcrypt
-
-INSTALLATION_DIRS=             bin ${PKGMANDIR}/man1 share/examples/mksh
+DISTNAME=              mksh-R59b
+PKGNAME=               ${DISTNAME:S/-R/-/}
+CATEGORIES=            shells
+MASTER_SITES=          # maintained locally
+DISTFILES=             # empty
+
+MAINTAINER=            jperkin%pkgsrc.org@localhost
+HOMEPAGE=              http://mirbsd.de/mksh
+COMMENT=               MirBSD Korn Shell
+LICENSE=               miros
+
+BOOTSTRAP_PKG=         yes
+NO_CHECKSUM=           yes
+
+WRKSRC=                        ${WRKDIR}/mksh
+
+LIBS.Interix+=         -lcrypt
+
+INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1 share/examples/mksh
+
+.include "../../mk/bsd.prefs.mk"
+
+#
+# If mksh is currently in use as the bootstrap shell then do not enable
+# PKG_SHELL as it can cause circular problems (its +INSTALL script will
+# require the shell itself).  This match is deliberate to catch both of
+# the prefixes used during bootstrap, we can't simply use LOCALBASE.
+#
+.if ${TOOLS_PLATFORM.sh:N?*/bin/mksh}
+PKG_SHELL=             bin/mksh
+.endif
 
 do-extract:
        ${CP} -R ${FILESDIR} ${WRKSRC}