 @@ -1,16 +1,16 @@
 #!@PERL5@
-# $NetBSD: lintpkgsrc.pl,v 1.36 2022/07/30 10:55:51 rillig Exp $
+# $NetBSD: lintpkgsrc.pl,v 1.37 2022/07/30 11:33: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;
 @@ -68,43 +68,31 @@ sub pkgver($@) {
 sub pkgs($@) {
 	my $self = shift;
 	if (@_) {
 		return $self->{_pkgs}{$_[0]};
 	} else {
 		return (sort { $a->pkg cmp $b->pkg } values %{$self->{_pkgs}});
+	}
+}
 sub store($) {
 	my $self = shift;
 	my @pkgs = keys %{$self->{_pkgs}};
 	my ($cnt, $subcnt) = $self->count;
-	print("\$pkgcnt = $cnt;\n");
+	my $pkgs = $self->{_pkgs};
-	print("\$subpkgcnt = $subcnt;\n");
+	foreach my $pkg (sort keys %$pkgs) {
-	map($self->{_pkgs}{$_}->store, keys %{$self->{_pkgs}});
+		$pkgs->{$pkg}->store();
+	}
 sub count($) {
 	my $self = shift;
 	my ($pkgcnt, $pkgsubcnt);
 	map {
 		$pkgcnt++;
 		$pkgsubcnt += $self->{_pkgs}{$_}->count;
 	} keys %{$self->{_pkgs}};
 	wantarray ? ($pkgcnt, $pkgsubcnt) : $pkgcnt;
+}
 # Pkgs is all versions of a given package (eg: apache-1.x and apache-2.x)
+#
 package Pkgs;
 sub add($@) {
 	my $self = shift;
 	$self->{_pkgver}{$_[1]} = new PkgVer @_;
+}
 sub new($@) {
 @@ -138,34 +126,30 @@ sub pkgver($@) {
+	}
 	return sort { $b->ver() cmp $a->ver() } values %{$self->{_pkgver}};
+}
 sub latestver($) {
 	my $self = shift;
 	($self->pkgver())[0];
+}
 sub store($) {
 	my $self = shift;
-	print("\$pkgnum++;\n");
+	my $pkgvers = $self->{_pkgver};
-	map($self->{_pkgver}{$_}->store, keys %{$self->{_pkgver}});
+	foreach my $pkgver (sort keys %$pkgvers) {
 		$pkgvers->{$pkgver}->store();
+	}
 sub count($) {
 	my $self = shift;
 	scalar(keys %{$self->{_pkgver}});
+}
 # PkgVer is a unique package+version
+#
 package PkgVer;
 sub new($$$) {
 	my $class = shift;
 	my $self = {};
 	bless $self, $class;
 	$self->{_pkg} = $_[0];
 	$self->{_ver} = $_[1];
 @@ -197,37 +181,39 @@ sub ver($) {
 	my $self = shift;
 	$self->{_ver};
+}
 sub vars($) {
 	my $self = shift;
 	grep(!/^_(pkg|ver)$/, keys %{$self});
+}
 sub store($) {
 	my $self = shift;
 	my $data;
 	($data = $self->{_pkg}) =~ s/([\\\$\@\%\"])/\\$1/g;
 	print("\$pkgver = \$pkglist->add(\"$data\", \"");
-	($data = $self->{_ver}) =~ s/([\\\$\@\%\"])/\\$1/g;
+	my $name = $self->{_pkg};
-	print("$data\"); __pkgcount(1);\n");
+	my $ver = $self->{_ver};
-	foreach ($self->vars) {
+	$name =~ /\s/ and die "cannot store package name '$name'\n";
-		($data = $self->{$_}) =~ s/([\\\$\@\%\"])/\\$1/g;
+	$ver =~ /\s/ and die "cannot store package version '$ver'\n";
-		print("\$pkgver->var(\"$_\", \"$data\");\n");
+	printf("package\t%s\t%s\n", $name, $ver);
 	foreach my $varname (sort $self->vars) {
 		my $value = $self->{$varname};
 		$varname =~ /\s/ and die "cannot store variable name '$varname'\n";
 		$value =~ /\n/ and die "cannot store variable value '$value'\n";
 		printf("var\t%s\t%s\n", $varname, $value);
+	}
+}
 package main;
 # Buildtime configuration
 my $conf_make = '@MAKE@';
 my $conf_pkgsrcdir = '@PKGSRCDIR@';
 my $conf_prefix = '@PREFIX@';
 my $conf_sysconfdir = '@PKG_SYSCONFDIR@';
 my (
     $pkglist,                  # list of Pkg packages
 @@ -387,28 +373,27 @@ sub parse_eval_make_false($$) {
 	$false = 0;
 	$test = parse_expand_vars($line, $vars);
 	# XXX This is _so_ wrong - need to parse this correctly
 	$test =~ s/""/\r/g;
 	$test =~ s/"//g; # "
 	$test =~ s/\r/""/g;
 	debug("conditional: $test\n");
 	# XXX Could do something with target
 	while ($test =~ /(target|empty|make|defined|exists)\s*\(([^()]+)\)/) {
-		my $testname = $1;
+		my ($testname, $varname) = ($1, $2);
 		my $varname = $2;
 		my $var;
 		# Implement (some of) make's :M modifier
 		if ($varname =~ /^([^:]+):M(.+)$/) {
 			$varname = $1;
 			my $match = $2;
 			$var = $${vars}{$varname};
 			$var = parse_expand_vars($var, $vars)
 			    if defined $var;
 			$match =~ s/([{.+])/\\$1/g;
 			$match =~ s/\*/.*/g;
 @@ -1165,34 +1150,43 @@ sub parse_makefile_pkgsrc($) {
 # chdir() || fail()
+#
 sub safe_chdir($) {
 	my ($dir) = @_;
 	debug("chdir: $dir");
 	if (!chdir($dir)) {
 		fail("Unable to chdir($dir): $!");
+	}
+}
 sub load_pkgsrc_makefiles($) {
 	my ($fname) = @_;
-	open(STORE, "<$_[0]") || die("Cannot read pkgsrc store from $_[0]: $!\n");
+	open(STORE, "<", $fname)
 	    or die("Cannot read pkgsrc store from $fname: $!\n");
 	my ($pkgver);
-	our ($pkgcnt, $pkgnum, $subpkgcnt, $subpkgnum);
+	$pkglist = PkgList->new;
-	$pkglist = new PkgList;
+	while (defined(my $line = <STORE>)) {
-	while (<STORE>) {
+		chomp($line);
-		debug("eval store $_");
+		if ($line =~ qr"^package\t([^\t]+)\t([^\t]+$)$") {
-		eval $_;
+			$pkgver = $pkglist->add($1, $2);
 		} elsif ($line =~ qr"^var\t([^\t]+)\t(.*)$") {
 			$pkgver->var($1, $2);
 		} elsif ($line =~ qr"^sub ") {
 			die "Outdated cache format in '$fname'\n";
 		} else {
 			die "Invalid line '$line' in cache '$fname'\n";
+		}
+	}
 	close(STORE);
+}
 # Generate pkgname->category/pkg mapping, optionally check DEPENDS
+#
 sub scan_pkgsrc_makefiles($) {
 	my ($pkgsrcdir) = @_;
 	my (@categories);
 	if ($pkglist) {
 		# Already done
 @@ -1367,38 +1361,35 @@ sub scan_pkgsrc_distfiles_vs_distinfo($$
+					}
+				}
+			}
 			close($out);
 			waitpid($pid, 0) || fail "xargs digest $sum";
 			waitpid($pid2, 0) || fail "pipe write to xargs";
+		}
 		safe_chdir('/'); # Do not want to stay in $pkgdistdir
+	}
 	(sort keys %bad_distfiles);
+}
 sub store_pkgsrc_makefiles($) {
-	open(STORE, ">$_[0]") || die("Cannot save pkgsrc store to $_[0]: $!\n");
+	my ($fname) = @_;
 	my $was = select(STORE);
-	print(
+	open(STORE, ">", $fname)
-	    'sub __pkgcount { $subpkgnum += $_[0]; ',
+	    or die("Cannot save pkgsrc store to $fname: $!\n");
-	    'verbose("\rReading pkgsrc database: ',
+	my $prev = select(STORE);
-	    '$pkgnum / $pkgcnt ($subpkgnum / $subpkgcnt) pkgs"); }',
+	$pkglist->store();
-	    "\n"
+	select($prev);
-	);
+	close(STORE)
-	$pkglist->store;
+	    or die("Cannot save pkgsrc store to $fname: $!\n");
 	print("verbose(\"...done\\n\");\n");
 	select($was);
 	close(STORE);
+}
 # Remember to update manual page when modifying option list
+#
 sub usage_and_exit() {
 	print "Usage: lintpkgsrc [opts] [makefiles]
 opts:
   -h : This help.	 [see lintpkgsrc(1) for more information]
 Installed package options:		Distfile options:
   -i : Check version against pkgsrc	  -m : List distinfo mismatches
   -u : As -i + fetch dist (may change)	  -o : List obsolete (no distinfo)
 					  -y : Remove orphan distfiles

 @@ -1,17 +1,16 @@
-# $NetBSD: Makefile,v 1.40 2022/07/30 10:11:45 rillig Exp $
+# $NetBSD: Makefile,v 1.41 2022/07/30 11:33:23 rillig Exp $
-PKGNAME=	lintpkgsrc-4.98
+PKGNAME=	lintpkgsrc-4.99
 PKGREVISION=	1
 CATEGORIES=	pkgtools
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://www.NetBSD.org/Documentation/pkgsrc/
 COMMENT=	Sanity checks on the complete pkgsrc tree
 DEPENDS+=	digest>=20010101:../../pkgtools/digest
 CONFLICTS+=	pkglint<4.82
 USE_TOOLS+=	perl:run
 WRKSRC=		${WRKDIR}
 USE_LANGUAGES=	# none