CVS commit: pkgsrc/bootstrap

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Tue Jun 14 09:08:31 UTC 2022

Modified Files:
        pkgsrc/bootstrap: README.OpenBSD bootstrap

Log Message:
bootstrap: Default to PREFER_PKGSRC=yes on OpenBSD


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 pkgsrc/bootstrap/README.OpenBSD
cvs rdiff -u -r1.310 -r1.311 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.OpenBSD
diff -u pkgsrc/bootstrap/README.OpenBSD:1.15 pkgsrc/bootstrap/README.OpenBSD:1.16
--- pkgsrc/bootstrap/README.OpenBSD:1.15        Tue Jun 14 05:04:23 2022
+++ pkgsrc/bootstrap/README.OpenBSD     Tue Jun 14 09:08:31 2022
@@ -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 @@ system-provided clang. Earlier version/p
 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

Index: pkgsrc/bootstrap/bootstrap
diff -u pkgsrc/bootstrap/bootstrap:1.310 pkgsrc/bootstrap/bootstrap:1.311
--- pkgsrc/bootstrap/bootstrap:1.310    Wed Apr  6 13:06:09 2022
+++ pkgsrc/bootstrap/bootstrap  Tue Jun 14 09:08:31 2022
@@ -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 "PKGMANDIR=         $pkgmandir" >> ${TARGE
 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