 @@ -1,16 +1,16 @@
 #!@PERL5@
-# $NetBSD: lintpkgsrc.pl,v 1.61 2022/08/09 19:31:57 rillig Exp $
+# $NetBSD: lintpkgsrc.pl,v 1.62 2022/08/09 19:42:46 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 locale;
 @@ -429,106 +429,106 @@ sub parse_makefile_line_include($$$$$$)
 	# 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)#)) {
 		debug("$file: .include \"$incfile\" skipped\n");
 		return;
+	}
 	debug("$file: .include \"$incfile\"\n");
 	if (substr($incfile, 0, 1) ne '/') {
-		foreach my $dir (keys %$incdirs) {
+		foreach my $dir (reverse @$incdirs) {
 			if (-f "$dir/$incfile") {
 				$incfile = "$dir/$incfile";
 				last;
+			}
+		}
+	}
 	# perl 5.6.1 realpath() cannot handle files, only directories.
 	# If the last component is a symlink, this will give a false
 	# negative, but that is not a problem, as the duplicate check
 	# is for performance.
 	$incfile =~ m#^(.+)(/[^/]+)$#;
 	if (!-f $incfile) {
 		$opt{L} or verbose("\n");
-		my $dirs = join(' ', sort keys %$incdirs);
+		my $dirs = join(' ', @$incdirs);
 		verbose("$file: Cannot locate $incfile in $dirs\n");
 		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;
+	}
 	my $NEWCURDIR = $incfile;
 	$NEWCURDIR =~ s#/[^/]*$##;
-	$incdirs->{$NEWCURDIR} = 1;
+	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);
+}
 # Extract variable assignments from Makefile
 # Much unpalatable magic to avoid having to use make (all for speed)
+#
 sub parse_makefile_vars($$) {
 	my ($file, $cwd) = @_;
 	my (
-	    %vars, $plus, $value,
+	my %vars;
-	    %incfiles, # Cache of previously included fils
+	my %incfiles; # Cache of previously included files
-	    %incdirs,  # Directories in which to check for includes
+	my @incdirs;  # Directories in which to check for includes
-	    @if_false
+	my @if_false; # 0:true 1:false 2:nested-false&nomore-elsif
 	); # 0:true 1:false 2:nested-false&nomore-elsif
 	my @lines;
 	open(FILE, $file) or return undef;
 	chomp(@lines = <FILE>);
 	close(FILE);
-	$incdirs{'.'} = 1;
+	push(@incdirs, '.');
-	$incdirs{dirname($file)} = 1;
+	push(@incdirs, dirname($file));
 	# Some Makefiles depend on these being set
 	if ($file eq '/etc/mk.conf') {
 		$vars{LINTPKGSRC} = 'YES';
 	} else {
 		%vars = %{$default_vars};
+	}
 	$vars{BSD_PKG_MK} = 'YES';
 	if ($cwd) {
 		$vars{'.CURDIR'} = $cwd;
 	} elsif ($file =~ m#(.*)/#) {
 		$vars{'.CURDIR'} = $1;
 	} else {
 		$vars{'.CURDIR'} = getcwd;
+	}
-	$incdirs{$vars{'.CURDIR'}} = 1;
+	push(@incdirs, $vars{'.CURDIR'});
 	if ($opt{L}) {
 		print "$file\n";
+	}
 	while (defined($_ = shift(@lines))) {
 		s/\s*[^\\]#.*//;
 		# Continuation lines
+		#
 		while (substr($_, -1) eq "\\" && @lines > 0) {
 			substr($_, -2) = shift @lines;
+		}
 @@ -575,36 +575,32 @@ sub parse_makefile_vars($$) {
 		if (m#^\.\s*endif\b#) {
 			pop(@if_false);
 			debug("$file: .endif (! @if_false)\n");
 			next;
+		}
 		$if_false[$#if_false] && next;
 		if (m#^\.\s*include\s+"([^"]+)"#) {
 			my $incfile = parse_expand_vars($1, \%vars);
 			parse_makefile_line_include($file, $incfile,
-			    \%incdirs, \%incfiles, \@lines, \%vars);
+			    \@incdirs, \%incfiles, \@lines, \%vars);
 			next;
+		}
 		if (/^ *([-\w\.]+)\s*([:+?]?)=\s*(.*)/) {
-			my ($key);
+			my ($key, $plus, $value) = ($1, $2, $3);
 			$key = $1;
 			$plus = $2;
 			$value = $3;
 			if ($plus eq ':') {
 				$vars{$key} = parse_expand_vars($value, \%vars);
 			} elsif ($plus eq '+' && defined $vars{$key}) {
 				$vars{$key} .= " $value";
 			} elsif ($plus ne '?' || !defined $vars{$key}) {
 				$vars{$key} = $value;
+			}
 			debug("assignment: $key$plus=[$value] ($vars{$key})\n");
 			# Give python a little hand (XXX - do we wanna consider actually
 			# implementing make .for loops, etc?
+			#