From owner-svn-ports-all@freebsd.org Sun May 15 18:43:45 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 25825B3C127; Sun, 15 May 2016 18:43:45 +0000 (UTC) (envelope-from marcus@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D08E01DA0; Sun, 15 May 2016 18:43:44 +0000 (UTC) (envelope-from marcus@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4FIhirT044746; Sun, 15 May 2016 18:43:44 GMT (envelope-from marcus@FreeBSD.org) Received: (from marcus@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4FIhhU6044744; Sun, 15 May 2016 18:43:43 GMT (envelope-from marcus@FreeBSD.org) Message-Id: <201605151843.u4FIhhU6044744@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: marcus set sender to marcus@FreeBSD.org using -f From: Joe Marcus Clarke Date: Sun, 15 May 2016 18:43:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r415278 - in head/ports-mgmt/portlint: . src X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 May 2016 18:43:45 -0000 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 () { 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."); }