|
|
@@ -2161,6 +2161,7 @@ xargs xmkmf
|
|
|
next;
|
|
|
}
|
|
|
if ($curline =~ /(?:^|\s)[\@\-]{0,2}$i(?:$|\s)/
|
|
|
+ && $curline !~ /^PORTNAME=[^\n]+$i/m
|
|
|
&& $curline !~ /^[A-Z]+_TARGET[?+]?=[^\n]+$i/m
|
|
|
&& $curline !~ /^[A-Z]+_INSTALL_TARGET[?+]?=[^\n]+$i/m
|
|
|
&& $curline !~ /^IGNORE(_[\w\d]+)?(.)?=[^\n]+$i/m
|
|
|
@@ -2858,7 +2859,8 @@ DIST_SUBDIR EXTRACT_ONLY
|
|
|
if ($i =~ /^$ms/ && $i ne $ms) {
|
|
|
my $ip = $i;
|
|
|
$ip =~ s/^$ms\///;
|
|
|
- my $exp_sd = get_makevar($ip);
|
|
|
+ my (@ip_parts) = split(/:/, $ip);
|
|
|
+ my $exp_sd = get_makevar($ip_parts[0]);
|
|
|
if ($exp_sd eq $sd) {
|
|
|
&perror("WARN", $file, -1, "typically when you specify magic site $ms ".
|
|
|
"you do not need anything else as $sd is assumed");
|
