From owner-dev-commits-ports-main@freebsd.org Sun Sep 19 17:14:24 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 68A3766DFA3; Sun, 19 Sep 2021 17:14:24 +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 4HCDnX2VnHz3PtH; Sun, 19 Sep 2021 17:14:24 +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 31D6521184; Sun, 19 Sep 2021 17:14:24 +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 18JHEOvZ046479; Sun, 19 Sep 2021 17:14:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 18JHEONi046478; Sun, 19 Sep 2021 17:14:24 GMT (envelope-from git) Date: Sun, 19 Sep 2021 17:14:24 GMT Message-Id: <202109191714.18JHEONi046478@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: 772ba6c8dbe4 - main - ports-mgmt/portlint: Update to 2.19.8 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: 772ba6c8dbe420f4f96721ddaa060432a0f57ec4 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: Sun, 19 Sep 2021 17:14:24 -0000 The branch main has been updated by marcus: URL: https://cgit.FreeBSD.org/ports/commit/?id=772ba6c8dbe420f4f96721ddaa060432a0f57ec4 commit 772ba6c8dbe420f4f96721ddaa060432a0f57ec4 Author: Joe Marcus Clarke AuthorDate: 2021-09-19 17:12:39 +0000 Commit: Joe Marcus Clarke CommitDate: 2021-09-19 17:12:39 +0000 ports-mgmt/portlint: Update to 2.19.8 * Warn about deprecated USE_AUTOTOOLS [1] * Add support for BROKEN_* PR: 248487 [1] 257951 [2] --- ports-mgmt/portlint/Makefile | 2 +- ports-mgmt/portlint/src/portlint.pl | 18 +++++++++++++----- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/ports-mgmt/portlint/Makefile b/ports-mgmt/portlint/Makefile index d21f0898cb4f..41bec3134480 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.7 +PORTVERSION= 2.19.8 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 e5d64f1a573d..1c5b7da8fa7b 100644 --- a/ports-mgmt/portlint/src/portlint.pl +++ b/ports-mgmt/portlint/src/portlint.pl @@ -49,7 +49,7 @@ $portdir = '.'; # version variables my $major = 2; my $minor = 19; -my $micro = 7; +my $micro = 8; # default setting - for FreeBSD my $portsdir = '/usr/ports'; @@ -1916,7 +1916,7 @@ sub checkmakefile { # whole file: BROKEN et al. # my ($var); - foreach $var (qw(IGNORE BROKEN COMMENT FORBIDDEN MANUAL_PACKAGE_BUILD NO_CDROM NO_PACKAGE RESTRICTED)) { + foreach $var (qw(IGNORE BROKEN(_[\w\d]+)? COMMENT FORBIDDEN MANUAL_PACKAGE_BUILD NO_CDROM NO_PACKAGE RESTRICTED)) { print "OK: checking ${var}.\n" if ($verbose); if ($whole =~ /\n${var}[+?]?=[ \t]+"/) { my $lineno = &linenumber($`); @@ -1937,8 +1937,8 @@ sub checkmakefile { "with a lowercase letter and end without a period."); } - if ($whole =~ /\nBROKEN[+?]=[ \t]+[^a-z \t]/ || - $whole =~ /^BROKEN[+?]?=[ \t]+.*\.$/m) { + if ($whole =~ /\nBROKEN(_[\w\d]+)?[+?]?=[ \t]+[^a-z \t]/ || + $whole =~ /^BROKEN(_[\w\d]+)?[+?]?=[ \t]+.*\.$/m) { my $lineno = &linenumber($`); &perror("WARN", $file, $lineno, "BROKEN messages should begin ". "with a lowercase letter and end without a period."); @@ -2223,7 +2223,7 @@ xargs xmkmf && $lm !~ /^COMMENT(.)?=[^\n]+($i\d*)/m) { &perror("WARN", $file, $lineno, "possible direct use of ". "command \"$sm\" found. Use $autocmdnames{$i} ". - "instead and set according USE_AUTOTOOLS= macro"); + "instead and set USES=autoreconf and GNU_CONFIGURE=yes"); } } } @@ -2233,6 +2233,14 @@ xargs xmkmf "Use USES=libtool instead."); } + if ($makevar{'USE_AUTOTOOLS'} =~ /\blibtoolize\b/) { + &perror("WARN", $file, -1, "USE_AUTOTOOLS=libtoolize is deprecated. ". + "Use \"USES=autoreconf libtool\" instead."); + } elsif ($makevar{'USE_AUTOCONF'}) { + &perror("WARN", $file, -1, "USE_AUTOTOOLS is deprecated. ". + "Use USES=autoreconf and set GNU_CONFIGURE=yes instead."); + } + # # whole file: check for use of paths that have macro replacements #