CVS commit: pkgsrc

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Sat Apr 12 08:46:05 UTC 2025

Modified Files:
        pkgsrc/bootstrap: bootstrap
        pkgsrc/pkgtools/bootstrap-mk-files/files/mods: Cygwin.sys.mk

Log Message:
bootstrap: Switch Cygwin to bsdinstall.

This was previously missing need_bsd_install=yes entirely so any package
that tried to call ${INSTALL} would fail.  Confirmed sysutils/bsdinstall
builds and works correctly, so use that instead for faster execution.

via dreckly, original author jperkin@


To generate a diff of this commit:
cvs rdiff -u -r1.333 -r1.334 pkgsrc/bootstrap/bootstrap
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/pkgtools/bootstrap-mk-files/files/mods/Cygwin.sys.mk

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.333 pkgsrc/bootstrap/bootstrap:1.334
--- pkgsrc/bootstrap/bootstrap:1.333    Mon Mar 31 14:16:38 2025
+++ pkgsrc/bootstrap/bootstrap  Sat Apr 12 08:46:05 2025
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# $NetBSD: bootstrap,v 1.333 2025/03/31 14:16:38 wiz Exp $
+# $NetBSD: bootstrap,v 1.334 2025/04/12 08:46:05 nia Exp $
 #
 # Copyright (c) 2001-2011 Alistair Crooks <agc%NetBSD.org@localhost>
 # All rights reserved.
@@ -584,6 +584,8 @@ CYGWIN_*)
        root_group=Administrators
        opsys=`uname -o`
        machine_arch=`uname -m`
+       need_bsd_install=yes
+       use_bsdinstall=yes
        # only used for unprivileged builds.
        whoamiprog='id -u'
        groupsprog='id -g'

Index: pkgsrc/pkgtools/bootstrap-mk-files/files/mods/Cygwin.sys.mk
diff -u pkgsrc/pkgtools/bootstrap-mk-files/files/mods/Cygwin.sys.mk:1.2 pkgsrc/pkgtools/bootstrap-mk-files/files/mods/Cygwin.sys.mk:1.3
--- pkgsrc/pkgtools/bootstrap-mk-files/files/mods/Cygwin.sys.mk:1.2     Mon Apr 22 07:33:05 2024
+++ pkgsrc/pkgtools/bootstrap-mk-files/files/mods/Cygwin.sys.mk Sat Apr 12 08:46:05 2025
@@ -1,4 +1,4 @@
-#      $NetBSD: Cygwin.sys.mk,v 1.2 2024/04/22 07:33:05 jperkin Exp $
+#      $NetBSD: Cygwin.sys.mk,v 1.3 2025/04/12 08:46:05 nia Exp $
 
 unix?=         We run Unix
 
@@ -50,7 +50,7 @@ LINK.F?=      ${FC} ${FFLAGS} ${CPPFLAGS} ${L
 COMPILE.r?=    ${FC} ${FFLAGS} ${RFLAGS} -c
 LINK.r?=       ${FC} ${FFLAGS} ${RFLAGS} ${LDFLAGS}
 
-INSTALL?=      ${LOCALBASE}/bin/install-sh
+INSTALL?=      ${PREFIX}/bin/bsdinstall
 
 LEX?=          lex
 LFLAGS?=