diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2008-10-21 22:38:14 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2008-10-21 22:38:14 +0000 |
| commit | 05eccf354547e5fc5840034c455f2331fcdf4560 (patch) | |
| tree | 61f811c23f4c566e2e2fecf4f6c3a229ac273178 /ports-mgmt | |
| parent | ed9b1936cfda27d268db38e03257536dba0d315f (diff) | |
Update to 2.10.1
* Allow WWW URLs which start with "https://" [1]
* Warn on possible improper use of @dirrm[try] [2]
PR: 127128 [1]
127081 [2]
Submitted by: Tomoyuki Sakurai <cherry@trombik.org> [2]
Notes
Notes:
svn path=/head/; revision=221887
Diffstat (limited to 'ports-mgmt')
| -rw-r--r-- | ports-mgmt/portlint/Makefile | 2 | ||||
| -rw-r--r-- | ports-mgmt/portlint/src/portlint.pl | 13 |
2 files changed, 10 insertions, 5 deletions
diff --git a/ports-mgmt/portlint/Makefile b/ports-mgmt/portlint/Makefile index 69a60ef0e45c..d71f0e7bbbff 100644 --- a/ports-mgmt/portlint/Makefile +++ b/ports-mgmt/portlint/Makefile @@ -8,7 +8,7 @@ # PORTNAME= portlint -PORTVERSION= 2.10.0 +PORTVERSION= 2.10.1 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 1459be3af205..f070279e4e28 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.159 2008/08/24 17:14:31 marcus Exp $ +# $MCom: portlint/portlint.pl,v 1.161 2008/10/21 22:37:28 marcus Exp $ # use vars qw/ $opt_a $opt_A $opt_b $opt_C $opt_c $opt_g $opt_h $opt_t $opt_v $opt_M $opt_N $opt_B $opt_V /; @@ -46,7 +46,7 @@ $portdir = '.'; # version variables my $major = 2; my $minor = 10; -my $micro = 0; +my $micro = 1; sub l { '[{(]'; } sub r { '[)}]'; } @@ -612,9 +612,9 @@ sub checkdescr { } if (/^WWW:\s*(\S*)/) { my $wwwurl = $1; - if ($wwwurl !~ m|^http://|) { + if ($wwwurl !~ m|^https?://|) { &perror("WARN", $file, -1, "WWW URL, $wwwurl should begin ". - "with \"http://\"."); + "with \"http://\" or \"https://\"."); } } $linecnt++; @@ -750,6 +750,11 @@ sub checkplist { $rcsidseen++ if (/\$$rcsidstr[:\$]/); } elsif ($_ =~ /^\@(owner|group|mode)\s/) { &perror("WARN", $file, $., "\@$1 should not be needed"); + | elsif ($_ =~ m!^\@(dirrm|dirrmtry)\s+/! ) { + &perror("WARN", $file, $., "Using \@$1 with absolute path ". + "will not work as you expected in most cases. Use ". + "pkg-deinstall or \@unexec rmdir ... if you want to ". + "remove a directory such as /var/\${PORTNAME}"); } elsif ($_ =~ /^\@(dirrm|option|stopdaemon)/) { ; # no check made } elsif ($_ eq "\@cwd") { |