Date: Wed, 4 Sep 2019 15:07:47 +0000 (UTC) From: Joe Marcus Clarke <marcus@FreeBSD.org> 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 Message-ID: <201909041507.x84F7lh8065334@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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[+?]?=/) {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201909041507.x84F7lh8065334>