diff options
| author | rillig <rillig@pkgsrc.org> | 2005-11-04 17:29:02 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2005-11-04 17:29:02 +0000 |
| commit | 9df8a0ff820185f2600414b75e4168a8846852ee (patch) | |
| tree | af61d6c58abe2150566b2404f386be2ebf28e541 /pkgtools | |
| parent | 282b382dfea352497ae1038402d383b35f7b5e31 (diff) | |
| download | pkgsrc-9df8a0ff820185f2600414b75e4168a8846852ee.tar.gz | |
- PLIST_SRC may be set with both "=" and "+=".
- Allow variables as Option.
- Improved the diagnostic for "invalid subdirectory of ${WRKSRC}".
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/pkglint/files/makevars.map | 4 | ||||
| -rw-r--r-- | pkgtools/pkglint/files/pkglint.pl | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgtools/pkglint/files/makevars.map b/pkgtools/pkglint/files/makevars.map index 50e66c1ec3c..53039117d2f 100644 --- a/pkgtools/pkglint/files/makevars.map +++ b/pkgtools/pkglint/files/makevars.map @@ -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_SKIP_REASON List 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 --git a/pkgtools/pkglint/files/pkglint.pl b/pkgtools/pkglint/files/pkglint.pl index 0c64d4f6a6f..40a98afd788 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.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 @@ sub checktext_basic_vartype($$$$$) { } } 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 @@ sub checktext_basic_vartype($$$$$) { # 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") { |