 @@ -1,14 +1,14 @@
-# $NetBSD: makevars.map,v 1.235 2013/08/15 17:57:44 wiz Exp $
+# $NetBSD: makevars.map,v 1.236 2013/08/15 20:30:43 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
 @@ -200,26 +200,27 @@ BUILTIN_FIND_FILES_VAR	List of Varname [
 BUILTIN_FIND_FILES.*	List of Pathname [builtin.mk:s]
 BUILTIN_FIND_GREP.*	String [builtin.mk:s]
 BUILTIN_FIND_LIBS	List of Pathname [builtin.mk:s]
 BUILTIN_IMAKE_CHECK	List of Unchecked [builtin.mk:s]
 BUILTIN_IMAKE_CHECK.*	YesNo []
 BUILTIN_X11_TYPE	Unchecked [$system]
 BUILTIN_X11_VERSION	Unchecked [$system]
 CATEGORIES		List of Category [m:as,c:ads]
 CC_VERSION		Message [$system]
 CC			ShellCommand [$system]
 CFLAGS*			List of CFlag [$package_list]
 # ^^ may also be changed by the user
 CHECK_BUILTIN		YesNo [builtin.mk:d,m:s]
 CHECK_BUILTIN.*		YesNo [*:p]
 CHECK_FILES_SKIP	List of Pathmask [m:a,c:a]
 CHECK_FILES_SUPPORTED	YesNo [$package]
 CHECK_HEADERS		YesNo [$user]
 CHECK_HEADERS_SKIP	List of Pathmask [$package_list]
 CHECK_INTERPRETER	YesNo [$user]
 CHECK_INTERPRETER_SKIP	List of Pathmask [$package_list]
 CHECK_PERMS		YesNo [$user]
 CHECK_PERMS_SKIP	List of Pathmask [$package_list]
 #CHECK_PERMS_AUTOFIX	YesNo [$package]
 # ^^ experimental
 CHECK_PORTABILITY	YesNo [$user]
 CHECK_PORTABILITY_SKIP	List of Pathmask [$package_list]
 CHECK_SHLIBS		YesNo [m:s]
 @@ -357,26 +358,27 @@ GAMEDATAMODE		FileMode [$system]
 GAMES_GROUP		UserGroupName [$system]
 GAMEMODE		FileMode [$system]
 GAMES_USER		UserGroupName [$system]
 GCC_REQD		List of Version [$package_list]
 GENERATE_PLIST		List of ShellWord [$package_list]
 # ^^ List of Shellcommand, terminated with a semicolon
 GNU_ARCH		{ mips }
 GNU_CONFIGURE		Yes [c:s,m:s]
 GNU_CONFIGURE_MANDIR	Pathname [m:s,c:s]
 GNU_CONFIGURE_PREFIX	Pathname [m:s]
 HAS_CONFIGURE		Yes [m:s,c:s]
 HEADER_TEMPLATES	List of Pathname [$package_list]
 HOMEPAGE		URL [$package]
 IGNORE_PKG.*		Yes [*:sp]
 INCOMPAT_CURSES		InternalList of PlatformTriple [m:as]
 INCOMPAT_ICONV		InternalList of PlatformTriple
 INFO_DIR		Pathname
 # ^^ relative to PREFIX
 INFO_FILES		Yes [$package]
 INSTALL			ShellCommand [$system]
 INSTALLATION_DIRS	List of PrefixPathname [$package_list]
 INSTALLATION_DIRS_FROM_PLIST	Yes [$package]
 INSTALL_DATA		ShellCommand [$system]
 INSTALL_DATA_DIR	ShellCommand [$system]
 INSTALL_DIRS		List of WrksrcSubdirectory [$package_list]
 INSTALL_ENV		List of ShellWord [$package_list]
 INSTALL_FILE		Pathname [m:s]

 @@ -1,15 +1,15 @@
 #! @PERL@
-# $NetBSD: pkglint.pl,v 1.856 2013/05/26 18:09:24 wiz Exp $
+# $NetBSD: pkglint.pl,v 1.857 2013/08/15 20:30:43 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.
+#
 @@ -4243,27 +4243,27 @@ sub checkline_mk_vartype_basic($$$$$$$$)
 				$line->log_error("PKGBASE must not be used in PKG_OPTIONS_VAR.");
 				$line->explain_error(
 "PKGBASE is defined in bsd.pkg.mk, which is included as the",
 "very last file, but PKG_OPTIONS_VAR is evaluated earlier.",
 "Use \${PKGNAME:C/-[0-9].*//} instead.");
+			}
 		},
 		PkgRevision => sub {
 			if ($value !~ m"^[1-9]\d*$") {
 				$line->log_warning("${varname} must be a positive integer number.");
+			}
 			if ($line->fname !~ m"(?:^|/)Makefile$") {
-				$line->log_error("${varname} must not be set outside the package Makefile.");
+				$line->log_error("${varname} only makes sense directly in the package Makefile.");
 				$line->explain_error(
 "Usually, different packages using the same Makefile.common have",
 "different dependencies and will be bumped at different times (e.g. for",
 "shlib major bumps) and thus the PKGREVISIONs must be in the separate",
 "Makefiles. There is no practical way of having this information in a",
 "commonly used Makefile.");
+			}
 		},
 		PlatformTriple => sub {
 			my $part = qr"(?:\[[^\]]+\]|[^-\[])+";
 			if ($value =~ m"^(${part})-(${part})-(${part})$") {
 				my ($opsys, $os_version, $arch) = ($1, $2, $3);
 @@ -6132,27 +6132,27 @@ sub checkfile_package_Makefile($$) {
+		}
 	} else {
 		if (!-f "${current_dir}/${distinfo_file}") {
 			log_warning("${current_dir}/${distinfo_file}", NO_LINE_NUMBER, "File not found. Please run '".conf_make." makesum'.");
+		}
+	}
 	if (exists($pkgctx_vardef->{"REPLACE_PERL"}) && exists($pkgctx_vardef->{"NO_CONFIGURE"})) {
 		$pkgctx_vardef->{"REPLACE_PERL"}->log_warning("REPLACE_PERL is ignored when ...");
 		$pkgctx_vardef->{"NO_CONFIGURE"}->log_warning("... NO_CONFIGURE is set.");
+	}
 	if (!exists($pkgctx_vardef->{"LICENSE"})) {
-		log_error($fname, NO_LINE_NUMBER, "All packages must define their LICENSE.");
+		log_error($fname, NO_LINE_NUMBER, "Each package must define its LICENSE.");
+	}
 	if (exists($pkgctx_vardef->{"GNU_CONFIGURE"}) && exists($pkgctx_vardef->{"USE_LANGUAGES"})) {
 		my $languages_line = $pkgctx_vardef->{"USE_LANGUAGES"};
 		my $value = $languages_line->get("value");
 		if ($languages_line->has("comment") && $languages_line->get("comment") =~ m"\b(?:c|empty|none)\b"i) {
 			# Don't emit a warning, since the comment
 			# probably contains a statement that C is
 			# really not needed.
 		} elsif ($value !~ m"(?:^|\s+)(?:c|c99|objc)(?:\s+|$)") {
 			$pkgctx_vardef->{"GNU_CONFIGURE"}->log_warning("GNU_CONFIGURE almost always needs a C compiler, ...");
 @@ -6220,26 +6220,29 @@ sub checkfile_package_Makefile($$) {
 		$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};
 			my $comment = (defined($suggcomm) ? " (${suggcomm})" : "");
 			next unless $effective_pkgbase eq $suggbase;
 			if (dewey_cmp($effective_pkgversion, "<", $suggver)) {
 				$effective_pkgname_line->log_warning("This package should be updated to ${suggver}${comment}.");
 				$effective_pkgname_line->explain_warning(
 "The wishlist for package updates in doc/TODO mentions that a newer",
 "version of this package is available.");
+			}
 			if (dewey_cmp($effective_pkgversion, "==", $suggver)) {
 				$effective_pkgname_line->log_note("The update request to ${suggver} from doc/TODO${comment} has been done.");
+			}
 			if (dewey_cmp($effective_pkgversion, ">", $suggver)) {
 				$effective_pkgname_line->log_note("This package is newer than the update request to ${suggver}${comment}.");
+			}
+		}
+	}
 	checklines_mk($lines);
 	checklines_package_Makefile_varorder($lines);
 	autofix($lines);
 @@ -6272,26 +6275,36 @@ sub checkfile_patch($) {
 	use constant re_patch_ufa	=> qr"^\+{3}\s(\S+)(?:\s+(.*))?$";
 	use constant re_patch_uh	=> qr"^\@\@\s-(?:(\d+),)?(\d+)\s\+(?:(\d+),)?(\d+)\s\@\@(.*)$";
 	use constant re_patch_uld	=> qr"^-(.*)$";
 	use constant re_patch_ula	=> qr"^\+(.*)$";
 	use constant re_patch_ulc	=> qr"^\s(.*)$";
 	use constant re_patch_ulnonl	=> qr"^\\ No newline at end of file$";
 	use enum qw(:PST_
 		START CENTER TEXT
 		CFA CH CHD CLD0 CLD CLA0 CLA
 		UFA UH UL
 	);
 	my @comment_explanation = (
 "Each patch must document why it is necessary. If it has been applied",
 "because of a security issue, a reference to the CVE should be mentioned",
 "as well.",
 "",
 "Since it is our goal to have as few patches as possible, all patches",
 "should be sent to the upstream maintainers of the package. After you",
 "have done so, you should add a reference to the bug report containing",
 "the patch.");
 	my ($line, $m);
 	my $check_text = sub($) {
 		my ($text) = @_;
 		if ($text =~ m"(\$(Author|Date|Header|Id|Locker|Log|Name|RCSfile|Revision|Source|State|$opt_rcsidstring)(?::[^\$]*)?\$)") {
 			my ($tag) = ($2);
 			if ($text =~ re_patch_uh) {
 				$line->log_warning("Found RCS tag \"\$${tag}\$\". Please remove it.");
 				$line->set_text($1);
 			} else {
 				$line->log_warning("Found RCS tag \"\$${tag}\$\". Please remove it by reducing the number of context lines using pkgdiff or \"diff -U[210]\".");
 @@ -6423,50 +6436,54 @@ sub checkfile_patch($) {
 	};
 	my $transitions =
 		# [ from state, regex, to state, action ]
 		[   [PST_START, re_patch_rcsid, PST_CENTER, sub() {
 			checkline_rcsid($line, "");
 		}], [PST_START, undef, PST_CENTER, sub() {
 			checkline_rcsid($line, "");
 		}], [PST_CENTER, re_patch_empty, PST_TEXT, sub() {
+			#
 		}], [PST_TEXT, re_patch_cfd, PST_CFA, sub() {
 			if (!$seen_comment) {
 				$line->log_error("Comment expected.");
 				$line->explain_error(@comment_explanation);
+			}
 			$line->log_warning("Please use unified diffs (diff -u) for patches.");
 		}], [PST_TEXT, re_patch_ufd, PST_UFA, sub() {
 			if (!$seen_comment) {
 				$line->log_error("Comment expected.");
 				$line->explain_error(@comment_explanation);
+			}
 		}], [PST_TEXT, re_patch_text, PST_TEXT, sub() {
 			$seen_comment = true;
 		}], [PST_TEXT, re_patch_empty, PST_TEXT, sub() {
+			#
 		}], [PST_TEXT, undef, PST_TEXT, sub() {
+			#
 		}], [PST_CENTER, re_patch_cfd, PST_CFA, sub() {
 			if ($seen_comment) {
 				$opt_warn_space and $line->log_note("Empty line expected.");
 			} else {
 				$line->log_error("Comment expected.");
 				$line->explain_error(@comment_explanation);
+			}
 			$line->log_warning("Please use unified diffs (diff -u) for patches.");
 		}], [PST_CENTER, re_patch_ufd, PST_UFA, sub() {
 			if ($seen_comment) {
 				$opt_warn_space and $line->log_note("Empty line expected.");
 			} else {
 				$line->log_error("Comment expected.");
 				$line->explain_error(@comment_explanation);
+			}
 		}], [PST_CENTER, undef, PST_TEXT, sub() {
 			$opt_warn_space and $line->log_note("Empty line expected.");
 		}], [PST_CFA, re_patch_cfa, PST_CH, sub() {
 			$current_fname = $m->text(1);
 			$current_ftype = get_filetype($line, $current_fname);
 			$opt_debug_patches and $line->log_debug("fname=$current_fname ftype=$current_ftype");
 			$patched_files++;
 			$hunks = 0;
 		}], [PST_CH, re_patch_ch, PST_CHD, sub() {
 			$hunks++;
 		}], [PST_CHD, re_patch_chd, PST_CLD0, sub() {
 			$dellines = ($m->has(2))