CVS commit: pkgsrc/devel/bmake

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

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Mon Jul  6 10:24:04 UTC 2020

Modified Files:
        pkgsrc/devel/bmake: Makefile

Log Message:
bmake: Support mksh as a bootstrap shell.


To generate a diff of this commit:
cvs rdiff -u -r1.78 -r1.79 pkgsrc/devel/bmake/Makefile

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

Modified files:

Index: pkgsrc/devel/bmake/Makefile
diff -u pkgsrc/devel/bmake/Makefile:1.78 pkgsrc/devel/bmake/Makefile:1.79
--- pkgsrc/devel/bmake/Makefile:1.78    Thu Jun 18 10:07:35 2020
+++ pkgsrc/devel/bmake/Makefile Mon Jul  6 10:24:04 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.78 2020/06/18 10:07:35 jperkin Exp $
+# $NetBSD: Makefile,v 1.79 2020/07/06 10:24:04 jperkin Exp $
 
 DISTNAME=      bmake-20200524
 PKGREVISION=   1
@@ -38,11 +38,14 @@ CONFIGURE_ARGS+=    --sysconfdir=${PKG_SYSC
 # This section is incomplete, but the general idea is that we should use the
 # same shell that was selected by bootstrap.
 #
-.if ${OPSYS} == "SunOS" && exists(/usr/bin/bash)
-CONFIGURE_ARGS+=       --with-defshell=/usr/bin/bash
-.elif ${TOOLS_PLATFORM.sh:M*/bin/pdksh}
+.if ${TOOLS_PLATFORM.sh:M?*/bin/mksh}
+DEPENDS+=              mksh-[0-9]*:../../shells/mksh
+CONFIGURE_ARGS+=       --with-defshell=${PREFIX}/bin/mksh
+.elif ${TOOLS_PLATFORM.sh:M?*/bin/pdksh}
 DEPENDS+=              pdksh-[0-9]*:../../shells/pdksh
 CONFIGURE_ARGS+=       --with-defshell=${PREFIX}/bin/pdksh
+.elif ${OPSYS} == "SunOS" && exists(/usr/bin/bash)
+CONFIGURE_ARGS+=       --with-defshell=/usr/bin/bash
 .endif
 
 MAKE_ENV.Interix+=     XDEFS=-DUSE_SELECT