CVS commit: pkgsrc/mk/check

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

Module Name:    pkgsrc
Committed By:   rillig
Date:           Wed Mar 11 19:21:00 UTC 2020

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

Log Message:
mk/check: enable check-portability for [[

Since pkgtools/check-portability is not installed by default, it will not
harm any existing pkgsrc setup. To activate it, it has to be installed
manually. After a testing phase, it will be installed whenever
PKG_DEVELOPER is set.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/mk/check/check-portability.mk
cvs rdiff -u -r1.10 -r1.11 pkgsrc/mk/check/check-portability.sh

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.9 pkgsrc/mk/check/check-portability.mk:1.10
--- pkgsrc/mk/check/check-portability.mk:1.9    Sun Oct  6 13:38:22 2019
+++ pkgsrc/mk/check/check-portability.mk        Wed Mar 11 19:21:00 2020
@@ -1,4 +1,4 @@
-# $NetBSD: check-portability.mk,v 1.9 2019/10/06 13:38:22 rillig Exp $
+# $NetBSD: check-portability.mk,v 1.10 2020/03/11 19:21:00 rillig Exp $
 #
 # This file contains some checks that are applied to the configure
 # scripts to check for certain constructs that are known to cause
@@ -45,4 +45,5 @@ _check-portability:
        [ -d ${WRKSRC}/. ] || exit 0;                                   \
        cd ${WRKSRC};                                                   \
        env     SKIP_FILTER=${CHECK_PORTABILITY_SKIP:@p@${p}) skip=yes;;@:Q} \
+               PREFIX=${PREFIX}                                        \
                sh ${PKGSRCDIR}/mk/check/check-portability.sh

Index: pkgsrc/mk/check/check-portability.sh
diff -u pkgsrc/mk/check/check-portability.sh:1.10 pkgsrc/mk/check/check-portability.sh:1.11
--- pkgsrc/mk/check/check-portability.sh:1.10   Thu Jan 17 00:11:44 2019
+++ pkgsrc/mk/check/check-portability.sh        Wed Mar 11 19:21:00 2020
@@ -1,4 +1,4 @@
-# $NetBSD: check-portability.sh,v 1.10 2019/01/17 00:11:44 rillig Exp $
+# $NetBSD: check-portability.sh,v 1.11 2020/03/11 19:21:00 rillig Exp $
 #
 # This program checks all files in the current directory and any
 # subdirectories for portability issues that are likely to result in
@@ -27,6 +27,11 @@ check_shell() {
                        -f "$checkdir/check-portability.awk" \
                < "$1" 1>&2 \
        || cs_exitcode=1
+
+       if test -f "${PREFIX}/bin/check-portability"; then
+               ${PREFIX}/bin/check-portability "$1" 1>&2 \
+               || cs_exitcode=1
+       fi
 }
 
 find * -type f -print 2>/dev/null \