pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/pkgtools/pkglint/files Allow append-only lists to be i...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/d8a3c92ab49f
branches:  trunk
changeset: 503949:d8a3c92ab49f
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Fri Dec 02 09:01:32 2005 +0000

description:
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:

 pkgtools/pkglint/files/makevars.map |  4 ++--
 pkgtools/pkglint/files/pkglint.pl   |  4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diffs (39 lines):

diff -r ceea0c098248 -r d8a3c92ab49f pkgtools/pkglint/files/makevars.map
--- a/pkgtools/pkglint/files/makevars.map       Fri Dec 02 08:56:09 2005 +0000
+++ b/pkgtools/pkglint/files/makevars.map       Fri Dec 02 09:01:32 2005 +0000
@@ -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_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 -r ceea0c098248 -r d8a3c92ab49f pkgtools/pkglint/files/pkglint.pl
--- a/pkgtools/pkglint/files/pkglint.pl Fri Dec 02 08:56:09 2005 +0000
+++ b/pkgtools/pkglint/files/pkglint.pl Fri Dec 02 09:01:32 2005 +0000
@@ -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 @@
                        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 \"+=\".");
                        }
 



Home | Main Index | Thread Index | Old Index