[pkgsrc/trunk]: pkgsrc/bootstrap README.macOS: nbsed requires no user action,...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/74816d4173f2
branches:  trunk
changeset: 376357:74816d4173f2
user:      schmonz <schmonz%pkgsrc.org@localhost>
date:      Wed Apr 06 13:06:09 2022 +0000

description:
README.macOS: nbsed requires no user action, merge comment to bootstrap.

diffstat:

 bootstrap/README.macOS |  8 +-------
 bootstrap/bootstrap    |  5 +++--
 2 files changed, 4 insertions(+), 9 deletions(-)

diffs (43 lines):

diff -r 626dd8c16884 -r 74816d4173f2 bootstrap/README.macOS
--- a/bootstrap/README.macOS    Wed Apr 06 09:55:58 2022 +0000
+++ b/bootstrap/README.macOS    Wed Apr 06 13:06:09 2022 +0000
@@ -1,4 +1,4 @@
-$NetBSD: README.macOS,v 1.5 2021/02/10 17:30:20 gdt Exp $
+$NetBSD: README.macOS,v 1.6 2022/04/06 13:06:09 schmonz Exp $
 
 This file describes the use of current versions of pkgsrc with
 multiple versions of Darwin and macOS, omitting information about
@@ -109,12 +109,6 @@
 most are past this issue already and no longer interested in
 experimenting.)
 
-** sed in 10.9
-
-The sed that comes with 10.9 appears to be broken; it exits when
-called on files with UTF-8 or other apparently-binary content.
-Therefore, pkgsrc uses nbsed on 10.9.
-
 * Developer tools and prerequisites
 
 ** XCode
diff -r 626dd8c16884 -r 74816d4173f2 bootstrap/bootstrap
--- a/bootstrap/bootstrap       Wed Apr 06 09:55:58 2022 +0000
+++ b/bootstrap/bootstrap       Wed Apr 06 13:06:09 2022 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# $NetBSD: bootstrap,v 1.309 2022/04/03 20:46:11 tnn Exp $
+# $NetBSD: bootstrap,v 1.310 2022/04/06 13:06:09 schmonz Exp $
 #
 # Copyright (c) 2001-2011 Alistair Crooks <agc%NetBSD.org@localhost>
 # All rights reserved.
@@ -594,7 +594,8 @@
        macos_version=`sw_vers -productVersion | \
            awk -F. '{ printf("%02d%02d", $1, $2) }'`
 
-       # Newer native sed does not support multibyte correctly.
+       # Since 10.9, native sed exits when called on files with UTF-8
+       # or other apparently-binary content.
        if [ $macos_version -ge 1008 ]; then
                need_awk=yes
                need_sed=yes