mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-11 07:22:22 +00:00
Code Issues Releases Activity

Update to 2.9.4.

Browse Source 
* 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]
This commit is contained in:
Joe Marcus Clarke 2007-06-09 19:02:10 +00:00
parent 1073f67dd1
commit a30daca963
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=193121
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports-mgmt/portlint/Makefile
View File

@ -8,7 +8,7 @@
#
PORTNAME= portlint
PORTVERSION= 2.9.3
PORTVERSION= 2.9.4
CATEGORIES= ports-mgmt
MASTER_SITES= # none
DISTFILES= # none

11
ports-mgmt/portlint/src/portlint.pl
View File

@ -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' &&