kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Make bash the default shell on SmartOS.

Browse source
This commit is contained in:
jperkin 2012-07-24 13:18:00 +00:00
parent fc77f47459
commit 64938354fb
2 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
bootstrap/bootstrap
View file

@ -1,6 +1,6 @@
#! /bin/sh
# $NetBSD: bootstrap,v 1.178 2012/07/13 16:12:41 jperkin Exp $
# $NetBSD: bootstrap,v 1.179 2012/07/24 13:18:00 jperkin Exp $
#
# Copyright (c) 2001-2011 Alistair Crooks <agc@NetBSD.org>
# All rights reserved.
@ -678,8 +678,16 @@ SunOS)
need_sed=yes
fi
if [ "`uname -r`" = "5.11" ]; then
bootstrap_sh=${SH:-/bin/ksh}
bootstrap_sh_set=set
case "`uname -v`" in
joyent_*)
bootstrap_sh=${SH:-/usr/bin/bash}
bootstrap_sh_set=set
;;
*)
bootstrap_sh=${SH:-/bin/ksh}
bootstrap_sh_set=set
;;
esac
else
need_ksh=yes
fi

6
devel/bmake/Makefile
View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.57 2012/06/15 09:54:41 jperkin Exp $
# $NetBSD: Makefile,v 1.58 2012/07/24 13:18:00 jperkin Exp $
#
DISTNAME= bmake-20110606
@ -34,7 +34,9 @@ CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
.include "../../mk/bsd.prefs.mk"
.if ${OPSYS} == "SunOS" && ${OS_VERSION} == "5.11"
.if ${OS_VARIANT} == "SmartOS"
CONFIGURE_ARGS+= --with-defshell=/usr/bin/bash
.elif ${OPSYS} == "SunOS" && ${OS_VERSION} == "5.11"
CONFIGURE_ARGS+= --with-defshell=/bin/ksh
.elif ${OPSYS} == "SunOS" || ${OPSYS} == "OSF1"
DEPENDS+= pdksh-[0-9]*:../../shells/pdksh