diff options
| author | marcus <marcus@FreeBSD.org> | 2014-10-13 05:53:56 +0000 |
|---|---|---|
| committer | marcus <marcus@FreeBSD.org> | 2014-10-13 05:53:56 +0000 |
| commit | 7f73a3f89502bc70b279c99bc8917ee56d6b6886 (patch) | |
| tree | 6de6c7cf3a89edeac7e76fb673ee820af89bea8d | |
| parent | 7b8b222f2f9330af38a702b5800439983a2fc3dc (diff) | |
| download | FreeBSD-ports-7f73a3f89502bc70b279c99bc8917ee56d6b6886.zip FreeBSD-ports-7f73a3f89502bc70b279c99bc8917ee56d6b6886.tar.gz | |
Update to 2.15.6.
* Check to make sure each instance of USES is properly sorted.
PR: 193792
| -rw-r--r-- | ports-mgmt/portlint/Makefile | 2 | ||||
| -rw-r--r-- | ports-mgmt/portlint/src/portlint.pl | 16 |
2 files changed, 10 insertions, 8 deletions
diff --git a/ports-mgmt/portlint/Makefile b/ports-mgmt/portlint/Makefile index adea220..652741d 100644 --- a/ports-mgmt/portlint/Makefile +++ b/ports-mgmt/portlint/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= portlint -PORTVERSION= 2.15.5 +PORTVERSION= 2.15.6 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 9d49caa..4fca6af 100644 --- a/ports-mgmt/portlint/src/portlint.pl +++ b/ports-mgmt/portlint/src/portlint.pl @@ -15,7 +15,7 @@ # was removed. # # $FreeBSD$ -# $MCom: portlint/portlint.pl,v 1.338 2014/10/08 23:35:33 marcus Exp $ +# $MCom: portlint/portlint.pl,v 1.340 2014/10/13 05:52:02 marcus Exp $ # use strict; @@ -51,7 +51,7 @@ $portdir = '.'; # version variables my $major = 2; my $minor = 15; -my $micro = 5; +my $micro = 6; sub l { '[{(]'; } sub r { '[)}]'; } @@ -1742,11 +1742,13 @@ sub checkmakefile { # whole file: Check if USES is sorted # print "OK: checking to see if USES is sorted.\n" if ($verbose); - if ($makevar{USES} ne '') { - my @suses = sort(split / /, $makevar{USES}); - if (join(" ", @suses) ne $makevar{USES}) { - &perror("WARN", $file, -1, "the options to USES are not sorted. ". - "Please consider sorting them."); + while ($whole =~ /\nUSES.=\s*(.+)\n/g) { + my $lineno = &linenumber($`); + my $srex = $1; + my @suses = sort(split / /, $srex); + if (join(" ", @suses) ne $srex) { + &perror("WARN", $file, $lineno, "the options to USES are not ". + "sorted. Please consider sorting them."); } } |
