Updated pkglint to 4.28.1.
Declared some more variables as List types. Added a check that PERL5_PACKLIST matches the PKGNAME.
This commit is contained in:
parent
f1d7980a7c
commit
e95f2f49e0
5 changed files with 23 additions and 6 deletions
|
@ -1,4 +1,4 @@
|
|||
$NetBSD: CHANGES,v 1.11474 2005/10/14 08:37:16 adrianp Exp $
|
||||
$NetBSD: CHANGES,v 1.11475 2005/10/14 09:24:29 rillig Exp $
|
||||
|
||||
Changes to the packages collection and infrastructure in 2005:
|
||||
|
||||
|
@ -4576,3 +4576,4 @@ Changes to the packages collection and infrastructure in 2005:
|
|||
Added security/dirb version 1.8 [minskim 2005-10-14]
|
||||
Added security/secpanel version 0.5.1 [minskim 2005-10-14]
|
||||
Updated mail/sendmail to 8.13.5 [adrianp 2005-10-14]
|
||||
Updated pkgtools/pkglint to 4.28.1 [rillig 2005-10-14]
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
# $NetBSD: Makefile,v 1.264 2005/10/14 00:05:23 rillig Exp $
|
||||
# $NetBSD: Makefile,v 1.265 2005/10/14 09:23:46 rillig Exp $
|
||||
#
|
||||
|
||||
DISTNAME= pkglint-4.28
|
||||
DISTNAME= pkglint-4.28.1
|
||||
CATEGORIES= pkgtools devel
|
||||
MASTER_SITES= # empty
|
||||
DISTFILES= # empty
|
||||
|
|
|
@ -8,3 +8,4 @@
|
|||
* in dependency lines check for ../../category/package, not ../package
|
||||
* ONLY_FOR_PLATFORM => NOT_FOR_PLATFORM
|
||||
* -Wl,-rpath
|
||||
* check that PERL5_PACKLIST is a path relative to ${FOO}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: makevars.map,v 1.15 2005/10/14 00:05:23 rillig Exp $
|
||||
# $NetBSD: makevars.map,v 1.16 2005/10/14 09:23:46 rillig Exp $
|
||||
#
|
||||
|
||||
# This file tries to guess the type of some variables, according to their
|
||||
|
@ -64,3 +64,7 @@ CFLAGS List
|
|||
CPPFLAGS List
|
||||
LDFLAGS List
|
||||
LIBS List
|
||||
MAKE_ENV List
|
||||
CONFIGURE_ENV List
|
||||
MAKE_FLAGS List
|
||||
CONFIGURE_ARGS List
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
# Freely redistributable. Absolutely no warranty.
|
||||
#
|
||||
# From Id: portlint.pl,v 1.64 1998/02/28 02:34:05 itojun Exp
|
||||
# $NetBSD: pkglint.pl,v 1.298 2005/10/14 00:05:23 rillig Exp $
|
||||
# $NetBSD: pkglint.pl,v 1.299 2005/10/14 09:23:46 rillig Exp $
|
||||
#
|
||||
# This version contains lots of changes necessary for NetBSD packages
|
||||
# done by:
|
||||
|
@ -1540,6 +1540,17 @@ sub checklines_package_Makefile($) {
|
|||
}
|
||||
}
|
||||
|
||||
if ($varname eq "PERL5_PACKLIST" && defined($pkgname) && $pkgname =~ qr"^p5-(.*)-[0-9].*") {
|
||||
my ($guess) = ($1);
|
||||
$guess =~ s/-/\//g;
|
||||
$guess = "auto/${guess}/.packlist";
|
||||
|
||||
my ($ucvalue, $ucguess) = (uc($value), uc($guess));
|
||||
if ($ucvalue ne $ucguess && $ucvalue ne "\${PERL5_SITEARCH\}/${ucguess}") {
|
||||
$line->log_warning("Unusual value for PERL5_PACKLIST -- \"${guess}\" expected.");
|
||||
}
|
||||
}
|
||||
|
||||
if ($varname eq "PKG_SUPPORTED_OPTIONS" || $varname eq "PKG_SUGGESTED_OPTIONS") {
|
||||
if ($value =~ qr"_") {
|
||||
$line->log_warning("Options should not contain underscores.");
|
||||
|
@ -1685,7 +1696,6 @@ sub checkfile_package_Makefile($$$$$) {
|
|||
log_subinfo("checkfile_package_Makefile", $fname, NO_LINE_NUMBER, undef);
|
||||
|
||||
checkperms($fname);
|
||||
checklines_package_Makefile($lines);
|
||||
|
||||
$abspkgdir = Cwd::abs_path($dir);
|
||||
$category = basename(dirname($abspkgdir));
|
||||
|
@ -2152,6 +2162,7 @@ sub checkfile_package_Makefile($$$$$) {
|
|||
"discouraged. Redefine \"do-$1\" instead.");
|
||||
}
|
||||
|
||||
checklines_package_Makefile($lines);
|
||||
checklines_Makefile_varuse($lines);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue