 @@ -1,15 +1,15 @@
 #!@PERL5@
-# $NetBSD: lintpkgsrc.pl,v 1.115 2022/08/17 18:36:10 rillig Exp $
+# $NetBSD: lintpkgsrc.pl,v 1.116 2022/08/17 18:45:16 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;
 @@ -441,37 +441,38 @@ sub parse_makefile_line_include($file, $
 		return;
+	}
 	$incfile = realpath($1) . $2;
 	return if $included->{$incfile};
 	$opt{L} and print "inc $incfile\n";
 	$included->{$incfile} = 1;
 	if (!open(FILE, $incfile)) {
 		verbose("Cannot open '$incfile' (from $file): $_ $!\n");
 		return;
+	}
 	# FIXME: .CURDIR doesn't change, but .PARSEDIR does.
 	my $NEWCURDIR = $incfile;
 	$NEWCURDIR =~ s#/[^/]*$##;
 	push @$incdirs, $NEWCURDIR
 	    unless grep { $_ eq $NEWCURDIR } @$incdirs;
 	unshift @$lines, ".CURDIR=" . $vars->{'.CURDIR'};
 	chomp(my @inc_lines = <FILE>);
 	unshift @$lines, @inc_lines;
 	unshift @$lines, ".CURDIR=$NEWCURDIR";
 	close(FILE);
 	my $new_curdir = dirname $incfile;
 	push @$incdirs, $new_curdir
 	    unless grep { $_ eq $new_curdir } @$incdirs;
 	# FIXME: .CURDIR doesn't change, but .PARSEDIR does.
 	unshift @$lines,
 	    ".CURDIR=$new_curdir",
 	    @inc_lines,
 	    ".CURDIR=" . $vars->{'.CURDIR'};
+}
 sub parse_makefile_line_var($varname, $op, $value, $vars) {
 	if ($op eq ':=') {
 		$vars->{$varname} = expand_exprs($value, $vars);
 	} elsif ($op eq '+=' && defined $vars->{$varname}) {
 		$vars->{$varname} .= " $value";
 	} elsif ($op eq '?=' && defined $vars->{$varname}) {
 		# Do nothing.
 	} else {
 		$vars->{$varname} = $value;
+	}
 	debug($op eq '='
 @@ -660,42 +661,44 @@ sub parse_makefile_vars($file, $cwd = un
 	if ($opt{D}) {
 		print "Before expansion:\n";
 		foreach my $varname (sort keys %vars) {
 			print "\t$varname = $vars{$varname}\n";
+		}
+	}
 	debug("$file: expand");
 	# Handle variable substitutions  FRED = a-${JIM:S/-/-b-/}
 	for (my $loop = 1; $loop != 0;) {
 		$loop = 0;
-		foreach my $key (keys %vars) {
+		foreach my $varname (keys %vars) {
-			next if index($vars{$key}, '$') == -1;
+			next if index($vars{$varname}, '$') == -1;
-			$_ = expand_exprs($vars{$key}, \%vars);
+			$_ = expand_exprs($vars{$varname}, \%vars);
-			if ($_ ne $vars{$key}) {
+			if ($_ ne $vars{$varname}) {
-				$vars{$key} = $_;
+				$vars{$varname} = $_;
 				$loop = 1;
-			} elsif ($vars{$key} =~ m#\$\{([\w.]+):([CS]([^{}])[^{}\3]+\3[^{}\3]*\3[g1]*(|:[^{}]+)|U[^{}]+)\}#) {
+			} elsif ($vars{$varname} =~ m#\$\{([\w.]+):([CS]([^{}])[^{}\3]+\3[^{}\3]*\3[g1]*(|:[^{}]+)|U[^{}]+)\}#) {
-				$loop ||= expand_modifiers($file, $key, $`, $1, $2, $', \%vars);
+				$loop ||= expand_modifiers($file, $varname, $`, $1, $2, $', \%vars);
+			}
+		}
+	}
-	foreach my $key (keys %vars) {
+	foreach my $varname (keys %vars) {
-		$vars{$key} =~ s/$magic_undefined//;
+		# XXX: Removing only the first magic string is strange; either
 		#  all of them or none of them should be removed.
 		$vars{$varname} =~ s/$magic_undefined//;
+	}
 	\%vars;
+}
 sub get_default_makefile_vars() {
 	chomp($_ = `uname -srm`);
+	(
 	    $default_vars->{OPSYS},
 	    $default_vars->{OS_VERSION},
 	    $default_vars->{MACHINE}
 	) = split;
 	$default_vars->{MACHINE}