CVS commit: [pkgsrc-2019Q2] pkgsrc/bootstrap

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Tue Jul 23 11:26:32 UTC 2019

Modified Files:
        pkgsrc/bootstrap [pkgsrc-2019Q2]: bootstrap

Log Message:
Pullup ticket #6010 - requested by rillig
bootstrap: Solaris 10 build fix (PR pkg/54349)

Revisions pulled up:
- bootstrap/bootstrap                                           1.269

---
   Module Name:    pkgsrc
   Committed By:   rillig
   Date:           Sun Jul 21 20:14:06 UTC 2019

   Modified Files:
           pkgsrc/bootstrap: bootstrap

   Log Message:
   bootstrap/bootstrap: fix bootstrap on Solaris 10

   Fixes pkg/54349.


To generate a diff of this commit:
cvs rdiff -u -r1.266.2.1 -r1.266.2.2 pkgsrc/bootstrap/bootstrap

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

Modified files:

Index: pkgsrc/bootstrap/bootstrap
diff -u pkgsrc/bootstrap/bootstrap:1.266.2.1 pkgsrc/bootstrap/bootstrap:1.266.2.2
--- pkgsrc/bootstrap/bootstrap:1.266.2.1        Sat Jul  6 16:23:36 2019
+++ pkgsrc/bootstrap/bootstrap  Tue Jul 23 11:26:32 2019
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# $NetBSD: bootstrap,v 1.266.2.1 2019/07/06 16:23:36 bsiegert Exp $
+# $NetBSD: bootstrap,v 1.266.2.2 2019/07/23 11:26:32 bsiegert 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 @@ checkarg_no_symlink_path()
 {
        _dir=$1
        while [ ! -d "$_dir" ]; do
-               _dir=${_dir%/*}
+               _dir=`dirname "$_dir"`
                [ "$_dir" ] || _dir="/"
        done