diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2011-01-10 04:43:58 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2011-01-10 04:43:58 +0000 |
| commit | d6cedf8b477417859c061f8813ee9d1bd1d7360a (patch) | |
| tree | ee46f86c78e580896b4b88136e689b805a0f5c76 /ports-mgmt/portlint/src | |
| parent | d3572568e4c67c697c12e15190d68bf26fc27424 (diff) | |
Update to 2.13.3
* Do not warn when the "work" directory is not in CVS. [1]
* Improve Ruby docs and examples handling. [2]
PR: 152053 [1]
153596 [2]
Submitted by: Eitan Adler <lists@eitanadler.com> [1]
tota [2]
Notes
Notes:
svn path=/head/; revision=267566
Diffstat (limited to 'ports-mgmt/portlint/src')
| -rw-r--r-- | ports-mgmt/portlint/src/portlint.pl | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/ports-mgmt/portlint/src/portlint.pl b/ports-mgmt/portlint/src/portlint.pl index db57916ab69c..6cc821277aa0 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.203 2010/11/07 22:10:25 marcus Exp $ +# $MCom: portlint/portlint.pl,v 1.207 2011/01/10 04:42:45 marcus Exp $ # use strict; @@ -52,7 +52,7 @@ $portdir = '.'; # version variables my $major = 2; my $minor = 13; -my $micro = 2; +my $micro = 3; sub l { '[{(]'; } sub r { '[)}]'; } @@ -464,7 +464,7 @@ if ($committer) { if /^(?:\.\.?|CVS)$/; my $filename = $dir eq '.' ? $_ : "$dir/$_"; if (-d $filename) { - if (!$entries{$_} || $entries{$_} ne 'D') { + if ((!$entries{$_} || $entries{$_} ne 'D') && $filename ne 'work') { &perror("FATAL", "", -1, "directory $filename not in CVS."); } else { @@ -699,8 +699,13 @@ sub checkplist { # E.g., %%PORTDOCS%%%%RUBY_MODDOCDIR%% will be OK because there is # no %%PORTRUBY_MODDOC%% substitution. my %check_xxxdir_ok = ( + "DOCS" => "DOCS", + "EXAMPLES" => "EXPAMPLES", + "DATA" => "DATA", + "RUBY_DOC" => "DOCS", + "RUBY_EXAMPLES" => "EXAMPLES", "RUBY_MODDOC" => "DOCS", - "RUBY_MODEXAMPLES" => "DOCS", + "RUBY_MODEXAMPLES" => "EXAMPLES", ); open(IN, "< $file") || return 0; @@ -925,7 +930,7 @@ sub checkplist { if ($_ =~ m{^%%PORT(\w+)%%(.*?)%%(\w+)DIR%%(.*)$} and $1 ne $3) { &perror("WARN", $file, $., "Do not mix %%PORT$1%% with %%$3DIR%%. ". - "Use '%%PORT$3%%$2%%$3DIR%%$4' instead and update Makefile ". + "Use '%%PORT$check_xxxdir_ok{$3}%%$2%%$3DIR%%$4' instead and update Makefile ". "accordingly.") unless (defined($check_xxxdir_ok{$3}) and $check_xxxdir_ok{$3} eq $1); } |