From owner-svn-ports-all@FreeBSD.ORG Sun Dec 29 05:29:12 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 78E646C3; Sun, 29 Dec 2013 05:29:12 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 644571901; Sun, 29 Dec 2013 05:29:12 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBT5TC2B061541; Sun, 29 Dec 2013 05:29:12 GMT (envelope-from marcus@svn.freebsd.org) Received: (from marcus@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBT5TCYG061538; Sun, 29 Dec 2013 05:29:12 GMT (envelope-from marcus@svn.freebsd.org) Message-Id: <201312290529.rBT5TCYG061538@svn.freebsd.org> From: Joe Marcus Clarke Date: Sun, 29 Dec 2013 05:29:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r337940 - 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-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Dec 2013 05:29:12 -0000 Author: marcus Date: Sun Dec 29 05:29:11 2013 New Revision: 337940 URL: http://svnweb.freebsd.org/changeset/ports/337940 Log: Update to 2.14.8. * Do not warn on direct use of "false" if it is found in DESKTOP_ENTRIES. [1] * Make sure the DESKTOP_ENTRIES true/false parameter does not include quotes. * Remove an unreferenced variable dereference. [2] * Add some additional variables to avoid explicit command use checks. [3] PR: 185086 [1] 185225 [2] 185110 [3] 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 Dec 29 05:23:23 2013 (r337939) +++ head/ports-mgmt/portlint/Makefile Sun Dec 29 05:29:11 2013 (r337940) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= portlint -PORTVERSION= 2.14.7 +PORTVERSION= 2.14.8 CATEGORIES= ports-mgmt MASTER_SITES= # none DISTFILES= # none Modified: head/ports-mgmt/portlint/src/portlint.pl ============================================================================== --- head/ports-mgmt/portlint/src/portlint.pl Sun Dec 29 05:23:23 2013 (r337939) +++ head/ports-mgmt/portlint/src/portlint.pl Sun Dec 29 05:29:11 2013 (r337940) @@ -17,7 +17,7 @@ # OpenBSD and NetBSD will be accepted. # # $FreeBSD$ -# $MCom: portlint/portlint.pl,v 1.297 2013/10/26 14:41:47 marcus Exp $ +# $MCom: portlint/portlint.pl,v 1.302 2013/12/29 05:26:49 marcus Exp $ # use strict; @@ -52,7 +52,7 @@ $portdir = '.'; # version variables my $major = 2; my $minor = 14; -my $micro = 7; +my $micro = 8; sub l { '[{(]'; } sub r { '[)}]'; } @@ -851,11 +851,11 @@ sub checkplist { } } - if ($_ =~ m{^%%PORT(\w+)%%(.*?)%%(\w+)DIR%%(.*)$} and $1 ne $3) { + if ($_ =~ m{^%%PORT(\w+)%%(.*?)%%(\w+)DIR%%(.*)$} and $1 ne $3 and + defined($check_xxxdir_ok{$3})) { &perror("WARN", $file, $., "Do not mix %%PORT$1%% with %%$3DIR%%. ". "Use '%%PORT$check_xxxdir_ok{$3}%%$2%%$3DIR%%$4' instead and update Makefile ". - "accordingly.") unless (defined($check_xxxdir_ok{$3}) and - $check_xxxdir_ok{$3} eq $1); + "accordingly.") unless ($check_xxxdir_ok{$3} eq $1); } if ($_ =~ m#man/([^/]+/)?man([$manchapters])/([^\.]+\.[$manchapters])(\.gz)?$#) { @@ -1630,8 +1630,9 @@ sub checkmakefile { # print "OK: checking DESKTOP_ENTRIES for \${TRUE}/\${FALSE}.\n" if ($verbose); $desktop_entries = &get_makevar_raw('DESKTOP_ENTRIES'); - if ($desktop_entries =~ /\${TRUE}/ or $desktop_entries =~ /\${FALSE}/) { - &perror("FATAL", $file, -1, "Use true/false instead of \${TRUE}/\${FALSE} in DESKTOP_ENTRIES."); + if ($desktop_entries =~ /\${TRUE}/ or $desktop_entries =~ /\${FALSE}/ or + $desktop_entries =~ /\"true\"/ or $desktop_entries =~ /\"false\"/) { + &perror("FATAL", $file, -1, "Use true/false (without quotes) instead of \${TRUE}/\${FALSE} in DESKTOP_ENTRIES."); } # @@ -1893,6 +1894,11 @@ ruby sed sh sort sysctl touch tr which x # lines, and go through each one. while ($j =~ /^(.*$i.*)$/gm) { my $curline = $1; + my $dte_test = $curline; + $dte_test =~ s/^\s+//g; + if ($desktop_entries =~ /$dte_test$/) { + next; + } my $lineno = &linenumber($`); if ($curline =~ /(?:^|\s)[\@\-]{0,2}$i(?:$|\s)/ && $curline !~ /^[A-Z]+_TARGET[?+]?=[^\n]+$i/m @@ -1905,6 +1911,8 @@ ruby sed sh sort sysctl touch tr which x && $curline !~ /^CATEGORIES(.)?=[^\n]+$i/m && $curline !~ /^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 && $curline !~ /^\s*#.+$/m && $curline !~ /\-\-$i/m && $curline !~ /^COMMENT(.)?=[^\n]+$i/m) {