git: 234ad8349fdf - main - ports-mgmt/portlint: Update to 2.22.6

The branch main has been updated by marcus:

URL: https://cgit.FreeBSD.org/ports/commit/?id=234ad8349fdff637996fa9c41beb5828d1b9de99

commit 234ad8349fdff637996fa9c41beb5828d1b9de99
Author:     Joe Marcus Clarke <marcus@FreeBSD.org>
AuthorDate: 2025-04-07 12:29:47 +0000
Commit:     Joe Marcus Clarke <marcus@FreeBSD.org>
CommitDate: 2025-04-07 12:29:47 +0000

    ports-mgmt/portlint: Update to 2.22.6
    
    * Remove the mention of USE_GCC=X+ [1]
    * Convert to USES=java [2]
    
    PR:             285255 [1]
                    285792 [2]
    Submitted by:   gerald [1]
---
 ports-mgmt/portlint/Makefile        |  2 +-
 ports-mgmt/portlint/src/portlint.pl | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ports-mgmt/portlint/Makefile b/ports-mgmt/portlint/Makefile
index ef28219d5d9b..90cc5f077567 100644
--- a/ports-mgmt/portlint/Makefile
+++ b/ports-mgmt/portlint/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	portlint
-PORTVERSION=	2.22.5
+PORTVERSION=	2.22.6
 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 1c3c9e32ec98..6dc08dbd2fa6 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 = 5;
+my $micro = 6;
 
 # default setting - for FreeBSD
 my $portsdir = '/usr/ports';
@@ -2394,22 +2394,22 @@ xargs xmkmf
 		} elsif ($gcc_val !~ /\+/) {
 			&perror("WARN", $file, $lineno, "Setting a specific version for ".
 				"USE_GCC should only be done as a last resort.  Unless you ".
-				"have confirmed this port does not build with later ".
-				"versions of GCC, please use USE_GCC=$gcc_val+.");
+				"are unable to get this port to build with current ".
+				"versions of GCC, please use USE_GCC=yes.");
 		}
 	}
 
 	#
 	# whole file: USE_JAVA check
 	#
-	if ($whole =~ /^USE_JAVA[?:]?=\s*(.*)$/m) {
+	if ($makevar{USES} =~ /\bjava(:(build|run))?\b/) {
 		$use_java = 1;
 	}
 
 	#
 	# whole file: USE_ANT check
 	#
-	if ($whole =~ /^USE_ANT[?:]?=\s*(.*)$/m) {
+	if ($makevar{USES} =~ /\bjava:ant/) {
 		$use_ant = 1;
 	}
 
@@ -2429,7 +2429,7 @@ xargs xmkmf
 	# whole file: check for USE_ANT and USES=gmake both defined
 	#
 	if ($use_ant && $makevar{USES} =~ /\bgmake\b/) {
-		&perror("WARN", $file, -1, "a port shall not define both USE_ANT ".
+		&perror("WARN", $file, -1, "a port shall not define both USES=java:ant ".
 			"and USES[+]=gmake");
 	}