Date: Mon, 13 Oct 2014 05:53:56 +0000 (UTC) From: Joe Marcus Clarke <marcus@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r370756 - in head/ports-mgmt/portlint: . src Message-ID: <201410130553.s9D5ruxN032022@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marcus Date: Mon Oct 13 05:53:56 2014 New Revision: 370756 URL: https://svnweb.freebsd.org/changeset/ports/370756 QAT: https://qat.redports.org/buildarchive/r370756/ Log: Update to 2.15.6. * Check to make sure each instance of USES is properly sorted. PR: 193792 Modified: head/ports-mgmt/portlint/Makefile head/ports-mgmt/portlint/src/portlint.pl Modified: head/ports-mgmt/portlint/Makefile ============================================================================== --- head/ports-mgmt/portlint/Makefile Mon Oct 13 05:41:07 2014 (r370755) +++ head/ports-mgmt/portlint/Makefile Mon Oct 13 05:53:56 2014 (r370756) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= portlint -PORTVERSION= 2.15.5 +PORTVERSION= 2.15.6 CATEGORIES= ports-mgmt MASTER_SITES= # none DISTFILES= # none Modified: head/ports-mgmt/portlint/src/portlint.pl ============================================================================== --- head/ports-mgmt/portlint/src/portlint.pl Mon Oct 13 05:41:07 2014 (r370755) +++ head/ports-mgmt/portlint/src/portlint.pl Mon Oct 13 05:53:56 2014 (r370756) @@ -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."); } }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201410130553.s9D5ruxN032022>