cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 2.5.8.

Browse Source 
* 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]
This commit is contained in:
Joe Marcus Clarke 2004-03-10 06:33:00 +00:00
parent 6cf8fd70b2
commit 26b0d5c789
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=103500
4 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devel/portlint/Makefile
View File

@ -8,7 +8,7 @@
#
PORTNAME= portlint
PORTVERSION= 2.5.7
PORTVERSION= 2.5.8
CATEGORIES= devel
MASTER_SITES= # none
DISTFILES= # none

13
devel/portlint/src/portlint.pl
View File

@ -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\}";
}

2
ports-mgmt/portlint/Makefile
View File

@ -8,7 +8,7 @@
#
PORTNAME= portlint
PORTVERSION= 2.5.7
PORTVERSION= 2.5.8
CATEGORIES= devel
MASTER_SITES= # none
DISTFILES= # none

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

@ -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\}";
}