CVS commit: pkgsrc/bootstrap

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Wed Apr  6 13:06:09 UTC 2022

Modified Files:
        pkgsrc/bootstrap: README.macOS bootstrap

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


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/bootstrap/README.macOS
cvs rdiff -u -r1.309 -r1.310 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/README.macOS
diff -u pkgsrc/bootstrap/README.macOS:1.5 pkgsrc/bootstrap/README.macOS:1.6
--- pkgsrc/bootstrap/README.macOS:1.5   Wed Feb 10 17:30:20 2021
+++ pkgsrc/bootstrap/README.macOS       Wed Apr  6 13:06:09 2022
@@ -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 @@ option.  Repeatable data about recovery 
 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

Index: pkgsrc/bootstrap/bootstrap
diff -u pkgsrc/bootstrap/bootstrap:1.309 pkgsrc/bootstrap/bootstrap:1.310
--- pkgsrc/bootstrap/bootstrap:1.309    Sun Apr  3 20:46:11 2022
+++ pkgsrc/bootstrap/bootstrap  Wed Apr  6 13:06:09 2022
@@ -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 @@ Darwin)
        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