CVS commit: pkgsrc/pkgtools/lintpkgsrc/files

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

Module Name:    pkgsrc
Committed By:   rillig
Date:           Wed Aug 17 18:18:20 UTC 2022

Modified Files:
        pkgsrc/pkgtools/lintpkgsrc/files: lintpkgsrc.pl

Log Message:
lintpkgsrc: fix parse-guessing of pkgsrc-wip packages using an SCM


To generate a diff of this commit:
cvs rdiff -u -r1.110 -r1.111 pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl

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

Modified files:

Index: pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl
diff -u pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl:1.110 pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl:1.111
--- pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl:1.110        Wed Aug 17 17:47:50 2022
+++ pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl      Wed Aug 17 18:18:20 2022
@@ -1,5 +1,5 @@
 #!@PERL5@
-# $NetBSD: lintpkgsrc.pl,v 1.110 2022/08/17 17:47:50 rillig Exp $
+# $NetBSD: lintpkgsrc.pl,v 1.111 2022/08/17 18:18:20 rillig Exp $
 
 # Written by David Brownlee <abs%netbsd.org@localhost>.
 #
@@ -999,8 +999,12 @@ sub parse_makefile_pkgsrc($file) {
                $pkgname = canonicalize_pkgname($pkgname);
 
                my $pkgrevision = $vars->{PKGREVISION};
-               if (defined $pkgrevision and not $pkgrevision =~ /^\s*$/) {
-                       if ($pkgrevision =~ /^\$\{(_(CVS|GIT|HG|SVN)_PKGVERSION):.*\}$/) {
+               if (defined $pkgrevision && $pkgrevision !~ /^\s*$/) {
+                       if ($pkgrevision =~ /^\$\{ (?:
+                           _CVS_PKGVERSION |
+                           _GIT_PKGVERSION_CMD |
+                           _HG_PKGVERSION_CMD |
+                           _SVN_PKGREVISION_CMD) :.* \}$ /x) {
                                # See wip/mk/*-package.mk.
                        } elsif ($pkgrevision =~ /\D/) {
                                print "\n";