pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/pkgtools/pkglint/files The only valid value for NO_{SR...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/71ca6dc79510
branches:  trunk
changeset: 512127:71ca6dc79510
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Mon May 01 20:19:04 2006 +0000

description:
The only valid value for NO_{SRC,BIN}_ON_{CDROM,FTP} is ${RESTRICTED},
as documented in the pkgsrc guide.

diffstat:

 pkgtools/pkglint/files/makevars.map |  10 +++++-----
 pkgtools/pkglint/files/pkglint.pl   |   7 ++++++-
 2 files changed, 11 insertions(+), 6 deletions(-)

diffs (53 lines):

diff -r 16fd3d6f6a59 -r 71ca6dc79510 pkgtools/pkglint/files/makevars.map
--- a/pkgtools/pkglint/files/makevars.map       Mon May 01 19:56:29 2006 +0000
+++ b/pkgtools/pkglint/files/makevars.map       Mon May 01 20:19:04 2006 +0000
@@ -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_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_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 -r 16fd3d6f6a59 -r 71ca6dc79510 pkgtools/pkglint/files/pkglint.pl
--- a/pkgtools/pkglint/files/pkglint.pl Mon May 01 19:56:29 2006 +0000
+++ b/pkgtools/pkglint/files/pkglint.pl Mon May 01 20:19:04 2006 +0000
@@ -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 @@
        } 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.");



Home | Main Index | Thread Index | Old Index