diff options
| author | rillig <rillig@pkgsrc.org> | 2022-08-10 20:16:55 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2022-08-10 20:16:55 +0000 |
| commit | 077b50575c8a331dd132fb5111860fae21851106 (patch) | |
| tree | 0bd8612223023835690bd28d24425c6442154720 | |
| parent | 8c0ecee742a0a43420e622834d4afb7a859ffc54 (diff) | |
| download | pkgsrc-077b50575c8a331dd132fb5111860fae21851106.tar.gz | |
lintpkgsrc: update to Perl 5.36
Bump version.
| -rw-r--r-- | pkgtools/lintpkgsrc/Makefile | 5 | ||||
| -rwxr-xr-x | pkgtools/lintpkgsrc/files/lintpkgsrc.pl | 22 |
2 files changed, 13 insertions, 14 deletions
diff --git a/pkgtools/lintpkgsrc/Makefile b/pkgtools/lintpkgsrc/Makefile index 75855c514f4..26ed77d9671 100644 --- a/pkgtools/lintpkgsrc/Makefile +++ b/pkgtools/lintpkgsrc/Makefile @@ -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 @@ -12,6 +12,7 @@ TEST_DEPENDS+= p5-File-Slurp>=0:../../devel/p5-File-Slurp TEST_DEPENDS+= p5-IO-Null>=0:../../devel/p5-IO-Null USE_TOOLS+= perl:run +PERL5_REQD+= 5.36 WRKSRC= ${WRKDIR} USE_LANGUAGES= # none diff --git a/pkgtools/lintpkgsrc/files/lintpkgsrc.pl b/pkgtools/lintpkgsrc/files/lintpkgsrc.pl index b2e68306943..704d90600cf 100755 --- a/pkgtools/lintpkgsrc/files/lintpkgsrc.pl +++ b/pkgtools/lintpkgsrc/files/lintpkgsrc.pl @@ -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>. # @@ -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"); |