diff options
| author | rillig <rillig> | 2005-12-02 09:01:32 +0000 |
|---|---|---|
| committer | rillig <rillig> | 2005-12-02 09:01:32 +0000 |
| commit | a9a60cd0098d565e13fcdc7f8869d56c805c3db5 (patch) | |
| tree | a140088dedb09ead67f94cc0e93a4d420bd428b4 /pkgtools | |
| parent | 64af939d5df8f062a1601714ee47861f5314bc6f (diff) | |
| download | pkgsrc-a9a60cd0098d565e13fcdc7f8869d56c805c3db5.tar.gz | |
Allow append-only lists to be initialized using the "?=" operator, in
addition to initializing them to a commented empty value and using the
"+=" operator. Reenabled the check for BUILDLINK_RECOMMENDED.
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/pkglint/files/makevars.map | 4 | ||||
| -rw-r--r-- | pkgtools/pkglint/files/pkglint.pl | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgtools/pkglint/files/makevars.map b/pkgtools/pkglint/files/makevars.map index b939da14a37..7f201719526 100644 --- a/pkgtools/pkglint/files/makevars.map +++ b/pkgtools/pkglint/files/makevars.map @@ -1,4 +1,4 @@ -# $NetBSD: makevars.map,v 1.46 2005/12/02 08:56:09 rillig Exp $ +# $NetBSD: makevars.map,v 1.47 2005/12/02 09:01:32 rillig Exp $ # # This file contains the guessed type of some variables, according to @@ -44,7 +44,7 @@ BDB_LIBS Readonly BDB_TYPE Readonly BUILDLINK_DEPENDS List!+ of Dependency BUILDLINK_PKGSRCDIR RelativePkgDir -#BUILDLINK_RECOMMENDED List!+ of Dependency +BUILDLINK_RECOMMENDED List!+ of Dependency BUILDLINK_TRANSFORM List+ BUILD_DEFS List+ of Varname BUILD_DEPENDS List!+ of DependencyWithPath diff --git a/pkgtools/pkglint/files/pkglint.pl b/pkgtools/pkglint/files/pkglint.pl index ff8ce538c81..5b75b3ed86e 100644 --- a/pkgtools/pkglint/files/pkglint.pl +++ b/pkgtools/pkglint/files/pkglint.pl @@ -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.410 2005/12/02 08:44:23 rillig Exp $ +# $NetBSD: pkglint.pl,v 1.411 2005/12/02 09:01:32 rillig Exp $ # # This version contains lots of changes necessary for NetBSD packages # done by: @@ -2166,7 +2166,7 @@ sub checkline_Makefile_vartype($$) { my ($internal_list, $append_only, $element_type) = ($1 eq "!", $2 eq "+", $3); my (@words, $rest); - if ($append_only && $op ne "+=" && !($value eq "" && defined($comment) && $comment =~ qr"^#")) { + if ($append_only && $op ne "+=" && $op ne "?=" && !($value eq "" && defined($comment) && $comment =~ qr"^#")) { $line->log_warning("${varname} should be modified using \"+=\"."); } |