aboutsummaryrefslogtreecommitdiff
path: root/ports-mgmt
diff options
context:
space:
mode:
authorJoe Marcus Clarke <marcus@FreeBSD.org>2014-10-13 05:53:56 +0000
committerJoe Marcus Clarke <marcus@FreeBSD.org>2014-10-13 05:53:56 +0000
commitae096929541215655af04979946cc472122f9e7c (patch)
tree6de6c7cf3a89edeac7e76fb673ee820af89bea8d /ports-mgmt
parent6d89459c816da68bf01568a820f89cd2378f7807 (diff)
downloadports-ae096929541215655af04979946cc472122f9e7c.tar.gz
ports-ae096929541215655af04979946cc472122f9e7c.zip
Notes
Diffstat (limited to 'ports-mgmt')
-rw-r--r--ports-mgmt/portlint/Makefile2
-rw-r--r--ports-mgmt/portlint/src/portlint.pl16
2 files changed, 10 insertions, 8 deletions
diff --git a/ports-mgmt/portlint/Makefile b/ports-mgmt/portlint/Makefile
index adea2204ca12..652741d2d030 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 9d49caa1cf4b..4fca6af84eb4 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.");
}
}