[pkgsrc/trunk]: pkgsrc/pkgtools/lintpkgsrc/files lintpkgsrc: clean up style

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d0b57e711956
branches:  trunk
changeset: 383391:d0b57e711956
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Thu Aug 18 18:28:08 2022 +0000

description:
lintpkgsrc: clean up style

diffstat:

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

diffs (88 lines):

diff -r 1444e8510c81 -r d0b57e711956 pkgtools/lintpkgsrc/files/lintpkgsrc.pl
--- a/pkgtools/lintpkgsrc/files/lintpkgsrc.pl   Thu Aug 18 18:26:57 2022 +0000
+++ b/pkgtools/lintpkgsrc/files/lintpkgsrc.pl   Thu Aug 18 18:28:08 2022 +0000
@@ -1,5 +1,5 @@
 #!@PERL5@
-# $NetBSD: lintpkgsrc.pl,v 1.122 2022/08/18 18:26:46 rillig Exp $
+# $NetBSD: lintpkgsrc.pl,v 1.123 2022/08/18 18:28:08 rillig Exp $
 
 # Written by David Brownlee <abs%netbsd.org@localhost>.
 #
@@ -91,7 +91,7 @@
 }
 
 sub pkgver($self, $pkgversion) {
-       $self->{pkgvers}->{$pkgversion}
+       $self->{pkgvers}->{$pkgversion};
 }
 
 # PkgData is a small database of all packages in pkgsrc.
@@ -235,6 +235,7 @@
        opendir(DIR, $thisdir) or fail("Unable to opendir($thisdir): $!");
        @thislist = grep { substr($_, 0, 1) ne '.' && $_ ne 'CVS' } readdir(DIR);
        closedir(DIR);
+
        foreach my $entry (@thislist) {
                if (-d "$thisdir/$entry") {
                        push @list, listdir($base, "$dir$entry");
@@ -242,6 +243,7 @@
                        push @list, "$dir$entry";
                }
        }
+
        @list;
 }
 
@@ -690,6 +692,7 @@
                #  all of them or none of them should be removed.
                $vars{$varname} =~ s/$magic_undefined//;
        }
+
        \%vars;
 }
 
@@ -793,8 +796,6 @@
        map { $_ = canonicalize_pkgname($_) } @pkgs;
 }
 
-# List top level pkgsrc categories
-#
 sub list_pkgsrc_categories($pkgsrcdir) {
        my @categories;
 
@@ -806,7 +807,6 @@
 }
 
 # For a given category, list potentially valid pkgdirs
-#
 sub list_pkgsrc_pkgdirs($pkgsrcdir, $cat) {
        opendir(CAT, "$pkgsrcdir/$cat")
            or die("Unable to opendir($pkgsrcdir/$cat): $!");
@@ -1036,7 +1036,6 @@
        ($pkgname, $vars);
 }
 
-
 sub chdir_or_fail($dir) {
        my $prev_dir = getcwd() or die;
        debug("chdir: $dir");
@@ -1200,9 +1199,7 @@
        }
 
        if ($check_distinfo) {
-               if (@distwarn) {
-                       verbose(@distwarn);
-               }
+               verbose(@distwarn) if @distwarn;
 
                verbose("checksum mismatches\n");
                my $prev_dir = chdir_or_fail($pkgdistdir);
@@ -1287,7 +1284,7 @@
                # Skip these subdirs if present
                $File::Find::prune = 1;
 
-       } elsif (/(.+)-(\d.*)\.t[bg]z$/) {
+       } elsif (/^ (.+) - (\d.*) \.t[bg]z $/x) {
                my ($pkg, $ver) = ($1, $2);
 
                $pkg = canonicalize_pkgname($pkg);