From owner-svn-ports-all@freebsd.org Sun Nov 29 17:24:44 2020 Return-Path: Delivered-To: svn-ports-all@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 74B124A8578; Sun, 29 Nov 2020 17:24:44 +0000 (UTC) (envelope-from marcus@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CkZx82qX1z4vC3; Sun, 29 Nov 2020 17:24:44 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5005D15028; Sun, 29 Nov 2020 17:24: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 0ATHOihD099198; Sun, 29 Nov 2020 17:24:44 GMT (envelope-from marcus@FreeBSD.org) Received: (from marcus@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0ATHOh7Z099196; Sun, 29 Nov 2020 17:24:43 GMT (envelope-from marcus@FreeBSD.org) Message-Id: <202011291724.0ATHOh7Z099196@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: marcus set sender to marcus@FreeBSD.org using -f From: Joe Marcus Clarke Date: Sun, 29 Nov 2020 17:24:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r556590 - in head/ports-mgmt/portlint: . src X-SVN-Group: ports-head X-SVN-Commit-Author: marcus X-SVN-Commit-Paths: in head/ports-mgmt/portlint: . src X-SVN-Commit-Revision: 556590 X-SVN-Commit-Repository: ports 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.34 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, 29 Nov 2020 17:24:44 -0000 Author: marcus Date: Sun Nov 29 17:24:43 2020 New Revision: 556590 URL: https://svnweb.freebsd.org/changeset/ports/556590 Log: Update to 2.19.3. * Do not complain about USE_LDCONFIG32 [1] * Allow a master port to have its last line be ".endif" [2] * Attempt to find OPTIONS use in a smarter way [3] PR: 251431 [1] 251430 [2] 249970 [3] Submitted by: gerald [1] 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 Nov 29 16:47:45 2020 (r556589) +++ head/ports-mgmt/portlint/Makefile Sun Nov 29 17:24:43 2020 (r556590) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= portlint -PORTVERSION= 2.19.2 +PORTVERSION= 2.19.3 CATEGORIES= ports-mgmt MASTER_SITES= # none DISTFILES= # none Modified: head/ports-mgmt/portlint/src/portlint.pl ============================================================================== --- head/ports-mgmt/portlint/src/portlint.pl Sun Nov 29 16:47:45 2020 (r556589) +++ head/ports-mgmt/portlint/src/portlint.pl Sun Nov 29 17:24:43 2020 (r556590) @@ -15,7 +15,7 @@ # was removed. # # $FreeBSD$ -# $MCom: portlint/portlint.pl,v 1.515 2020/05/31 15:15:06 jclarke Exp $ +# $MCom: portlint/portlint.pl,v 1.519 2020/11/29 17:21:16 jclarke Exp $ # use strict; @@ -50,7 +50,7 @@ $portdir = '.'; # version variables my $major = 2; my $minor = 19; -my $micro = 2; +my $micro = 3; # default setting - for FreeBSD my $portsdir = '/usr/ports'; @@ -1790,15 +1790,25 @@ sub checkmakefile { } if (!grep(/^$i$/, (@mopt, @popt))) { if ($whole !~ /\n${i}_($m)(_\w+)?(.)?=[^\n]+/ and $whole !~ /\n[-\w]+-${i}-(on|off):\n/) { - if (!$slaveport) { - &perror("WARN", $file, -1, "$i is listed in ". - "OPTIONS_DEFINE, but no PORT_OPTIONS:M$i appears."); - } else { - &perror("WARN", $file, -1, "$i is listed in ". - "OPTIONS_DEFINE, but no PORT_OPTIONS:M$i appears ". - "in this slave Makefile. Make sure it appears in ". - "the master's Makefile."); + my $found_opt_use = 0; + foreach my $oarg ('BUILD_DEPENDS', 'RUN_DEPENDS', 'LIB_DEPENDS') { + my $oarg_var = &get_makevar("${i}_${oarg}"); + if ($oarg_var ne "") { + $found_opt_use = 1; + last; + } } + if (!$found_opt_use) { + if (!$slaveport) { + &perror("WARN", $file, -1, "$i is listed in ". + "OPTIONS_DEFINE, but no PORT_OPTIONS:M$i appears."); + } else { + &perror("WARN", $file, -1, "$i is listed in ". + "OPTIONS_DEFINE, but no PORT_OPTIONS:M$i appears ". + "in this slave Makefile. Make sure it appears in ". + "the master's Makefile."); + } + } } } } @@ -1830,7 +1840,7 @@ sub checkmakefile { my $lineno = &linenumber($`); &perror("WARN", $file, $lineno, "is $1$2 a user-settable option? ". "Consider using WITH_$2 instead.") - if ($1.$2 ne 'USE_GCC'); + if ($1.$2 ne 'USE_GCC' && $1.$2 ne 'USE_LDCONFIG32'); } # @@ -2624,9 +2634,10 @@ xargs xmkmf #$slaveport = 0; print "OK: non-slave port detected, checking for anything after bsd.port(.post).mk.\n" if ($verbose); - if ($whole !~ /\n\.include\s+\s*$/s) { + if ($whole !~ /\n\.include\s+\s*$/s && + $whole !~ /\n\.endif\s*$/s) { &perror("FATAL", $file, -1, "the last line of Makefile has to be". - ' .include '); + ' .include (or .endif in the case of a conditional)'); } if ($whole =~ /^MASTERDIR\s*[+?:!]?\s*=/m) { &perror("WARN", $file, -1, "non-slave ports may not define MASTERDIR");