diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2009-04-13 01:56:17 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2009-04-13 01:56:17 +0000 |
| commit | 3af18d3222c9e14cc2633015aa329d317a6c2abc (patch) | |
| tree | 3abedd4b39890c2fbf8271daeb72f93189e8f21f /ports-mgmt | |
| parent | Add support for libxul. (diff) | |
Update to 2.11.1.
* Fix some Perl warnings. [1]
* Fix an improper invocation of perror(). [2]
* Add some more allowed full paths. [3]
* Add a check for MAKE_JOBS_[UN]SAFE used in conjunction with NO_BUILD.
If this is found, throw a warning. [4]
PR: 133207 [4]
Submitted by: gerald [3]
Reported by: pav [1]
Vladimir Chukharev <Vladimir.Chukharev@tut.fi> [2]
Notes
Notes:
svn path=/head/; revision=232261
Diffstat (limited to 'ports-mgmt')
| -rw-r--r-- | ports-mgmt/portlint/Makefile | 2 | ||||
| -rw-r--r-- | ports-mgmt/portlint/src/portlint.pl | 24 |
2 files changed, 20 insertions, 6 deletions
diff --git a/ports-mgmt/portlint/Makefile b/ports-mgmt/portlint/Makefile index e9f432ede90f..82bbba99254b 100644 --- a/ports-mgmt/portlint/Makefile +++ b/ports-mgmt/portlint/Makefile @@ -8,7 +8,7 @@ # PORTNAME= portlint -PORTVERSION= 2.11.0 +PORTVERSION= 2.11.1 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 5474a8e7f329..895c2e98ec21 100644 --- a/ports-mgmt/portlint/src/portlint.pl +++ b/ports-mgmt/portlint/src/portlint.pl @@ -17,7 +17,7 @@ # OpenBSD and NetBSD will be accepted. # # $FreeBSD$ -# $MCom: portlint/portlint.pl,v 1.169 2009/03/22 17:52:12 marcus Exp $ +# $MCom: portlint/portlint.pl,v 1.174 2009/04/13 01:54:37 marcus Exp $ # use strict; @@ -45,12 +45,12 @@ $extrafile = $parenwarn = $committer = $verbose = $usetabs = $newport = 0; $contblank = 1; $portdir = '.'; -@ALLOWED_FULL_PATHS = qw(/boot/loader.conf /compat/); +@ALLOWED_FULL_PATHS = qw(/boot/loader.conf /compat/ /dev/null /etc/inetd.conf); # version variables my $major = 2; my $minor = 11; -my $micro = 0; +my $micro = 1; sub l { '[{(]'; } sub r { '[)}]'; } @@ -1426,7 +1426,7 @@ sub checkmakefile { } foreach my $i (@oopt) { if (!grep(/^$i$/, @mopt)) { - &perror("WARN", $file, "$i is listed in OPTIONS, ". + &perror("WARN", $file, -1, "$i is listed in OPTIONS, ". "but neither WITH_$i nor WITHOUT_$i appears."); } } @@ -1541,6 +1541,20 @@ sub checkmakefile { } # + # whole file: MAKE_JOBS_[UN]SAFE + # + print "OK: checking for MAKE_JOBS_SAFE in combination with NO_BUILD.\n" if ($verbose); + if ($whole =~ /\n(MAKE_JOBS_(UN)?SAFE).?=/) { + my $matched = $1; + if ($whole =~ /\nNO_BUILD.?=/) { + my $lineno = &linenumber($`); + &perror("WARN", $file, $lineno, "$matched should not ". + "be used in combination with NO_BUILD. You ". + "should remove $matched from your Makefile."); + } + } + + # # whole file: USE_GETOPT_LONG # print "OK: checking for USE_GETOPT_LONG.\n" if ($verbose); @@ -2239,7 +2253,7 @@ DIST_SUBDIR EXTRACT_ONLY && $1 !~ /^[ \t]*$/) || ($makevar{MASTER_SITES} ne '')) { print "OK: seen MASTER_SITES, sanity checking URLs.\n" if ($verbose); - my @sites = split(/\s+/, $1); + my @sites = split(/\s+/, $1 // ''); my $skipnext = 0; foreach my $i (@sites) { if ($skipnext) { |