 @@ -1,15 +1,15 @@
 #!@PERL5@
-# $NetBSD: lintpkgsrc.pl,v 1.99 2022/08/16 18:58:00 rillig Exp $
+# $NetBSD: lintpkgsrc.pl,v 1.100 2022/08/16 19:07:53 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;
 @@ -1375,112 +1375,121 @@ sub debug_parse_makefiles(@args) {
+}
 sub check_distfiles($pkgsrcdir, $pkgdistdir) {
 	my @unref_distfiles = scan_pkgsrc_distfiles_vs_distinfo(
 	    $pkgsrcdir, $pkgdistdir, $opt{o}, $opt{m});
 	return unless $opt{r};
 	verbose("Unlinking unreferenced distfiles\n");
 	foreach my $distfile (@unref_distfiles) {
 		unlink("$pkgdistdir/$distfile");
+	}
+}
 # looking for files that are downloaded on the current system
 # but do not belong to any currently installed package i.e. orphaned
 sub remove_orphaned_distfiles($dldistfiles, $pkgdistfiles, $pkgdistdir) {
 	my $found = 0;
 	my @orphan;
 	foreach my $dldf (@$dldistfiles) {
 		foreach my $pkgdf (@$pkgdistfiles) {
 			if ($dldf eq $pkgdf) {
 				$found = 1;
+			}
+		}
 		if ($found != 1) {
 			push @orphan, $dldf;
 			print "Orphaned file: $dldf\n";
+		}
 		$found = 0;
+	}
 	if ($opt{r}) {
 		chdir_or_fail("$pkgdistdir");
 		verbose("Unlinking 'orphaned' distfiles\n");
 		foreach my $distfile (@orphan) {
 			unlink($distfile)
+		}
+	}
+}
 # looking for files that are downloaded on the current system
 # but belong to a currently installed package i.e. parented
 sub remove_parented_distfiles($dldistfiles, $pkgdistfiles, $pkgdistdir) {
 	my $found = 0;
 	my @parent;
 	foreach my $pkgdf (sort @$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);
+		}
+	}
+}
 sub remove_distfiles($pkgsrcdir, $pkgdistdir) {
-	my @pkgs = list_installed_packages();
+	my @installed_pkgnames = list_installed_packages();
 	scan_pkgsrc_makefiles($pkgsrcdir);
 	# list the installed packages and the directory they live in
-	my @installed;
+	my @installed_pkgvers;
-	foreach my $pkgname (sort @pkgs) {
+	foreach my $pkgname (sort @installed_pkgnames) {
-		if ($pkgname =~ /^([^*?[]+)-([\d*?[].*)/) {
+		if ($pkgname !~ /^ ([^*?[]+) - ([\d*?[].*) /x) {
-			foreach my $pkgver ($pkgdb->pkgvers_by_pkgbase($1)) {
+			warn "Invalid installed package name: $pkgname";
-				next if $pkgver->var('dir') =~ /-current/;
+			next;
 				push @installed, $pkgver;
 				last;
 		foreach my $pkgver ($pkgdb->pkgvers_by_pkgbase($1)) {
 			next if $pkgver->var('dir') =~ /-current/;
 			push @installed_pkgvers, $pkgver;
 			last;
+		}
+	}
 	# distfiles belonging to the currently installed packages
 	my (%distfiles, @pkgdistfiles);
-	foreach my $pkgver (sort @installed) {
+	foreach my $pkgver (sort @installed_pkgvers) {
 		my $pkgpath = $pkgver->var('dir');
 		foreach my $entry (load_distinfo("$pkgsrcdir/$pkgpath")) {
 			my $distfile = $entry->{distfile};
 			next if $distfile =~ /^patch-[\w.+\-]+$/;
 			next if defined $distfiles{$distfile};
 			$distfiles{$distfile}->{name} = $distfile;
 			push @pkgdistfiles, $distfile;
+		}
+	}
 	# distfiles downloaded on the current system
 	my @dldistfiles = sort grep { $_ ne 'pkg-vulnerabilities' }
 	    listdir("$pkgdistdir", undef);
-	if ($opt{y}) {
+	$opt{y} and remove_orphaned_distfiles(
-		# looking for files that are downloaded on the current system
+	    \@dldistfiles, \@pkgdistfiles, $pkgdistdir);
 		# but do not belong to any currently installed package i.e. orphaned
 		my $found = 0;
 		my @orphan;
 		foreach my $dldf (@dldistfiles) {
 			foreach my $pkgdf (@pkgdistfiles) {
 				if ($dldf eq $pkgdf) {
 					$found = 1;
 			if ($found != 1) {
 				push @orphan, $dldf;
 				print "Orphaned file: $dldf\n";
 			$found = 0;
-		if ($opt{r}) {
+	$opt{z} and remove_parented_distfiles(
-			chdir_or_fail("$pkgdistdir");
+	    \@dldistfiles, \@pkgdistfiles, $pkgdistdir);
 			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
 		my $found = 0;
 		my @parent;
 		foreach my $pkgdf (sort @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);
+}
 sub list_broken_packages($pkgsrcdir) {
 	scan_pkgsrc_makefiles($pkgsrcdir);
 	foreach my $pkgver ($pkgdb->pkgvers_all) {
 		my $broken = $pkgver->var('BROKEN');
 		next unless $broken;
 		print $pkgver->pkgname . ": $broken\n";
+	}
+}
 # List obsolete or NO_BIN_ON_FTP/RESTRICTED prebuilt packages
+#