diff options
| author | marcus <marcus@FreeBSD.org> | 2007-06-10 03:02:10 +0800 |
|---|---|---|
| committer | marcus <marcus@FreeBSD.org> | 2007-06-10 03:02:10 +0800 |
| commit | 9133b79d509af3fcf728985c3b6199ed193ea25e (patch) | |
| tree | 5726d3058bfd7c4a1cfa4e980b280ef50586438c /ports-mgmt | |
| parent | 3b7f9fa77857bf0aea17ba95703a3158fe706aa0 (diff) | |
| download | freebsd-ports-gnome-9133b79d509af3fcf728985c3b6199ed193ea25e.tar.gz freebsd-ports-gnome-9133b79d509af3fcf728985c3b6199ed193ea25e.tar.zst freebsd-ports-gnome-9133b79d509af3fcf728985c3b6199ed193ea25e.zip | |
Update to 2.9.4.
* bsd.php.mk can now be included after bsd.port.pre.mk [1]
* Tighten the check on *_DEPENDS so that it only looks at BUILD, FETCH, PATCH,
LIB, and RUN DEPENDS [2]
PR: 110461 [1]
Submitted by: Alexander Logvinov <ports@logvinov.com> [1]
Reported by: Alexander Logvinov <ports@logvinov.com> [2]
Diffstat (limited to 'ports-mgmt')
| -rw-r--r-- | ports-mgmt/portlint/Makefile | 2 | ||||
| -rw-r--r-- | ports-mgmt/portlint/src/portlint.pl | 11 |
2 files changed, 6 insertions, 7 deletions
diff --git a/ports-mgmt/portlint/Makefile b/ports-mgmt/portlint/Makefile index b0b016165df5..62ade39428d1 100644 --- a/ports-mgmt/portlint/Makefile +++ b/ports-mgmt/portlint/Makefile @@ -8,7 +8,7 @@ # PORTNAME= portlint -PORTVERSION= 2.9.3 +PORTVERSION= 2.9.4 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 24e659bbdcb1..abf849f7ee9d 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.133 2007/02/11 19:19:23 marcus Exp $ +# $MCom: portlint/portlint.pl,v 1.137 2007/06/09 19:00:58 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 = 9; -my $micro = 3; +my $micro = 4; sub l { '[{(]'; } sub r { '[)}]'; } @@ -1186,7 +1186,6 @@ sub checkmakefile { (?:LIB)?RUBY LINUX_PREFIX OPENSSL - PHP PYTHON QT2? QT_VER @@ -2278,7 +2277,7 @@ EXTRACT_DEPENDS LIB_DEPENDS PATCH_DEPENDS BUILD_DEPENDS RUN_DEPENDS FETCH_DEPENDS DEPENDS_TARGET ); - if ($tmp =~ /(LIB_|BUILD_|RUN_|FETCH_)DEPENDS/) { + if ($tmp =~ /^(PATCH_|EXTRACT_|LIB_|BUILD_|RUN_|FETCH_)DEPENDS/m) { &checkearlier($file, $tmp, @varnames); my %seen_depends; @@ -2286,8 +2285,8 @@ FETCH_DEPENDS DEPENDS_TARGET if (!defined $ENV{'PORTSDIR'}) { $ENV{'PORTSDIR'} = $portsdir; } - foreach my $i (grep(/^[A-Z_]*DEPENDS[?+]?=/, split(/\n/, $tmp))) { - $i =~ s/^([A-Z_]*DEPENDS)[?+]?=[ \t]*//; + foreach my $i (grep(/^(PATCH_|EXTRACT_|LIB_|BUILD_|RUN_|FETCH_)*DEPENDS[?+]?=/, split(/\n/, $tmp))) { + $i =~ s/^((PATCH_|EXTRACT_|LIB_|BUILD_|RUN_|FETCH_)*DEPENDS)[?+]?=[ \t]*//; $j = $1; $seen_depends{$j}++; if ($j ne 'DEPENDS' && |