git: 7e62f9c1672b - main - ports-mgmt/portlint: Update to 2.22.7

From: Joe Marcus Clarke <marcus_at_FreeBSD.org>
Date: Mon, 07 Apr 2025 13:28:43 UTC
The branch main has been updated by marcus:

URL: https://cgit.FreeBSD.org/ports/commit/?id=7e62f9c1672b873ee39a642f55236364bf28f770

commit 7e62f9c1672b873ee39a642f55236364bf28f770
Author:     Joe Marcus Clarke <marcus@FreeBSD.org>
AuthorDate: 2025-04-07 13:27:54 +0000
Commit:     Joe Marcus Clarke <marcus@FreeBSD.org>
CommitDate: 2025-04-07 13:27:54 +0000

    ports-mgmt/portlint: Update to 2.22.7
    
    Don't perform checkearlier() twice for LICENSE*
    
    PR:             285145
---
 ports-mgmt/portlint/Makefile        |  2 +-
 ports-mgmt/portlint/src/portlint.pl | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/ports-mgmt/portlint/Makefile b/ports-mgmt/portlint/Makefile
index 90cc5f077567..9d81d4acd787 100644
--- a/ports-mgmt/portlint/Makefile
+++ b/ports-mgmt/portlint/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	portlint
-PORTVERSION=	2.22.6
+PORTVERSION=	2.22.7
 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 6dc08dbd2fa6..5ebbb5a79e74 100644
--- a/ports-mgmt/portlint/src/portlint.pl
+++ b/ports-mgmt/portlint/src/portlint.pl
@@ -52,7 +52,7 @@ $portdir = '.';
 # version variables
 my $major = 2;
 my $minor = 22;
-my $micro = 6;
+my $micro = 7;
 
 # default setting - for FreeBSD
 my $portsdir = '/usr/ports';
@@ -3306,6 +3306,7 @@ MAINTAINER COMMENT WWW
 			LICENSE LICENSE_COMB LICENSE_GROUPS LICENSE_NAME
 			LICENSE_TEXT LICENSE_FILE LICENSE_PERMS
 		));
+		&checkearlier($file, $tmp, @varnames);
 	} else {
 		&perror("WARN", $file, -1, "Consider defining LICENSE.");
 	}
@@ -3327,17 +3328,16 @@ NOT_FOR_ARCHS NOT_FOR_ARCHS_REASON(_\w+)? LEGAL_TEXT
 
 	if ($tmp =~ /$brokenpattern/) {
 		$idx++;
-	}
+		$tmp = "\n" . $tmp;
 
-	$tmp = "\n" . $tmp;
+		foreach my $i (@linestocheck) {
+			$tmp =~ s/$i[?+:]?=[^\n]+\n//g;
+		}
 
-	foreach my $i (@linestocheck) {
-		$tmp =~ s/$i[?+:]?=[^\n]+\n//g;
+		push(@varnames, @linestocheck);
+		&checkearlier($file, $tmp, @varnames);
 	}
 
-	push(@varnames, @linestocheck);
-	&checkearlier($file, $tmp, @varnames);
-
 	#
 	# section 7: *_DEPENDS (may not be there)
 	#