[pkgsrc/trunk]: pkgsrc/pkgtools/lintpkgsrc/files lintpkgsrc: fix parse-guessi...

[rillig <rillig%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/be76e401c02b
branches:  trunk
changeset: 383321:be76e401c02b
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Wed Aug 17 18:18:20 2022 +0000

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

diffstat:

 pkgtools/lintpkgsrc/files/lintpkgsrc.pl |  10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diffs (25 lines):

diff -r 12d82f2e5033 -r be76e401c02b pkgtools/lintpkgsrc/files/lintpkgsrc.pl
--- a/pkgtools/lintpkgsrc/files/lintpkgsrc.pl   Wed Aug 17 17:47:50 2022 +0000
+++ b/pkgtools/lintpkgsrc/files/lintpkgsrc.pl   Wed Aug 17 18:18:20 2022 +0000
@@ -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 @@
                $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";