From nobody Fri Dec 27 16:47:08 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YKWcX3mjNz5j1ds; Fri, 27 Dec 2024 16:47:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YKWcX3CqBz4sSv; Fri, 27 Dec 2024 16:47:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735318028; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=StAdFLEpPILx+ib9knpwfTg1kF+mJa26fwbQE0s/Qwo=; b=SQ2OGoHPuG6Bl2ErU4NtOuQWYsOxF3BWkX4mNt12mVLhBCJx7/FNpnOijVk9JLfCU/PrUp SU/U6LMXdHQxOyMeMO6FSopiMpjLeT5Tv4GU1IwJouW+BRyBmisVpCmbWGsNbV4jSiAELL 1yxLGVRLzzKzxRrKAzGrznEPCCSelkbpyJwwl5YaXfarFlCEnlT2lMP6MhNe4IGurnUPhc pfR1pws8iHnOFMktXg4Pnn92hxa30n+oQUFl3+yrBXick5e8UCRICvxhnIeGp5O1B1nIfy 1/yR6O+S3XOOxKqul4YtQNKJKpAEriDaHUF2McXQaD4V/jLf6+pv3UYG2ke0Sg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735318028; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=StAdFLEpPILx+ib9knpwfTg1kF+mJa26fwbQE0s/Qwo=; b=yAppDdjzDpjDE3GC0rjPgyvkkam8iGaymNqV4qmhi1NPbOJ83sFrT90P7n5H21bJUiTGBj CyO6uvPC3htCkLEZ7dUL285ygy5t0nExdhyX03PvYzoF9A2X+QcfHtjFnHEWA9JuK1xdIP kbFvuXBrtt+8vqXJcsNLUPWrma8xQUdMSz3e3GKbT4JWgr5WUlYNK0eCQfMkCCxjbg1FXW TiwwN3YyHCVqUMe6LNMiFjA7Y0HsUIWgsn2pLfWiCWDzDX9hTGJYTcD3hNIUQt0/3TnRdC +o5/+34RmT2bCvBuoAC8yAfyv967aA82uVYJv/4Wz0Jp4qcFEBdeFuUcdCQefQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735318028; a=rsa-sha256; cv=none; b=JU+CdGP/9c0VreznNx+6adzQo21KSUExXQQo5WRBABsH7esUau7nfmkLu8X+U8y6d94Ikc mvKPrcqxBUzO0M15LWmmePxKFttw62FKz6tV755fg1eepuDeZpmZ0h2BbXFlYST1+4NFP2 qQACUyNlUQQlfLw0m8W58TcS88TvYQBc4e6DfyJ+7eG0pg7EIekTJrmRuStxietyDrwgGD xxwY5HefMPpnYAteSpGH1jF5atAXD+/SiKL10TXcWzi7uMa+lWIC+L6kMXCNh1N22t9uIx WMB7WQa9NQnP00lq+VnhbairGEPUfEee38kmQ8eoPrB+xOmkkQBn1J6d7wc+Fg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YKWcX2j3Bzn5d; Fri, 27 Dec 2024 16:47:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BRGl8xg098927; Fri, 27 Dec 2024 16:47:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BRGl8a1098924; Fri, 27 Dec 2024 16:47:08 GMT (envelope-from git) Date: Fri, 27 Dec 2024 16:47:08 GMT Message-Id: <202412271647.4BRGl8a1098924@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Joe Marcus Clarke Subject: git: b94980b88b1a - main - ports-mgmt/portlint: Update to 2.22.4 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: marcus X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b94980b88b1a94e062c0329b06e05713b185fc41 Auto-Submitted: auto-generated The branch main has been updated by marcus: URL: https://cgit.FreeBSD.org/ports/commit/?id=b94980b88b1a94e062c0329b06e05713b185fc41 commit b94980b88b1a94e062c0329b06e05713b185fc41 Author: Joe Marcus Clarke AuthorDate: 2024-12-27 16:44:43 +0000 Commit: Joe Marcus Clarke CommitDate: 2024-12-27 16:44:43 +0000 ports-mgmt/portlint: Update to 2.22.4 * Drop support for USE_GCC=any [1] * Attempt to eliminate duplicate "earlier" messages [2] PR: 283323 [1] 283046 [2] Submitted by: gerald [1] --- ports-mgmt/portlint/Makefile | 2 +- ports-mgmt/portlint/src/portlint.pl | 16 +++++++++------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/ports-mgmt/portlint/Makefile b/ports-mgmt/portlint/Makefile index 86b20ce83b9f..7b74f65e8505 100644 --- a/ports-mgmt/portlint/Makefile +++ b/ports-mgmt/portlint/Makefile @@ -1,5 +1,5 @@ PORTNAME= portlint -PORTVERSION= 2.22.3 +PORTVERSION= 2.22.4 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 0fd3a76ee362..44f4536905a2 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 = 3; +my $micro = 4; # default setting - for FreeBSD my $portsdir = '/usr/ports'; @@ -2389,8 +2389,8 @@ xargs xmkmf if ($whole =~ /^USE_GCC[?:]?=\s*([^\s#]*).*$/m) { my $lineno = &linenumber($`); my $gcc_val = $1; - if ($gcc_val eq 'any' || $gcc_val eq 'yes') { - # Just accept these two. + if ($gcc_val eq 'yes') { + # Just accept this one. } elsif ($gcc_val !~ /\+/) { &perror("WARN", $file, $lineno, "Setting a specific version for ". "USE_GCC should only be done as a last resort. Unless you ". @@ -3133,7 +3133,7 @@ DIST_SUBDIR EXTRACT_ONLY # print "OK: checking second section of $file (PATCH*: optional).\n" if ($verbose); - $tmp = $sections[$idx] // ''; + $tmp = "\n" . $sections[$idx] // ''; if ($tmp =~ /(PATCH_SITES|PATCH_SITE_SUBDIR|PATCHFILES|PATCH_DIST_STRIP)/) { &checkearlier($file, $tmp, @varnames); @@ -3329,6 +3329,8 @@ NOT_FOR_ARCHS NOT_FOR_ARCHS_REASON(_\w+)? LEGAL_TEXT $idx++; } + $tmp = "\n" . $tmp; + foreach my $i (@linestocheck) { $tmp =~ s/$i[?+:]?=[^\n]+\n//g; } @@ -3341,7 +3343,7 @@ NOT_FOR_ARCHS NOT_FOR_ARCHS_REASON(_\w+)? LEGAL_TEXT # print "OK: checking seventh section of $file (*_DEPENDS).\n" if ($verbose); - $tmp = $sections[$idx] // ''; + $tmp = "\n" . $sections[$idx] // ''; # Check for direct assignment of BUILD_DEPENDS to RUN_DEPENDS. if ($tmp =~ /\nRUN_DEPENDS=[ \t]*\$\{BUILD_DEPENDS}/) { @@ -3384,7 +3386,7 @@ TEST_DEPENDS FETCH_DEPENDS DEPENDS_TARGET # print "OK: check eighth section of $file (FLAVORS: optional).\n" if ($verbose); - $tmp = $sections[$idx] // ''; + $tmp = "\n" . $sections[$idx] // ''; if ($tmp =~ /(FLAVORS|FLAVOR)/) { &checkearlier($file, $tmp, @varnames); @@ -3451,7 +3453,7 @@ TEST_DEPENDS FETCH_DEPENDS DEPENDS_TARGET # Makefile 10: check the rest of file # print "OK: checking the rest of the $file.\n" if ($verbose); - $tmp = join("\n\n", @sections[$idx .. scalar(@sections)-1]); + $tmp = join("\n\n", @sections[$idx+1 .. scalar(@sections)-1]); $tmp = "\n" . $tmp; # to make the begin-of-line check easier