Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1660847288232100"
MIME-Version: 1.0
Date: Thu, 18 Aug 2022 18:28:08 +0000
From: "Roland Illig" <rillig@netbsd.org>
Subject: CVS commit: pkgsrc/pkgtools/lintpkgsrc/files
To: pkgsrc-changes@NetBSD.org
Reply-To: rillig@netbsd.org
Message-Id: <20220818182808.6DFFBFB1A@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1660847288232100
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	rillig
Date:		Thu Aug 18 18:28:08 UTC 2022

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

Log Message:
lintpkgsrc: clean up style


To generate a diff of this commit:
cvs rdiff -u -r1.122 -r1.123 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.


--_----------=_1660847288232100
Content-Disposition: inline
Content-Length: 2559
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl
diff -u pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl:1.122 pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl:1.123
--- pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl:1.122	Thu Aug 18 18:26:46 2022
+++ pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl	Thu Aug 18 18:28:08 2022
@@ -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>.
 #
@@ -91,7 +91,7 @@ sub pkgvers_all($self) {
 }
 
 sub pkgver($self, $pkgversion) {
-	$self->{pkgvers}->{$pkgversion}
+	$self->{pkgvers}->{$pkgversion};
 }
 
 # PkgData is a small database of all packages in pkgsrc.
@@ -235,6 +235,7 @@ sub listdir($base, $dir = undef) {
 	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 @@ sub listdir($base, $dir = undef) {
 			push @list, "$dir$entry";
 		}
 	}
+
 	@list;
 }
 
@@ -690,6 +692,7 @@ sub parse_makefile_vars($file, $cwd = un
 		#  all of them or none of them should be removed.
 		$vars{$varname} =~ s/$magic_undefined//;
 	}
+
 	\%vars;
 }
 
@@ -793,8 +796,6 @@ sub list_installed_packages() {
 	map { $_ = canonicalize_pkgname($_) } @pkgs;
 }
 
-# List top level pkgsrc categories
-#
 sub list_pkgsrc_categories($pkgsrcdir) {
 	my @categories;
 
@@ -806,7 +807,6 @@ sub list_pkgsrc_categories($pkgsrcdir) {
 }
 
 # 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 @@ sub parse_makefile_pkgsrc($file) {
 	($pkgname, $vars);
 }
 
-
 sub chdir_or_fail($dir) {
 	my $prev_dir = getcwd() or die;
 	debug("chdir: $dir");
@@ -1200,9 +1199,7 @@ sub check_pkgsrc_distfiles_vs_distinfo($
 	}
 
 	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 @@ sub check_prebuilt_packages() {
 		# 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);


--_----------=_1660847288232100--