svn commit: r361618 - in head/ports-mgmt/portlint: . src

[Joe Marcus Clarke]

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 at 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 '')) {