 @@ -1,16 +1,16 @@
 #! /bin/sh
-# $NetBSD: bootstrap,v 1.281 2020/05/30 21:36:15 jperkin Exp $
+# $NetBSD: bootstrap,v 1.282 2020/06/29 12:01:38 jperkin Exp $
+#
 # Copyright (c) 2001-2011 Alistair Crooks <agc@NetBSD.org>
 # All rights reserved.
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 # 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
+#
 @@ -525,187 +525,154 @@ else
 	[ -z "$pkgmandir" ] && pkgmandir=man
 fi
 infodir=${prefix}/${pkginfodir}
 mandir=${prefix}/${pkgmandir}
 [ -z "$sysconfdir" ] && sysconfdir=${prefix}/etc
 if [ "x$preserve_path" != "xyes" ]; then
 	PATH="$PATH:/sbin:/usr/sbin"
 fi
 overpath=""
 root_user=root
 bmakexargs=
 need_awk=no
 need_bsd_install=no
 need_extras=no
 need_sed=no
 need_xargs=no
 set_opsys=no
 use_bsdinstall=
 case "$opsys" in
 AIX)
 	root_group=system
 	need_bsd_install=yes
 	need_awk=yes
 	need_sed=yes
 	need_ksh=yes
 	need_fixed_strip=yes
 	set_opsys=no
 	machine_arch=`get_machine_arch_aix`
 	;;
 Bitrig)
 	root_group=wheel
 	need_bsd_install=no
 	need_awk=no
 	need_sed=no
 	set_opsys=no
 	machine_arch=`arch -s`
 	check_compiler=yes
 	;;
 CYGWIN_*)
 	is_root () {
 		if id -nG | grep -q 'Administrators'; then
 			return 0
 		fi
 		return 1
+	}
 	root_user=Administrators
 	root_group=Administrators
 	need_bsd_install=no
 	opsys=`uname -o`
 	need_awk=no
 	need_sed=yes
 	need_xargs=no
 	machine_arch=`uname -m`
 	# only used for unprivileged builds.
 	whoamiprog='id -u'
 	groupsprog='id -g'
 	;;
 Darwin)
 	root_group=wheel
 	need_bsd_install=no
 	need_awk=yes
 	need_sed=yes
 	set_opsys=no
 	machine_arch=`get_machine_arch_darwin`
 	CC=${CC:-"cc -isystem /usr/include"}; export CC
 	check_compiler=yes
 	osrev=`uname -r`
 	macosx_version=`echo $osrev | awk -F . '{ print "10."$1-4; }'`
 	case "$macosx_version" in
 .[7-9])
 		packagemaker=/Applications/PackageMaker.app/Contents/MacOS/PackageMaker
 		;;
 .[0-4])
 		packagemaker=/Developer/Tools/packagemaker
 		;;
 	*)
 		packagemaker=/Developer/usr/bin/packagemaker
 		;;
 	esac
 	case "$macosx_version" in
 .[0-7])
 		need_awk=no
 		need_sed=no
 		;;
 	esac
 	unset osrev macosx_version
 	;;
 DragonFly)
 	root_group=wheel
 	need_bsd_install=no
 	need_awk=no
 	need_sed=no
 	set_opsys=no
 	check_prog tarprog tar
 	machine_arch=`uname -p`
 	;;
 FreeBSD)
 	root_group=wheel
 	need_bsd_install=no
 	need_awk=no
 	need_sed=no
 	set_opsys=no
 	machine_arch=`uname -p`
 	check_compiler=yes
 	;;
 FreeMiNT)
 	root_group=root
 	need_bsd_install=no
 	need_awk=no
 	need_sed=no
 	set_opsys=no
 	machine_arch=m68k
 	;;
 GNUkFreeBSD)
 	root_group=root
 	need_bsd_install=no
 	need_awk=yes
 	need_sed=no
 	set_opsys=no
 	machine_arch=`uname -m`
 	;;
 Haiku)
 	root_user=`id -un`
 	root_group=root
 	need_bsd_install=no
 	need_awk=no
 	need_sed=no
 	set_opsys=no
 	case `uname -m` in
 	BeMac)
 		machine_arch=powerpc
 		;;
 	BePC)
 		machine_arch=i386
 		;;
 	*)
 		machine_arch=`uname -p`
 		;;
 	esac
 	;;
 HPUX)
 	root_group=sys
 	need_bsd_install=yes
 	need_awk=yes
 	need_sed=yes
 	set_opsys=no
 	machine_arch=`uname -m | sed 's/^9000.*$/hppa/'`
 	;;
 Interix)
 	is_root () {
 		if id -G | grep -q 131616; then
 			return 0
 		fi
 		return 1
+	}
 	mkdir_p () {
 		mkdir -p "$@" # allows umask to take effect
+	}
 	default_install_mode=0775
 	root_user=`id -un`
 	root_group=+Administrators
 	case `uname -r` in
 .* | 5.*)
 		need_bsd_install=yes
 		need_awk=yes
 		need_sed=yes
 		set_opsys=no
 		need_xargs=yes
 		;;
 	*)
 		need_bsd_install=no
 		need_awk=no
 		need_sed=no
 		set_opsys=no
 		need_xargs=no
 		;;
 	esac
 	# only used for unprivileged builds
 	groupsprog="id -gn"
 	# for bootstrap only; pkgsrc uses CPPFLAGS
 	CC="gcc -D_ALL_SOURCE"; export CC
 	ac_cv_header_poll_h=no; export ac_cv_header_poll_h
 	ac_cv_func_poll=no; export ac_cv_func_poll
 	;;
 IRIX*)
 	if [ -d "/usr/freeware/bin" ]; then
 		overpath="/usr/freeware/bin:$overpath"
 	fi
 	if [ -d "/usr/bsd" ]; then
 @@ -725,182 +692,148 @@ IRIX*)
 	check_compiler=yes
 	if [ `uname -r` -lt 6 ]; then
 # IRIX 5's mkdir bails out with an error when trying to create with the -p
 # option an already existing directory
 		need_mkdir=yes
 	fi
 	;;
 Linux)
 	if [ -f /etc/ssdlinux_version ]; then
 		root_group=wheel
 	else
 		root_group=root
 	fi
 	need_bsd_install=no
 	# Debian/Ubuntu's awk is mawk, and mawk does not understand
 	# some regexp used in pkgsrc/mk.
 	if [ -f /etc/debian_version ]; then
 		need_awk=yes
 	# Arch uses gawk 5 that breaks some regexps. It doesn't provide pax
 	# anymore.
 	elif [ -f /etc/arch-release ]; then
 		need_awk=yes
 		need_pax=yes
 	elif grep -sq '^CHROMEOS_RELEASE_NAME' /etc/lsb-release; then
 		need_awk=yes
 		need_sed=yes
 	else
 		need_awk=no
 		need_sed=no
 	fi
 	set_opsys=no
 	machine_arch=`uname -m`
 	# Override machine_arch where required.
 	case "$machine_arch" in
 	i?86)		machine_arch=i386 ;;
 	ppc64le)	machine_arch=powerpc64le ;;
 	esac
 	;;
 Minix)
 	root_group=wheel
 	need_bsd_install=no
 	need_awk=no
 	need_sed=no
 	set_opsys=no
 	machine_arch=`uname -p`
 	check_compiler=yes
 	;;
 MirBSD)
 	root_group=wheel
 	need_pax=yes
 	need_mtree=no
 	need_bsd_install=no
 	need_awk=no
 	need_sed=no
 	set_opsys=no
 	check_prog mtreeprog mtree
 	machine_arch=`arch -s`
 	# there is no /usr/bin/cc, so use mgcc if unset
 	test -n "$CC" || { CC=mgcc; export CC; }
 	# get some variables from the native make if unset
 	for var in CFLAGS CPPFLAGS LDFLAGS; do
 		# check if variable is already set
 		eval _tmp=\"\$$var\"
 		[ "x$_tmp" != x ] && continue
 		# ask the native make (EXPERIMENTAL = don't add -Werror)
 		# the -I${.CURDIR} dance is to prevent junk in CPPFLAGS
 		_tmp=`printf '%s\nall:\n\t@%s %%s %s=${%s:M*:Q:Q}\n%s\n%s\n' \
 		    $var'+=-I${.CURDIR}' printf $var $var':S/-I${.CURDIR}//' \
 		    EXPERIMENTAL=yes '.include <bsd.prog.mk>' | \
 		    (unset MAKECONF; /usr/bin/make -f - all 2>/dev/null) | \
 		    sed 's/^x//'`
 		eval $_tmp
 		eval export $var
 	done
 	;;
 NetBSD)
 	root_group=wheel
 	need_bsd_install=no
 	need_awk=no
 	need_sed=no
 	set_opsys=no
 	machine_arch=`uname -p`
 	;;
 OpenBSD)
 	root_group=wheel
 	need_bsd_install=no
 	need_awk=no
 	need_sed=no
 	set_opsys=no
 	machine_arch=`arch -s`
 	CC=${CC:-cc}; export CC
 	check_compiler=yes
 	;;
 OSF1)
 	root_group=system
 	need_bsd_install=yes
 	need_awk=yes
 	need_sed=yes
 	need_ksh=yes
 	set_opsys=no
 	machine_arch=`uname -p`
 	;;
 QNX)
 	root_group=root
 	need_bsd_install=yes
 	need_awk=yes
 	need_sed=yes
 	set_opsys=no
 	groupsprog="id -gn"
 	whoamiprog="id -un"
 	machine_arch=`uname -p | sed -e 's/x86/i386/'`
 	;;
 SCO_SV)
 	root_group=root
 	need_awk=yes
 	need_bsd_install=yes
 	need_sed=yes
 	set_opsys=no
 	whoamiprog='id -u'
 	groupsprog='id -g'
 	# /bin/sh under OpenServer 5.0.7/3.2 breaks bmake tests.
 	#bmakexargs="$bmakexargs --with-defshell=/bin/ksh"
 	;;
 SunOS)
 	root_group=root
 	need_bsd_install=yes
 	use_bsdinstall=yes
-	if [ -x "/usr/gnu/bin/awk" ]; then
+	if [ ! -x "/usr/gnu/bin/awk" ]; then
 		need_awk=no
 	else
 		need_awk=yes
 	fi
-	if [ -x "/usr/gnu/bin/sed" ]; then
+	if [ ! -x "/usr/gnu/bin/sed" ]; then
 		need_sed=no
 	else
 		need_sed=yes
 	fi
 	if [ -x "/usr/bin/bash" ]; then
 		bootstrap_sh=${SH:-/usr/bin/bash}
 		bootstrap_sh_set=set
 	else
 		need_ksh=yes
 	fi
 	set_opsys=no
 	idprog="/usr/xpg4/bin/id"
 	groupsprog="${idprog} -gn"
 	whoamiprog="${idprog} -un"
 	machine_arch=`isainfo -k`
 	check_compiler=yes
 	check_ssp=yes
 	;;
 UnixWare)
 	root_group=sys
 	need_bsd_install=no
 	BSTRAP_ENV="INSTALL=/usr/ucb/install $BSTRAP_ENV"
 	need_mkdir=yes
 	need_awk=yes
 	need_sed=yes
 	whoamiprog=/usr/ucb/whoami
 	set_opsys=no
 	CC="gcc -DUNIXWARE"; export CC
 	;;
 *)
 	echo "This platform ($opsys) is untried - good luck, and thanks for using pkgsrc"
 	root_group=wheel
 	need_bsd_install=yes
 	need_awk=yes
 	need_sed=yes
 	set_opsys=no
 	;;
 esac
 # Fixup MACHINE_ARCH to use canonical pkgsrc variants, and support multiarch
 # systems via --abi, setting a default $abi based on MACHINE_ARCH if not set.
+#
 case "$machine_arch/$abi" in
 # "amd64" translates to "x86_64", defaults to 64-bit
 amd64/32)	abi=32	machine_arch=i386	;;
 amd64/*)	abi=64	machine_arch=x86_64	;;
 # XXX: hppa untested
 hppa/64)	abi=64	machine_arch=hppa64	;;
 hppa/*)		abi=32	machine_arch=hppa	;;