From owner-svn-ports-all@freebsd.org Sat Jul 22 01:51:46 2017 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 6EC26C7AAB3; Sat, 22 Jul 2017 01:51:46 +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 4640065FF9; Sat, 22 Jul 2017 01:51:46 +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 v6M1pjN6039068; Sat, 22 Jul 2017 01:51:45 GMT (envelope-from marcus@FreeBSD.org) Received: (from marcus@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6M1pjkO039066; Sat, 22 Jul 2017 01:51:45 GMT (envelope-from marcus@FreeBSD.org) Message-Id: <201707220151.v6M1pjkO039066@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: marcus set sender to marcus@FreeBSD.org using -f From: Joe Marcus Clarke Date: Sat, 22 Jul 2017 01:51:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r446351 - 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: 446351 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.23 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: Sat, 22 Jul 2017 01:51:46 -0000 Author: marcus Date: Sat Jul 22 01:51:44 2017 New Revision: 446351 URL: https://svnweb.freebsd.org/changeset/ports/446351 Log: Update to 2.17.10. * Remove the other check for conflicts that are too broad [1] * Remove the check for portlint that is more than 30 days old [2] * Check to see uf USE_* comes before USES [3] PR: 220087 [2] 220340 [3] Reminded by: dbaio [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 Sat Jul 22 01:05:15 2017 (r446350) +++ head/ports-mgmt/portlint/Makefile Sat Jul 22 01:51:44 2017 (r446351) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= portlint -PORTVERSION= 2.17.9 +PORTVERSION= 2.17.10 CATEGORIES= ports-mgmt MASTER_SITES= # none DISTFILES= # none Modified: head/ports-mgmt/portlint/src/portlint.pl ============================================================================== --- head/ports-mgmt/portlint/src/portlint.pl Sat Jul 22 01:05:15 2017 (r446350) +++ head/ports-mgmt/portlint/src/portlint.pl Sat Jul 22 01:51:44 2017 (r446351) @@ -15,7 +15,7 @@ # was removed. # # $FreeBSD$ -# $MCom: portlint/portlint.pl,v 1.409 2017/06/04 22:22:22 jclarke Exp $ +# $MCom: portlint/portlint.pl,v 1.413 2017/07/22 01:46:20 jclarke Exp $ # use strict; @@ -50,7 +50,7 @@ $portdir = '.'; # version variables my $major = 2; my $minor = 17; -my $micro = 9; +my $micro = 10; # default setting - for FreeBSD my $portsdir = '/usr/ports'; @@ -214,7 +214,26 @@ while () { close(IN); open(MK, 'Makefile') || die "Makefile: $!"; -my @muses = grep($_ = /^USES[?+]?=\s*(.*)/ && $1, ); +my $ulineno = -1; +my $uulineno = -1; +my @muses = (); +while (my $mline = ) { + if ($uulineno == -1 && $mline =~ /^USE_/) { + $uulineno = $.; + } + if ($mline =~ /^USES[?+]?=\s*(.*)/) { + if ($ulineno == -1) { + $ulineno = $.; + } + if ($1) { + push @muses, split(/\s+/, $1); + } + } +} +if ($uulineno < $ulineno) { + &perror("WARN", 'Makefile', $uulineno, "USE_* seen before USES. ". + "According to the porters-handbook, USES must appear first."); +} foreach my $muse (@muses) { $makevar{USES} .= " " . $muse; } @@ -397,10 +416,6 @@ sub checkdistinfo { my $now = time; if ($1 > $now) { &perror("FATAL", $file, $., "TIMESTAMP is in the future"); - } else { - if ($now - $1 > (30 * 60 * 60 * 24)) { - &perror("WARN", $file, $., "TIMESTAMP is over 30 days old"); - } } next; } @@ -2734,10 +2749,6 @@ DIST_SUBDIR EXTRACT_ONLY foreach my $conflict (split ' ', $makevar{CONFLICTS}) { `$pkg_version -T '$makevar{PKGNAME}' '$conflict'`; my $selfconflict = !$?; - if ($conflict !~ /[<>=-][^-]*[0-9][^-]*$/) { - &perror("WARN", "", -1, "Conflict \"$conflict\" specified too broad. ". - "You should end it with a version number fragment (-[0-9]*)."); - } if ($selfconflict) { &perror("FATAL", "", -1, "Package conflicts with itself. ". "You should remove \"$conflict\" from CONFLICTS.");