From owner-svn-ports-head@freebsd.org Fri Apr 21 19:51:00 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 885CDD49FDC; Fri, 21 Apr 2017 19:51:00 +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 40ABB87A; Fri, 21 Apr 2017 19:51:00 +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 v3LJoxb7069061; Fri, 21 Apr 2017 19:50:59 GMT (envelope-from marcus@FreeBSD.org) Received: (from marcus@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v3LJoxeQ069059; Fri, 21 Apr 2017 19:50:59 GMT (envelope-from marcus@FreeBSD.org) Message-Id: <201704211950.v3LJoxeQ069059@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: marcus set sender to marcus@FreeBSD.org using -f From: Joe Marcus Clarke Date: Fri, 21 Apr 2017 19:50:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r439128 - in head/ports-mgmt/portlint: . src X-SVN-Group: ports-head 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: Fri, 21 Apr 2017 19:51:00 -0000 Author: marcus Date: Fri Apr 21 19:50:59 2017 New Revision: 439128 URL: https://svnweb.freebsd.org/changeset/ports/439128 Log: Update to 2.17.8. * Check for use of OPT_XXX_OFF syntax to prevent false incorrect option usage assertions. [1] * Remove now-obsolete warning about using :LU operators with make(1). [2] * Fix the regex to prevent direct command use from hittin on lines like FOO_USES=... [3] PR: 218260 [1] 218325 [2] 218672 [3] Submitted by: jrm [2] Reported by: rezny [2] Modified: head/ports-mgmt/portlint/Makefile head/ports-mgmt/portlint/src/portlint.pl Modified: head/ports-mgmt/portlint/Makefile ============================================================================== --- head/ports-mgmt/portlint/Makefile Fri Apr 21 19:38:26 2017 (r439127) +++ head/ports-mgmt/portlint/Makefile Fri Apr 21 19:50:59 2017 (r439128) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= portlint -PORTVERSION= 2.17.7 +PORTVERSION= 2.17.8 CATEGORIES= ports-mgmt MASTER_SITES= # none DISTFILES= # none Modified: head/ports-mgmt/portlint/src/portlint.pl ============================================================================== --- head/ports-mgmt/portlint/src/portlint.pl Fri Apr 21 19:38:26 2017 (r439127) +++ head/ports-mgmt/portlint/src/portlint.pl Fri Apr 21 19:50:59 2017 (r439128) @@ -15,7 +15,7 @@ # was removed. # # $FreeBSD$ -# $MCom: portlint/portlint.pl,v 1.401 2017/03/29 15:26:37 jclarke Exp $ +# $MCom: portlint/portlint.pl,v 1.405 2017/04/21 19:47:51 jclarke Exp $ # use strict; @@ -50,7 +50,7 @@ $portdir = '.'; # version variables my $major = 2; my $minor = 17; -my $micro = 7; +my $micro = 8; # default setting - for FreeBSD my $portsdir = '/usr/ports'; @@ -1405,16 +1405,6 @@ sub checkmakefile { } # - # whole file: use of :LU variable expansion modifiers - # - print "OK: checking for use of :LU variable expansion modifiers.\n" if ($verbose); - if ($whole =~ /\$\{[^}]+:[LU]/m) { - my $lineno = &linenumber($`); - &perror("FATAL", $file, $lineno, ":U and :L syntax is not supported ". - "anymore. Please use :tu and :tl instead."); - } - - # # whole file: use of IGNOREFILES # print "OK: checking for use of IGNOREFILES.\n" if ($verbose); @@ -1635,7 +1625,7 @@ sub checkmakefile { # skip global options next if ($i eq 'DOCS' or $i eq 'NLS' or $i eq 'EXAMPLES' or $i eq 'IPV6' or $i eq 'X11' or $i eq 'DEBUG'); if (!grep(/^$i$/, (@mopt, @popt))) { - if ($whole !~ /\n${i}_($m)(.)?=[^\n]+/) { + if ($whole !~ /\n${i}_($m)(_\w+)?(.)?=[^\n]+/) { if (!$slaveport) { &perror("WARN", $file, -1, "$i is listed in ". "OPTIONS_DEFINE, but no PORT_OPTIONS:M$i appears."); @@ -1979,7 +1969,7 @@ xargs xmkmf && $curline !~ /^NO_CDROM(.)?=[^\n]+$i/m && $curline !~ /^MAINTAINER(.)?=[^\n]+$i/m && $curline !~ /^CATEGORIES(.)?=[^\n]+$i/m - && $curline !~ /^USES(.)?=[^\n]+$i/m + && $curline !~ /^(\w+)?USES(.)?=[^\n]+$i/m && $curline !~ /^WX_COMPS(.)?=[^\n]+$i/m && $curline !~ /^ONLY_FOR_ARCHS_REASON(.)?=[^\n]+$i/m && $curline !~ /^NOT_FOR_ARCHS_REASON(.)?=[^\n]+$i/m