diff options
| author | rillig <rillig> | 2006-05-01 20:19:04 +0000 |
|---|---|---|
| committer | rillig <rillig> | 2006-05-01 20:19:04 +0000 |
| commit | 4960f765899aa521c2ba45258ca6ee9eebde434e (patch) | |
| tree | 08df70d5491e394188919a43c783c7c76e775f2f /pkgtools/pkglint | |
| parent | c5b8f4abdf97589b5ae3ae0d6abd6582bbb21a2c (diff) | |
| download | pkgsrc-4960f765899aa521c2ba45258ca6ee9eebde434e.tar.gz | |
The only valid value for NO_{SRC,BIN}_ON_{CDROM,FTP} is ${RESTRICTED},
as documented in the pkgsrc guide.
Diffstat (limited to 'pkgtools/pkglint')
| -rw-r--r-- | pkgtools/pkglint/files/makevars.map | 10 | ||||
| -rw-r--r-- | pkgtools/pkglint/files/pkglint.pl | 7 |
2 files changed, 11 insertions, 6 deletions
diff --git a/pkgtools/pkglint/files/makevars.map b/pkgtools/pkglint/files/makevars.map index 2acdd7717a5..d150a203e44 100644 --- a/pkgtools/pkglint/files/makevars.map +++ b/pkgtools/pkglint/files/makevars.map @@ -1,4 +1,4 @@ -# $NetBSD: makevars.map,v 1.83 2006/05/01 00:13:47 rillig Exp $ +# $NetBSD: makevars.map,v 1.84 2006/05/01 20:19:04 rillig Exp $ # # This file contains the guessed type of some variables, according to @@ -273,8 +273,8 @@ MYSQL_VERSIONS_ACCEPTED List of { 40 41 50 } MYSQL_VERSION_DEFAULT Userdefined NOT_FOR_COMPILER List of { ccc gcc icc ido mipspro mipspro-ucode sunpro xlc } NOT_FOR_PLATFORM List of PlatformTriple -NO_BIN_ON_CDROM Message -NO_BIN_ON_FTP Message +NO_BIN_ON_CDROM Restricted +NO_BIN_ON_FTP Restricted NO_BUILD Yes NO_CHECKSUM Yes NO_CONFIGURE Yes @@ -285,8 +285,8 @@ NO_MTREE Yes NO_PACKAGE Message NO_PKGTOOLS_REQD_CHECK Yes NO_PKG_REGISTER Yes -NO_SRC_ON_CDROM Message -NO_SRC_ON_FTP Message +NO_SRC_ON_CDROM Restricted +NO_SRC_ON_FTP Restricted ONLY_FOR_COMPILER List of { ccc gcc icc ido mipspro mipspro-ucode sunpro xlc } ONLY_FOR_PLATFORM List of PlatformTriple OPSYSVARS List+ of Varname diff --git a/pkgtools/pkglint/files/pkglint.pl b/pkgtools/pkglint/files/pkglint.pl index ba65e142a4b..dd884d5746d 100644 --- a/pkgtools/pkglint/files/pkglint.pl +++ b/pkgtools/pkglint/files/pkglint.pl @@ -1,5 +1,5 @@ #! @PERL@ -# $NetBSD: pkglint.pl,v 1.569 2006/05/01 18:08:00 rillig Exp $ +# $NetBSD: pkglint.pl,v 1.570 2006/05/01 20:19:04 rillig Exp $ # # pkglint - static analyzer and checker for pkgsrc packages @@ -3312,6 +3312,11 @@ sub checkline_mk_vartype_basic($$$$$$$) { } elsif ($type eq "RelativePkgPath") { checkline_relative_path($line, $value); + } elsif ($type eq "Restricted") { + if ($value ne "\${RESTRICTED}") { + $line->log_warning("This variable should be set to \${RESTRICTED}."); + } + } elsif ($type eq "SVR4PkgName") { if ($value =~ regex_unresolved) { $line->log_error("SVR4_PKGNAME must not contain references to other variables."); |