kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update to 2.18.8

Browse source 
* 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]
This commit is contained in:
Joe Marcus Clarke 2019-01-22 16:19:06 +00:00
parent bc033e9fec
commit 625d09dcbb
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=490959
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ports-mgmt/portlint/Makefile
View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= portlint
PORTVERSION= 2.18.7
PORTVERSION= 2.18.8
CATEGORIES= ports-mgmt
MASTER_SITES= # none
DISTFILES= # none

9
ports-mgmt/portlint/src/portlint.pl
View file

@ -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 (<IN>) {
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.");
}