From owner-dev-commits-ports-main@freebsd.org Fri May 14 17:16:00 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 402C364E51F; Fri, 14 May 2021 17:16:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FhZtQ239Gz4gSy; Fri, 14 May 2021 17:15:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 27AC61603A; Fri, 14 May 2021 17:15:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 14EHFw36085672; Fri, 14 May 2021 17:15:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14EHFwkv085671; Fri, 14 May 2021 17:15:58 GMT (envelope-from git) Date: Fri, 14 May 2021 17:15:58 GMT Message-Id: <202105141715.14EHFwkv085671@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Joe Marcus Clarke Subject: git: 122c3ecb51c4 - main - ports-mgmt/portlint: Update to 2.19.6 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: marcus X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 122c3ecb51c4a8057d09d1699a962dd1987e8061 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 May 2021 17:16:00 -0000 The branch main has been updated by marcus: URL: https://cgit.FreeBSD.org/ports/commit/?id=122c3ecb51c4a8057d09d1699a962dd1987e8061 commit 122c3ecb51c4a8057d09d1699a962dd1987e8061 Author: Joe Marcus Clarke AuthorDate: 2021-05-14 16:57:48 +0000 Commit: Joe Marcus Clarke CommitDate: 2021-05-14 17:15:44 +0000 ports-mgmt/portlint: Update to 2.19.6 * Allow ports without any leading comment section [1] loader@ submitted a patch on which this was based * Add a check to make sure the license is actually valid PR: 255520 [1] --- ports-mgmt/portlint/Makefile | 2 +- ports-mgmt/portlint/src/portlint.pl | 57 ++++++++++++++++++++++--------------- 2 files changed, 35 insertions(+), 24 deletions(-) diff --git a/ports-mgmt/portlint/Makefile b/ports-mgmt/portlint/Makefile index ad6edb127375..c7a08584c901 100644 --- a/ports-mgmt/portlint/Makefile +++ b/ports-mgmt/portlint/Makefile @@ -1,7 +1,7 @@ # Created by: Jun-ichiro itojun Hagino PORTNAME= portlint -PORTVERSION= 2.19.5 +PORTVERSION= 2.19.6 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 329821698a0b..d797c4c6a11f 100644 --- a/ports-mgmt/portlint/src/portlint.pl +++ b/ports-mgmt/portlint/src/portlint.pl @@ -14,7 +14,7 @@ # bsd.port.mk. There are significant differences in those so non-FreeBSD code # was removed. # -# $MCom: portlint/portlint.pl,v 1.525 2021/04/19 20:48:32 jclarke Exp $ +# $MCom: portlint/portlint.pl,v 1.528 2021/05/14 16:53:31 jclarke Exp $ # use strict; @@ -49,7 +49,7 @@ $portdir = '.'; # version variables my $major = 2; my $minor = 19; -my $micro = 5; +my $micro = 6; # default setting - for FreeBSD my $portsdir = '/usr/ports'; @@ -2663,34 +2663,39 @@ xargs xmkmf } } $idx = 0; + my @linestocheck = (); - # - # section 1: comment lines. - # - print "OK: checking comment section of $file.\n" if ($verbose); - my @linestocheck = split("\n", <&1 >/dev/null"); + if ($lic_check) { + &perror("FATAL", $file, -1, "Failed to validate port LICENSE '$makevar{LICENSE}' with ``make check-license''"); + } + $idx++; push(@varnames, qw(