 @@ -1,15 +1,15 @@
 #! @PERL@
-# $NetBSD: pkglint.pl,v 1.757 2008/01/25 17:59:24 rillig Exp $
+# $NetBSD: pkglint.pl,v 1.758 2008/01/28 00:53:21 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.
+#
 @@ -1746,27 +1746,27 @@ my (@options) = (
+#
 # Commonly used regular expressions.
+#
 use constant regex_dependency_gt => qr"^((?:\$\{[\w_]+\}|[\w_]|-[^\d])+)>=(.*)$";
 use constant regex_dependency_wildcard
 				=> qr"^((?:\$\{[\w_]+\}|[\w_]|-[^\d\[])+)-(?:\[0-9\]|\d.*)$";
 use constant regex_gnu_configure_volatile_vars
 				=> qr"^(?:.*_)?(?:CFLAGS||CPPFLAGS|CXXFLAGS|FFLAGS|LDFLAGS|LIBS)$";
 use constant regex_mk_comment	=> qr"^ *\s*#(.*)$";
 use constant regex_mk_cond	=> qr"^\.(\s*)(if|ifdef|ifndef|else|elif|endif|for|endfor|undef)(?:\s+([^\s#][^#]*?))?\s*(?:#.*)?$";
 use constant regex_mk_dependency=> qr"^([^\s:]+(?:\s*[^\s:]+)*):\s*([^#]*?)(?:\s*#.*)?$";
-use constant regex_mk_include	=> qr"^\.\s*s?include\s+\"([^\"]+)\"\s*(?:#.*)?$";
+use constant regex_mk_include	=> qr"^\.\s*(s?include)\s+\"([^\"]+)\"\s*(?:#.*)?$";
 use constant regex_mk_sysinclude=> qr"^\.\s*s?include\s+<([^>]+)>\s*(?:#.*)?$";
 use constant regex_mk_shellvaruse => qr"(?:^|[^\$])\$\$\{?(\w+)\}?"; # XXX: not perfect
 use constant regex_pkgname	=> qr"^((?:[\w.+]|-[^\d])+)-(\d(?:\w|\.\d)*)$";
 use constant regex_mk_shellcmd	=> qr"^\t(.*)$";
 use constant regex_rcs_conflict	=> qr"^(<<<<<<<|=======|>>>>>>>)";
 use constant regex_unresolved	=> qr"\$\{";
 use constant regex_validchars	=> qr"[\011\040-\176]";
 # Note: the following regular expression looks more complicated than
 # necessary to avoid a stack overflow in the Perl interpreter.
 # The leading white-space may only consist of \040 characters, otherwise
 # the order of regex_varassign and regex_mk_shellcmd becomes important.
 use constant regex_varassign	=> qr"^ *([-*+A-Z_a-z0-9.\${}\[]+?)\s*(=|\?=|\+=|:=|!=)\s*((?:[^\\#\s]+|\s+?|(?:\\#)+|\\)*?)(?:\s*(#.*))?$";
 use constant regex_sh_varassign	=> qr"^([A-Z_a-z][0-9A-Z_a-z]*)=";
 @@ -2317,27 +2317,27 @@ sub load_tool_names() {
 	# Get the list of files that define the tools from bsd.tools.mk.
+	#
 	@tool_files = ("defaults.mk");
+	{
 		my $fname = "${cwd_pkgsrcdir}/mk/tools/bsd.tools.mk";
 		my $lines = load_lines($fname, true);
 		if (!$lines) {
 			log_fatal($fname, NO_LINE_NUMBER, "Cannot be read.");
+		}
 		foreach my $line (@{$lines}) {
 			if ($line->text =~ regex_mk_include) {
-				my ($includefile) = ($1);
+				my (undef, $includefile) = ($1, $2);
 				if ($includefile =~ qr"^(?:\$\{PKGSRCDIR\}/mk/tools/)?([^/]+)$") {
 					push(@tool_files, $1);
+				}
+			}
+		}
+	}
 	assert(scalar(@tool_files) > 1, "Too few tool files. Maybe the files have been renamed again?");
+	#
 	# Scan the tool files for the actual definitions of the tools.
+	#
 	$tools = {};
 @@ -3490,27 +3490,27 @@ sub parseline_mk($) {
 		$line->set("is_empty", true);
 	} elsif ($text =~ regex_mk_cond) {
 		my ($indent, $directive, $args, $comment) = ($1, $2, $3, $4);
 		$line->set("is_cond", true);
 		$line->set("indent", $indent);
 		$line->set("directive", $directive);
 		defined($args) and $line->set("args", $args);
 		defined($comment) and $line->set("comment", $comment);
 	} elsif ($text =~ regex_mk_include) {
-		my ($includefile, $comment) = ($1, $2);
+		my (undef, $includefile, $comment) = ($1, $2, $3);
 		$line->set("is_include", true);
 		$line->set("includefile", $includefile);
 		defined($comment) and $line->set("comment", $comment);
 	} elsif ($text =~ regex_mk_sysinclude) {
 		my ($includefile, $comment) = ($1, $2);
 		$line->set("is_sysinclude", true);
 		$line->set("includefile", $includefile);
 		defined($comment) and $line->set("comment", $comment);
 	} elsif ($text =~ regex_mk_dependency) {
 @@ -3924,53 +3924,53 @@ sub checkline_other_absolute_pathname($$
 		} elsif ($before =~ qr"\w$") {
 			# Something like $dir/lib
 		} elsif ($before =~ qr"\.$") {
 			# ../foo is not an absolute pathname.
 		} else {
 			$opt_debug_misc and $line->log_debug("before=${before}");
 			checkword_absolute_pathname($line, $path);
+		}
+	}
+}
-sub checkline_relative_path($$) {
+sub checkline_relative_path($$$) {
-	my ($line, $path) = @_;
+	my ($line, $path, $must_exist) = @_;
 	my ($res_path);
 	if (!$is_wip && $path =~ qr"/wip/") {
 		$line->log_error("A pkgsrc package must not depend on any outside package.");
+	}
 	$res_path = resolve_relative_path($path, true);
 	if ($res_path =~ regex_unresolved) {
 		$opt_debug_unchecked and $line->log_debug("Unchecked path: \"${path}\".");
 	} elsif (!-e ((($res_path =~ qr"^/") ? "" : "${current_dir}/") . $res_path)) {
-		$line->log_error("\"${res_path}\" does not exist.");
+		$must_exist and $line->log_error("\"${res_path}\" does not exist.");
 	} elsif ($path =~ qr"^\.\./\.\./([^/]+)/([^/]+)(.*)") {
 		my ($cat, $pkg, $rest) = ($1, $2, $3);
 	} elsif ($path =~ qr"^\.\./\.\./mk/") {
 		# There need not be two directory levels for mk/ files.
 	} elsif ($path =~ qr"^\.\./mk/" && $cur_pkgsrcdir eq "..") {
 		# That's fine for category Makefiles.
 	} elsif ($path =~ qr"^\.\.") {
 		$line->log_warning("Invalid relative path \"${path}\".");
+	}
+}
 sub checkline_relative_pkgdir($$) {
 	my ($line, $path) = @_;
-	checkline_relative_path($line, $path);
+	checkline_relative_path($line, $path, true);
 	$path = resolve_relative_path($path, false);
 	if ($path !~ qr"^(?:\./)?\.\./\.\./[^/]+/[^/]+$") {
 		$line->log_warning("\"${path}\" is not a valid relative package directory.");
 		$line->explain_warning(
 			"A relative pathname always starts with \"../../\", followed",
 			"by a category, a slash and a the directory name of the package.",
 			"For example, \"../../misc/screen\" is a valid relative pathname.");
+	}
+}
 sub checkline_spellcheck($) {
 	my ($line) = @_;
 @@ -5418,27 +5418,27 @@ sub checkline_mk_vartype_basic($$$$$$$$)
+		}
 	} elsif ($type eq "PrefixPathname") {
 		if ($value =~ qr"^man/(.*)") {
 			my ($mansubdir) = ($1);
 			$line->log_warning("Please use \"\${PKGMANDIR}/${mansubdir}\" instead of \"${value}\".");
+		}
 	} elsif ($type eq "RelativePkgDir") {
 		checkline_relative_pkgdir($line, $value);
 	} elsif ($type eq "RelativePkgPath") {
-		checkline_relative_path($line, $value);
+		checkline_relative_path($line, $value, true);
 	} elsif ($type eq "Restricted") {
 		if ($value ne "\${RESTRICTED}") {
 			$line->log_warning("The only valid value for ${varname} is \${RESTRICTED}.");
 			$line->explain_warning(
 "These variables are used to control which files may be mirrored on FTP",
 "servers or CD-ROM collections. They are not intended to mark packages",
 "whose only MASTER_SITES are on ftp.NetBSD.org.");
+		}
 	} elsif ($type eq "SVR4PkgName") {
 		if ($value =~ regex_unresolved) {
 @@ -6230,30 +6230,30 @@ sub checklines_mk($) {
 				if ($aligned_len % 8 == 0) {
 					my $tabalign = ("\t" x (($aligned_len - tablen($prefix) + 7) / 8));
 					$line->replace("${prefix}${align}", "${prefix}${tabalign}");
+				}
+			}
 			checkline_mk_varassign($line, $varname, $op, $value, $comment);
 			$substcontext->check_varassign($line, $varname, $op, $value);
 		} elsif ($text =~ regex_mk_shellcmd) {
 			my ($shellcmd) = ($1);
 			checkline_mk_shellcmd($line, $shellcmd);
 		} elsif ($text =~ regex_mk_include) {
-			my ($includefile) = ($1);
+			my ($include, $includefile) = ($1, $2);
 			$opt_debug_include and $line->log_debug("includefile=${includefile}");
-			checkline_relative_path($line, $includefile);
+			checkline_relative_path($line, $includefile, $include eq "include");
 			if ($includefile =~ qr"../Makefile$") {
 				$line->log_error("Other Makefiles must not be included directly.");
 				$line->explain_warning(
 					"If you want to include portions of another Makefile, extract",
 					"the common parts and put them into a Makefile.common. After",
 					"that, both this one and the other package should include the",
 					"Makefile.common.");
+			}
 			if ($includefile eq "../../mk/bsd.prefs.mk") {
 				if ($line->fname =~ qr"buildlink3\.mk$") {
 					$line->log_note("For efficiency reasons, please include bsd.fast.prefs.mk instead of bsd.prefs.mk.");
 @@ -6456,27 +6456,27 @@ sub checklines_buildlink3_inclusion($) {
 	my ($included_files);
 	assert(@{$lines} != 0, "The lines array must be non-empty.");
 	$opt_debug_trace and log_debug($lines->[0]->fname, NO_LINES, "checklines_buildlink3_inclusion()");
 	if (!defined($pkgctx_bl3)) {
 		return;
+	}
 	# Collect all the included buildlink3.mk files from the file.
 	$included_files = {};
 	foreach my $line (@{$lines}) {
 		if ($line->text =~ regex_mk_include) {
-			my ($file, $comment) = ($1, $2);
+			my (undef, $file, $comment) = ($1, $2, $3);
 			if ($file =~ qr"^\.\./\.\./(.*)/buildlink3\.mk") {
 				my ($bl3) = ($1);
 				$included_files->{$bl3} = $line;
 				if (!exists($pkgctx_bl3->{$bl3})) {
 					$line->log_warning("${bl3}/buildlink3.mk is included by this file but not by the package.");
+				}
+			}
+		}
+	}
 	# Print debugging messages for all buildlink3.mk files that are