freebsd/ports
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ports-mgmt/portlint: Update to 2.19.10

Browse Source 
* 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 <dereks@lifeofadishwasher.com> [2]
This commit is contained in:
Joe Marcus Clarke
2022-02-21 14:45:11 -05:00
parent c4380bcddd
commit c33aae9e6a
2 changed files with 9 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ports-mgmt/portlint/Makefile
View File

@@ -1,7 +1,7 @@
# Created by: Jun-ichiro itojun Hagino <itojun@itojun.org>
PORTNAME= portlint
PORTVERSION= 2.19.9
PORTVERSION= 2.19.10
CATEGORIES= ports-mgmt
MASTER_SITES= # none
DISTFILES= # none

33
ports-mgmt/portlint/src/portlint.pl
View File

@@ -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 {
} elsif ($_ =~ m|lib[^\/]+\.so[.\d]*$|) {
$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, ".
@@ -1162,7 +1155,7 @@ sub check_depends_syntax {
next;
}
if ($k eq '') {
next;
next;
}
my ($tmp_depends, $fl) = split(/\@/, $k);
$tmp_depends =~ s/\$\{[^}]+}//g;
@@ -1183,8 +1176,7 @@ sub check_depends_syntax {
"colon-separated tuples.");
next;
}
my %m = ();
$m{'dep'} = $l[0];
my %m = ();
$m{'dep'} = $l[0];
$m{'dir'} = $l[1];
$m{'fla'} = $fl // '';
@@ -1572,12 +1564,6 @@ sub checkmakefile {
&perror("WARN", "", -1, "PLIST_FILES: this port installs a file which ".
"ends in \".core\". This file may be deleted if ".
"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, ".
"If possible, install this file with a different name.");
}
if ($plist_file =~ /%%[\w_\d]+%%/) {
@@ -2005,9 +1991,8 @@ sub checkmakefile {
}
#
# whole file: using INSTALLS_ICONS when it is not wanted
#
if (!($makevar{INSTALLS_ICONS} eq '') &&
# whole file: using INSTALLS_ICONS when it is not wanted
#
if (!($makevar{INSTALLS_ICONS} eq '')) {
&perror("WARN", $file, -1, "INSTALLS_ICONS is now deprecated. It should be removed.");
}
@@ -2176,6 +2161,7 @@ xargs xmkmf
my $dte_test = $curline;
$dte_test =~ s/^\s+//g;
if ($desktop_entries =~ /\Q$dte_test\E$/) {
next;
}
if ($curline =~ /(?:^|\s)[\@\-]{0,2}$i(?:$|\s)/
&& $curline !~ /^PORTNAME=[^\n]+$i/m
@@ -2873,7 +2859,8 @@ DIST_SUBDIR EXTRACT_ONLY
my $good_ms = 1;
foreach my $mss (split(/\s+/, $makevar{MASTER_SITES_SUBDIRS})) {
my ($ms, $sd) = split(/:/, $mss);
if ($i =~ /^$ms/ && $i ne $ms) {
if ($i =~ /^$ms/ && $i ne $ms) {
my $ip = $i;
$ip =~ s/^$ms\///;
my (@ip_parts) = split(/:/, $ip);
my $exp_sd = get_makevar($ip_parts[0]);
@@ -3953,10 +3940,6 @@ sub urlcheck {
if ($url =~ m#://[^/]*:/#) {
&perror("FATAL", $file, -1, "URL \"$url\" contains ".
"extra \":\".");
}
}
sub needs_installs_icons {
}
}