 @@ -1,15 +1,15 @@
 #!@PERL5@
-# $NetBSD: lintpkgsrc.pl,v 1.103 2022/08/16 19:40:24 rillig Exp $
+# $NetBSD: lintpkgsrc.pl,v 1.104 2022/08/16 20:06:05 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}
 use v5.36;
 @@ -697,50 +697,43 @@ sub get_default_makefile_vars() {
 	$mkvars = parse_makefile_vars(
 	    "$default_vars->{PKGSRCDIR}/mk/bsd.pkg.mk",
 	    "$default_vars->{PKGSRCDIR}/mk/scripts"
 	);
 	foreach my $varname (keys %{$mkvars}) {
 		if ($varname =~ /_REQD$/ || $varname eq 'EXTRACT_SUFX') {
 			$default_vars->{$varname} = $mkvars->{$varname};
+		}
+	}
 	$default_vars->{PACKAGES} ||= $default_vars->{PKGSRCDIR} . '/packages';
+}
-# Determine if a package version is current. If not, report correct version
+# Determine if a package version is current. If not, report the correct
-# if found
+# version if found.
 sub invalid_version($pkgmatch) {
 	my ($fail, $ok);
-	my @pkgmatches = expand_braces($pkgmatch);
+	my @warnings;
-	foreach $pkgmatch (@pkgmatches) {
+	foreach $pkgmatch (expand_braces($pkgmatch)) {
 		my ($pkg, $badver) = package_globmatch($pkgmatch);
 		# If we find one match, it's good enough.
 		return () unless defined $badver;
-		if (defined $badver) {
+		my $pkgs = $pkgdb->pkgs($pkg);
-			if (my $pkgs = $pkgdb->pkgs($pkg)) {
+		push @warnings, $pkgs
-				$fail .=
+		    ? "Version mismatch: '$pkg' $badver vs "
-				    "Version mismatch: '$pkg' $badver vs "
+		    . join(',', $pkgs->versions)
-					. join(',', $pkgs->versions) . "\n";
+		    : "Unknown package: '$pkg' version $badver";
 			} else {
 				$fail .= "Unknown package: '$pkg' version $badver\n";
 		} else {
 			# If we find one match, don't bitch about others
 			$ok = 1;
+	}
-	$ok ? undef : $fail;
+	@warnings;
+}
 sub list_installed_packages() {
 	open(PKG_INFO, "$conf_pkg_info -e '*' |")
 	    or fail("Unable to run $conf_pkg_info: $!");
 	chomp(my @pkgs = <PKG_INFO>);
 	close(PKG_INFO);
 	map { $_ = canonicalize_pkgname($_) } @pkgs;
+}
 # List top level pkgsrc categories
+#
 sub list_pkgsrc_categories($pkgsrcdir) {
 @@ -1064,34 +1057,33 @@ sub scan_pkgsrc_makefiles($pkgsrcdir) {
 # Cross reference all depends
+#
 sub pkgsrc_check_depends() {
 	foreach my $pkgver ($pkgdb->pkgvers_all) {
 		my $depends = $pkgver->var('DEPENDS');
 		next unless defined $depends;
 		my $seen_header = 0;
 		foreach my $depend (split(' ', $depends)) {
 			next unless $depend =~ s/:.*//;
 			$depend = canonicalize_pkgname($depend);
-			if ((my $msg = invalid_version($depend))) {
+			next unless my @msgs = invalid_version($depend);
 				if ($seen_header == 0) {
-					print $pkgver->pkgname . " DEPENDS errors:\n";
+			if ($seen_header == 0) {
-					$seen_header = 1;
+				print $pkgver->pkgname . " DEPENDS errors:\n";
 				$seen_header = 1;
 				$msg =~ s/(\n)(.)/$1\t$2/g;
 				print "\t$msg";
+			}
 			print map { "\t$_\n" } @msgs;
+		}
+	}
+}
 sub load_distinfo($dir) {
 	my $fname = "$dir/distinfo";
 	open(my $f, '<', $fname) or return;
 	chomp(my @lines = <$f>);
 	close($f) or die;
 	my @entries;
 	foreach my $line (@lines) {
 		next if $line eq '' || $line =~ m#^\$NetBSD#;
 @@ -1535,29 +1527,29 @@ sub generate_map_file($pkgsrcdir, $fname
 		    $pkgver->pkgversion;
+	}
 	close(TABLE) or fail("close('$tmpfile'): $!");
 	rename($tmpfile, $fname)
 	    or fail("rename('$tmpfile', '$fname'): $!");
+}
 sub check_outdated_installed_packages($pkgsrcdir) {
 	my @pkgs = list_installed_packages();
 	scan_pkgsrc_makefiles($pkgsrcdir);
 	my @update;
 	foreach my $pkgname (sort @pkgs) {
-		next unless $_ = invalid_version($pkgname);
+		next unless my @warnings = invalid_version($pkgname);
-		print $_;
+		print map { "$_\n" } @warnings;
 		next unless $pkgname =~ /^([^*?[]+)-([\d*?[].*)/;
 		foreach my $pkgver ($pkgdb->pkgvers_by_pkgbase($1)) {
 			next if $pkgver->var('dir') =~ /-current/;
 			push @update, $pkgver;
 			last;
+		}
+	}
 	return unless $opt{u};
 	print "\nREQUIRED details for packages that could be updated:\n";