summaryrefslogtreecommitdiff
path: root/shells
diff options
context:
space:
mode:
authorjperkin <jperkin@pkgsrc.org>2020-07-10 11:24:24 +0000
committerjperkin <jperkin@pkgsrc.org>2020-07-10 11:24:24 +0000
commita04941d2e2d07c6b8f0de69d445dd58bee644d97 (patch)
treeeee12445340ef2b3512cbbb5de9a09d89eddc87e /shells
parentb9d0648ea596d6007f8b42e2f8aac6f8a2602d8a (diff)
downloadpkgsrc-a04941d2e2d07c6b8f0de69d445dd58bee644d97.tar.gz
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.
Diffstat (limited to 'shells')
-rw-r--r--shells/mksh/Makefile42
1 files changed, 26 insertions, 16 deletions
diff --git a/shells/mksh/Makefile b/shells/mksh/Makefile
index ce06512a2d8..cd9e3ebddd3 100644
--- a/shells/mksh/Makefile
+++ b/shells/mksh/Makefile
@@ -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
+DISTNAME= mksh-R59b
+PKGNAME= ${DISTNAME:S/-R/-/}
+CATEGORIES= shells
+MASTER_SITES= # maintained locally
+DISTFILES= # empty
-MAINTAINER= jperkin@pkgsrc.org
-HOMEPAGE= http://mirbsd.de/mksh
-COMMENT= MirBSD Korn Shell
-LICENSE= miros
+MAINTAINER= jperkin@pkgsrc.org
+HOMEPAGE= http://mirbsd.de/mksh
+COMMENT= MirBSD Korn Shell
+LICENSE= miros
-BOOTSTRAP_PKG= yes
-NO_CHECKSUM= yes
+BOOTSTRAP_PKG= yes
+NO_CHECKSUM= yes
-WRKSRC= ${WRKDIR}/mksh
+WRKSRC= ${WRKDIR}/mksh
-PKG_SHELL= bin/mksh
+LIBS.Interix+= -lcrypt
-LIBS.Interix+= -lcrypt
+INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 share/examples/mksh
-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}