CVS commit: pkgsrc/bootstrap

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Fri May  3 13:26:34 UTC 2019

Modified Files:
        pkgsrc/bootstrap: bootstrap

Log Message:
bootstrap: Invert the awk/sed test on Darwin.

This stops us having to continue to add new macOS releases, it appears
that Apple is not going to fix this issue any time soon.


To generate a diff of this commit:
cvs rdiff -u -r1.263 -r1.264 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.263 pkgsrc/bootstrap/bootstrap:1.264
--- pkgsrc/bootstrap/bootstrap:1.263    Wed May  1 18:29:20 2019
+++ pkgsrc/bootstrap/bootstrap  Fri May  3 13:26:34 2019
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# $NetBSD: bootstrap,v 1.263 2019/05/01 18:29:20 rillig Exp $
+# $NetBSD: bootstrap,v 1.264 2019/05/03 13:26:34 jperkin Exp $
 #
 # Copyright (c) 2001-2011 Alistair Crooks <agc%NetBSD.org@localhost>
 # All rights reserved.
@@ -581,8 +581,8 @@ CYGWIN_*)
 Darwin)
        root_group=wheel
        need_bsd_install=no
-       need_awk=no
-       need_sed=no
+       need_awk=yes
+       need_sed=yes
        set_opsys=no
        machine_arch=`get_machine_arch_darwin`
        CC=${CC:-"cc -isystem /usr/include"}; export CC
@@ -601,9 +601,9 @@ Darwin)
                ;;
        esac
        case "$macosx_version" in
-       10.[8-9]|10.1[0123])
-               need_awk=yes
-               need_sed=yes
+       10.[0-7])
+               need_awk=no
+               need_sed=no
                ;;
        esac
        unset osrev macosx_version