git: 3ac754dbcea5 - main - ports-mgmt/portlint: Update to 2.19.11

From: Joe Marcus Clarke <marcus_at_FreeBSD.org>
Date: Tue, 05 Apr 2022 20:41:47 UTC
The branch main has been updated by marcus:

URL: https://cgit.FreeBSD.org/ports/commit/?id=3ac754dbcea5101f4e7c36242c2df36db2a7e5c9

commit 3ac754dbcea5101f4e7c36242c2df36db2a7e5c9
Author:     Joe Marcus Clarke <marcus@FreeBSD.org>
AuthorDate: 2022-04-05 20:40:54 +0000
Commit:     Joe Marcus Clarke <marcus@FreeBSD.org>
CommitDate: 2022-04-05 20:40:54 +0000

    ports-mgmt/portlint: Update to 2.19.11
    
    * Do not strip modifiers from variables when dereferencing.
    
    PR:             262941
---
 ports-mgmt/portlint/Makefile        |  3 +--
 ports-mgmt/portlint/src/portlint.pl | 17 +++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/ports-mgmt/portlint/Makefile b/ports-mgmt/portlint/Makefile
index 103f454493be..e14f2f36de92 100644
--- a/ports-mgmt/portlint/Makefile
+++ b/ports-mgmt/portlint/Makefile
@@ -1,8 +1,7 @@
 # Created by: Jun-ichiro itojun Hagino <itojun@itojun.org>
 
 PORTNAME=	portlint
-PORTVERSION=	2.19.10
-PORTREVISION=	1
+PORTVERSION=	2.19.11
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	# none
 DISTFILES=	# none
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. ".