Date: Sat, 30 May 2020 23:15:59 +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: r537110 - in head/ports-mgmt/portlint: . src Message-ID: <202005302315.04UNFxHN042015@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marcus Date: Sat May 30 23:15:58 2020 New Revision: 537110 URL: https://svnweb.freebsd.org/changeset/ports/537110 Log: Update to 2.19.1. Fix typos introduced in previous commits. PR: 246881 246882 Modified: head/ports-mgmt/portlint/Makefile head/ports-mgmt/portlint/src/portlint.pl Modified: head/ports-mgmt/portlint/Makefile ============================================================================== --- head/ports-mgmt/portlint/Makefile Sat May 30 23:04:12 2020 (r537109) +++ head/ports-mgmt/portlint/Makefile Sat May 30 23:15:58 2020 (r537110) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= portlint -PORTVERSION= 2.19.0 +PORTVERSION= 2.19.1 CATEGORIES= ports-mgmt MASTER_SITES= # none DISTFILES= # none Modified: head/ports-mgmt/portlint/src/portlint.pl ============================================================================== --- head/ports-mgmt/portlint/src/portlint.pl Sat May 30 23:04:12 2020 (r537109) +++ head/ports-mgmt/portlint/src/portlint.pl Sat May 30 23:15:58 2020 (r537110) @@ -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"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202005302315.04UNFxHN042015>