CVS commit: pkgsrc/bootstrap

["Taylor R Campbell" <riastradh%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   riastradh
Date:           Tue Jun 27 14:36:41 UTC 2023

Modified Files:
        pkgsrc/bootstrap: bootstrap

Log Message:
bootstrap: Override NATIVE_PKG_*_CMD, not PKG_*_CMD, during build.

NATIVE_PKG_*_CMD is what gets executed at build-time, and must be the
bootstrapped pkg_install which lives in the working tree; PKG_*_CMD
may get baked into packages for use at run-time.


To generate a diff of this commit:
cvs rdiff -u -r1.318 -r1.319 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/bootstrap
diff -u pkgsrc/bootstrap/bootstrap:1.318 pkgsrc/bootstrap/bootstrap:1.319
--- pkgsrc/bootstrap/bootstrap:1.318    Fri Nov 11 17:22:14 2022
+++ pkgsrc/bootstrap/bootstrap  Tue Jun 27 14:36:41 2023
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# $NetBSD: bootstrap,v 1.318 2022/11/11 17:22:14 jperkin Exp $
+# $NetBSD: bootstrap,v 1.319 2023/06/27 14:36:41 riastradh Exp $
 #
 # Copyright (c) 2001-2011 Alistair Crooks <agc%NetBSD.org@localhost>
 # All rights reserved.
@@ -1370,10 +1370,10 @@ run_cmd "$install_sh -c -o $user -g $gro
 run_cmd "$install_sh -c -o $user -g $group -m 755 $wrkdir/pkg_install/admin/pkg_admin $wrkdir/sbin/pkg_admin"
 run_cmd "$install_sh -c -o $user -g $group -m 755 $wrkdir/pkg_install/create/pkg_create $wrkdir/sbin/pkg_create"
 run_cmd "$install_sh -c -o $user -g $group -m 755 $wrkdir/pkg_install/info/pkg_info $wrkdir/sbin/pkg_info"
-echo "PKG_ADD_CMD?=                    $wrkdir/sbin/pkg_add" >> ${BOOTSTRAP_MKCONF}
-echo "PKG_ADMIN_CMD?=                  $wrkdir/sbin/pkg_admin" >> ${BOOTSTRAP_MKCONF}
-echo "PKG_CREATE_CMD?=                 $wrkdir/sbin/pkg_create" >> ${BOOTSTRAP_MKCONF}
-echo "PKG_INFO_CMD?=                   $wrkdir/sbin/pkg_info" >> ${BOOTSTRAP_MKCONF}
+echo "NATIVE_PKG_ADD_CMD?=             $wrkdir/sbin/pkg_add" >> ${BOOTSTRAP_MKCONF}
+echo "NATIVE_PKG_ADMIN_CMD?=           $wrkdir/sbin/pkg_admin" >> ${BOOTSTRAP_MKCONF}
+echo "NATIVE_PKG_CREATE_CMD?=          $wrkdir/sbin/pkg_create" >> ${BOOTSTRAP_MKCONF}
+echo "NATIVE_PKG_INFO_CMD?=            $wrkdir/sbin/pkg_info" >> ${BOOTSTRAP_MKCONF}
 
 MAKECONF=$wrkdir/mk.conf
 export MAKECONF