 @@ -1,16 +1,16 @@
 #!@PERL5@
-# $NetBSD: lintpkgsrc.pl,v 1.28 2022/07/30 08:18:31 rillig Exp $
+# $NetBSD: lintpkgsrc.pl,v 1.29 2022/07/30 08:21:31 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;
 @@ -291,27 +291,27 @@ sub listdir($$) {
+	}
 	@list;
+}
 sub canonicalize_pkgname($) {
 	my ($pkgname) = @_;
 	$pkgname =~ s,^py\d+(?:pth|)-,py-,;
 	$pkgname =~ s,^ruby\d+-,ruby-,;
 	$pkgname =~ s,^php\d+-,php-,;
 	return $pkgname;
+}
-sub convert_to_standard_dewey(@) {
+sub convert_to_standard_pkgversion(@) {
 	my ($elem, $underscore, @temp);
 	# According to the current implementation in pkg_install/lib/str.c
 	# as of 2002/06/02, '_' before a number, '.', and 'pl' get treated as 0,
 	# while 'rc' and 'pre' get treated as -1; beta as '-2', alpha as '-3'.
 	# Other characters are converted to lower
 	# case and then to a number: a->1, b->2, c->3, etc. Numbers stay the same.
 	# 'nb' is a special case that's already been handled when we are here.
 	foreach $elem (@_) {
 		if ($elem =~ /\d+/) {
 			push(@temp, $elem);
 		} elsif ($elem =~ /^pl$/ or $elem =~ /^\.$/) {
 			push(@temp, 0);
 @@ -323,79 +323,79 @@ sub convert_to_standard_dewey(@) {
 			push(@temp, -1);
 		} elsif ($elem =~ /^beta$/) {
 			push(@temp, -2);
 		} elsif ($elem =~ /^alpha$/) {
 			push(@temp, -3);
 		} else {
 			push(@temp, 0);
 			push(@temp, ord($elem) - ord("a") + 1);
+		}
+	}
 	@temp;
+}
-sub deweycmp_extract($$) {
+sub pkgversioncmp_extract($$) {
 	my ($match, $val) = @_;
 	my ($cmp, @matchlist, @vallist, $i, $len);
-	@matchlist = convert_to_standard_dewey(split(/(\D+)/, lc($match)));
+	@matchlist = convert_to_standard_pkgversion(split(/(\D+)/, lc($match)));
-	@vallist = convert_to_standard_dewey(split(/(\D+)/, lc($val)));
+	@vallist = convert_to_standard_pkgversion(split(/(\D+)/, lc($val)));
 	$cmp = 0;
 	$i = 0;
 	if ($#matchlist > $#vallist) {
 		$len = $#matchlist;
 	} else {
 		$len = $#vallist;
+	}
 	while (!$cmp && ($i++ <= $len)) {
 		if (!@matchlist) {
 			push(@matchlist, 0);
+		}
 		if (!@vallist) {
 			push(@vallist, 0);
+		}
 		$cmp = (shift @matchlist <=> shift @vallist);
+	}
 	$cmp;
+}
-# Dewey decimal version number matching - or thereabouts
+# Package version number matching - or thereabouts
 # Also handles 'nb<N>' suffix (checked iff values otherwise identical)
+#
-sub deweycmp($$$) {
+sub pkgversioncmp($$$) {
 	my ($match, $test, $val) = @_;
 	my ($cmp, $match_nb, $val_nb);
 	$match_nb = $val_nb = 0;
 	if ($match =~ /(.*)nb(.*)/) {
 		# Handle nb<N> suffix
 		$match = $1;
 		$match_nb = $2;
+	}
 	if ($val =~ /(.*)nb(.*)/) {
 		# Handle nb<N> suffix
 		$val = $1;
 		$val_nb = $2;
+	}
-	$cmp = deweycmp_extract($match, $val);
+	$cmp = pkgversioncmp_extract($match, $val);
 	if (!$cmp) {
 		# Iff otherwise identical, check nb suffix
-		$cmp = deweycmp_extract($match_nb, $val_nb);
+		$cmp = pkgversioncmp_extract($match_nb, $val_nb);
+	}
-	debug("eval deweycmp $cmp $test 0\n");
+	debug("eval pkgversioncmp $cmp $test 0\n");
 	eval "$cmp $test 0";
+}
 sub parse_expand_vars_dumb($$) {
 	my ($line, $vars) = @_;
 	while ($line =~ /\$\{([-\w.]+)\}/) {
 		if (defined(${$vars}{$1})) {
 			$line = $` . ${$vars}{$1} . $';
 		} else {
 			$line = $` . $magic_undefined . $';
+		}
+	}
 @@ -999,39 +999,39 @@ sub glob2regex($) {
 	'^' . $regex . '$';
+}
 # Perform some (reasonable) subset of 'pkg_info -e' / glob(3)
 # Returns (sometimes best guess at) package name,
 # and either 'problem version' or undef if all OK
+#
 sub package_globmatch($) {
 	my ($pkgmatch) = @_;
 	my ($matchpkgname, $matchver, $regex);
 	if ($pkgmatch =~ /^([^*?[]+)(<|>|<=|>=|-)(\d[^*?[{]*)$/) {
-		# (package)(cmp)(dewey)
+		# (package)(cmp)(pkgversion)
 		my ($test, @pkgvers);
 		($matchpkgname, $test, $matchver) = ($1, $2, $3);
 		if (@pkgvers = $pkglist->pkgver($matchpkgname)) {
 			foreach my $pkgver (@pkgvers) {
 				if ($test eq '-') {
 					if ($pkgver->ver eq $matchver) {
 						$matchver = undef;
 						last;
+					}
 				} else {
-					if (deweycmp($pkgver->ver, $test, $matchver)) {
+					if (pkgversioncmp($pkgver->ver, $test, $matchver)) {
 						$matchver = undef;
 						last;
+					}
+				}
+			}
 			if ($matchver && $test ne '-') {
 				$matchver = "$test$matchver";
+			}
+		}
 	} elsif ($pkgmatch =~ /^([^[]+)-([\d*?{[].*)$/) {