 @@ -1,15 +1,15 @@
 #!@PERL5@
-# $NetBSD: lintpkgsrc.pl,v 1.89 2022/08/14 03:06:41 rillig Exp $
+# $NetBSD: lintpkgsrc.pl,v 1.90 2022/08/14 03:12:02 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;
 @@ -297,56 +297,55 @@ sub eval_mk_cond_func($func, $arg, $vars
 	} elsif ($func eq 'exists') {
 		my $fname = expand_exprs($arg, $vars);
 		-e $fname ? 1 : 0;
 	} elsif ($func eq 'make') {
 ;
 	} else { # $func eq 'target'
 ;
+	}
+}
 sub eval_mk_cond($line, $vars) {
-	my $test = expand_exprs($line, $vars);
+	my $cond = expand_exprs($line, $vars);
 	# XXX This is _so_ wrong - need to parse this correctly
-	$test =~ s/""/\r/g;
+	$cond =~ s/""/\r/g;
-	$test =~ s/"//g;
+	$cond =~ s/"//g;
-	$test =~ s/\r/""/g;
+	$cond =~ s/\r/""/g;
-	debug("conditional: $test");
+	debug("conditional: $cond");
-	while ($test =~ /(target|empty|make|defined|exists)\s*\(([^()]+)\)/) {
+	while ($cond =~ /(target|empty|make|defined|exists)\s*\(([^()]+)\)/) {
 		my ($func, $arg) = ($1, $2);
 		my $result = eval_mk_cond_func($func, $arg, $vars);
-		$test =~ s/$func\s*\([^()]+\)/$result/;
+		$cond =~ s/$func\s*\([^()]+\)/$result/;
-		debug("conditional: update to $test");
+		debug("conditional: update to $cond");
+	}
-	while ($test =~ /([^\s()\|\&]+) \s+ (!=|==) \s+ ([^\s()]+)/x) {
+	while ($cond =~ /([^\s()\|\&]+) \s+ (!=|==) \s+ ([^\s()]+)/x) {
 		my $result = 0 + (($2 eq '==') ? ($1 eq $3) : ($1 ne $3));
-		$test =~ s/[^\s()\|\&]+ \s+ (!=|==) \s+ [^\s()]+/$result/x;
+		$cond =~ s/[^\s()\|\&]+ \s+ (!=|==) \s+ [^\s()]+/$result/x;
+	}
-	if ($test =~ /^[ <> \d () \s & | . ! ]+$/xx) {
+	if ($cond =~ /^[ <> \d () \s & | . ! ]+$/xx) {
-		debug("eval test $test");
+		my $result = eval "($cond) ? 1 : 0";
-		my $result = eval "($test) ? 1 : 0";
+		defined $result or fail("Eval '$cond' failed in '$line': $@");
 		defined $result or fail("Eval '$test' failed in '$line': $@");
 		debug("conditional: evaluated to " . ($result ? 'true' : 'false'));
 		$result;
 	} else {
-		debug("conditional: defaulting '$test' to true");
+		debug("conditional: defaulting '$cond' to true");
 ;
+	}
+}
 sub parse_makefile_line_include($file, $incfile,
 				$incdirs, $included, $lines, $vars) {
 	# At this point just skip any includes which we were
 	# not able to fully expand.
 	if ($incfile =~ m#/mk/bsd#
 	    || $incfile =~ /$magic_undefined/
 	    || $incfile =~ /\$\{/
 	    || (!$opt{d} && $incfile =~ m#/(buildlink[^/]*\.mk)#)) {
 @@ -1136,110 +1135,110 @@ sub load_distinfo($pkgsrcdir, $cat, $pkg
 				. "in $cat/$pkgdir "
 				. "and $distfiles->{$distfile}{path}\n";
+		}
+	}
 	close(DISTINFO) or die;
+}
 # Extract all distinfo entries, then verify contents of distfiles
+#
 sub scan_pkgsrc_distfiles_vs_distinfo($pkgsrcdir, $pkgdistdir, $check_unref,
 				      $check_distinfo) {
 	my (@categories);
 	my (%distfiles, %sumfiles, @distwarn, $numpkg);
-	my (%bad_distfiles);
+	my (%unref_distfiles);
 	@categories = list_pkgsrc_categories($pkgsrcdir);
 	verbose('Scan distinfo: ' . '_' x @categories . "\b" x @categories);
 	$numpkg = 0;
 	foreach my $cat (sort @categories) {
 		foreach my $pkgdir (list_pkgsrc_pkgdirs($pkgsrcdir, $cat)) {
 			++$numpkg;
 			load_distinfo($pkgsrcdir, $cat, $pkgdir,
 			    \%distfiles, \@distwarn);
+		}
 		verbose('.');
+	}
 	verbose(" ($numpkg packages)\n");
 	# check each file in $pkgdistdir
 	find({ wanted => sub {
 		my ($dist);
 		if (-f $File::Find::name) {
 			my $distn = $File::Find::name;
 			$distn =~ s/$pkgdistdir\/?//g;
 			#pkg/47516 ignore cvs dirs
 			return if $distn =~ m/^\.cvsignore/;
 			return if $distn =~ m/^CVS\//;
 			if (!defined($dist = $distfiles{$distn})) {
-				$bad_distfiles{$distn} = 1;
+				$unref_distfiles{$distn} = 1;
 			} elsif ($dist->{sum} ne 'IGNORE') {
 				push @{$sumfiles{ $dist->{sumtype} }}, $distn;
+			}
+		}
 	} },
 	    ($pkgdistdir));
-	if ($check_unref && %bad_distfiles) {
+	if ($check_unref && %unref_distfiles) {
-		verbose(scalar(keys %bad_distfiles),
+		verbose(scalar(keys %unref_distfiles),
 		    " unreferenced file(s) in '$pkgdistdir':\n");
-		print join("\n", sort keys %bad_distfiles), "\n";
+		print join("\n", sort keys %unref_distfiles), "\n";
+	}
 	if ($check_distinfo) {
 		if (@distwarn) {
 			verbose(@distwarn);
+		}
 		verbose("checksum mismatches\n");
 		chdir_or_fail($pkgdistdir);
 		foreach my $sum (keys %sumfiles) {
 			if ($sum eq 'Size') {
 				foreach my $file (@{$sumfiles{$sum}}) {
 					if (!-f $file || -S $file != $distfiles{$file}{sum}) {
 						print $file, " (Size)\n";
-						$bad_distfiles{$file} = 1;
+						$unref_distfiles{$file} = 1;
+					}
+				}
 				next;
+			}
 			my $pid = open3(my $in, my $out, undef, 'xargs', 'digest', $sum);
 			defined $pid || fail 'fork';
 			my $pid2 = fork();
 			defined $pid2 || fail 'fork';
 			if ($pid2) {
 				close($in);
 			} else {
 				print $in "@{$sumfiles{$sum}}";
 				exit 0;
+			}
 			while (<$out>) {
 				if (m/^$sum ?\(([^\)]+)\) = (\S+)/) {
 					if ($distfiles{$1}{sum} ne $2) {
 						print $1, " ($sum)\n";
-						$bad_distfiles{$1} = 1;
+						$unref_distfiles{$1} = 1;
+					}
+				}
+			}
 			close($out);
 			waitpid($pid, 0) || fail "xargs digest $sum";
 			waitpid($pid2, 0) || fail 'pipe write to xargs';
+		}
 		chdir_or_fail('/'); # Do not want to stay in $pkgdistdir
+	}
-	sort keys %bad_distfiles;
+	sort keys %unref_distfiles;
+}
 sub store_pkgdb_in_cache($db, $fname) {
 	open(STORE, '>', $fname)
 	    or die("Cannot save package data to $fname: $!\n");
 	foreach my $pkgver ($db->pkgvers_all) {
 		my $pkgbase = $pkgver->pkgbase;
 		my $pkgversion = $pkgver->pkgversion;
 		$pkgbase =~ /^\S+$/
 		    or die "cannot store package name '$pkgbase'\n";
 		$pkgversion =~ /^\S+$/
 		    or die "cannot store package version '$pkgversion'\n";
 @@ -1360,32 +1359,32 @@ sub debug_parse_makefiles(@args) {
 		print "$file -> $pkgname\n";
 		foreach my $varname (sort keys %$vars) {
 			print "\t$varname = $vars->{$varname}\n";
+		}
 		#if ($opt{d}) {
 		#	pkgsrc_check_depends();
 		#}
+	}
+}
 sub check_distfiles($pkgsrcdir, $pkgdistdir) {
-	my @baddist = scan_pkgsrc_distfiles_vs_distinfo(
+	my @unref_distfiles = scan_pkgsrc_distfiles_vs_distinfo(
 	    $pkgsrcdir, $pkgdistdir, $opt{o}, $opt{m});
 	return unless $opt{r};
-	verbose("Unlinking 'bad' distfiles\n");
+	verbose("Unlinking unreferenced distfiles\n");
-	foreach my $distfile (@baddist) {
+	foreach my $distfile (@unref_distfiles) {
 		unlink("$pkgdistdir/$distfile");
+	}
+}
 sub remove_distfiles($pkgsrcdir, $pkgdistdir) {
 	my @pkgs = list_installed_packages();
 	scan_pkgsrc_makefiles($pkgsrcdir);
 	# list the installed packages and the directory they live in
 	my @installed;
 	foreach my $pkgname (sort @pkgs) {
 		if ($pkgname =~ /^([^*?[]+)-([\d*?[].*)/) {
 			foreach my $pkgver ($pkgdb->pkgvers_by_pkgbase($1)) {