From nobody Tue Apr 05 20:41:47 2022 X-Original-To: dev-commits-ports-all@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 3FDBF1A9D0EC; Tue, 5 Apr 2022 20:41:48 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KY01S1LMfz4gQj; Tue, 5 Apr 2022 20:41:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649191308; 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=1j4wyGDRh24obrnVl0x+ubqo65Ddavl8frxHEEGng+8=; b=kYiIVT3mHOpEmkAmRehYBH20fFq+drUwgPm0H2vlOAsO9ZKiZRpc9l7iVP3uoigMdmn3FN dpjgKtWl6rVb1m2ZSu3SXukj3vJPXYYwpY3M7hW6fXO9/sB7Sg1NcaAJv/+PmN0O+sHN/W SMWAaEhkaq2RXQ//dOwuASjlEQUU069PcJwX7hS/tjZ935tRDIyrQxH3+mVAA3GCAZ7tqf C41bawtIyvrcPPcL6dkFxTLeK0gnhFLgBMJyG6fX/mXLpQFPPDpDqR5uFMM+2dEmL7TSmS 4wGQyoNC944cIELaWhSFXlKcVuVRiGPc7cxscKh+/F+/UPc9iBmK/a2ahNyeHw== 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 0DEDF5D84; Tue, 5 Apr 2022 20:41:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 235Kfl8c019095; Tue, 5 Apr 2022 20:41:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 235KflKI019094; Tue, 5 Apr 2022 20:41:47 GMT (envelope-from git) Date: Tue, 5 Apr 2022 20:41:47 GMT Message-Id: <202204052041.235KflKI019094@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: 3ac754dbcea5 - main - ports-mgmt/portlint: Update to 2.19.11 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: 3ac754dbcea5101f4e7c36242c2df36db2a7e5c9 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649191308; 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=1j4wyGDRh24obrnVl0x+ubqo65Ddavl8frxHEEGng+8=; b=yFlQIj/36KdX0hpNhVwnWNzQmsSmew8DJeE9r7dgcetjKBhm2dqEC0imH90wnZP3DGyAWX 3AE+u15ziMuniKoTZkv/aYFPPmNAcsQez6WsB7Ts7hQ3wn7usocCQwANistdJdOs8LPQd7 0sR6ycdKS1YdNLtbxhgL9roxTElrlxjrTs397mmzICO1zl29p2JuAoLnJNYVEegL0jxLuc QYe9UdGVrhJC3pGlK6bNKHVMiF2Hlkq9J1iN9RLMWiEQBu42DiAoFf4uLQ7RoMYbGefqWz gbGKHsSc8c6AJW5H20wahGNsm1LHm7CCrym2ijE1MpBySoZlw2iqf4y4/bVEVA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649191308; a=rsa-sha256; cv=none; b=od0pLrgTm/iYAjMmqbqHhsBYgaKJ9B5PfVmbk41RtJ68KdSK+OKPRW2glMg4NfzJrTNCyD htkprNk+ZqkxsoUxmR5RgVVTepSTFJ1UdpaI6MZ3hE5DK3s4DLqNS/bXb9l1vntlXgmkrT BvV3B8uFdJNkNeL7XyXWF7czkCruQZvyIQKlQRjs9Ag1wkvipoEZtulbZRaUMf6gA+P6Ul KywWyYwIM/NUBRyzCYiIqzl2KFa73ZeCxFCV2tBL2FICcB8fxqmLuupaWu0dgBno7X90PN WzJbVkLt39CrV7TfCul6vXVAp64sZG4raYRzxbO+6vn+RdVjMfdk0Sm8hW05sg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by marcus: URL: https://cgit.FreeBSD.org/ports/commit/?id=3ac754dbcea5101f4e7c36242c2df36db2a7e5c9 commit 3ac754dbcea5101f4e7c36242c2df36db2a7e5c9 Author: Joe Marcus Clarke AuthorDate: 2022-04-05 20:40:54 +0000 Commit: Joe Marcus Clarke 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 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. ".