diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2022-04-05 16:40:54 -0400 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2022-04-05 16:40:54 -0400 |
| commit | 3ac754dbcea5101f4e7c36242c2df36db2a7e5c9 (patch) | |
| tree | 9057231db0b497cb377dae8f1cb56e1e3423b125 /ports-mgmt/portlint/src | |
| parent | games/julius: unbreak on riscv64 (diff) | |
ports-mgmt/portlint: Update to 2.19.11
* Do not strip modifiers from variables when dereferencing.
PR: 262941
Diffstat (limited to 'ports-mgmt/portlint/src')
| -rw-r--r-- | ports-mgmt/portlint/src/portlint.pl | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/ports-mgmt/portlint/src/portlint.pl b/ports-mgmt/portlint/src/portlint.pl index 6faf2ebd8404..ddeb7d290c7d 100644 --- a/ports-mgmt/portlint/src/portlint.pl +++ b/ports-mgmt/portlint/src/portlint.pl @@ -49,7 +49,7 @@ $portdir = '.'; # version variables my $major = 2; my $minor = 19; -my $micro = 10; +my $micro = 11; # default setting - for FreeBSD my $portsdir = '/usr/ports'; @@ -2860,7 +2860,14 @@ DIST_SUBDIR EXTRACT_ONLY my $ip = $i; $ip =~ s/^$ms\///; my (@ip_parts) = split(/:/, $ip); - my $exp_sd = get_makevar($ip_parts[0]); + my $check_var = $ip_parts[0]; + shift(@ip_parts); + foreach my $check_part (@ip_parts) { + if ($check_part =~ /^[A-Z]}/) { + $check_var .= ":$check_part"; + } + } + my $exp_sd = get_makevar($check_var); 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"); @@ -2994,12 +3001,6 @@ DIST_SUBDIR EXTRACT_ONLY my %seen; foreach my $conflict (split ' ', $conflicts) { if (not $seen{$conflict}) { -# `$pkg_version -T '$makevar{PKGBASE}' '$conflict' || $pkg_version -T '$makevar{PKGNAME}' '$conflict'`; -# my $selfconflict = !$?; -# if ($selfconflict) { -# &perror("FATAL", "", -1, "Package conflicts with itself. ". -# "You should remove \"$conflict\" from CONFLICTS."); -# } elsif ($conflict =~ m/-\[0-9\]\*$/) { if ($conflict =~ m/-\[0-9\]\*$/) { &perror("WARN", $file, -1, "CONFLICTS definition \"$conflict\" ". "ends in redundant version pattern. ". |