 @@ -1,16 +1,16 @@
 #!@PERL5@
-# $NetBSD: lintpkgsrc.pl,v 1.43 2022/08/03 16:15:49 rillig Exp $
+# $NetBSD: lintpkgsrc.pl,v 1.44 2022/08/03 19:22:34 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;
 @@ -18,73 +18,73 @@ use strict;
 use warnings;
 use Getopt::Std;
 use File::Find;
 use File::Basename;
 use IPC::Open3;
 use Cwd 'realpath', 'getcwd';
 # PkgVer is a PKGBASE + PKGVERSION, including some of the variables that
 # have been extracted from the package Makefile.
+#
 package PkgVer;
 sub new($$$) {
-	my $class = shift;
+	my ($class, $pkgbase, $pkgversion) = @_;
-	my $self = {};
+	my $self = {
 	    pkgbase    => $pkgbase,
 	    pkgversion => $pkgversion,
 	    vars       => {},
 	};
 	bless $self, $class;
 	$self->{_pkg} = $_[0];
 	$self->{_ver} = $_[1];
 	return $self;
+}
-sub pkgname($) {
+sub pkg($) {
-	my $self = shift;
+	my ($self) = @_;
-	$self->pkg . '-' . $self->ver;
+	$self->{pkgbase};
+}
-sub pkg($) {
+sub ver($) {
-	my $self = shift;
+	my ($self) = @_;
-	$self->{_pkg};
+	$self->{pkgversion};
+}
-sub var($$$) {
+sub pkgname($) {
 	my $self = shift;
 	my ($key, $val) = @_;
-	(defined $val)
+	$self->pkg . '-' . $self->ver;
 	    ? ($self->{$key} = $val)
 	    : $self->{$key};
+}
-sub ver($) {
+sub var($$$) {
-	my $self = shift;
+	my ($self, $key, $val) = @_;
-	$self->{_ver};
+	(defined $val)
 	    ? ($self->{vars}->{$key} = $val)
 	    : $self->{vars}->{$key};
+}
 sub vars($) {
-	my $self = shift;
+	my ($self) = @_;
-	grep(!/^_(pkg|ver)$/, keys %{$self});
+	keys %{$self->{vars}};
+}
 sub store($) {
 	my $self = shift;
-	my $name = $self->{_pkg};
+	my $name = $self->pkg;
-	my $ver = $self->{_ver};
+	my $ver = $self->ver;
 	$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);
+	}
+}

 @@ -1,24 +1,32 @@
-# $NetBSD: packages.t,v 1.4 2022/08/03 18:51:56 rillig Exp $
+# $NetBSD: packages.t,v 1.5 2022/08/03 19:22:34 rillig Exp $
 use strict;
 use warnings;
 use Capture::Tiny 'capture';
 use Test;
 BEGIN { plan tests => 11, onfail => sub { die } }
 require('../lintpkgsrc.pl');
 sub test_pkgver() {
 	my $pkgver = PkgVer->new('base', '1.0nb4');
 	ok($pkgver->pkg , 'base');
 	ok($pkgver->ver , '1.0nb4');
 	ok($pkgver->pkgname , 'base-1.0nb4');
+}
 sub test_package_variables() {
 	my $pkglist = PkgList->new();
 	my $pkgbase_1_0 = $pkglist->add('pkgbase', '1.0');
 	$pkgbase_1_0->var('NAME', 'value');
 	ok($pkgbase_1_0->var('NAME'), 'value');
 	ok($pkgbase_1_0->var('undefined'), undef);
 	my $pkgbase_2_0 = $pkglist->add('pkgbase', '2.0');
 	my $pkgbase_1_5 = $pkglist->add('pkgbase', '1.5');
 	my $pkgbase_1_10 = $pkglist->add('pkgbase', '1.10');
 @@ -47,15 +55,16 @@ sub test_store_order() {
 	my $stdout = capture {
 		$pkglist->store();
 	};
 	# XXX: 1.3nb4 should be sorted before 1.15.
 	# On the other hand, this is just an internal cache file format.
 	ok($stdout, ''
 	    . "package\tpkgbase\t1.0\n"
 	    . "package\tpkgbase\t1.15\n"
 	    . "package\tpkgbase\t1.3nb4\n");
+}
 test_pkgver();
 test_package_variables();
 test_store_order();