CVS commit: pkgsrc/pkgtools/lintpkgsrc

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

Module Name:    pkgsrc
Committed By:   rillig
Date:           Wed Aug 10 20:16:55 UTC 2022

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

Log Message:
lintpkgsrc: update to Perl 5.36

Bump version.


To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 pkgsrc/pkgtools/lintpkgsrc/Makefile
cvs rdiff -u -r1.69 -r1.70 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.47 pkgsrc/pkgtools/lintpkgsrc/Makefile:1.48
--- pkgsrc/pkgtools/lintpkgsrc/Makefile:1.47    Tue Aug  9 18:14:22 2022
+++ pkgsrc/pkgtools/lintpkgsrc/Makefile Wed Aug 10 20:16:55 2022
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.47 2022/08/09 18:14:22 rillig Exp $
+# $NetBSD: Makefile,v 1.48 2022/08/10 20:16:55 rillig Exp $
 
-PKGNAME=       lintpkgsrc-2022.08.09
+PKGNAME=       lintpkgsrc-2022.08.10
 CATEGORIES=    pkgtools
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
@@ -12,6 +12,7 @@ TEST_DEPENDS+=        p5-File-Slurp>=0:../../de
 TEST_DEPENDS+= p5-IO-Null>=0:../../devel/p5-IO-Null
 
 USE_TOOLS+=    perl:run
+PERL5_REQD+=   5.36
 
 WRKSRC=                ${WRKDIR}
 USE_LANGUAGES= # none

Index: pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl
diff -u pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl:1.69 pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl:1.70
--- pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl:1.69 Wed Aug 10 07:12:52 2022
+++ pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl      Wed Aug 10 20:16:55 2022
@@ -1,6 +1,6 @@
 #!@PERL5@
 
-# $NetBSD: lintpkgsrc.pl,v 1.69 2022/08/10 07:12:52 rillig Exp $
+# $NetBSD: lintpkgsrc.pl,v 1.70 2022/08/10 20:16:55 rillig Exp $
 
 # Written by David Brownlee <abs%netbsd.org@localhost>.
 #
@@ -13,7 +13,7 @@
 # TODO: Handle fun DEPENDS like avifile-devel with
 #                      {qt2-designer>=2.2.4,qt2-designer-kde>=2.3.1nb1}
 
-use v5.34;
+use v5.36;
 use locale;
 use strict;
 use warnings;
@@ -22,8 +22,6 @@ use File::Find;
 use File::Basename;
 use IPC::Open3;
 use Cwd 'realpath', 'getcwd';
-use feature 'signatures';               # only for < v5.36
-no warnings 'experimental::signatures'; # only for < v5.36
 
 # PkgVer is a PKGBASE + PKGVERSION, including some of the variables that
 # have been extracted from the package Makefile.
@@ -178,12 +176,12 @@ my (
 # gets removed in the final evaluation
 my $magic_undefined = 'M_a_G_i_C_uNdEfInEd';
 
-sub debug(@) {
-       $opt{D} and print STDERR 'DEBUG: ', @_;
+sub debug(@args) {
+       $opt{D} and print STDERR 'DEBUG: ', @args;
 }
 
-sub verbose(@) {
-       -t STDERR and print STDERR @_;
+sub verbose(@args) {
+       -t STDERR and print STDERR @args;
 }
 
 sub fail($msg) {
@@ -1035,7 +1033,7 @@ sub load_pkgsrc_makefiles($fname) {
        open(STORE, '<', $fname)
            or die("Cannot read pkgsrc store from $fname: $!\n");
        my ($pkgver);
-       $pkgdb = PkgDb->new;
+       $pkgdb = PkgDb->new();
        while (defined(my $line = <STORE>)) {
                chomp($line);
                if ($line =~ qr"^package\t([^\t]+)\t([^\t]+$)$") {
@@ -1067,7 +1065,7 @@ sub scan_pkgsrc_makefiles($pkgsrcdir) {
                return;
        }
 
-       $pkgdb = new PkgDb;
+       $pkgdb = PkgDb->new();
        @categories = list_pkgsrc_categories($pkgsrcdir);
        verbose('Scan Makefiles: ');
 
@@ -1356,8 +1354,8 @@ sub check_prebuilt_packages() {
        }
 }
 
-sub debug_parse_makefiles(@) {
-       foreach my $file (@_) {
+sub debug_parse_makefiles(@args) {
+       foreach my $file (@args) {
                -d $file and $file .= '/Makefile';
                -f $file or fail("No such file: $file");