aboutsummaryrefslogtreecommitdiffstats
path: root/ports-mgmt
diff options
context:
space:
mode:
authormarcus <marcus@FreeBSD.org>2011-08-22 07:35:27 +0800
committermarcus <marcus@FreeBSD.org>2011-08-22 07:35:27 +0800
commit23260767d8a62bccbd325287230faf19a3b1912b (patch)
treef9746eb5744c0cf4105671578dceda710d665027 /ports-mgmt
parent888e06848c5471acb5d2540ee2e4f6494fc130fd (diff)
downloadfreebsd-ports-gnome-23260767d8a62bccbd325287230faf19a3b1912b.tar.gz
freebsd-ports-gnome-23260767d8a62bccbd325287230faf19a3b1912b.tar.zst
freebsd-ports-gnome-23260767d8a62bccbd325287230faf19a3b1912b.zip
Update to 2.13.7.
* Change a comment to relfect the check number [1] * Add a check to see if a file that ends in ".core" was checked into CVS [2] * Do a proper check for 2 or 3 tuple depends [3] * Correct the detection of the WWW string in pkg-descr [4] PR: 159057 [3] 159522 [4] Reported by: Ilya A. Arkhipov <micro@heavennet.ru> [1] Requested by: netchild [2] Sbumitted by: sunpoet [4]
Diffstat (limited to 'ports-mgmt')
-rw-r--r--ports-mgmt/portlint/Makefile2
-rw-r--r--ports-mgmt/portlint/src/portlint.pl18
2 files changed, 15 insertions, 5 deletions
diff --git a/ports-mgmt/portlint/Makefile b/ports-mgmt/portlint/Makefile
index 85c863461126..8c5c81013a3c 100644
--- a/ports-mgmt/portlint/Makefile
+++ b/ports-mgmt/portlint/Makefile
@@ -8,7 +8,7 @@
#
PORTNAME= portlint
-PORTVERSION= 2.13.6
+PORTVERSION= 2.13.7
CATEGORIES= ports-mgmt
MASTER_SITES= # none
DISTFILES= # none
diff --git a/ports-mgmt/portlint/src/portlint.pl b/ports-mgmt/portlint/src/portlint.pl
index 7e31881bc1df..9865877c29b3 100644
--- a/ports-mgmt/portlint/src/portlint.pl
+++ b/ports-mgmt/portlint/src/portlint.pl
@@ -17,7 +17,7 @@
# OpenBSD and NetBSD will be accepted.
#
# $FreeBSD$
-# $MCom: portlint/portlint.pl,v 1.223 2011/06/26 21:25:51 marcus Exp $
+# $MCom: portlint/portlint.pl,v 1.229 2011/08/21 23:33:05 marcus Exp $
#
use strict;
@@ -52,7 +52,7 @@ $portdir = '.';
# version variables
my $major = 2;
my $minor = 13;
-my $micro = 6;
+my $micro = 7;
sub l { '[{(]'; }
sub r { '[)}]'; }
@@ -478,6 +478,12 @@ if ($committer) {
unless (eval { /$ENV{'PL_CVS_IGNORE'}/, 1 } &&
/$ENV{'PL_CVS_IGNORE'}/);
}
+ elsif ($filename =~ /\.core$/ && $entries{$_}) {
+ &perror("FATAL", "", -1, "file $filename ends in ".
+ "\".core\". This file can be removed by periodic ".
+ "cleanup scripts. Do not include files that end in ".
+ "\".core\".");
+ }
elsif ($entries{$_} eq 'D') {
&perror("FATAL", "", -1, "file $filename is a directory in CVS.");
}
@@ -630,7 +636,7 @@ sub checkdescr {
"returns. Strip all carriage returns (e.g. run dos2unix) ".
"in $file.");
}
- if (/^WWW:\s*(\S*)/) {
+ if (/^WWW:\s+(\S*)/) {
my $wwwurl = $1;
if ($wwwurl !~ m|^https?://|) {
&perror("WARN", $file, -1, "WWW URL, $wwwurl should begin ".
@@ -1196,6 +1202,10 @@ sub check_depends_syntax {
if ($k =~ /^#/) {
last;
}
+ if ($k =~ /^\$\{(\w+)\}$/) {
+ $k = `make -V $1`;
+ chomp $k;
+ }
my @l = split(':', $k);
print "OK: checking dependency value for $j.\n"
@@ -2841,7 +2851,7 @@ FETCH_DEPENDS DEPENDS_TARGET
&checkearlier($file, $tmp, @varnames);
#
- # Makefile 6: check the rest of file
+ # Makefile 7: check the rest of file
#
print "OK: checking the rest of the $file.\n" if ($verbose);
$tmp = join("\n\n", @sections[$idx .. scalar(@sections)-1]);