[pkgsrc/trunk]: pkgsrc/pkgtools/pkglint/files - PLIST_SRC may be set with bot...

[rillig <rillig%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ec76297e35ae
branches:  trunk
changeset: 502429:ec76297e35ae
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Fri Nov 04 17:29:02 2005 +0000

description:
- PLIST_SRC may be set with both "=" and "+=".
- Allow variables as Option.
- Improved the diagnostic for "invalid subdirectory of ${WRKSRC}".

diffstat:

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

diffs (48 lines):

diff -r 8550136903b6 -r ec76297e35ae pkgtools/pkglint/files/makevars.map
--- a/pkgtools/pkglint/files/makevars.map       Fri Nov 04 17:22:08 2005 +0000
+++ b/pkgtools/pkglint/files/makevars.map       Fri Nov 04 17:29:02 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: makevars.map,v 1.25 2005/11/04 17:00:58 rillig Exp $
+# $NetBSD: makevars.map,v 1.26 2005/11/04 17:29:02 rillig Exp $
 #
 
 # This file contains the guessed type of some variables, according to
@@ -148,7 +148,7 @@
 PKG_SUFX               Userdefined
 PKG_SUGGESTED_OPTIONS  List* of Option
 PKG_SUPPORTED_OPTIONS  List* of Option
-PLIST_SRC              List of Pathname
+PLIST_SRC              List* of Pathname
 PLIST_SUBST            List
 PLIST_TYPE             { dynamic static }
 PTHREAD_AUTO_VARS      YesNo
diff -r 8550136903b6 -r ec76297e35ae pkgtools/pkglint/files/pkglint.pl
--- a/pkgtools/pkglint/files/pkglint.pl Fri Nov 04 17:22:08 2005 +0000
+++ b/pkgtools/pkglint/files/pkglint.pl Fri Nov 04 17:29:02 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.329 2005/11/04 17:04:49 rillig Exp $
+# $NetBSD: pkglint.pl,v 1.330 2005/11/04 17:29:02 rillig Exp $
 #
 # This version contains lots of changes necessary for NetBSD packages
 # done by:
@@ -1540,7 +1540,7 @@
                }
 
        } elsif ($type eq "Option") {
-               if ($value !~ qr"^-?[a-z][-0-9a-z]*$") {
+               if ($value_novar !~ qr"^-?[a-z][-0-9a-z]*$") {
                        $line->log_warning("\"${value}\" is not a valid option name.");
                }
 
@@ -1634,7 +1634,7 @@
                        # The value of another variable
 
                } elsif ($value_novar !~ qr"^(?:\.|[0-9A-Za-z][-0-9A-Za-z._/+]*)$") {
-                       $line->log_warning("\"${value}\" is not a valid subdirectory.");
+                       $line->log_warning("\"${value}\" is not a valid subdirectory of \${WRKSRC}.");
                }
 
        } elsif ($type eq "Yes") {