[pkgsrc/trunk]: pkgsrc/bootstrap bootstrap/bootstrap: fix bootstrap on Solari...

[rillig <rillig%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d3e2b99be4fe
branches:  trunk
changeset: 336738:d3e2b99be4fe
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Sun Jul 21 20:14:06 2019 +0000

description:
bootstrap/bootstrap: fix bootstrap on Solaris 10

Fixes pkg/54349.

diffstat:

 bootstrap/bootstrap |  11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diffs (35 lines):

diff -r ef11976c4649 -r d3e2b99be4fe bootstrap/bootstrap
--- a/bootstrap/bootstrap       Sun Jul 21 19:46:04 2019 +0000
+++ b/bootstrap/bootstrap       Sun Jul 21 20:14:06 2019 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# $NetBSD: bootstrap,v 1.268 2019/07/08 19:44:08 sevan Exp $
+# $NetBSD: bootstrap,v 1.269 2019/07/21 20:14:06 rillig Exp $
 #
 # Copyright (c) 2001-2011 Alistair Crooks <agc%NetBSD.org@localhost>
 # All rights reserved.
@@ -31,8 +31,13 @@
 # compiler/linker flags: CFLAGS, CPPFLAGS, LDFLAGS, LIBS
 # tools: CP, GREP, ID, MKDIR, SH, TEST, TOUCH, XARGS
 
+# The bootstrap program must be able to run with very limited shells.
+# It must not use any of the following features:
+#
+# * the ${var%pattern} or ${var#pattern} expansions
+# * the $(command) subshell
 
-BOOTSTRAP_VERSION=20060721
+BOOTSTRAP_VERSION=20190721
 
 # Don't let the bootstrap program get confused by a pre-existing mk.conf
 # file.
@@ -363,7 +368,7 @@
 {
        _dir=$1
        while [ ! -d "$_dir" ]; do
-               _dir=${_dir%/*}
+               _dir=`dirname "$_dir"`
                [ "$_dir" ] || _dir="/"
        done