From owner-svn-ports-all@freebsd.org Tue Jan 22 16:19:08 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BF02F14A6FBC; Tue, 22 Jan 2019 16:19:07 +0000 (UTC) (envelope-from marcus@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 65D6092AC3; Tue, 22 Jan 2019 16:19:07 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5B6743D80; Tue, 22 Jan 2019 16:19:07 +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 x0MGJ74J005670; Tue, 22 Jan 2019 16:19:07 GMT (envelope-from marcus@FreeBSD.org) Received: (from marcus@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x0MGJ691005668; Tue, 22 Jan 2019 16:19:06 GMT (envelope-from marcus@FreeBSD.org) Message-Id: <201901221619.x0MGJ691005668@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: marcus set sender to marcus@FreeBSD.org using -f From: Joe Marcus Clarke Date: Tue, 22 Jan 2019 16:19:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r490959 - 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: 490959 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 65D6092AC3 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_SHORT(-0.97)[-0.967,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-0.999,0] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 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: Tue, 22 Jan 2019 16:19:08 -0000 Author: marcus Date: Tue Jan 22 16:19:06 2019 New Revision: 490959 URL: https://svnweb.freebsd.org/changeset/ports/490959 Log: Update to 2.18.8 * Handle multiple licenses [1] * Warn about leading and trailing whitespace in pkg-descr [2] PR: 233774 [1] 235070 [2] Submitted by: amdmi3 [1] swills [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 Tue Jan 22 15:58:23 2019 (r490958) +++ head/ports-mgmt/portlint/Makefile Tue Jan 22 16:19:06 2019 (r490959) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= portlint -PORTVERSION= 2.18.7 +PORTVERSION= 2.18.8 CATEGORIES= ports-mgmt MASTER_SITES= # none DISTFILES= # none Modified: head/ports-mgmt/portlint/src/portlint.pl ============================================================================== --- head/ports-mgmt/portlint/src/portlint.pl Tue Jan 22 15:58:23 2019 (r490958) +++ head/ports-mgmt/portlint/src/portlint.pl Tue Jan 22 16:19:06 2019 (r490959) @@ -15,7 +15,7 @@ # was removed. # # $FreeBSD$ -# $MCom: portlint/portlint.pl,v 1.484 2018/11/19 20:03:35 jclarke Exp $ +# $MCom: portlint/portlint.pl,v 1.488 2019/01/22 16:16:28 jclarke Exp $ # use strict; @@ -50,7 +50,7 @@ $portdir = '.'; # version variables my $major = 2; my $minor = 18; -my $micro = 7; +my $micro = 8; # default setting - for FreeBSD my $portsdir = '/usr/ports'; @@ -491,6 +491,9 @@ sub checkdescr { open(IN, "< $file") || return 0; while () { + if ($_ =~ /[ \t]+\n?$/) { + &perror("WARN", $file, $., "whitespace before end ". + "of line."); $tmp .= $_; chomp || &perror("WARN", $file, -1, "lines should terminate with a ". "newline (i.e. '\\n')."); @@ -3146,7 +3149,7 @@ MAINTAINER COMMENT if ($tmp =~ /\nLICENSE_FILE_([^\s=]+)([\s=])/) { my $lfn = $1; my $nchar = $2; - if ($lfn ne $makevar{LICENSE}) { + if (!grep(/\b$lfn\b/, $makevar{LICENSE})) { &perror("FATAL", $file, -1, "license specified is $makevar{LICENSE}, ". "but LICENSE_FILE specified is for $lfn."); }