 @@ -1,14 +1,14 @@
-# $NetBSD: makevars.map,v 1.194 2009/04/09 00:55:12 joerg Exp $
+# $NetBSD: makevars.map,v 1.195 2009/06/13 06:30:25 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
 @@ -296,26 +296,41 @@ EMACS_BIN		Pathname [$system]
 EMACS_ETCPREFIX		Pathname [$system]
 EMACS_FLAVOR		{ emacs xemacs } [$system]
 EMACS_INFOPREFIX	Pathname [$system]
 EMACS_LISPPREFIX	Pathname [$system]
 EMACS_MODULES		List of Identifier [m:as,c:as]
 EMACS_PKGNAME_PREFIX	Identifier [$system]
 # ^^ or the empty string.
 EMACS_TYPE		{ emacs xemacs } [$system]
 EMACS_USE_LEIM		Yes
 EMACS_VERSIONS_ACCEPTED	List of { emacs22 emacs22nox emacs21 emacs21nox emacs20 xemacs215 xemacs214 } [m:s]
 EMACS_VERSION_MAJOR	Integer [$system]
 EMACS_VERSION_MINOR	Integer [$system]
 EMACS_VERSION_REQD	List of { emacs22 emacs22nox emacs21 emacs21nox emacs20 xemacs215 xemacs214 } [m:as]
 EMULDIR			Pathname [$system]
 EMULSUBDIR		Pathname [$system]
 OPSYS_EMULDIR		Pathname [$system]
 EMULSUBDIRSLASH		Pathname [$system]
 EMUL_ARCH		{ i386 none } [$system]
 EMUL_DISTRO		Identifier [$system]
 EMUL_IS_NATIVE		Yes [$system]
 EMUL_MODULES.*		List of Identifier [$package]
 EMUL_OPSYS		{ linux } [$system]
 EMUL_PKG_FMT		{ plain rpm } [$package]
 EMUL_PLATFORM		EmulPlatform [$user]
 EMUL_PLATFORMS		List of EmulPlatform [$package]
 EMUL_PREFER		List of EmulPlatform [$user]
 EMUL_REQD		InternalList of Dependency [$package]
 EMUL_TYPE.*		{ native builtin suse suse-9.1 suse-9.x suse-10.0 suse-10.x } [$user]
 ERROR_CAT		ShellCommand [$system]
 ERROR_MSG		ShellCommand [$system]
 EVAL_PREFIX		InternalList of ShellWord [m:a,c:a]
 # ^^ FIXME: Looks like a type mismatch.
 EXPORT_SYMBOLS_LDFLAGS	List of LdFlag [$system]
 EXTRACT_CMD		ShellCommand [$system]
 EXTRACT_ELEMENTS	List of Pathmask [$package_list]
 EXTRACT_ONLY		List of Pathname [$package_list]
 EXTRACT_OPTS		List of ShellWord [m:as,c:as]
 EXTRACT_OPTS_BIN	List of ShellWord [m:as,c:as]
 EXTRACT_OPTS_LHA	List of ShellWord [m:as,c:as]
 EXTRACT_OPTS_PAX	List of ShellWord [m:as,c:as]
 EXTRACT_OPTS_RAR	List of ShellWord [m:as,c:as]

 @@ -1,15 +1,15 @@
 #! @PERL@
-# $NetBSD: pkglint.pl,v 1.812 2009/05/26 21:40:42 rillig Exp $
+# $NetBSD: pkglint.pl,v 1.813 2009/06/13 06:30:25 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.
+#
 @@ -4969,26 +4969,50 @@ sub checkline_mk_vartype_basic($$$$$$$$)
 			$line->log_warning("Unknown dependency format.");
 			$line->explain_warning(
 "Examples for valid dependencies are:",
 "  package-[0-9]*:../../category/package",
 "  package>=3.41:../../category/package",
 "  package-2.718:../../category/package");
+		}
 	} elsif ($type eq "DistSuffix") {
 		if ($value eq ".tar.gz") {
 			$line->log_note("${varname} is \".tar.gz\" by default, so this definition may be redundant.");
+		}
 	} elsif ($type eq "EmulPlatform") {
 		if ($value =~ m"^(\w+)-(\w+)$") {
 			my ($opsys, $arch) = ($1, $2);
 			if ($opsys !~ m"^(?:bsdos|darwin|dragonfly|freebsd|hpux|interix|irix|linux|netbsd|openbsd|osf1|sunos)$") {
 				$line->log_warning("Unknown operating system: ${opsys}");
+			}
 			# no check for $os_version
 			if ($arch !~ m"^(?:i386|alpha|amd64|arc|arm|arm32|cobalt|convex|dreamcast|hpcmips|hpcsh|hppa|ia64|m68k|m88k|mips|mips64|mipsel|mipseb|mipsn32|ns32k|pc532|pmax|powerpc|rs6000|s390|sparc|sparc64|vax|x86_64)$") {
 				$line->log_warning("Unknown hardware architecture: ${arch}");
+			}
 		} else {
 			$line->log_warning("\"${value}\" is not a valid emulation platform.");
 			$line->explain_warning(
 "An emulation platform has the form <OPSYS>-<MACHINE_ARCH>.",
 "OPSYS is the lower-case name of the operating system, and MACHINE_ARCH",
 "is the hardware architecture.",
 "",
 "Examples: linux-i386, irix-mipsel.");
+		}
 	} elsif ($type eq "Filename") {
 		if ($value_novar =~ m"/") {
 			$line->log_warning("A filename should not contain a slash.");
 		} elsif ($value_novar !~ m"^[-0-9\@A-Za-z.,_~+%]*$") {
 			$line->log_warning("\"${value}\" is not a valid filename.");
+		}
 	} elsif ($type eq "Filemask") {
 		if ($value_novar !~ m"^[-0-9A-Za-z._~+%*?]*$") {
 			$line->log_warning("\"${value}\" is not a valid filename mask.");
+		}