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

Update to 2.17.8.

Browse Source 
* Check for use of OPT_XXX_OFF syntax to prevent false incorrect option
  usage assertions. [1]
* Remove now-obsolete warning about using :LU operators with make(1). [2]
* Fix the regex to prevent direct command use from hittin on lines
  like FOO_USES=... [3]

PR:		218260 [1]
		218325 [2]
		218672 [3]
Submitted by:	jrm [2]
Reported by:	rezny [2]
This commit is contained in:
Joe Marcus Clarke 2017-04-21 19:50:59 +00:00
parent 2aadf79bad
commit 6bb9127bab
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=439128
2 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports-mgmt/portlint/Makefile
View File

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= portlint
PORTVERSION= 2.17.7
PORTVERSION= 2.17.8
CATEGORIES= ports-mgmt
MASTER_SITES= # none
DISTFILES= # none

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

@ -15,7 +15,7 @@
# was removed.
#
# $FreeBSD$
# $MCom: portlint/portlint.pl,v 1.401 2017/03/29 15:26:37 jclarke Exp $
# $MCom: portlint/portlint.pl,v 1.405 2017/04/21 19:47:51 jclarke Exp $
#
use strict;
@ -50,7 +50,7 @@ $portdir = '.';
# version variables
my $major = 2;
my $minor = 17;
my $micro = 7;
my $micro = 8;
# default setting - for FreeBSD
my $portsdir = '/usr/ports';
@ -1404,16 +1404,6 @@ sub checkmakefile {
"be \${SETENV} to avoid strange behaviors in sh(1).");
}
#
# whole file: use of :LU variable expansion modifiers
#
print "OK: checking for use of :LU variable expansion modifiers.\n" if ($verbose);
if ($whole =~ /\$\{[^}]+:[LU]/m) {
my $lineno = &linenumber($`);
&perror("FATAL", $file, $lineno, ":U and :L syntax is not supported ".
"anymore. Please use :tu and :tl instead.");
}
#
# whole file: use of IGNOREFILES
#
@ -1635,7 +1625,7 @@ sub checkmakefile {
# skip global options
next if ($i eq 'DOCS' or $i eq 'NLS' or $i eq 'EXAMPLES' or $i eq 'IPV6' or $i eq 'X11' or $i eq 'DEBUG');
if (!grep(/^$i$/, (@mopt, @popt))) {
if ($whole !~ /\n${i}_($m)(.)?=[^\n]+/) {
if ($whole !~ /\n${i}_($m)(_\w+)?(.)?=[^\n]+/) {
if (!$slaveport) {
&perror("WARN", $file, -1, "$i is listed in ".
"OPTIONS_DEFINE, but no PORT_OPTIONS:M$i appears.");
@ -1979,7 +1969,7 @@ xargs xmkmf
&& $curline !~ /^NO_CDROM(.)?=[^\n]+$i/m
&& $curline !~ /^MAINTAINER(.)?=[^\n]+$i/m
&& $curline !~ /^CATEGORIES(.)?=[^\n]+$i/m
&& $curline !~ /^USES(.)?=[^\n]+$i/m
&& $curline !~ /^(\w+)?USES(.)?=[^\n]+$i/m
&& $curline !~ /^WX_COMPS(.)?=[^\n]+$i/m
&& $curline !~ /^ONLY_FOR_ARCHS_REASON(.)?=[^\n]+$i/m
&& $curline !~ /^NOT_FOR_ARCHS_REASON(.)?=[^\n]+$i/m