CVS commit: pkgsrc/pkgtools/pkg_comp

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Sun May  8 20:26:52 UTC 2022

Modified Files:
        pkgsrc/pkgtools/pkg_comp: Makefile distinfo
Added Files:
        pkgsrc/pkgtools/pkg_comp/patches: patch-pkg__comp.sh

Log Message:
Avoid finding pkgsrc-installed bash, as it won't be in the sandbox. Bump
PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.61 -r1.62 pkgsrc/pkgtools/pkg_comp/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/pkgtools/pkg_comp/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/pkgtools/pkg_comp/patches/patch-pkg__comp.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/pkgtools/pkg_comp/Makefile
diff -u pkgsrc/pkgtools/pkg_comp/Makefile:1.61 pkgsrc/pkgtools/pkg_comp/Makefile:1.62
--- pkgsrc/pkgtools/pkg_comp/Makefile:1.61      Mon Jan 14 10:53:37 2019
+++ pkgsrc/pkgtools/pkg_comp/Makefile   Sun May  8 20:26:52 2022
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.61 2019/01/14 10:53:37 jmmv Exp $
+# $NetBSD: Makefile,v 1.62 2022/05/08 20:26:52 schmonz Exp $
 
 DISTNAME=      pkg_comp-2.1
+PKGREVISION=   1
 CATEGORIES=    sysutils
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=jmmv/}pkg_comp/releases/download/pkg_comp-2.1/
 
@@ -33,6 +34,11 @@ SUBST_FILES.sandboxctl=      sandbox.conf.in
 SUBST_SED.sandboxctl=  -e 's,__PKG_COMP_BASESYSCONFDIR__/sandboxctl/,${SANDBOXCTL_SYSCONFDIR}/,g'
 SANDBOXCTL_SYSCONFDIR= ${PKG_SYSCONFDIR.sandboxctl:U${PKG_SYSCONFBASE}/sandboxctl}
 
+SUBST_CLASSES+=                paths
+SUBST_STAGE.paths=     pre-configure
+SUBST_FILES.paths=     pkg_comp.sh
+SUBST_VARS.paths=      PREFIX
+
 PKG_OPTIONS_VAR=       PKG_OPTIONS.pkg_comp
 PKG_SUPPORTED_OPTIONS= tests
 PKG_SUGGESTED_OPTIONS= tests

Index: pkgsrc/pkgtools/pkg_comp/distinfo
diff -u pkgsrc/pkgtools/pkg_comp/distinfo:1.4 pkgsrc/pkgtools/pkg_comp/distinfo:1.5
--- pkgsrc/pkgtools/pkg_comp/distinfo:1.4       Tue Oct 26 11:11:07 2021
+++ pkgsrc/pkgtools/pkg_comp/distinfo   Sun May  8 20:26:52 2022
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.4 2021/10/26 11:11:07 nia Exp $
+$NetBSD: distinfo,v 1.5 2022/05/08 20:26:52 schmonz Exp $
 
 BLAKE2s (pkg_comp-2.1.tar.gz) = 0bf6652c902492cb53ef5b8f68f369e71bb102f62d995722fe9278f4db3b6449
 SHA512 (pkg_comp-2.1.tar.gz) = 14e953113cae585250241f64a260358160907faa50d8c2536c68d0b13cc52cdf8fe1b10d66f099ce1f817a9f7e74fbe2069b809b8125ba68bc68f0609c9afcfc
 Size (pkg_comp-2.1.tar.gz) = 97357 bytes
+SHA1 (patch-pkg__comp.sh) = 94a6dc79cbcc445171a9a07093fc85eec6c9049c

Added files:

Index: pkgsrc/pkgtools/pkg_comp/patches/patch-pkg__comp.sh
diff -u /dev/null pkgsrc/pkgtools/pkg_comp/patches/patch-pkg__comp.sh:1.1
--- /dev/null   Sun May  8 20:26:52 2022
+++ pkgsrc/pkgtools/pkg_comp/patches/patch-pkg__comp.sh Sun May  8 20:26:52 2022
@@ -0,0 +1,16 @@
+$NetBSD: patch-pkg__comp.sh,v 1.1 2022/05/08 20:26:52 schmonz Exp $
+
+Avoid finding pkgsrc-installed bash, as it won't be in the sandbox.
+
+--- pkg_comp.sh.orig   2019-01-12 10:54:23.000000000 +0000
++++ pkg_comp.sh
+@@ -181,7 +181,8 @@ setup_bootstrap() {
+         local dash_echo_test="$("${bootstrap_sh}" -c 'echo "\\100"')"
+         if [ "$(uname -s)" != GNUkFreeBSD -a "${dash_echo_test}" = @ ]; then
+             local bash
+-            bash="$(which bash)"
++            # Avoid finding pkgsrc-installed bash, as it won't be in the sandbox
++            bash="$(PATH="$(echo ${PATH} | tr ':' '\n' | grep -v '^@PREFIX@/' | tr '\n' ':')" which bash)"
+             if [ ${?} -eq 0 ]; then
+                 bootstrap_sh="${bash}"
+             else