svn commit: r469758 - in head/ports-mgmt/portlint: . src
Joe Marcus Clarke
marcus at FreeBSD.org
Sat May 12 22:14:32 UTC 2018
Author: marcus
Date: Sat May 12 22:14:30 2018
New Revision: 469758
URL: https://svnweb.freebsd.org/changeset/ports/469758
Log:
Bump version to 2.18.2.
Fix a regression in the mae makepatch check.
Make sure only the patch header is checked, but make sure
to read in the entire patch file. This regression was
introduced in 2.18.0.
PR: 228203
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 12 21:27:22 2018 (r469757)
+++ head/ports-mgmt/portlint/Makefile Sat May 12 22:14:30 2018 (r469758)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= portlint
-PORTVERSION= 2.18.1
+PORTVERSION= 2.18.2
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 12 21:27:22 2018 (r469757)
+++ head/ports-mgmt/portlint/src/portlint.pl Sat May 12 22:14:30 2018 (r469758)
@@ -15,7 +15,7 @@
# was removed.
#
# $FreeBSD$
-# $MCom: portlint/portlint.pl,v 1.461 2018/05/12 18:55:45 jclarke Exp $
+# $MCom: portlint/portlint.pl,v 1.463 2018/05/12 22:12:18 jclarke Exp $
#
use strict;
@@ -50,7 +50,7 @@ $portdir = '.';
# version variables
my $major = 2;
my $minor = 18;
-my $micro = 1;
+my $micro = 2;
# default setting - for FreeBSD
my $portsdir = '/usr/ports';
@@ -1037,16 +1037,17 @@ sub checkpatch {
open(IN, "< $file") || return 0;
$whole = '';
+ my $checked_header = 0;
while (<IN>) {
$whole .= $_;
- if (/^--- /) {
+ if (/^--- / && !$checked_header) {
+ $checked_header = 1;
if ($_ !~ /UTC\s*$/) {
&perror("WARN", $file, -1, "patch was not generated using ".
"``make makepatch''. It is recommended to use ".
"``make makepatch'' when you need to [re-]generate a ".
"patch to ensure proper patch format.");
}
- # last;
}
}
More information about the svn-ports-all
mailing list