diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2020-05-30 23:15:58 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2020-05-30 23:15:58 +0000 |
| commit | ad2fcdcdc96696e6ba9bfb5161deec6cfeffc8e9 (patch) | |
| tree | 4cd3bd844d99612316e18dc561d69500a7a10ada /ports-mgmt | |
| parent | e0aad50b6cd886877a18643607e33a85f775eeaf (diff) | |
| download | ports-ad2fcdcdc96696e6ba9bfb5161deec6cfeffc8e9.tar.gz ports-ad2fcdcdc96696e6ba9bfb5161deec6cfeffc8e9.zip | |
Update to 2.19.1.
Fix typos introduced in previous commits.
PR: 246881
246882
Notes
Notes:
svn path=/head/; revision=537110
Diffstat (limited to 'ports-mgmt')
| -rw-r--r-- | ports-mgmt/portlint/Makefile | 2 | ||||
| -rw-r--r-- | ports-mgmt/portlint/src/portlint.pl | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/ports-mgmt/portlint/Makefile b/ports-mgmt/portlint/Makefile index be751f3628c6..90106b2d28ea 100644 --- a/ports-mgmt/portlint/Makefile +++ b/ports-mgmt/portlint/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= portlint -PORTVERSION= 2.19.0 +PORTVERSION= 2.19.1 CATEGORIES= ports-mgmt MASTER_SITES= # none DISTFILES= # none diff --git a/ports-mgmt/portlint/src/portlint.pl b/ports-mgmt/portlint/src/portlint.pl index 26bbab231d27..05e86e3088dc 100644 --- a/ports-mgmt/portlint/src/portlint.pl +++ b/ports-mgmt/portlint/src/portlint.pl @@ -15,7 +15,7 @@ # was removed. # # $FreeBSD$ -# $MCom: portlint/portlint.pl,v 1.510 2020/05/30 13:40:58 jclarke Exp $ +# $MCom: portlint/portlint.pl,v 1.512 2020/05/30 23:14:06 jclarke Exp $ # use strict; @@ -50,7 +50,7 @@ $portdir = '.'; # version variables my $major = 2; my $minor = 19; -my $micro = 0; +my $micro = 1; # default setting - for FreeBSD my $portsdir = '/usr/ports'; @@ -1974,7 +1974,8 @@ sub checkmakefile { foreach my $sorted_macro (@macros_to_sort) { while ($whole =~ /\n$sorted_macro.?=\s*([^#]+)(#.*)?\n/g) { my $lineno = &linenumber($`); - my $srex = chomp($1); + my $srex = $1; + $srex =~ s/\s+$//; my @smacros = sort(split / /, $srex); if (join(" ", @smacros) ne $srex) { &perror("WARN", $file, $lineno, "the arguments to $sorted_macro ". @@ -3056,7 +3057,7 @@ DIST_SUBDIR EXTRACT_ONLY # should be # DISTNAME= package-1.0 # EXTRACT_SUFX= .tgz - if ($makevar{USE_GITHUB} ne 'nodefault' && $makevar{USE_GITLUB} ne 'nodefault') { + if ($makevar{USE_GITHUB} ne 'nodefault' && $makevar{USE_GITHUB} ne 'nodefault') { if ($distfiles =~ /^\S+$/ && $distfiles !~ /:[^\/:]+$/) { $bogusdistfiles++; print "OK: seen DISTFILES with single item, checking value.\n" |