diff options
author | marcus <marcus@FreeBSD.org> | 2004-03-10 14:33:00 +0800 |
---|---|---|
committer | marcus <marcus@FreeBSD.org> | 2004-03-10 14:33:00 +0800 |
commit | 2a0edd0704cdf34fbd2778ec6461d5f24b22d199 (patch) | |
tree | e0b9c748ed2cc2371ec4ee563c0cda4b734fb97a /devel/portlint | |
parent | e455514f19ac858cad3a52f3d4d1bac83631d1b0 (diff) | |
download | freebsd-ports-graphics-2a0edd0704cdf34fbd2778ec6461d5f24b22d199.tar.gz freebsd-ports-graphics-2a0edd0704cdf34fbd2778ec6461d5f24b22d199.tar.zst freebsd-ports-graphics-2a0edd0704cdf34fbd2778ec6461d5f24b22d199.zip |
Update to 2.5.8.
* Add dirname and egrep direct command use checks
* Add a missing '?' in checking for text after bsd.port(.post)?.mk [1]
* Add a check to make sure OPTIONS is set before bsd.port.pre.mk
Submitted by: eik [1]
Diffstat (limited to 'devel/portlint')
-rw-r--r-- | devel/portlint/Makefile | 2 | ||||
-rw-r--r-- | devel/portlint/src/portlint.pl | 13 |
2 files changed, 8 insertions, 7 deletions
diff --git a/devel/portlint/Makefile b/devel/portlint/Makefile index e8b13db81e8..fd3b156d558 100644 --- a/devel/portlint/Makefile +++ b/devel/portlint/Makefile @@ -8,7 +8,7 @@ # PORTNAME= portlint -PORTVERSION= 2.5.7 +PORTVERSION= 2.5.8 CATEGORIES= devel MASTER_SITES= # none DISTFILES= # none diff --git a/devel/portlint/src/portlint.pl b/devel/portlint/src/portlint.pl index d9f3086b455..3225c91268d 100644 --- a/devel/portlint/src/portlint.pl +++ b/devel/portlint/src/portlint.pl @@ -17,7 +17,7 @@ # OpenBSD and NetBSD will be accepted. # # $FreeBSD$ -# $Id: portlint.pl,v 1.38 2004/01/22 20:01:54 marcus Exp $ +# $Id: portlint.pl,v 1.41 2004/03/10 06:25:06 marcus Exp $ # use vars qw/ $opt_a $opt_A $opt_b $opt_c $opt_h $opt_t $opt_v $opt_M $opt_N $opt_B $opt_V /; @@ -40,7 +40,7 @@ $portdir = '.'; # version variables my $major = 2; my $minor = 5; -my $micro = 7; +my $micro = 8; sub l { '[{(]'; } sub r { '[)}]'; } @@ -1032,6 +1032,7 @@ sub checkmakefile { my @other_early = qw( EMACS_PORT_NAME + OPTIONS ); my $earlypattern = join('|', 'USE_(?:'.join('|', @use_early).')', @@ -1049,7 +1050,7 @@ sub checkmakefile { # print "OK: checking for anything after bsd.port(.post).mk.\n" if ($verbose); - if ($whole =~ /^\.include\s+<bsd\.port(?:\.post)\.mk>\s*[^\s]/m) { + if ($whole =~ /^\.include\s+<bsd\.port(?:\.post)?\.mk>\s*[^\s]/m) { &perror("FATAL: $file: do not include anything after ". "bsd.port(.post).mk."); } @@ -1119,9 +1120,9 @@ sub checkmakefile { my %cmdnames = (); print "OK: checking direct use of command names.\n" if ($verbose); foreach my $i (qw( -awk basename brandelf cat chmod chown cp cpio dialog echo expr false file find -gmake grep gzcat ldconfig ln md5 mkdir mv objcopy paste patch pax perl printf -rm rmdir ruby sed sh sort touch tr which xargs xmkmf +awk basename brandelf cat chmod chown cp cpio dialog dirname echo egrep expr +false file find gmake grep gzcat ldconfig ln md5 mkdir mv objcopy paste patch +pax perl printf rm rmdir ruby sed sh sort touch tr which xargs xmkmf )) { $cmdnames{$i} = "\$\{\U$i\E\}"; } |