 @@ -1,15 +1,15 @@
 #! @PERL@
-# $NetBSD: pkglint.pl,v 1.821 2009/11/20 12:02:33 rillig Exp $
+# $NetBSD: pkglint.pl,v 1.822 2010/03/10 14:42:22 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.
+#
 @@ -3136,26 +3136,35 @@ sub parse_mk_cond($$) {
 		} elsif ($cond =~ s/^empty\((${re_simple_varname})\)$//) {
 			return ["empty", $1];
 		} elsif ($cond =~ s/^empty\((${re_simple_varname}):M([^\$:{})]+)\)$//) {
 			return ["empty", ["match", $1, $2]];
 		} elsif ($cond =~ s/^\$\{(${re_simple_varname})\}\s+(==|!=)\s+"([^"\$\\]*)"$//) {
 			return [$2, ["var", $1], ["string", $3]];
 		} else {
 			$opt_debug_unchecked and $line->log_debug("parse_mk_cond: ${cond}");
 			return ["unknown", $cond];
+		}
+	}
+}
 sub parse_licenses($) {
 	my ($licenses) = @_;
 	# XXX: this is clearly cheating
 	$licenses =~ s,[()]|AND|OR,,g;
 	my @licenses = split(/\s+/, $licenses);
 	return \@licenses;
+}
 # This procedure fills in the extra fields of a line, depending on the
 # line type. These fields can later be queried without having to parse
 # them again and again.
+#
 sub parseline_mk($) {
 	my ($line) = @_;
 	my $text = $line->text;
 	if ($text =~ regex_varassign) {
 		my ($varname, $op, $value, $comment) = ($1, $2, $3, $4);
 		# In variable assignments, a '#' character is preceded
 		# by a backslash. In shell commands, it is interpreted
 @@ -5097,38 +5106,41 @@ sub checkline_mk_vartype_basic($$$$$$$$)
 		} else {
 			$line->log_warning("Linker flag \"${value}\" does not start with a dash.");
+		}
 	} elsif ($type eq "License") {
 		use constant deprecated_licenses => array_to_hash(qw(
 			fee-based-commercial-use
 			no-commercial-use no-profit no-redistribution
 			shareware
 		));
-		my $license_file = "${cwd_pkgsrcdir}/licenses/${value}";
+		my $licenses = parse_licenses($value);
-		if (defined($pkgctx_vardef) && exists($pkgctx_vardef->{"LICENSE_FILE"})) {
+		foreach my $license (@$licenses) {
-			my $license_file_line = $pkgctx_vardef->{"LICENSE_FILE"};
+			my $license_file = "${cwd_pkgsrcdir}/licenses/${license}";
 			if (defined($pkgctx_vardef) && exists($pkgctx_vardef->{"LICENSE_FILE"})) {
 				my $license_file_line = $pkgctx_vardef->{"LICENSE_FILE"};
-			$license_file = "${current_dir}/" . resolve_relative_path($license_file_line->get("value"), false);
+				$license_file = "${current_dir}/" . resolve_relative_path($license_file_line->get("value"), false);
+			}
-		if (!-f $license_file) {
+			if (!-f $license_file) {
-			$line->log_warning("License file ".normalize_pathname($license_file)." does not exist.");
+				$line->log_warning("License file ".normalize_pathname($license_file)." does not exist.");
+			}
-		if (exists(deprecated_licenses->{$value})) {
+			if (exists(deprecated_licenses->{$license})) {
-			$line->log_warning("License ${value} is deprecated.");
+				$line->log_warning("License ${license} is deprecated.");
+			}
+		}
 	} elsif ($type eq "Mail_Address") {
 		if ($value =~ m"^([+\-.0-9A-Z_a-z]+)\@([-\w\d.]+)$") {
 			my ($localpart, $domain) = ($1, $2);
 			if ($domain =~ m"^NetBSD.org"i && $domain ne "NetBSD.org") {
 				$line->log_warning("Please write NetBSD.org instead of ${domain}.");
+			}
 			if ("${localpart}\@${domain}" =~ m"^(tech-pkg|packages)\@NetBSD\.org$"i) {
 				$line->log_warning("${localpart}\@${domain} is deprecated. Use pkgsrc-users\@NetBSD.org instead.");
+			}
 		} else {