[pkgsrc/trunk]: pkgsrc/bootstrap bootstrap: Default to PREFER_PKGSRC=yes on O...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d4de6550ff0f
branches:  trunk
changeset: 380754:d4de6550ff0f
user:      nia <nia%pkgsrc.org@localhost>
date:      Tue Jun 14 09:08:31 2022 +0000

description:
bootstrap: Default to PREFER_PKGSRC=yes on OpenBSD

diffstat:

 bootstrap/README.OpenBSD |  4 ++--
 bootstrap/bootstrap      |  7 ++++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diffs (41 lines):

diff -r 9d3f0df5af62 -r d4de6550ff0f bootstrap/README.OpenBSD
--- a/bootstrap/README.OpenBSD  Tue Jun 14 08:45:41 2022 +0000
+++ b/bootstrap/README.OpenBSD  Tue Jun 14 09:08:31 2022 +0000
@@ -1,4 +1,4 @@
-$NetBSD: README.OpenBSD,v 1.15 2022/06/14 05:04:23 charlotte Exp $
+$NetBSD: README.OpenBSD,v 1.16 2022/06/14 09:08:31 nia Exp $
 
 Please read the general README file as well.
 
@@ -26,7 +26,7 @@
 have previously been reported to work.
 
 If the bootstrap fails for you, try adding `--prefer-pkgsrc yes` to your
-bootstrap command line.
+bootstrap command line (this is now the default).
 
 Once bootstrapped, as is typical with pkgsrc, many packages build as is.
 For any particular package that doesn't, fixes are often in OpenBSD
diff -r 9d3f0df5af62 -r d4de6550ff0f bootstrap/bootstrap
--- a/bootstrap/bootstrap       Tue Jun 14 08:45:41 2022 +0000
+++ b/bootstrap/bootstrap       Tue Jun 14 09:08:31 2022 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# $NetBSD: bootstrap,v 1.310 2022/04/06 13:06:09 schmonz Exp $
+# $NetBSD: bootstrap,v 1.311 2022/06/14 09:08:31 nia Exp $
 #
 # Copyright (c) 2001-2011 Alistair Crooks <agc%NetBSD.org@localhost>
 # All rights reserved.
@@ -1132,6 +1132,11 @@
 echo "" >> ${TARGET_MKCONF}
 
 case $opsys in
+OpenBSD)
+       if [ -z "$prefer_pkgsrc" ] && [ "$prefer_native" != "yes" ]; then
+               prefer_pkgsrc="yes"
+       fi
+       ;;
 Linux)
        # Default to PREFER_PKGSRC=yes unless user specifies --prefer-native=yes
        # Linux systems likely have software from other packages managers