 @@ -1,16 +1,16 @@
 #! /bin/sh
-# $NetBSD: bootstrap,v 1.302 2021/07/13 12:43:58 schmonz Exp $
+# $NetBSD: bootstrap,v 1.303 2021/11/12 20:29:05 nia 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.
+#
 @@ -825,26 +825,27 @@ SunOS)
 	groupsprog="${idprog} -gn"
 	whoamiprog="${idprog} -un"
 	machine_arch=`isainfo -k`
 	check_compiler=yes
 	check_ssp=yes
 	;;
 UnixWare)
 	root_group=sys
 	BSTRAP_ENV="INSTALL=/usr/ucb/install $BSTRAP_ENV"
 	need_mkdir=yes
 	need_awk=yes
 	need_sed=yes
 	whoamiprog=/usr/ucb/whoami
 	machine_arch=`uname -m`
 	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
 	;;
 esac
 # Override if the user explicitly requests it.
 if [ -n "${march}" ]; then

 @@ -1,14 +1,14 @@
-# $NetBSD: bsd.prefs.mk,v 1.410 2021/11/02 08:14:58 nia Exp $
+# $NetBSD: bsd.prefs.mk,v 1.411 2021/11/12 20:29:05 nia Exp $
+#
 # This file includes the mk.conf file, which contains the user settings.
+#
 # Packages should include this file before any of the .if directives, as
 # well as before modifying variables like CFLAGS, LDFLAGS, and so on.
 # Otherwise the behavior may be unexpected.
+#
 # When mk.conf is included by this file, the following variables are
 # defined:
+#
 # ACCEPTABLE_LICENSES
 #	This variable is set to the list of Open Source licenses. See
 #	mk/license.mk for details.
 @@ -275,26 +275,32 @@ LOWER_VARIANT_VERSION=	${_UNAME_V}
 .elif ${OPSYS} == "SCO_SV"
 SCO_RELEASE!=		${UNAME} -r
 SCO_VERSION!=		${UNAME} -v
 LOWER_VENDOR?=		pc
 LOWER_OPSYS?=		sco
 LOWER_OPSYS_VERSUFFIX=	${SCO_RELEASE}v${SCO_VERSION}
 _UNAME_V!=		${UNAME} -v
 .  if !empty(_UNAME_V:M5.0*)
 OS_VARIANT=		SCOOSR5
 .  elif !empty(_UNAME_V:M6.0*)
 OS_VARIANT=		SCOOSR6
 .  endif
 .elif ${OPSYS} == "UnixWare"
 SCO_RELEASE?=		sysv5${OPSYS}
 SCO_VERSION!=		${UNAME} -v
 LOWER_VENDOR?=		unknown
 LOWER_OPSYS_VERSUFFIX=	${SCO_RELEASE}${SCO_VERSION}
 .elif ${OPSYS} == "Minix"
 LOWER_VENDOR?=		unknown
 LOWER_OPSYS:=		${OPSYS:tl}
 .elif !defined(LOWER_OPSYS)
 LOWER_OPSYS:=		${OPSYS:tl}
 .endif
 # Now commit the [LOWER_]OS_VERSION values computed above, eliding the :sh
 OS_VERSION:=		${OS_VERSION}
 LOWER_OS_VERSION:=	${OS_VERSION:tl}
 MAKEFLAGS+=		LOWER_OPSYS=${LOWER_OPSYS:Q}
 @@ -352,26 +358,28 @@ OBJECT_FMT=	ECOFF
 .elif ${OPSYS} == "HPUX"
 .  if ${MACHINE_ARCH} == "ia64"
 OBJECT_FMT=	ELF
 .  elif ${MACHINE_ARCH} == "hppa64"
 # it is ELF but for most purposes behaves like SOM (.sl suffix, ...)
 OBJECT_FMT=	SOM
 .  else # hppa
 OBJECT_FMT=	SOM
 .  endif
 .elif ${OPSYS} == "Cygwin"
 OBJECT_FMT=	PE
 .elif ${OPSYS} == "SCO_SV"
 OBJECT_FMT=	ELF
 .elif ${OPSYS} == "UnixWare"
 OBJECT_FMT=	ELF
 .endif
 # Calculate depth
 .if exists(${.CURDIR}/mk/bsd.pkg.mk)
 _PKGSRC_TOPDIR=	${.CURDIR}
 .elif exists(${.CURDIR}/../mk/bsd.pkg.mk)
 _PKGSRC_TOPDIR=	${.CURDIR}/..
 .elif exists(${.CURDIR}/../../mk/bsd.pkg.mk)
 _PKGSRC_TOPDIR=	${.CURDIR}/../..
 .endif
 # include the defaults file
 .include "${_PKGSRC_TOPDIR}/mk/defaults/mk.conf"