From owner-svn-ports-head@FreeBSD.ORG Sat Feb 8 19:59:24 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 29370639; Sat, 8 Feb 2014 19:59:24 +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 11DA719A5; Sat, 8 Feb 2014 19:59:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s18JxN7o050837; Sat, 8 Feb 2014 19:59:23 GMT (envelope-from marcus@svn.freebsd.org) Received: (from marcus@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s18JxNmF050835; Sat, 8 Feb 2014 19:59:23 GMT (envelope-from marcus@svn.freebsd.org) Message-Id: <201402081959.s18JxNmF050835@svn.freebsd.org> From: Joe Marcus Clarke Date: Sat, 8 Feb 2014 19:59:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r343379 - 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.17 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: Sat, 08 Feb 2014 19:59:24 -0000 Author: marcus Date: Sat Feb 8 19:59:23 2014 New Revision: 343379 URL: http://svnweb.freebsd.org/changeset/ports/343379 QAT: https://qat.redports.org/buildarchive/r343379/ Log: Update to 2.14.10. * Check for old-style LIB_DEPENDS * Don't emit a warning if there is only one MASTER_SITE, but that MASTER_SITE is known in our list of site macros. [1] * Attempt to find corrupt DESKTOP_ENTRIES that do not specify a proper startupnotify value. [1] Reported by: Hardy Schumacher Modified: head/ports-mgmt/portlint/Makefile head/ports-mgmt/portlint/src/portlint.pl Modified: head/ports-mgmt/portlint/Makefile ============================================================================== --- head/ports-mgmt/portlint/Makefile Sat Feb 8 19:54:10 2014 (r343378) +++ head/ports-mgmt/portlint/Makefile Sat Feb 8 19:59:23 2014 (r343379) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= portlint -PORTVERSION= 2.14.9 +PORTVERSION= 2.14.10 CATEGORIES= ports-mgmt MASTER_SITES= # none DISTFILES= # none Modified: head/ports-mgmt/portlint/src/portlint.pl ============================================================================== --- head/ports-mgmt/portlint/src/portlint.pl Sat Feb 8 19:54:10 2014 (r343378) +++ head/ports-mgmt/portlint/src/portlint.pl Sat Feb 8 19:59:23 2014 (r343379) @@ -17,7 +17,7 @@ # OpenBSD and NetBSD will be accepted. # # $FreeBSD$ -# $MCom: portlint/portlint.pl,v 1.305 2014/01/05 05:50:13 marcus Exp $ +# $MCom: portlint/portlint.pl,v 1.310 2014/02/08 19:57:20 marcus Exp $ # use strict; @@ -52,7 +52,7 @@ $portdir = '.'; # version variables my $major = 2; my $minor = 14; -my $micro = 9; +my $micro = 10; sub l { '[{(]'; } sub r { '[)}]'; } @@ -1237,6 +1237,12 @@ sub check_depends_syntax { "really necessary."); } + # Check for old-style LIB_DEPENDS + if ($j eq 'LIB_DEPENDS' && $m{'dep'} !~ m/^lib.*\.so$/) { + &perror("WARN", $file, -1, "$j the new format is ". + "libFOO.so (e.g., lib$m{'dep'}.so)."); + } + # check port dir existence $k = $m{'dir'}; $k =~ s/\${PORTSDIR}/$ENV{'PORTSDIR'}/; @@ -1636,6 +1642,25 @@ sub checkmakefile { &perror("FATAL", $file, -1, "Use true/false (without quotes) instead of \${TRUE}/\${FALSE} in DESKTOP_ENTRIES."); } + my @dte_parts = split(/\s+/, $desktop_entries); + my $dtc = 0; + my $dte_quote = 0; + foreach my $dte_part (@dte_parts) { + if ($dtc % 5 == 0 && $dte_part eq '""') { + &perror("FATAL", $file, -1, "Use true/false (without quotes) instead of \${TRUE}/\${FALSE} in DESKTOP_ENTRIES."); + } + if ($dte_quote == 1 && $dte_part =~ /"$/) { + $dte_quote = 0; + } + if ($dte_part =~ /^"[^"]+$/) { + $dte_quote = 1; + next; + } + if (!$dte_quote) { + $dtc++; + } + } + # # whole file: USE_* as a user-settable option # @@ -2536,7 +2561,7 @@ DIST_SUBDIR EXTRACT_ONLY if ($makevar{MASTER_SITES} ne '' && ! grep {$makevar{MASTER_SITES} =~ m|$_|} @MASTERSITES_WHITELIST) { my @sites = split(/\s+/, $makevar{MASTER_SITES}); - if (scalar(@sites) == 1) { + if (scalar(@sites) == 1 && !&is_predefined($sites[0], undef)) { &perror("WARN", $file, -1, "only one MASTER_SITE configured. ". "Consider adding additional mirrors."); } @@ -3485,7 +3510,7 @@ sub is_predefined { $site_re = quotemeta $site; $site_re =~ s,$subdir_re,/(.*)/,; - if ($url =~ /$site_re/) { + if ($url =~ /$site_re/ && $file) { my $pe = "how about using \"\${MASTER_SITE_$predefined{$site}}\" "; if ($1) { $pe .= "with \"MASTER_SITE_SUBDIR=$1\", "; @@ -3493,6 +3518,8 @@ sub is_predefined { $pe .= "instead of \"$url\"?"; &perror("WARN", $file, -1, $pe); return &TRUE; + } elsif ($url =~ /$site_re/ && !$file) { + return &TRUE; } } undef;