 @@ -1,16 +1,16 @@
 #!@PERL5@
-# $NetBSD: lintpkgsrc.pl,v 1.41 2022/07/30 17:30:47 rillig Exp $
+# $NetBSD: lintpkgsrc.pl,v 1.42 2022/07/30 18:20:23 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;
 @@ -1467,316 +1467,344 @@ sub check_prebuilt_packages() {
 		if (-l $_) {
 			my ($dest) = readlink($_);
 			if (substr($dest, 0, 1) ne '/') {
 				$dest = "$File::Find::dir/$dest";
+			}
 			if (!$prebuilt_pkgdir_cache{$dest}) {
 				push(@prebuilt_pkgdirs, $dest);
+			}
+		}
+	}
+}
-sub main() {
+sub debug_parse_makefiles(@) {
-	$ENV{PATH} .=
+	foreach my $file (@_) {
-	    ":/bin:/usr/bin:/sbin:/usr/sbin:$conf_prefix/sbin:$conf_prefix/bin";
+		-d $file and $file .= "/Makefile";
 		-f $file or fail("No such file: $file");
-	if (
+		my ($pkgname, $vars) = parse_makefile_pkgsrc($file);
-	    !getopts('BDE:I:K:LM:OP:RSVdg:himopruyz', \%opt)
+		$pkgname ||= 'uNDEFINEd';
 		|| $opt{h}
-		|| !grep(/[BDEORSdgimopruyz]/, keys %opt)) {
+		print "$file -> $pkgname\n";
-		usage_and_exit();
+		foreach my $varname (sort keys %$vars) {
 			print "\t$varname = $vars->{$varname}\n";
+		}
 		#if ($opt{d}) {
 		#	pkgsrc_check_depends();
 		#}
+	}
 	$| = 1;
-	get_default_makefile_vars(); # $default_vars
+sub check_distfiles($$) {
 	my ($pkgsrcdir, $pkgdistdir) = @_;
-	if ($opt{D} && @ARGV) {
+	my @baddist = scan_pkgsrc_distfiles_vs_distinfo(
-		foreach my $file (@ARGV) {
+	    $pkgsrcdir, $pkgdistdir, $opt{o}, $opt{m});
 			if (-d $file) {
-				$file .= "/Makefile";
+	return unless $opt{r};
 	verbose("Unlinking 'bad' distfiles\n");
-			if (!-f $file) {
+	foreach my $distfile (@baddist) {
-				fail("No such file: $file");
+		unlink("$pkgdistdir/$distfile");
 			my ($pkgname, $vars) = parse_makefile_pkgsrc($file);
 			$pkgname ||= 'uNDEFINEd';
 			print "$file -> $pkgname\n";
 			foreach my $varname (sort keys %{$vars}) {
 				print "\t$varname = $vars->{$varname}\n";
 			#if ($opt{d}) {
 			#	pkgsrc_check_depends();
 			#}
 		exit;
+	}
+}
-	my $pkgsrcdir = $default_vars->{PKGSRCDIR};
+sub remove_distfiles($$) {
-	my $pkgdistdir = $default_vars->{DISTDIR};
+	my ($pkgsrcdir, $pkgdistdir) = @_;
-	if ($opt{r} && !$opt{o} && !$opt{m} && !$opt{p}) {
+	my @pkgs = list_installed_packages();
-		$opt{o} = $opt{m} = $opt{p} = 1;
+	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 ($pkglist->pkgver($1)) {
 				next if $pkgver->var('dir') =~ /-current/;
 				push(@installed, $pkgver);
 				last;
+			}
+		}
+	}
 	if ($opt{o} || $opt{m}) {
 		my (@baddist);
-		@baddist = scan_pkgsrc_distfiles_vs_distinfo(
+	# distfiles belonging to the currently installed packages
-		    $pkgsrcdir, $pkgdistdir, $opt{o}, $opt{m});
+	my (%distfiles, @pkgdistfiles);
-		if ($opt{r}) {
+	foreach my $pkgver (sort @installed) {
-			verbose("Unlinking 'bad' distfiles\n");
+		my $pkgpath = $pkgver->var('dir');
-			foreach my $distfile (@baddist) {
+		next unless open(DISTINFO, "$pkgsrcdir/$pkgpath/distinfo");
-				unlink("$pkgdistdir/$distfile");
+		while (<DISTINFO>) {
 			next unless m/^(\w+) ?\(([^\)]+)\) = (\S+)/;
 			my $dn = $2;
 			next if $dn =~ /^patch-[\w.+\-]+$/;
 			# Strip leading ./ which sometimes gets added
 			# because of DISTSUBDIR=.
 			$dn =~ s/^(\.\/)*//;
 			if (!defined $distfiles{$dn}) {
 				$distfiles{$dn}{name} = $dn;
 				push(@pkgdistfiles, $dn);
+			}
+		}
 		close(DISTINFO);
+	}
-	# Remove all distfiles that are / are not part of an installed package
+	# distfiles downloaded on the current system
-	if ($opt{y} || $opt{z}) {
+	my @tmpdistfiles = listdir("$pkgdistdir", undef);
-		my (@pkgs, @installed, %distfiles, @pkgdistfiles, @dldistfiles);
+	my @dldistfiles = grep { $_ ne "pkg-vulnerabilities" } @tmpdistfiles;
 		my (@tmpdistfiles, @orphan, $found, @parent);
-		@pkgs = list_installed_packages();
+	# sort the two arrays to make searching a bit faster
-		scan_pkgsrc_makefiles($pkgsrcdir);
+	@dldistfiles = sort { $a cmp $b } @dldistfiles;
 	@pkgdistfiles = sort { $a cmp $b } @pkgdistfiles;
-		# list the installed packages and the directory they live in
+	if ($opt{y}) {
-		foreach my $pkgname (sort @pkgs) {
+		# looking for files that are downloaded on the current system
-			if ($pkgname =~ /^([^*?[]+)-([\d*?[].*)/) {
+		# but do not belong to any currently installed package i.e. orphaned
-				foreach my $pkgver ($pkglist->pkgver($1)) {
+		my $found = 0;
-					$pkgver->var('dir') =~ /-current/ && next;
+		my @orphan;
-					push(@installed, $pkgver);
+		foreach my $dldf (@dldistfiles) {
-					last;
+			foreach my $pkgdf (@pkgdistfiles) {
 				if ($dldf eq $pkgdf) {
 					$found = 1;
+				}
+			}
 			if ($found != 1) {
 				push(@orphan, $dldf);
-		# distfiles belonging to the currently installed packages
+				print "Orphaned file: $dldf\n";
 		foreach my $pkgver (sort @installed) {
 			if (open(DISTINFO, "$pkgsrcdir/" . $pkgver->var('dir') . "/distinfo")) {
 				while (<DISTINFO>) {
 					if (m/^(\w+) ?\(([^\)]+)\) = (\S+)/) {
 						my ($dn);
 						if ($2 =~ /^patch-[\w.+\-]+$/) { next; }
 						$dn = $2;
 						# Strip leading ./ which sometimes gets added
 						# because of DISTSUBDIR=.
 						$dn =~ s/^(\.\/)*//;
 						if (!defined $distfiles{$dn}) {
 							$distfiles{$dn}{name} = $dn;
 							push(@pkgdistfiles, $dn);
 				close(DISTINFO);
+			}
 			$found = 0;
+		}
-		# distfiles downloaded on the current system
+		if ($opt{r}) {
-		@tmpdistfiles = listdir("$pkgdistdir", undef);
+			chdir_or_fail("$pkgdistdir");
-		foreach my $tmppkg (@tmpdistfiles) {
+			verbose("Unlinking 'orphaned' distfiles\n");
-			if ($tmppkg ne "pkg-vulnerabilities") {
+			foreach my $distfile (@orphan) {
-				push(@dldistfiles, $tmppkg);
+				unlink($distfile)
+			}
+		}
+	}
-		# sort the two arrays to make searching a bit faster
+	if ($opt{z}) {
-		@dldistfiles = sort { $a cmp $b } @dldistfiles;
+		# looking for files that are downloaded on the current system
-		@pkgdistfiles = sort { $a cmp $b } @pkgdistfiles;
+		# but belong to a currently installed package i.e. parented
 		my $found = 0;
-		if ($opt{y}) {
+		my @parent;
-			# looking for files that are downloaded on the current system
+		foreach my $pkgdf (@pkgdistfiles) {
 			# but do not belong to any currently installed package i.e. orphaned
 			$found = 0;
 			foreach my $dldf (@dldistfiles) {
-				foreach my $pkgdf (@pkgdistfiles) {
+				if ($pkgdf eq $dldf) {
-					if ($dldf eq $pkgdf) {
+					$found = 1;
 						$found = 1;
+				}
 				if ($found != 1) {
 					push(@orphan, $dldf);
 					print "Orphaned file: $dldf\n";
 				$found = 0;
+			}
 			if ($found == 1) {
-			if ($opt{r}) {
+				push(@parent, $pkgdf);
-				chdir_or_fail("$pkgdistdir");
+				print "Parented file: $pkgdf\n";
 				verbose("Unlinking 'orphaned' distfiles\n");
 				foreach my $distfile (@orphan) {
 					unlink($distfile)
+			}
 		if ($opt{z}) {
 			# looking for files that are downloaded on the current system
 			# but belong to a currently installed package i.e. parented
 			$found = 0;
 			foreach my $pkgdf (@pkgdistfiles) {
 				foreach my $dldf (@dldistfiles) {
 					if ($pkgdf eq $dldf) {
 						$found = 1;
 				if ($found == 1) {
 					push(@parent, $pkgdf);
 					print "Parented file: $pkgdf\n";
 				$found = 0;
+		}
 		if ($opt{r}) {
 			chdir_or_fail("$pkgdistdir");
 			verbose("Unlinking 'parented' distfiles\n");
 			foreach my $distfile (@parent) {
 				unlink($distfile);
+			}
+		}
+	}
+}
-	# List BROKEN packages
+sub list_broken_packages($) {
-	if ($opt{B}) {
+	my ($pkgsrcdir) = @_;
 		scan_pkgsrc_makefiles($pkgsrcdir);
-		foreach my $pkgver ($pkglist->pkgver) {
+	scan_pkgsrc_makefiles($pkgsrcdir);
-			$pkgver->var('BROKEN') || next;
+	foreach my $pkgver ($pkglist->pkgver) {
-			print $pkgver->pkgname . ': ' . $pkgver->var('BROKEN') . "\n";
+		my $broken = $pkgver->var('BROKEN');
 		next unless $broken;
 		print $pkgver->pkgname . ": $broken\n";
+	}
+}
-	# List obsolete or NO_BIN_ON_FTP/RESTRICTED prebuilt packages
+# List obsolete or NO_BIN_ON_FTP/RESTRICTED prebuilt packages
+#
-	if ($opt{p} || $opt{O} || $opt{R}) {
+sub list_prebuilt_packages($) {
-		scan_pkgsrc_makefiles($pkgsrcdir);
+	my ($pkgsrcdir) = @_;
-		@prebuilt_pkgdirs = ($default_vars->{PACKAGES});
+	scan_pkgsrc_makefiles($pkgsrcdir);
 		%prebuilt_pkgdir_cache = ();
-		while (@prebuilt_pkgdirs) {
+	@prebuilt_pkgdirs = ($default_vars->{PACKAGES});
-			find(\&check_prebuilt_packages, shift @prebuilt_pkgdirs);
+	%prebuilt_pkgdir_cache = ();
-		if ($opt{r}) {
+	while (@prebuilt_pkgdirs) {
-			verbose("Unlinking listed prebuilt packages\n");
+		find(\&check_prebuilt_packages, shift @prebuilt_pkgdirs);
 			foreach my $pkgfile (@matched_prebuiltpackages) {
 				unlink($pkgfile);
 	if ($opt{r}) {
 		verbose("Unlinking listed prebuilt packages\n");
 		foreach my $pkgfile (@matched_prebuiltpackages) {
 			unlink($pkgfile);
+		}
+	}
+}
-	if ($opt{S}) {
+sub list_packages_not_in_SUBDIR($) {
-		my (%in_subdir);
+	my ($pkgsrcdir) = @_;
-		foreach my $cat (list_pkgsrc_categories($pkgsrcdir)) {
+	my (%in_subdir);
-			my $vars = parse_makefile_vars("$pkgsrcdir/$cat/Makefile", undef);
+	foreach my $cat (list_pkgsrc_categories($pkgsrcdir)) {
 		my $vars = parse_makefile_vars("$pkgsrcdir/$cat/Makefile", undef);
-			if (!$vars->{SUBDIR}) {
+		if (!$vars->{SUBDIR}) {
-				print "Warning - no SUBDIR for $cat\n";
+			print "Warning - no SUBDIR for $cat\n";
-				next;
+			next;
 			foreach my $pkgdir (split(/\s+/, $vars->{SUBDIR})) {
 				$in_subdir{"$cat/$pkgdir"} = 1;
+		}
 		foreach my $pkgdir (split(/\s+/, $vars->{SUBDIR})) {
 			$in_subdir{"$cat/$pkgdir"} = 1;
+		}
+	}
-		scan_pkgsrc_makefiles($pkgsrcdir);
+	scan_pkgsrc_makefiles($pkgsrcdir);
-		foreach my $pkgver ($pkglist->pkgver) {
+	foreach my $pkgver ($pkglist->pkgver) {
-			if (!defined $in_subdir{ $pkgver->var('dir') }) {
+		my $pkgpath = $pkgver->var('dir');
-				print $pkgver->var('dir') . ": Not in SUBDIR\n";
+		if (!defined $in_subdir{$pkgpath}) {
 			print "$pkgpath: Not in SUBDIR\n";
+		}
+	}
+}
-	if ($opt{g}) {
+sub generate_map_file($$) {
-		my $tmpfile = "$opt{g}.tmp.$$";
+	my ($pkgsrcdir, $fname) = @_;
-		scan_pkgsrc_makefiles($pkgsrcdir);
+	my $tmpfile = "$fname.tmp.$$";
 		if (!open(TABLE, ">$tmpfile")) {
-			fail("Unable to write '$tmpfile': $!");
+	scan_pkgsrc_makefiles($pkgsrcdir);
 	open(TABLE, '>', $tmpfile) or fail("Cannot write '$tmpfile': $!");
-		foreach my $pkgver ($pkglist->pkgver) {
+	foreach my $pkgver ($pkglist->pkgver) {
-			print TABLE $pkgver->pkg . "\t"
+		print TABLE $pkgver->pkg . "\t"
-			    . $pkgver->var('dir') . "\t"
+		    . $pkgver->var('dir') . "\t"
-			    . $pkgver->ver . "\n";
+		    . $pkgver->ver . "\n";
 		if (!close(TABLE)) {
 			fail("Error while writing '$tmpfile': $!");
 		if (!rename($tmpfile, $opt{g})) {
 			fail("Error in rename('$tmpfile','$opt{g}'): $!");
+	}
 	close(TABLE) or fail("close('$tmpfile'): $!");
 	rename($tmpfile, $fname)
 	    or fail("rename('$tmpfile', '$fname'): $!");
+}
-	if ($opt{d}) {
+sub check_outdated_installed_packages($) {
-		scan_pkgsrc_makefiles($pkgsrcdir);
+	my ($pkgsrcdir) = @_;
 		pkgsrc_check_depends();
 	my @pkgs = list_installed_packages();
 	scan_pkgsrc_makefiles($pkgsrcdir);
 	my @update;
 	foreach my $pkgname (sort @pkgs) {
 		next unless $_ = invalid_version($pkgname);
 		print $_;
 		next unless $pkgname =~ /^([^*?[]+)-([\d*?[].*)/;
 		foreach my $pkgver ($pkglist->pkgver($1)) {
 			next if $pkgver->var('dir') =~ /-current/;
 			push(@update, $pkgver);
 			last;
+		}
+	}
-	if ($opt{i} || $opt{u}) {
+	return unless $opt{u};
 		my (@pkgs, @update);
-		@pkgs = list_installed_packages();
+	print "\nREQUIRED details for packages that could be updated:\n";
 		scan_pkgsrc_makefiles($pkgsrcdir);
-		foreach my $pkgname (sort @pkgs) {
+	foreach my $pkgver (@update) {
-			if ($_ = invalid_version($pkgname)) {
+		print $pkgver->pkg . ':';
-				print $_;
+		if (open(PKGINFO, 'pkg_info -R ' . $pkgver->pkg . '|')) {
 			my ($list);
 				if ($pkgname =~ /^([^*?[]+)-([\d*?[].*)/) {
-					foreach my $pkgver ($pkglist->pkgver($1)) {
+			while (<PKGINFO>) {
-						$pkgver->var('dir') =~ /-current/ && next;
+				if (/Required by:/) {
-						push(@update, $pkgver);
+					$list = 1;
-						last;
+				} elsif ($list) {
 					chomp;
 					s/-\d.*//;
 					print " $_";
+				}
+			}
 			close(PKGINFO);
+		}
 		print "\n";
+	}
-		if ($opt{u}) {
+	print "\nRunning '$conf_make fetch-list | sh' for each package:\n";
-			print "\nREQUIRED details for packages that could be updated:\n";
+	foreach my $pkgver (@update) {
 		my $pkgpath = $pkgver->var('dir');
 		defined($pkgpath)
 		    or fail('Cannot determine ' . $pkgver->pkg . ' directory');
-			foreach my $pkgver (@update) {
+		print "$pkgsrcdir/$pkgpath\n";
-				print $pkgver->pkg . ':';
+		chdir_or_fail("$pkgsrcdir/$pkgpath");
-				if (open(PKGINFO, 'pkg_info -R ' . $pkgver->pkg . '|')) {
+		system("$conf_make fetch-list | sh");
 					my ($list);
+}
 					while (<PKGINFO>) {
 						if (/Required by:/) {
 							$list = 1;
 						} elsif ($list) {
 							chomp;
 							s/-\d.*//;
 							print " $_";
 					close(PKGINFO);
 				print "\n";
-			print "\nRunning '$conf_make fetch-list | sh' for each package:\n";
+sub main() {
 			foreach my $pkgver (@update) {
 				my ($pkgdir);
-				$pkgdir = $pkgver->var('dir');
+	$ENV{PATH} .=
-				if (!defined($pkgdir)) {
+	    ":/bin:/usr/bin:/sbin:/usr/sbin:$conf_prefix/sbin:$conf_prefix/bin";
 					fail('Unable to determine ' . $pkgver->pkg . ' directory');
-				print "$pkgsrcdir/$pkgdir\n";
+	if (
-				chdir_or_fail("$pkgsrcdir/$pkgdir");
+	    !getopts('BDE:I:K:LM:OP:RSVdg:himopruyz', \%opt)
-				system("$conf_make fetch-list | sh");
+		|| $opt{h}
 		|| !grep(/[BDEORSdgimopruyz]/, keys %opt)) {
 		usage_and_exit();
+	}
 	$| = 1;
 	get_default_makefile_vars(); # $default_vars
 	if ($opt{D} && @ARGV) {
 		debug_parse_makefiles(@ARGV);
 		exit;
+	}
 	my $pkgsrcdir = $default_vars->{PKGSRCDIR};
 	my $pkgdistdir = $default_vars->{DISTDIR};
 	if ($opt{r} && !$opt{o} && !$opt{m} && !$opt{p}) {
 		$opt{o} = $opt{m} = $opt{p} = 1;
+	}
 	if ($opt{o} || $opt{m}) {
 		check_distfiles($pkgsrcdir, $pkgdistdir);
+	}
 	# Remove all distfiles that are / are not part of an installed package
 	if ($opt{y} || $opt{z}) {
 		remove_distfiles($pkgsrcdir, $pkgdistdir);
+	}
 	if ($opt{B}) {
 		list_broken_packages($pkgsrcdir);
+	}
 	if ($opt{p} || $opt{O} || $opt{R}) {
 		list_prebuilt_packages($pkgsrcdir);
+	}
 	if ($opt{S}) {
 		list_packages_not_in_SUBDIR($pkgsrcdir);
+	}
 	if ($opt{g}) {
 		generate_map_file($pkgsrcdir, $opt{g});
+	}
 	if ($opt{d}) {
 		scan_pkgsrc_makefiles($pkgsrcdir);
 		pkgsrc_check_depends();
+	}
 	if ($opt{i} || $opt{u}) {
 		check_outdated_installed_packages($pkgsrcdir);
+	}
 	if ($opt{E}) {
 		scan_pkgsrc_makefiles($pkgsrcdir);
 		store_pkgsrc_makefiles($opt{E});
+	}
+}
 main() unless caller();