CVS commit: pkgsrc/mk/check

["Roland Illig" <rillig%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rillig
Date:           Sun Jun  7 06:05:35 UTC 2020

Modified Files:
        pkgsrc/mk/check: check-portability.mk

Log Message:
mk/check/check-portability.mk: use predefined tools

Just in case any of these tools defines some command line arguments. The
correct path had already been used before since both env and sh are added
to USE_TOOLS in bsd.pkg.mk.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 pkgsrc/mk/check/check-portability.mk

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

Modified files:

Index: pkgsrc/mk/check/check-portability.mk
diff -u pkgsrc/mk/check/check-portability.mk:1.17 pkgsrc/mk/check/check-portability.mk:1.18
--- pkgsrc/mk/check/check-portability.mk:1.17   Sat May  9 19:40:10 2020
+++ pkgsrc/mk/check/check-portability.mk        Sun Jun  7 06:05:35 2020
@@ -1,4 +1,4 @@
-# $NetBSD: check-portability.mk,v 1.17 2020/05/09 19:40:10 rillig Exp $
+# $NetBSD: check-portability.mk,v 1.18 2020/06/07 06:05:35 rillig Exp $
 #
 # This file checks that the extracted shell programs don't contain
 # bashisms or other constructs that only work on some platforms.
@@ -48,8 +48,10 @@ _check-portability:
        ${RUN}                                                          \
        [ -d ${WRKSRC}/. ] || exit 0;                                   \
        cd ${WRKSRC};                                                   \
-       env     SKIP_FILTER=${CHECK_PORTABILITY_SKIP:@p@${p}) skip=yes;;@:Q} \
+       echo "$$PATH" | tr : '\n'; \
+       ${SETENV}                                                       \
+               SKIP_FILTER=${CHECK_PORTABILITY_SKIP:@p@${p}) skip=yes;;@:Q} \
                PREFIX=${PREFIX}                                        \
                PATCHDIR=${PATCHDIR}                                    \
                CHECK_PORTABILITY_EXPERIMENTAL=${CHECK_PORTABILITY_EXPERIMENTAL:Uno} \
-               sh ${PKGSRCDIR}/mk/check/check-portability.sh
+               ${SH} ${PKGSRCDIR}/mk/check/check-portability.sh