CVS commit: pkgsrc/pkgtools/lintpkgsrc

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

Module Name:    pkgsrc
Committed By:   rillig
Date:           Thu Dec 17 16:17:45 UTC 2020

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

Log Message:
pkgtools/lintpkgsrc: update to 4.96

Changes since 4.95:

Do not complain about "Bogus: ${_SVN_PKGREVISION:...}" that are
generated by wip/mk/*-package.mk.  Using PKGREVISION to track the
current date of the package is the wrong approach; PKGVERSION_NOREV
should be used instead.  Anyway, this is nothing the average pkgsrc user
should be worried about, so shut up the warning for now.

https://mail-index.netbsd.org/pkgsrc-users/2020/12/16/msg032884.html


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 pkgsrc/pkgtools/lintpkgsrc/Makefile
cvs rdiff -u -r1.19 -r1.20 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/Makefile
diff -u pkgsrc/pkgtools/lintpkgsrc/Makefile:1.34 pkgsrc/pkgtools/lintpkgsrc/Makefile:1.35
--- pkgsrc/pkgtools/lintpkgsrc/Makefile:1.34    Mon Aug 31 18:10:58 2020
+++ pkgsrc/pkgtools/lintpkgsrc/Makefile Thu Dec 17 16:17:44 2020
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.34 2020/08/31 18:10:58 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2020/12/17 16:17:44 rillig Exp $
 
-PKGNAME=       lintpkgsrc-4.95
-PKGREVISION=   1
+PKGNAME=       lintpkgsrc-4.96
 CATEGORIES=    pkgtools
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl
diff -u pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl:1.19 pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl:1.20
--- pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl:1.19 Thu Dec 17 16:08:44 2020
+++ pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl      Thu Dec 17 16:17:45 2020
@@ -1,6 +1,6 @@
 #!@PERL5@
 
-# $NetBSD: lintpkgsrc.pl,v 1.19 2020/12/17 16:08:44 rillig Exp $
+# $NetBSD: lintpkgsrc.pl,v 1.20 2020/12/17 16:17:45 rillig Exp $
 
 # Written by David Brownlee <abs%netbsd.org@localhost>.
 #
@@ -996,7 +996,10 @@ sub parse_makefile_pkgsrc($) {
         if ( defined $vars->{PKGREVISION}
             and not $vars->{PKGREVISION} =~ /^\s*$/ )
         {
-            if ( $vars->{PKGREVISION} =~ /\D/ ) {
+            if ( $vars->{PKGREVISION} =~ /^\$\{(_(CVS|GIT|HG|SVN)_PKGVERSION):.*\}$/ ) {
+                # See wip/mk/*-package.mk.
+            }
+            elsif ( $vars->{PKGREVISION} =~ /\D/ ) {
                 print
                   "\nBogus: PKGREVISION $vars->{PKGREVISION} (from $file)\n";