svn commit: r415278 - in head/ports-mgmt/portlint: . src

[Joe Marcus Clarke]

Author: marcus
Date: Sun May 15 18:43:43 2016
New Revision: 415278
URL: https://svnweb.freebsd.org/changeset/ports/415278

Log:
  Update to 2.17.2.
  
  * Properly check for TIMESTAMP in distinfo

Modified:
  head/ports-mgmt/portlint/Makefile
  head/ports-mgmt/portlint/src/portlint.pl

Modified: head/ports-mgmt/portlint/Makefile
==============================================================================
--- head/ports-mgmt/portlint/Makefile	Sun May 15 18:22:40 2016	(r415277)
+++ head/ports-mgmt/portlint/Makefile	Sun May 15 18:43:43 2016	(r415278)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	portlint
-PORTVERSION=	2.17.1
-PORTREVISION=	1
+PORTVERSION=	2.17.2
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	# none
 DISTFILES=	# none

Modified: head/ports-mgmt/portlint/src/portlint.pl
==============================================================================
--- head/ports-mgmt/portlint/src/portlint.pl	Sun May 15 18:22:40 2016	(r415277)
+++ head/ports-mgmt/portlint/src/portlint.pl	Sun May 15 18:43:43 2016	(r415278)
@@ -15,7 +15,7 @@
 # was removed.
 #
 # $FreeBSD$
-# $MCom: portlint/portlint.pl,v 1.386 2016/05/15 18:21:04 jclarke Exp $
+# $MCom: portlint/portlint.pl,v 1.388 2016/05/15 18:42:34 jclarke Exp $
 #
 
 use strict;
@@ -50,7 +50,7 @@ $portdir = '.';
 # version variables
 my $major = 2;
 my $minor = 17;
-my $micro = 1;
+my $micro = 2;
 
 # default setting - for FreeBSD
 my $portsdir = '/usr/ports';
@@ -391,14 +391,17 @@ sub checkdistinfo {
 	while (<IN>) {
 		if (/^\s*$/) {
 			&perror("FATAL", $file, $., "found blank line.");
+			next;
 		}
-		m/(\S+)\s+\((\S+)\)\s+=\s+(\S+)/;
-
-		if ($1 ne "" && $2 ne "" && $3 ne "") {
+		if (/^TIMESTAMP\s+=\s+\d+$/) {
+			# TIMESTAMP is a valid distinfo option
+			next;
+		}
+		if (/(\S+)\s+\((\S+)\)\s+=\s+(\S+)/) {
 			my ($tag, $path, $value) = ($1, $2, $3);
 			$records{$path}{$tag} = $value;
 
-			if (!$algorithms{$tag} && $tag ne "SIZE" && $tag ne "TIMESTAMP") {
+			if (!$algorithms{$tag} && $tag ne "SIZE") {
 				&perror("FATAL", $file, $., "unsupported checksum algorithm ".
 					"found: $tag.");
 			}