From owner-svn-ports-head@freebsd.org Sun Jun 4 22:24:30 2017 Return-Path: Delivered-To: svn-ports-head@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 E4B5DBF0FE6; Sun, 4 Jun 2017 22:24:30 +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 C0785389A; Sun, 4 Jun 2017 22:24:30 +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 v54MOUds047828; Sun, 4 Jun 2017 22:24:30 GMT (envelope-from marcus@FreeBSD.org) Received: (from marcus@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v54MOTYb047826; Sun, 4 Jun 2017 22:24:29 GMT (envelope-from marcus@FreeBSD.org) Message-Id: <201706042224.v54MOTYb047826@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: marcus set sender to marcus@FreeBSD.org using -f From: Joe Marcus Clarke Date: Sun, 4 Jun 2017 22:24:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r442596 - 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-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 04 Jun 2017 22:24:31 -0000 Author: marcus Date: Sun Jun 4 22:24:29 2017 New Revision: 442596 URL: https://svnweb.freebsd.org/changeset/ports/442596 Log: Update to 2.17.9 * Remove a check for narrow conflicts now that we are in the post-pkg world [1] * Genericize the USES_ sorting code and check to see if NOT_FOR_ARCHS and ONLY_FOR_ARCHS are sorted. [2] * Fix the check for JAVALIBDIR so that it falls before the variable expansion code. [3] PR: 219684 [1] 218823 [2] 219360 [3] Submitted by: eugen [3] 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 Jun 4 22:21:46 2017 (r442595) +++ head/ports-mgmt/portlint/Makefile Sun Jun 4 22:24:29 2017 (r442596) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= portlint -PORTVERSION= 2.17.8 +PORTVERSION= 2.17.9 CATEGORIES= ports-mgmt MASTER_SITES= # none DISTFILES= # none Modified: head/ports-mgmt/portlint/src/portlint.pl ============================================================================== --- head/ports-mgmt/portlint/src/portlint.pl Sun Jun 4 22:21:46 2017 (r442595) +++ head/ports-mgmt/portlint/src/portlint.pl Sun Jun 4 22:24:29 2017 (r442596) @@ -15,7 +15,7 @@ # was removed. # # $FreeBSD$ -# $MCom: portlint/portlint.pl,v 1.405 2017/04/21 19:47:51 jclarke Exp $ +# $MCom: portlint/portlint.pl,v 1.409 2017/06/04 22:22:22 jclarke Exp $ # use strict; @@ -50,7 +50,7 @@ $portdir = '.'; # version variables my $major = 2; my $minor = 17; -my $micro = 8; +my $micro = 9; # default setting - for FreeBSD my $portsdir = '/usr/ports'; @@ -1096,6 +1096,14 @@ sub check_depends_syntax { } } + # check JAVALIBDIR + if ($m{'dep'} =~ m|share/java/classes|) { + &perror("FATAL", $file, -1, "you should use \${JAVALIBDIR} ". + "in BUILD_DEPENDS/RUN_DEPENDS to define ". + "dependencies on JAR files installed in ". + "\${JAVAJARDIR}"); + } + foreach my $dv ($m{'dep'}, $m{'dir'}, $m{'tgt'}) { foreach my $dmv (keys %depmvars) { $dv =~ s/\$\{$dmv\}/$depmvars{$dmv}/g; @@ -1176,13 +1184,6 @@ sub check_depends_syntax { "USE_GHOSTSCRIPT(_BUILD|_RUN)."); } - # check JAVALIBDIR - if ($m{'dep'} =~ m|share/java/classes|) { - &perror("FATAL", $file, -1, "you should use \${JAVALIBDIR} ". - "in BUILD_DEPENDS/RUN_DEPENDS to define ". - "dependencies on JAR files installed in ". - "\${JAVAJARDIR}"); - } # check for PREFIX if ($m{'dep'} =~ /\$\{PREFIX}/) { @@ -1765,25 +1766,24 @@ sub checkmakefile { } # - # whole file: Check if USES stuff is sorted + # whole file: Check if some macros are sorted # - my @uses_to_sort = qw( - USES - USE_PYTHON - USE_XORG + my @macros_to_sort = qw( + ONLY_FOR_ARCHS + NOT_FOR_ARCHS ); -# print "OK: checking to see if USES_* stuff is sorted.\n" if ($verbose); -# foreach my $sorted_use (@uses_to_sort) { -# while ($whole =~ /\n$sorted_use.?=\s*(.+)\n/g) { -# my $lineno = &linenumber($`); -# my $srex = $1; -# my @suses = sort(split / /, $srex); -# if (join(" ", @suses) ne $srex) { -# &perror("WARN", $file, $lineno, "the options to $sorted_use ". -# "are not sorted. Please consider sorting them."); -# } -# } -# } + print "OK: checking to see if certain macros are sorted.\n" if ($verbose); + foreach my $sorted_macro (@macros_to_sort) { + while ($whole =~ /\n$sorted_macro.?=\s*(.+)\n/g) { + my $lineno = &linenumber($`); + my $srex = $1; + my @smacros = sort(split / /, $srex); + if (join(" ", @smacros) ne $srex) { + &perror("WARN", $file, $lineno, "the arguments to $sorted_macro ". + "are not sorted. Please consider sorting them."); + } + } + } # # whole file: USE_GNOME=pkgconfig @@ -2734,10 +2734,7 @@ DIST_SUBDIR EXTRACT_ONLY foreach my $conflict (split ' ', $makevar{CONFLICTS}) { `$pkg_version -T '$makevar{PKGNAME}' '$conflict'`; my $selfconflict = !$?; - if ($conflict !~ /(?:[<>=]|[]?*]$)/) { - &perror("WARN", "", -1, "Conflict \"$conflict\" specified too narrow. ". - "You should end it with a wildcard (-[0-9]*)."); - } elsif ($conflict !~ /[<>=-][^-]*[0-9][^-]*$/) { + if ($conflict !~ /[<>=-][^-]*[0-9][^-]*$/) { &perror("WARN", "", -1, "Conflict \"$conflict\" specified too broad. ". "You should end it with a version number fragment (-[0-9]*)."); }