From owner-svn-ports-head@freebsd.org Sun Oct 8 17:58:53 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9F644E3BE69; Sun, 8 Oct 2017 17:58:53 +0000 (UTC) (envelope-from marcus@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 792403443; Sun, 8 Oct 2017 17:58:53 +0000 (UTC) (envelope-from marcus@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v98HwqcF003344; Sun, 8 Oct 2017 17:58:52 GMT (envelope-from marcus@FreeBSD.org) Received: (from marcus@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v98HwqIe003342; Sun, 8 Oct 2017 17:58:52 GMT (envelope-from marcus@FreeBSD.org) Message-Id: <201710081758.v98HwqIe003342@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: marcus set sender to marcus@FreeBSD.org using -f From: Joe Marcus Clarke Date: Sun, 8 Oct 2017 17:58:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r451553 - in head/ports-mgmt/portlint: . src X-SVN-Group: ports-head X-SVN-Commit-Author: marcus X-SVN-Commit-Paths: in head/ports-mgmt/portlint: . src X-SVN-Commit-Revision: 451553 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Oct 2017 17:58:53 -0000 Author: marcus Date: Sun Oct 8 17:58:52 2017 New Revision: 451553 URL: https://svnweb.freebsd.org/changeset/ports/451553 Log: Update to 2.17.13. * Do not complain about USE_GITHUB before USES [1] * Make sure each variable in a dependency is fully expanded [2] * Clean up the earlier checks for BROKEN, etc. to prevent bogus warnings [3] * 'USE=execinfo' is removed with ports r450351. So stop suggesting to use it [4] PR: 221971 [1] 221605 [2] 222409 [3] 222653 [4] Submitted by: amdmi3 [1] jrm [2] Yasuhiro KIMURA [4] Modified: head/ports-mgmt/portlint/Makefile head/ports-mgmt/portlint/src/portlint.pl Modified: head/ports-mgmt/portlint/Makefile ============================================================================== --- head/ports-mgmt/portlint/Makefile Sun Oct 8 17:11:42 2017 (r451552) +++ head/ports-mgmt/portlint/Makefile Sun Oct 8 17:58:52 2017 (r451553) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= portlint -PORTVERSION= 2.17.12 +PORTVERSION= 2.17.13 CATEGORIES= ports-mgmt MASTER_SITES= # none DISTFILES= # none Modified: head/ports-mgmt/portlint/src/portlint.pl ============================================================================== --- head/ports-mgmt/portlint/src/portlint.pl Sun Oct 8 17:11:42 2017 (r451552) +++ head/ports-mgmt/portlint/src/portlint.pl Sun Oct 8 17:58:52 2017 (r451553) @@ -15,7 +15,7 @@ # was removed. # # $FreeBSD$ -# $MCom: portlint/portlint.pl,v 1.424 2017/08/15 12:38:42 jclarke Exp $ +# $MCom: portlint/portlint.pl,v 1.430 2017/10/08 17:56:03 jclarke Exp $ # use strict; @@ -50,7 +50,7 @@ $portdir = '.'; # version variables my $major = 2; my $minor = 17; -my $micro = 12; +my $micro = 13; # default setting - for FreeBSD my $portsdir = '/usr/ports'; @@ -218,7 +218,7 @@ my $ulineno = -1; my $uulineno = -1; my @muses = (); while (my $mline = ) { - if ($uulineno == -1 && $mline =~ /^USE_/) { + if ($uulineno == -1 && $mline =~ /^USE_/ && $mline !~ /^USE_GITHUB/) { $uulineno = $.; } if ($mline =~ /^USES[?+]?=\s*(.*)/) { @@ -1104,14 +1104,13 @@ sub check_depends_syntax { my %depmvars = (); foreach my $dv ($m{'dep'}, $m{'dir'}, $m{'tgt'}) { foreach my $mv ($dv =~ /\$\{([^}]+)\}/g) { - my $mvar = $1; - if (defined($depmvars{$mvar})) { + if (defined($depmvars{$mv})) { next; } - if (defined($makevar{$mvar})) { - $depmvars{$mvar} = $makevar{$mvar}; + if (defined($makevar{$mv})) { + $depmvars{$mv} = $makevar{$mv}; } else { - $depmvars{$mvar} = &get_makevar($mvar); + $depmvars{$mv} = &get_makevar($mv); } } } @@ -1173,7 +1172,6 @@ sub check_depends_syntax { my %udeps = ( 'bison' => 'bison', 'fmake' => 'fmake', - 'libexecinfo.so' => 'execinfo', ); foreach my $udep (keys %udeps) { if ($m{'dep'} =~ /^$udep/) { @@ -2969,7 +2967,7 @@ MAINTAINER COMMENT # print "OK: checking fourth section of $file (LICENSE).\n" if ($verbose); - $tmp = $sections[$idx]; + $tmp = $sections[$idx] // ''; if ($makevar{LICENSE}) { &checkorder('LICENSE', $tmp, $file, qw( @@ -3022,6 +3020,10 @@ NOT_FOR_ARCHS NOT_FOR_ARCHS_REASON(_\w+)? $idx++; } + foreach my $i (@linestocheck) { + $tmp =~ s/$i[?+:]?=[^\n]+\n//g; + } + push(@varnames, @linestocheck); &checkearlier($file, $tmp, @varnames); @@ -3388,11 +3390,10 @@ sub checkorder { sub checkearlier { my($file, $str, @varnames) = @_; - my($i); $str //= ''; - print "OK: checking items that has to appear earlier.\n" if ($verbose); + print "OK: checking items that have to appear earlier.\n" if ($verbose); foreach my $i (@varnames) { if ($str =~ /\n($i)\??=/) { &perror("WARN", $file, -1, "\"$1\" has to appear earlier.");