From owner-svn-ports-all@FreeBSD.ORG Sat Jul 12 14:52:50 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id F0884C05;
Sat, 12 Jul 2014 14:52:49 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::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 DD6642919;
Sat, 12 Jul 2014 14:52:49 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6CEqn8t043220;
Sat, 12 Jul 2014 14:52:49 GMT (envelope-from marcus@svn.freebsd.org)
Received: (from marcus@localhost)
by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6CEqn62043218;
Sat, 12 Jul 2014 14:52:49 GMT (envelope-from marcus@svn.freebsd.org)
Message-Id: <201407121452.s6CEqn62043218@svn.freebsd.org>
From: Joe Marcus Clarke <marcus@FreeBSD.org>
Date: Sat, 12 Jul 2014 14:52:49 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
svn-ports-head@freebsd.org
Subject: svn commit: r361618 - 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-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
<mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
<mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 12 Jul 2014 14:52:50 -0000
Author: marcus
Date: Sat Jul 12 14:52:49 2014
New Revision: 361618
URL: http://svnweb.freebsd.org/changeset/ports/361618
QAT: https://qat.redports.org/buildarchive/r361618/
Log:
Update to 2.15.3.
* Make sure a port is placed in its proper category directory. [1]
* Don't check INSTALL_TARGET for direct command use. [2]
* Remove the single MASTER_SITE warning. [3]
* Check to make sure patch file names contain no more than 100 characters. [4]
PR: 191631 [2]
191079 [3]
Submitted by: wen heping <wenheping@gmail.com> [1]
gerald [2]
Requested by: demon [4]
Discussed on: ports@ [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 Sat Jul 12 14:47:19 2014 (r361617)
+++ head/ports-mgmt/portlint/Makefile Sat Jul 12 14:52:49 2014 (r361618)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= portlint
-PORTVERSION= 2.15.2
+PORTVERSION= 2.15.3
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 12 14:47:19 2014 (r361617)
+++ head/ports-mgmt/portlint/src/portlint.pl Sat Jul 12 14:52:49 2014 (r361618)
@@ -15,7 +15,7 @@
# was removed.
#
# $FreeBSD$
-# $MCom: portlint/portlint.pl,v 1.319 2014/06/21 19:21:54 marcus Exp $
+# $MCom: portlint/portlint.pl,v 1.325 2014/07/12 14:39:55 marcus Exp $
#
use strict;
@@ -50,7 +50,7 @@ $portdir = '.';
# version variables
my $major = 2;
my $minor = 15;
-my $micro = 2;
+my $micro = 3;
sub l { '[{(]'; }
sub r { '[)}]'; }
@@ -1046,6 +1046,11 @@ sub checkpatch {
return;
}
+ if (length $file > 100) {
+ &perror("FATAL", $file, -1, "make sure patch file names contain no ".
+ "more than 100 characters.");
+ }
+
open(IN, "< $file") || return 0;
$whole = '';
while (<IN>) {
@@ -1889,6 +1894,7 @@ ruby sed sdl-config sh sort sysctl touch
my $lineno = &linenumber($`);
if ($curline =~ /(?:^|\s)[\@\-]{0,2}$i(?:$|\s)/
&& $curline !~ /^[A-Z]+_TARGET[?+]?=[^\n]+$i/m
+ && $curline !~ /^[A-Z]+_INSTALL_TARGET[?+]?=[^\n]+$i/m
&& $curline !~ /^IGNORE(.)?=[^\n]+$i/m
&& $curline !~ /^BROKEN(.)?=[^\n]+$i/m
&& $curline !~ /^RESTRICTED(.)?=[^\n]+$i/m
@@ -2480,7 +2486,7 @@ DIST_SUBDIR EXTRACT_ONLY
"the main category for a port");
}
- if ($committer && $makevar{'.CURDIR'} =~ m'${portsdir}/([^/]+)/[^/]+/?$') {
+ if ($committer && $makevar{'.CURDIR'} =~ m/\Q${portsdir}\E\/([^\/]+)\/[^\/]+\/?$/) {
if ($cat[0] ne $1 && $makevar{PKGCATEGORY} ne $1 ) {
&perror("FATAL", $file, -1, "category \"$1\" must be listed first");
}
@@ -2529,16 +2535,6 @@ DIST_SUBDIR EXTRACT_ONLY
}
}
- # check number of MASTER_SITES
- if ($makevar{MASTER_SITES} ne '' &&
- ! grep {$makevar{MASTER_SITES} =~ m|$_|} @MASTERSITES_WHITELIST) {
- my @sites = split(/\s+/, $makevar{MASTER_SITES});
- if (scalar(@sites) == 1 && !&is_predefined($sites[0], undef)) {
- &perror("WARN", $file, -1, "only one MASTER_SITE configured. ".
- "Consider adding additional mirrors.");
- }
- }
-
# check the URL
if (($tmp =~ /\nMASTER_SITES[+?]?=[ \t]*([^\n]*)\n/
&& $1 !~ /^[ \t]*$/) || ($makevar{MASTER_SITES} ne '')) {