From owner-svn-ports-all@freebsd.org Wed Sep 4 15:07:48 2019 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 8CEDFF4900; Wed, 4 Sep 2019 15:07:48 +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 46NnHm39FRz4RF6; Wed, 4 Sep 2019 15:07:48 +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 358621D5AF; Wed, 4 Sep 2019 15:07:48 +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 x84F7mp4065335; Wed, 4 Sep 2019 15:07:48 GMT (envelope-from marcus@FreeBSD.org) Received: (from marcus@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x84F7lh8065334; Wed, 4 Sep 2019 15:07:47 GMT (envelope-from marcus@FreeBSD.org) Message-Id: <201909041507.x84F7lh8065334@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: marcus set sender to marcus@FreeBSD.org using -f From: Joe Marcus Clarke Date: Wed, 4 Sep 2019 15:07:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r511098 - 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: 511098 X-SVN-Commit-Repository: ports 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.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: Wed, 04 Sep 2019 15:07:48 -0000 Author: marcus Date: Wed Sep 4 15:07:47 2019 New Revision: 511098 URL: https://svnweb.freebsd.org/changeset/ports/511098 Log: Update to 2.18.10. * Relax wording around restrictive licensing [1] * Remove the check for extra items in the USE/USES section [2] One is allowed to put any _related_ variables here, and this will always change. It's easier not to check than to provide wrong recommendations. * Fix the check for unspecified license files [3] PR: 240233 [1] 239045 [2] 231303 [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 Wed Sep 4 14:53:15 2019 (r511097) +++ head/ports-mgmt/portlint/Makefile Wed Sep 4 15:07:47 2019 (r511098) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= portlint -PORTVERSION= 2.18.9 +PORTVERSION= 2.18.10 CATEGORIES= ports-mgmt MASTER_SITES= # none DISTFILES= # none Modified: head/ports-mgmt/portlint/src/portlint.pl ============================================================================== --- head/ports-mgmt/portlint/src/portlint.pl Wed Sep 4 14:53:15 2019 (r511097) +++ head/ports-mgmt/portlint/src/portlint.pl Wed Sep 4 15:07:47 2019 (r511098) @@ -15,7 +15,7 @@ # was removed. # # $FreeBSD$ -# $MCom: portlint/portlint.pl,v 1.494 2019/04/05 13:21:00 jclarke Exp $ +# $MCom: portlint/portlint.pl,v 1.498 2019/09/04 15:03:38 jclarke Exp $ # use strict; @@ -50,7 +50,7 @@ $portdir = '.'; # version variables my $major = 2; my $minor = 18; -my $micro = 9; +my $micro = 10; # default setting - for FreeBSD my $portsdir = '/usr/ports'; @@ -3167,12 +3167,12 @@ MAINTAINER COMMENT } # Check for proper license file usage - if ($tmp =~ /\nLICENSE_FILE_([^\s=]+)([\s=])/) { + while ($tmp =~ /\nLICENSE_FILE_([^\s=]+)([\s=])/g) { my $lfn = $1; my $nchar = $2; if (!grep(/\b$lfn\b/, $makevar{LICENSE})) { &perror("FATAL", $file, -1, "license specified is $makevar{LICENSE}, ". - "but LICENSE_FILE specified is for $lfn."); + "but found LICENSE_FILE for $lfn."); } if ($lfn =~ /\+$/ && $nchar eq '=') { @@ -3316,7 +3316,10 @@ TEST_DEPENDS FETCH_DEPENDS DEPENDS_TARGET } - &checkextra($tmp, 'USES/USE_x', $file); + # XXX: We should check this. But, one is allowed to add _related_ items to + # a USE_ or USES item in this same section. Since this would be an ever- + # moving target, remove the check. + #&checkextra($tmp, 'USES/USE_x', $file); $idx++; } @@ -3397,8 +3400,8 @@ TEST_DEPENDS FETCH_DEPENDS DEPENDS_TARGET my $lps = $makevar{LICENSE_PERMS} // ''; if ($committer && ($tmp =~ /\n(RESTRICTED|NO_CDROM|NO_PACKAGE)[+?]?=/ || $lps =~ /\bno-\b/)) { - &perror("WARN", $file, -1, "Restrictive licensing found. ". - "Do not forget to update ports/LEGAL."); + &perror("WARN", $file, -1, "Possible restrictive licensing found. ". + "If there are, in fact, limitations to use or distribution, please update ports/LEGAL."); } if ($tmp =~ /\nNO_PACKAGE[+?]?=/) {