From nobody Mon Feb 21 19:47:38 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 4B51B19D0707; Mon, 21 Feb 2022 19:47:38 +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 4K2Xrp1Zpxz3nRW; Mon, 21 Feb 2022 19:47:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645472858; 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=VhQMO0SUTf8YJYGqwbYqWUjwZxRjUvblVDNd9nmgl4o=; b=d6WgEHpTDb1LqsdXHkJjuwwHXb7b1Cpfz4dcRiBIaehTNOhp6iougYQdvkkuL56t4f2K9y cEs/p4ELwXbQAdUto56w9TgoSwfwiaI+9dT2tgzwwWZKRSdRPxQ+KvMkqOdGccEJ24Xg1H 7Op9DqxZqyIyMzjxnxdvYlUnivvoz9vXwcZS+IzRvpjx4xATPxq0lpC2IS8CEA4AHuSExb whANwvNGtJRU0zPGtwkqjRvCkcGr9chSMlvg9LuXr1EDHX1hikpMZ9mjqAWrjkqFqCT+3A dHSNN871NJPe9XLcMLnaRavAUcmRJI6zCA9nVcLR4VNyYW6zcrBaUe2TC/Veug== 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 167EB16756; Mon, 21 Feb 2022 19:47:38 +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 21LJlcku077509; Mon, 21 Feb 2022 19:47:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21LJlcx6077508; Mon, 21 Feb 2022 19:47:38 GMT (envelope-from git) Date: Mon, 21 Feb 2022 19:47:38 GMT Message-Id: <202202211947.21LJlcx6077508@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: c33aae9e6a5c - main - ports-mgmt/portlint: Update to 2.19.10 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: c33aae9e6a5c66516f3759f507a6d4a4543f10b4 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645472858; 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=VhQMO0SUTf8YJYGqwbYqWUjwZxRjUvblVDNd9nmgl4o=; b=TOSCq13I3Nq4SVYmp1t8D5B6z8AwjOzmgVZ4f4T+6cjHbSEcE4sOFLaSdBwjDU+aI2s+CU sTbWuuTGumPFHvZYJMoICp9zOibLCww2GDumseQXTkN1HdnuQCfEB0p/BbMxb2Y9tG4Vn5 ZYnjME623FmpUt+thnS+yT1tjpl8tjyVepzdipaaJnQwRZKThJ60P5e8xOi8XnyC1wuDw5 w0gxW0E4t2ZJKs4Yc5PPQqDcXFr2GVrcg1E8J4HkmPKegm1G5CYJYWx0yHeHxSSozPizvp haTi4GVDLKbEFirzKHg2V2njlbpoYxyEXLRzEyklFtEFpC+lSL2hvI2rMir9Cg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645472858; a=rsa-sha256; cv=none; b=dawtmoLut97N88kx416K7LLI4kNSV03jt6ErZBW2+K94ywtCthsn/dP7GsvG6jYZ+8N/PN mKNj9M/Tb/irz+Mqx83v6KI9XbYIXjrx3tG8SghJCz9cNQOVrOOgxZxCi+X2/U/hTlVSo2 VtwpopE/GLbhV+wqB9w+6xz+z3jOAAA+uvDNrlIUraPUKfn0NlzghOJa6PsKkFNGSc7b5Z KMcDs8v1j45dpU5Wj7van40Hu3+1fmPjn8uyhGJRS5W6VO5qTcoV8ExqALa1uijsDpErPl mTLsD6A8LurlWUi7nQft2CEiYXcpNPZiewXsB1SXoa5/Pw5fAzf4xJ26m+Z2xQ== 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=c33aae9e6a5c66516f3759f507a6d4a4543f10b4 commit c33aae9e6a5c66516f3759f507a6d4a4543f10b4 Author: Joe Marcus Clarke AuthorDate: 2022-02-21 19:45:11 +0000 Commit: Joe Marcus Clarke CommitDate: 2022-02-21 19:45:11 +0000 ports-mgmt/portlint: Update to 2.19.10 * Don't check for direct use of commands in PORTNAME [1] * Split on first '@' to avoid breaking directory detection [2] * Remove checks for deprecated INSTALLS_ICONS [3] PR: 229627 [1] 260246 [2] 261556 [3] Submitted by: gerald [1] Derek Schrock [2] --- ports-mgmt/portlint/Makefile | 2 +- ports-mgmt/portlint/src/portlint.pl | 33 ++++++++------------------------- 2 files changed, 9 insertions(+), 26 deletions(-) diff --git a/ports-mgmt/portlint/Makefile b/ports-mgmt/portlint/Makefile index 3149b7c9a1cd..bda2fb9402fe 100644 --- a/ports-mgmt/portlint/Makefile +++ b/ports-mgmt/portlint/Makefile @@ -1,7 +1,7 @@ # Created by: Jun-ichiro itojun Hagino PORTNAME= portlint -PORTVERSION= 2.19.9 +PORTVERSION= 2.19.10 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 87777de21918..5f6240beae9b 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 = 9; +my $micro = 10; # default setting - for FreeBSD my $portsdir = '/usr/ports'; @@ -813,13 +813,6 @@ sub checkplist { $found_so++; } - if ($_ =~ m|^share/icons/.*/| && - $makevar{INSTALLS_ICONS} eq '' && - needs_installs_icons()) { - &perror("WARN", $file, $., "installing icons, ". - "please define INSTALLS_ICONS as appropriate"); - } - if ($_ =~ m|\.omf$| && $makevar{INSTALLS_OMF} eq '') { &perror("WARN", $file, $., "installing OMF files, ". "please define INSTALLS_OMF (see the FreeBSD GNOME ". @@ -1162,7 +1155,7 @@ sub check_depends_syntax { if ($k eq '') { next; } - my $tmp_depends = $k; + my ($tmp_depends, $fl) = split(/\@/, $k); $tmp_depends =~ s/\$\{[^}]+}//g; my @l = split(':', $tmp_depends); @@ -1183,8 +1176,7 @@ sub check_depends_syntax { } my %m = (); $m{'dep'} = $l[0]; - my ($di, $fl) = split(/\@/, $l[1]); - $m{'dir'} = $di; + $m{'dir'} = $l[1]; $m{'fla'} = $fl // ''; $m{'tgt'} = $l[2] // ''; my %depmvars = (); @@ -1572,12 +1564,6 @@ sub checkmakefile { "daily_clean_disks_enable=\"YES\" in /etc/periodic.conf. ". "If possible, install this file with a different name."); } - if ($plist_file =~ m|^share/icons/.*/| && - $makevar{INSTALLS_ICONS} eq '' && - needs_installs_icons()) { - &perror("WARN", "", -1, "PLIST_FILES: installing icons, ". - "please define INSTALLS_ICONS as appropriate"); - } if ($plist_file =~ /%%[\w_\d]+%%/) { &perror("FATAL", "", -1, "PLIST_FILES: files cannot contain ". "%%FOO%% variables. Use make variables and logic instead"); @@ -2005,9 +1991,8 @@ sub checkmakefile { # # whole file: using INSTALLS_ICONS when it is not wanted # - if (!($makevar{INSTALLS_ICONS} eq '') && - !needs_installs_icons()) { - &perror("WARN", $file, -1, "INSTALLS_ICONS is set, but should not be."); + if (!($makevar{INSTALLS_ICONS} eq '')) { + &perror("WARN", $file, -1, "INSTALLS_ICONS is now deprecated. It should be removed."); } # @@ -2176,6 +2161,7 @@ xargs xmkmf next; } if ($curline =~ /(?:^|\s)[\@\-]{0,2}$i(?:$|\s)/ + && $curline !~ /^PORTNAME=[^\n]+$i/m && $curline !~ /^[A-Z]+_TARGET[?+]?=[^\n]+$i/m && $curline !~ /^[A-Z]+_INSTALL_TARGET[?+]?=[^\n]+$i/m && $curline !~ /^IGNORE(_[\w\d]+)?(.)?=[^\n]+$i/m @@ -2873,7 +2859,8 @@ DIST_SUBDIR EXTRACT_ONLY if ($i =~ /^$ms/ && $i ne $ms) { my $ip = $i; $ip =~ s/^$ms\///; - my $exp_sd = get_makevar($ip); + my (@ip_parts) = split(/:/, $ip); + my $exp_sd = get_makevar($ip_parts[0]); 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"); @@ -3953,10 +3940,6 @@ sub urlcheck { } } -sub needs_installs_icons { - return $makevar{USES} =~ /gnome/ -} - sub TRUE {1;} # Local variables: