pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc Set need_ksh=yes for SunOS as well. Asked by joerg@



details:   https://anonhg.NetBSD.org/pkgsrc/rev/4977626a55b6
branches:  trunk
changeset: 542631:4977626a55b6
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Fri May 23 18:06:44 2008 +0000

description:
Set need_ksh=yes for SunOS as well. Asked by joerg@

diffstat:

 bootstrap/bootstrap  |  6 ++----
 devel/bmake/Makefile |  8 ++------
 2 files changed, 4 insertions(+), 10 deletions(-)

diffs (49 lines):

diff -r 4241ea7f7d34 -r 4977626a55b6 bootstrap/bootstrap
--- a/bootstrap/bootstrap       Fri May 23 17:49:52 2008 +0000
+++ b/bootstrap/bootstrap       Fri May 23 18:06:44 2008 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# $NetBSD: bootstrap,v 1.125 2008/05/23 17:49:52 tnn Exp $
+# $NetBSD: bootstrap,v 1.126 2008/05/23 18:06:44 tnn Exp $
 #
 #
 # Copyright (c) 2001-2002 Alistair G. Crooks.  All rights reserved.
@@ -560,14 +560,12 @@
        if [ -d "/usr/xpg4/bin" ]; then
                overpath="/usr/xpg4/bin:$overpath"
        fi
-       if [ -x "/usr/xpg4/bin" ]; then
-               bmakexargs="$bmakexargs --with-defshell=/usr/xpg4/bin/sh"
-       fi
        root_group=root
        need_pax=yes
        need_bsd_install=no
        need_awk=yes
        need_sed=yes
+       need_ksh=yes
        set_opsys=no
        whoamiprog=/usr/ucb/whoami
        machine_arch=`uname -p | sed -e 's/i86pc/i386/'`
diff -r 4241ea7f7d34 -r 4977626a55b6 devel/bmake/Makefile
--- a/devel/bmake/Makefile      Fri May 23 17:49:52 2008 +0000
+++ b/devel/bmake/Makefile      Fri May 23 18:06:44 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2008/05/23 17:43:31 tnn Exp $
+# $NetBSD: Makefile,v 1.43 2008/05/23 18:06:44 tnn Exp $
 #
 
 DISTNAME=      bmake-20080215
@@ -33,11 +33,7 @@
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} == "SunOS" && exists(/usr/xpg4/bin/sh)
-BOOTSTRAP_ARGS+=       --with-defshell=/usr/xpg4/bin/sh
-.endif
-
-.if ${OPSYS} == "OSF1"
+.if ${OPSYS} == "SunOS" || ${OPSYS} == "OSF1"
 DEPENDS+=              pdksh-[0-9]*:../../shells/pdksh
 BOOTSTRAP_ARGS+=       --with-defshell=${PREFIX}/bin/pdksh
 .endif



Home | Main Index | Thread Index | Old Index