 @@ -1,14 +1,14 @@
-# $NetBSD: makevars.map,v 1.236 2013/08/15 20:30:43 rillig Exp $
+# $NetBSD: makevars.map,v 1.237 2013/08/31 18:14:28 rillig Exp $
+#
 # This file contains the guessed type of some variables, according to
 # their current use in pkgsrc.
+#
 # The type YesNo is used for variables that are checked using
 #     .if defined(VAR) && !empty(VAR:M[Yy][Ee][Ss])
+#
 # The type Yes is used for variables that are checked using
 #     .if defined(VAR)
+#
 # Type type List is used for lists of things. There are two types of lists,
 # InternalList and List, which are described in the pkgsrc guide, chapter
 @@ -531,26 +531,27 @@ PHASE_MSG		ShellCommand [$system]
 PHP_VERSION_REQD	Version [$user]
 PKGBASE			Identifier [$system]
 PKGCONFIG_OVERRIDE	List of Pathmask [m:as,c:a]
 PKGCONFIG_OVERRIDE_STAGE	Stage [$package]
 PKGDIR			RelativePkgDir [$package]
 PKGDIRMODE		FileMode [$system]
 PKGLOCALEDIR		Pathname [$system]
 PKGNAME			PkgName [$package]
 PKGNAME_NOREV		PkgName [$system]
 PKGPATH			Pathname [$system]
 PKGREPOSITORY		Unchecked []
 PKGREVISION		PkgRevision [m:s]
 PKGSRCDIR		Pathname [$system]
 PKGSRCTOP		Yes [m:s]
 PKGTOOLS_ENV		List of ShellWord
 PKGVERSION		Version [$system]
 PKGWILDCARD		Filemask [$system]
 PKG_ADMIN		ShellCommand [$system]
 PKG_APACHE		{ apache13 apache2 apache22 apache24 } [$system]
 PKG_APACHE_ACCEPTED	List of { apache13 apache2 apache22 apache24 } [$package]
 PKG_APACHE_DEFAULT	{ apache13 apache2 apache22 apache24 } [$user]
 PKG_CONFIG		Yes [$user]
 # ^^ No, this is not the popular command from GNOME, but the setting
 # whether the pkgsrc user wants configuration files automatically
 # installed or not.
 PKG_CREATE		ShellCommand [$system]
 PKG_DBDIR		Pathname [$system]

 @@ -1,15 +1,15 @@
 #! @PERL@
-# $NetBSD: pkglint.pl,v 1.857 2013/08/15 20:30:43 rillig Exp $
+# $NetBSD: pkglint.pl,v 1.858 2013/08/31 18:14:28 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.
+#
 @@ -2517,26 +2517,33 @@ sub checkline_trailing_whitespace($) {
 "Note: This is mostly for aesthetic reasons.");
 		$line->replace_regex(qr"\s+\n$", "\n");
+	}
+}
 sub checkline_rcsid_regex($$$) {
 	my ($line, $prefix_regex, $prefix) = @_;
 	my ($id) = ($opt_rcsidstring . ($is_wip ? "|Id" : ""));
 	$opt_debug_trace and $line->log_debug("checkline_rcsid_regex(${prefix_regex}, ${prefix})");
 	if ($line->text !~ m"^${prefix_regex}\$(${id})(?::[^\$]+|)\$$") {
 		$line->log_error("\"${prefix}\$${opt_rcsidstring}\$\" expected.");
 		$line->explain_error(
 "Several files in pkgsrc must contain the CVS Id, so that their current",
 "version can be traced back later from a binary package. This is to",
 "ensure reproducible builds, for example for finding bugs.",
 "",
 "Please insert the text from the above error message (without the quotes)",
 "at this position in the file.");
 		return false;
+	}
 	return true;
+}
 sub checkline_rcsid($$) {
 	my ($line, $prefix) = @_;
 	checkline_rcsid_regex($line, quotemeta($prefix), $prefix);
+}
 # Checks whether the line contains text that looks like absolute
 # pathnames, assuming that the file uses the common syntax with
 @@ -4389,27 +4396,30 @@ sub checkline_mk_vartype_basic($$$$$$$$)
 		},
 		Stage => sub {
 			if ($value !~ m"^(?:pre|do|post)-(?:extract|patch|configure|build|install)$") {
 				$line->log_warning("Invalid stage name. Use one of {pre,do,post}-{extract,patch,configure,build,install}.");
+			}
 		},
 		String => sub {
 			# No further checks possible.
 		},
 		Tool => sub {
-			if ($value =~ m"^([-\w]+|\[)(?::(\w+))?$") {
+			if ($varname eq "TOOLS_NOOP" && $op eq "+=") {
 				# no warning for package-defined tool definitions
 			} elsif ($value =~ m"^([-\w]+|\[)(?::(\w+))?$") {
 				my ($toolname, $tooldep) = ($1, $2);
 				if (!exists(get_tool_names()->{$toolname})) {
 					$line->log_error("Unknown tool \"${toolname}\".");
+				}
 				if (defined($tooldep) && $tooldep !~ m"^(?:bootstrap|build|pkgsrc|run)$") {
 					$line->log_error("Unknown tool dependency \"${tooldep}\". Use one of \"build\", \"pkgsrc\" or \"run\".");
+				}
 			} else {
 				$line->log_error("Invalid tool syntax: \"${value}\".");
+			}
 		},
 		Unchecked => sub {
 @@ -6921,29 +6931,30 @@ sub checkfile_PLIST($) {
 			} elsif ($text =~ m"^share/applications/.*\.desktop$") {
 				my $f = "../../sysutils/desktop-file-utils/desktopdb.mk";
 				if (defined($pkgctx_included) && !exists($pkgctx_included->{$f})) {
 					$line->log_warning("Packages that install a .desktop entry may .include \"$f\".");
 					$line->explain_warning(
 "If *.desktop files contain MimeType keys, global MIME Type registory DB",
 "must be updated by desktop-file-utils.",
 "Otherwise, this warning is harmless.");
+				}
 			} elsif ($pkgpath ne "graphics/hicolor-icon-theme" && $text =~ m"^share/icons/hicolor(?:$|/)") {
 				my $f = "../../graphics/hicolor-icon-theme/buildlink3.mk";
 				if (defined($pkgctx_included) && !exists($pkgctx_included->{$f})) {
-					$line->log_error("Please .include \"$f\"");
+					$line->log_error("Please .include \"$f\" in the Makefile");
 					$line->explain_error(
-"If hicolor icon themes are installed, icon theme cache must be maintained.");
+"If hicolor icon themes are installed, icon theme cache must be",
 "maintained. The hicolor-icon-theme package takes care of that.");
+				}
 			} elsif ($pkgpath ne "graphics/gnome-icon-theme" && $text =~ m"^share/icons/gnome(?:$|/)") {
 				my $f = "../../graphics/gnome-icon-theme/buildlink3.mk";
 				if (defined($pkgctx_included) && !exists($pkgctx_included->{$f})) {
 					$line->log_error("Please .include \"$f\"");
 					$line->explain_error(
 "If Gnome icon themes are installed, icon theme cache must be maintained.");
+				}
 			} elsif ($dirname eq "share/aclocal" && $basename =~ m"\.m4$") {
 				# Fine.
 			} elsif ($text =~ m"^share/doc/html/") {
 @@ -7154,32 +7165,34 @@ sub checkdir_root() {
 			if ($comment_flag eq "#" && (!defined($comment) || $comment eq "")) {
 				$line->log_warning("${subdir} commented out without giving a reason.");
+			}
 			if ($indentation ne "\t") {
 				$line->log_warning("Indentation should be a single tab character.");
+			}
 			if ($subdir =~ m"\$" || !-f "${current_dir}/${subdir}/Makefile") {
 				next;
+			}
-			if (defined($prev_subdir) && $subdir eq $prev_subdir) {
+			if (!defined($prev_subdir) || $subdir gt $prev_subdir) {
 				# correctly ordered
 			} elsif ($subdir eq $prev_subdir) {
 				$line->log_error("${subdir} must only appear once.");
-			} elsif (defined($prev_subdir) && $subdir lt $prev_subdir) {
+			} elsif ($prev_subdir eq "x11" && $subdir eq "archivers") {
-				$line->log_warning("${subdir} should come before ${prev_subdir}.");
+				# ignore that one, since it is documented in the top-level Makefile
 			} else {
-				# correctly ordered
+				$line->log_warning("${subdir} should come before ${prev_subdir}.");
+			}
 			$prev_subdir = $subdir;
 			if ($comment_flag eq "") {
 				push(@subdirs, "${current_dir}/${subdir}");
+			}
+		}
+	}
 	checklines_mk($lines);
 	if ($opt_recursive) {

	@@ -80,26 +80,27 @@ sub physlines($) {		@@ -80,26 +80,27 @@ sub physlines($) {
80	}	80	}
81		81
82	# Only for PkgLint::String support	82	# Only for PkgLint::String support
83	sub substring($$$$) {	83	sub substring($$$$) {
84	my ($self, $line, $start, $end) = @_;	84	my ($self, $line, $start, $end) = @_;
85		85
86	return substr($self->[PHYSLINES]->[$line]->[1], $start, $end);	86	return substr($self->[PHYSLINES]->[$line]->[1], $start, $end);
87	}	87	}
88		88
89	sub show_source($$) {	89	sub show_source($$) {
90	my ($self, $out) = @_;	90	my ($self, $out) = @_;
91		91
92	if (PkgLint::Logging::get_show_source_flag()) {	92	if (PkgLint::Logging::get_show_source_flag()) {
		93	print $out ("\n");
93	foreach my $line (@{$self->physlines}) {	94	foreach my $line (@{$self->physlines}) {
94	print $out ("> " . $line->[1]);	95	print $out ("> " . $line->[1]);
95	}	96	}
96	}	97	}
97	}	98	}
98		99
99	sub log_fatal($$) {	100	sub log_fatal($$) {
100	my ($self, $text) = @_;	101	my ($self, $text) = @_;
101		102
102	$self->show_source(*STDERR);	103	$self->show_source(*STDERR);
103	PkgLint::Logging::log_fatal($self->fname, $self->[LINES], $text);	104	PkgLint::Logging::log_fatal($self->fname, $self->[LINES], $text);
104	}	105	}
105	sub log_error($$) {	106	sub log_error($$) {