CVS commit: pkgsrc/mk/check

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

Module Name:    pkgsrc
Committed By:   rillig
Date:           Thu Mar 12 18:54:59 UTC 2020

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

Log Message:
mk/check/check-portability: don't check Makefile.am

These files typically come with a corresponding Makefile.in file, and the
same portability issue is in the .in file as well. For building the
package it is only necessary to patch the .in file. Patching the .am file
as well would mean additional work for the pkgsrc package maintainer.

Nevertheless, such fixes should be reported upstream. The upstream
maintainer is more interested in a patch for Makefile.am, since the .in
file is only generated.

Suggested by wiz via private mail.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 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.sh
diff -u pkgsrc/mk/check/check-portability.sh:1.15 pkgsrc/mk/check/check-portability.sh:1.16
--- pkgsrc/mk/check/check-portability.sh:1.15   Thu Mar 12 18:40:06 2020
+++ pkgsrc/mk/check/check-portability.sh        Thu Mar 12 18:54:59 2020
@@ -1,4 +1,4 @@
-# $NetBSD: check-portability.sh,v 1.15 2020/03/12 18:40:06 rillig Exp $
+# $NetBSD: check-portability.sh,v 1.16 2020/03/12 18:54:59 rillig Exp $
 #
 # This program checks all files in the current directory and any
 # subdirectories for portability issues that are likely to result in
@@ -47,18 +47,21 @@ find ./* -type f -print 2>/dev/null \
                [ $skip = no ] || continue
 
                skip_shebang_test=no
-               ext="${fname##*.}"
+               base="${fname##*/}"
+               ext="${base##*.}"
                case "$ext" in
                # A few file extensions cannot be skipped since the Makefiles
                # will be generated from these, in the configure stage, which
                # is run later.
-               (am|in)                                                 skip_shebang_test=yes;;
+               (in) skip_shebang_test=yes;;
+
                # echo */*/PLIST | xargs cat | sed s,'.*\.',, | sort | uniq -c | sort -nr | sed 40q
                (png|html|svg|py|h|mo|php|js|xml|rb|go|txt|3|hpp)       continue ;;
                (tfm|gif|dtd|properties|json|ogg|gz|test|result|xpm|po) continue ;;
                (page|1|kicad_mod|hxx|jpg|css|el|htm|a|docbook|vf|inc)  continue ;;
+
                # other source files:
-               (c|C|cc|cxx|f|go|pl|py|in|ac|m4)                        continue ;;
+               (c|C|cc|cxx|f|go|pl|py|ac|m4)                           continue ;;
                esac
 
                if [ $skip_shebang_test = yes ]; then