Fri Jul 29 19:00:36 2022 UTC ()

lintpkgsrc: enable Perl warnings

No functional change.


(rillig)

diff -r1.22 -r1.23 pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl

--- pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl 2022/04/27 22:24:16 1.22
+++ pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl 2022/07/29 19:00:36 1.23

 @@ -1,53 +1,59 @@
 #!@PERL5@
-# $NetBSD: lintpkgsrc.pl,v 1.22 2022/04/27 22:24:16 rillig Exp $
+# $NetBSD: lintpkgsrc.pl,v 1.23 2022/07/29 19:00:36 rillig Exp $
 # Written by David Brownlee <abs@netbsd.org>.
+#
 # Caveats:
 #	The 'Makefile parsing' algorithm used to obtain package versions and
 #	DEPENDS information is geared towards speed rather than perfection,
 #	though it has gotten somewhat better over time, it only parses the
 #	simpler Makefile conditionals.
+#
 # TODO: Handle fun DEPENDS like avifile-devel with
 #			{qt2-designer>=2.2.4,qt2-designer-kde>=2.3.1nb1}
 $^W = 1;
 use locale;
 use strict;
 use warnings;
 use Getopt::Std;
 use File::Find;
 use File::Basename;
 use IPC::Open3;
 use Cwd 'realpath', 'getcwd';
 # Buildtime configuration
 my $conf_make       = '@MAKE@';
 my $conf_pkgsrcdir  = '@PKGSRCDIR@';
 my $conf_prefix     = '@PREFIX@';
 my $conf_sysconfdir = '@PKG_SYSCONFDIR@';
 my (
     $pkglist,                     # list of Pkg packages
     $pkg_installver,              # installed version of pkg_install pseudo-pkg
     $default_vars,                # Set for Makefiles, inc PACKAGES & PKGSRCDIR
     %opt,                         # Command line options
     @matched_prebuiltpackages,    # List of obsolete prebuilt package paths
     @prebuilt_pkgdirs,            # Use to follow symlinks in prebuilt pkgdirs
     %prebuilt_pkgdir_cache,       # To avoid symlink loops in prebuilt_pkgdirs
 );
 sub usage_and_exit();
 sub listdir($$);
 sub get_default_makefile_vars();
 sub fail($);
 sub parse_makefile_pkgsrc($);
 $ENV{PATH} .=
   ":/bin:/usr/bin:/sbin:/usr/sbin:${conf_prefix}/sbin:${conf_prefix}/bin";
 if (
        !getopts( 'BDE:I:K:LM:OP:RSVdg:himopruyz', \%opt )
     || $opt{h}
     || !(
            defined $opt{d}
         || defined $opt{g}
         || defined $opt{i}
         || defined $opt{m}
         || defined $opt{o}
         || defined $opt{p}
 @@ -161,27 +167,27 @@ sub main() {
 			$dn =~ s/^(\.\/)*//;
 			if (!defined $distfiles{$dn})
+			    {
 			    $distfiles{$dn}{name} = $dn;
 			    push (@pkgdistfiles, $dn);
+			    }
+			}
+		    }
 		close(DISTINFO);
+		}
+	    }
 	# distfiles downloaded on the current system
-	@tmpdistfiles = listdir("$pkgdistdir");
+	@tmpdistfiles = listdir("$pkgdistdir", undef);
 	foreach my $tmppkg (@tmpdistfiles)
+	    {
 	    if ($tmppkg ne "pkg-vulnerabilities")
 	       { push (@dldistfiles, $tmppkg); }
+	    }
 	# sort the two arrays to make searching a bit faster
 	@dldistfiles = sort { $a cmp $b } @dldistfiles;
 	@pkgdistfiles = sort { $a cmp $b } @pkgdistfiles;
 	if ($opt{y})
+	    {
 	    # looking for files that are downloaded on the current system
 @@ -551,29 +557,29 @@ sub deweycmp_extract($$) {
+    }
     while ( !$cmp && ( $i++ <= $len ) ) {
         if ( !@matchlist ) {
             push( @matchlist, 0 );
+        }
         if ( !@vallist ) {
             push( @vallist, 0 );
+        }
         $cmp = ( shift @matchlist <=> shift @vallist );
+    }
     $cmp;
+}
-sub fail(@) {
+sub fail($) {
-    print STDERR @_, "\n";
+    print STDERR shift(), "\n";
     exit(3);
+}
 sub get_default_makefile_vars() {
     chomp( $pkg_installver = `pkg_info -V 2>/dev/null || echo 20010302` );
     chomp( $_ = `uname -srm` );
+    (
         $default_vars->{OPSYS},
         $default_vars->{OS_VERSION},
         $default_vars->{MACHINE}
     ) = (split);