 @@ -1,15 +1,15 @@
 #! @PERL@
-# $NetBSD: pkglint.pl,v 1.779 2008/10/20 11:09:07 rillig Exp $
+# $NetBSD: pkglint.pl,v 1.780 2008/11/04 21:45:13 rillig Exp $
+#
 # pkglint - static analyzer and checker for pkgsrc packages
+#
 # Written by:
 #	Roland Illig <rillig@NetBSD.org>
+#
 # Based on work by:
 #	Hubert Feyrer <hubertf@NetBSD.org>
 #	Thorsten Frueauf <frueauf@NetBSD.org>
 #	Thomas Klausner <wiz@NetBSD.org>
 #	and others.
+#
 @@ -1131,26 +1131,44 @@ use enum qw(FNAME REVISION MTIME TAG);
 sub new($$$$$) {
 	my ($class, $fname, $revision, $date, $tag) = @_;
 	my $self = [ $fname, $revision, $date, $tag ];
 	bless($self, $class);
 	return $self;
+}
 sub fname($)			{ return shift()->[FNAME]; }
 sub revision($)			{ return shift()->[REVISION]; }
 sub mtime($)			{ return shift()->[MTIME]; }
 sub tag($)			{ return shift()->[TAG]; }
 #== End of CVS_Entry ======================================================
 package PkgLint::Change;
 #==========================================================================
 # A change entry from doc/CHANGES-*
 #==========================================================================
 sub new($$$$$$) {
 	my ($class, $line, $action, $pkgpath, $version, $author, $date) = @_;
 	my $self = [ $line, $action, $pkgpath, $version, $author, $date ];
 	bless($self, $class);
 	return $self;
+}
 sub line($)			{ return shift()->[0]; }
 sub action($)			{ return shift()->[1]; }
 sub pkgpath($)			{ return shift()->[2]; }
 sub version($)			{ return shift()->[3]; }
 sub author($)			{ return shift()->[4]; }
 sub date($)			{ return shift()->[5]; }
 #== End of PkgLint::Change ================================================
 package main;
 #==========================================================================
 # This package contains the application-specific code of pkglint.
 # Most subroutines in this package follow a strict naming convention:
+#
 # The get_*() functions provide easy access to important non-trivial data
 # structures that are loaded from external files and are therefore cached.
+#
 # The is_*() functions return a boolean value and have no side effects.
+#
 # The checkline_*() procedures check a single line for compliance with some
 # rules.
 @@ -2193,26 +2211,90 @@ sub get_doc_TODO_updates() {
+	}
 	return $get_doc_TODO_updates_result;
+}
 my $get_wip_TODO_updates_result = undef;
 sub get_wip_TODO_updates() {
 	if (!defined($get_wip_TODO_updates_result)) {
 		$get_wip_TODO_updates_result = load_doc_TODO_updates("${cwd_pkgsrcdir}/wip/TODO");
+	}
 	return $get_wip_TODO_updates_result;
+}
 my $get_doc_CHANGES_docs = undef; # [ $fname, undef or $lines ]
 sub get_doc_CHANGES($) {
 	my ($pkgpath) = @_;
 	$opt_debug_trace and log_debug(NO_FILE, NO_LINES, "get_doc_CHANGES(\"$pkgpath\")");
 	# Make a reversed list of all the CHANGES-* files, but don't load
 	# them yet.
 	if (!defined($get_doc_CHANGES_docs)) {
 		opendir(DIR, "${cwd_pkgsrcdir}/doc") or die;
 		my @files = readdir(DIR);
 		closedir(DIR) or die;
 		foreach my $file (reverse sort @files) {
 			if ($file =~ m"^CHANGES-\d+$") {
 				push(@$get_doc_CHANGES_docs, [ $file, undef ]);
+			}
+		}
 		$opt_debug_misc and log_debug(NO_FILE, NO_LINES, "Found " . (scalar @$get_doc_CHANGES_docs) . " changes files.");
+	}
 	# Scan the *-CHANGES files in reverse order until some action
 	# matches the package directory.
 	my @result = ();
 	foreach my $doc (@$get_doc_CHANGES_docs) {
 		if (!defined($doc->[1])) {
 			$opt_debug_misc and log_debug(NO_FILE, NO_LINES, "loading $doc->[0]");
 			my $lines = load_file("${cwd_pkgsrcdir}/doc/$doc->[0]") or die;
 			my @changes = ();
 			foreach my $line (@$lines) {
 				my $text = $line->text;
 				next unless $text =~ m"^\t[A-Z]";
 				if ($text =~ m"^\t(Updated) (\S+) to (\S+) \[(\S+) (\d\d\d\d-\d\d-\d\d)\]$") {
 					push(@changes, PkgLint::Change->new($line, $1, $2, $3, $4, $5));
 				} elsif ($text =~ m"^\t(Added) (\S+) version (\S+) \[(\S+) (\d\d\d\d-\d\d-\d\d)\]$") {
 					push(@changes, PkgLint::Change->new($line, $1, $2, $3, $4, $5));
 				} elsif ($text =~ m"^\t(Removed) (\S+) (?:successor (\S+) )?\[(\S+) (\d\d\d\d-\d\d-\d\d)\]$") {
 					push(@changes, PkgLint::Change->new($line, $1, $2, undef, $3, $4));
 				} elsif ($text =~ m"^\t(Downgraded) (\S+) to (\S+) \[(\S+) (\d\d\d\d-\d\d-\d\d)\]$") {
 					push(@changes, PkgLint::Change->new($line, $1, $2, $3, $4, $5));
 				} elsif ($text =~ m"^\t(Renamed|Moved) (\S+) to (\S+) \[(\S+) (\d\d\d\d-\d\d-\d\d)\]$") {
 					push(@changes, PkgLint::Change->new($line, $1, $2, $3, $4, $5));
 				} else {
 					$line->log_warning("Unknown doc/CHANGES line: " . $line->text);
 					$line->explain_warning(
 "Maybe some developer didn't stick to the conventions that have been",
 "established by mk/misc/developer.mk?");
+				}
+			}
 			$doc->[1] = \@changes;
+		}
 		foreach my $change (@{$doc->[1]}) {
 			next unless $pkgpath eq $change->pkgpath;
 			push(@result, $change);
+		}
 		if (@result != 0) {
 			return @result;
+		}
+	}
 	return ();
+}
 sub get_suggested_package_updates() {
 	return ($is_wip)
 	    ? get_wip_TODO_updates()
 	    : get_doc_TODO_updates();
+}
 # Load all variables from mk/defaults/mk.conf. Since pkglint does not
 # load the infrastructure files during normal operation, these
 # definitions have to be added explicitly.
 sub load_userdefined_variables() {
 	my $fname = "${cwd_pkgsrcdir}/mk/defaults/mk.conf";
 	my ($lines, $vars);
 @@ -3387,26 +3469,51 @@ sub checkword_absolute_pathname($$) {
 		$line->explain_warning(
 "Absolute pathnames are often an indicator for unportable code. As",
 "pkgsrc aims to be a portable system, absolute pathnames should be",
 "avoided whenever possible.",
 "",
 "A special variable in this context is \${DESTDIR}, which is used in GNU",
 "projects to specify a different directory for installation than what",
 "the programs see later when they are executed. Usually it is empty, so",
 "if anything after that variable starts with a slash, it is considered",
 "an absolute pathname.");
+	}
+}
 sub checkpackage_possible_downgrade() {
 	$opt_debug_trace and log_debug(NO_FILE, NO_LINES, "checkpackage_possible_downgrade");
 	return unless defined $effective_pkgname;
 	return unless $effective_pkgname =~ regex_pkgname;
 	my ($pkgbase, $pkgversion) = ($1, $2);
 	my $line = $effective_pkgname_line;
 	my @changes = get_doc_CHANGES($pkgpath);
 	if (@changes == 0) {
 		$opt_debug_misc and $line->log_debug("No changes have been recorded for package $pkgpath.");
 		return;
+	}
 	my $last_change = $changes[-1];
 	return unless $last_change->action eq "Updated";
 	my $last_version = $last_change->version;
 	if (dewey_cmp($pkgversion, "<", $last_version)) {
 		$line->log_warning("The package is being downgraded from $last_version to $pkgversion.");
+	}
+}
+#
 # Subroutines to check a single line.
+#
 sub checkline_length($$) {
 	my ($line, $maxlength) = @_;
 	if (length($line->text) > $maxlength) {
 		$line->log_warning("Line too long (should be no more than $maxlength characters).");
 		$line->explain_warning(
 "Back in the old time, terminals with 80x25 characters were common.",
 "And this is still the default size of many terminal emulators.",
 "Moderately short lines also make reading easier.");
 @@ -6779,26 +6886,28 @@ sub checkfile_package_Makefile($$$) {
 	if (!defined($pkgname) && defined($distname) && $distname !~ regex_unresolved && $distname !~ regex_pkgname) {
 		$distname_line->log_warning("As DISTNAME is not a valid package name, please define the PKGNAME explicitly.");
+	}
 	($effective_pkgname, $effective_pkgname_line, $effective_pkgbase, $effective_pkgversion)
 		= (defined($pkgname) && $pkgname !~ regex_unresolved && $pkgname =~ regex_pkgname) ? ($pkgname, $pkgname_line, $1, $2)
 		: (defined($distname) && $distname !~ regex_unresolved && $distname =~ regex_pkgname) ? ($distname, $distname_line, $1, $2)
 		: (undef, undef, undef, undef);
 	if (defined($effective_pkgname_line)) {
 		$opt_debug_misc and $effective_pkgname_line->log_debug("Effective name=${effective_pkgname} base=${effective_pkgbase} version=${effective_pkgversion}.");
+	}
 	checkpackage_possible_downgrade();
 	if (!exists($pkgctx_vardef->{"COMMENT"})) {
 		log_warning($fname, NO_LINE_NUMBER, "No COMMENT given.");
+	}
 	if (exists($pkgctx_vardef->{"USE_IMAKE"}) && exists($pkgctx_vardef->{"USE_X11"})) {
 		$pkgctx_vardef->{"USE_IMAKE"}->log_note("USE_IMAKE makes ...");
 		$pkgctx_vardef->{"USE_X11"}->log_note("... USE_X11 superfluous.");
+	}
 	if (defined($effective_pkgbase)) {
 		foreach my $suggested_update (@{get_suggested_package_updates()}) {
 			my ($line, $suggbase, $suggver, $suggcomm) = @{$suggested_update};