 @@ -1,97 +1,99 @@
 #!@PERL5@
-# $NetBSD: lintpkgsrc.pl,v 1.37 2022/07/30 11:33:23 rillig Exp $
+# $NetBSD: lintpkgsrc.pl,v 1.38 2022/07/30 15:11:26 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;
 use strict;
 use warnings;
 use Getopt::Std;
 use File::Find;
 use File::Basename;
 use IPC::Open3;
 use Cwd 'realpath', 'getcwd';
-# PkgList is the master list of all packages in pkgsrc.
+# PkgVer is a unique package + version.
+#
-package PkgList;
+package PkgVer;
 sub add($@) {
 	my $self = shift;
 	if (!$self->pkgs($_[0])) {
 		$self->{_pkgs}{ $_[0] } = new Pkgs $_[0];
 	$self->pkgs($_[0])->add(@_);
-sub new($) {
+sub new($$$) {
 	my $class = shift;
 	my $self = {};
 	bless $self, $class;
 	$self->{_pkg} = $_[0];
 	$self->{_ver} = $_[1];
 	return $self;
+}
-sub numpkgver($) {
+sub pkgname($) {
 	my $self = shift;
 	scalar($self->pkgver);
 	$self->pkg . '-' . $self->ver;
+}
-sub pkgver($@) {
+sub pkg($) {
 	my $self = shift;
-	if (@_ == 0) {
+	$self->{_pkg};
 		my (@list);
 		foreach my $pkg ($self->pkgs) {
 			push(@list, $pkg->pkgver);
 		return (@list);
-	if (defined $self->{_pkgs}{$_[0]}) {
+sub var($$$) {
-		return (@_ > 1)
+	my $self = shift;
-		    ? $self->{_pkgs}{$_[0]}->pkgver($_[1])
+	my ($key, $val) = @_;
 		    : $self->{_pkgs}{$_[0]}->pkgver();
 	(defined $val)
-	return;
+	    ? ($self->{$key} = $val)
 	    : $self->{$key};
+}
-sub pkgs($@) {
+sub ver($) {
 	my $self = shift;
-	if (@_) {
+	$self->{_ver};
 		return $self->{_pkgs}{$_[0]};
 	} else {
-		return (sort { $a->pkg cmp $b->pkg } values %{$self->{_pkgs}});
+sub vars($) {
 	my $self = shift;
 	grep(!/^_(pkg|ver)$/, keys %{$self});
+}
 sub store($) {
 	my $self = shift;
-	my $pkgs = $self->{_pkgs};
+	my $name = $self->{_pkg};
-	foreach my $pkg (sort keys %$pkgs) {
+	my $ver = $self->{_ver};
 		$pkgs->{$pkg}->store();
 	$name =~ /\s/ and die "cannot store package name '$name'\n";
 	$ver =~ /\s/ and die "cannot store package version '$ver'\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);
+	}
+}
 # 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 @_;
+}
 @@ -132,88 +134,86 @@ sub latestver($) {
 	($self->pkgver())[0];
+}
 sub store($) {
 	my $self = shift;
 	my $pkgvers = $self->{_pkgver};
 	foreach my $pkgver (sort keys %$pkgvers) {
 		$pkgvers->{$pkgver}->store();
+	}
+}
-# PkgVer is a unique package+version
+# PkgList is the master list of all packages in pkgsrc.
+#
-package PkgVer;
+package PkgList;
-sub new($$$) {
+sub add($@) {
 	my $self = shift;
 	if (!$self->pkgs($_[0])) {
 		$self->{_pkgs}{ $_[0] } = new Pkgs $_[0];
+	}
 	$self->pkgs($_[0])->add(@_);
+}
 sub new($) {
 	my $class = shift;
 	my $self = {};
 	bless $self, $class;
 	$self->{_pkg} = $_[0];
 	$self->{_ver} = $_[1];
 	return $self;
+}
-sub pkgname($) {
+sub numpkgver($) {
 	my $self = shift;
 	$self->pkg . '-' . $self->ver;
 sub pkg($) {
 	my $self = shift;
 	scalar($self->pkgver);
 	$self->{_pkg};
+}
-sub var($$$) {
+sub pkgver($@) {
 	my $self = shift;
 	my ($key, $val) = @_;
-	(defined $val)
+	if (@_ == 0) {
-	    ? ($self->{$key} = $val)
+		my (@list);
-	    : $self->{$key};
+		foreach my $pkg ($self->pkgs) {
 			push(@list, $pkg->pkgver);
+		}
-sub ver($) {
+		return (@list);
 	my $self = shift;
-	$self->{_ver};
+	if (defined $self->{_pkgs}{$_[0]}) {
 		return (@_ > 1)
 		    ? $self->{_pkgs}{$_[0]}->pkgver($_[1])
 		    : $self->{_pkgs}{$_[0]}->pkgver();
+	}
 	return;
+}
-sub vars($) {
+sub pkgs($@) {
 	my $self = shift;
-	grep(!/^_(pkg|ver)$/, keys %{$self});
+	if (@_) {
 		return $self->{_pkgs}{$_[0]};
 	} else {
 		return (sort { $a->pkg cmp $b->pkg } values %{$self->{_pkgs}});
+	}
+}
 sub store($) {
 	my $self = shift;
-	my $name = $self->{_pkg};
+	my $pkgs = $self->{_pkgs};
-	my $ver = $self->{_ver};
+	foreach my $pkg (sort keys %$pkgs) {
 		$pkgs->{$pkg}->store();
 	$name =~ /\s/ and die "cannot store package name '$name'\n";
 	$ver =~ /\s/ and die "cannot store package version '$ver'\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