[pkgsrc/trunk]: pkgsrc/pkgtools/pkglint Updated pkglint to 4.45.1.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e3a52932af7e
branches:  trunk
changeset: 503552:e3a52932af7e
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Wed Nov 23 05:18:46 2005 +0000

description:
Updated pkglint to 4.45.1.

- Added a new type ShellWord that is used for MAKE_ENV and the like to
  check for invalid FOO="${VALUE}" additions. They really should be
  FOO=${VALUE:Q}, as they may already contain embedded quotes. This is
  especially important for CPPFLAGS and CFLAGS.

diffstat:

 pkgtools/pkglint/Makefile           |   4 ++--
 pkgtools/pkglint/files/makevars.map |  22 +++++++++++-----------
 pkgtools/pkglint/files/pkglint.pl   |   8 +++++++-
 3 files changed, 20 insertions(+), 14 deletions(-)

diffs (115 lines):

diff -r 52d3c328093b -r e3a52932af7e pkgtools/pkglint/Makefile
--- a/pkgtools/pkglint/Makefile Wed Nov 23 04:49:51 2005 +0000
+++ b/pkgtools/pkglint/Makefile Wed Nov 23 05:18:46 2005 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.305 2005/11/21 22:06:30 rillig Exp $
+# $NetBSD: Makefile,v 1.306 2005/11/23 05:18:46 rillig Exp $
 #
 
-DISTNAME=      pkglint-4.45
+DISTNAME=      pkglint-4.45.1
 CATEGORIES=    pkgtools
 MASTER_SITES=  # empty
 DISTFILES=     # empty
diff -r 52d3c328093b -r e3a52932af7e pkgtools/pkglint/files/makevars.map
--- a/pkgtools/pkglint/files/makevars.map       Wed Nov 23 04:49:51 2005 +0000
+++ b/pkgtools/pkglint/files/makevars.map       Wed Nov 23 05:18:46 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: makevars.map,v 1.36 2005/11/20 13:14:17 rillig Exp $
+# $NetBSD: makevars.map,v 1.37 2005/11/23 05:18:46 rillig Exp $
 #
 
 # This file contains the guessed type of some variables, according to
@@ -63,9 +63,9 @@
 CC_VERSION             Readonly
 CFLAGS                 List
 COMMENT                        Comment
-CONFIGURE_ARGS         List
+CONFIGURE_ARGS         List of ShellWord
 CONFIGURE_DIRS         List* of WrksrcSubdirectory
-CONFIGURE_ENV          List
+CONFIGURE_ENV          List of ShellWord
 CPPFLAGS               List
 DEPENDS                        List of DependencyWithPath
 DISTFILES              List* of Filename
@@ -87,7 +87,7 @@
 FAM_ACCEPTED           List* of { fam gamin }
 FAM_DEFAULT            Userdefined
 FAM_TYPE               Readonly
-FILES_SUBST            List
+FILES_SUBST            List of ShellWord
 GCC_REQD               List
 GNU_CONFIGURE          Yes
 HOMEPAGE               URL
@@ -101,10 +101,10 @@
 LDFLAGS                        List
 LIBS                   List
 MAINTAINER             Mail_Address
-MAKEFLAGS              List
+MAKEFLAGS              List of ShellWord
 MAKEVARS               List of Varname
-MAKE_ENV               List
-MAKE_FLAGS             List
+MAKE_ENV               List of ShellWord
+MAKE_FLAGS             List of ShellWord
 MANZ                   Yes
 MASTER_SITES           List* of URL
 MYSQL_VERSIONS_ACCEPTED        List* of { 40 41 50 }
@@ -140,7 +140,7 @@
 PKG_APACHE_DEFAULT     Userdefined
 PKG_DEBUG_LEVEL                Userdefined
 PKG_DEFAULT_OPTIONS    Userdefined
-PKG_FAIL_REASON                List
+PKG_FAIL_REASON                List of ShellWord
 PKG_INSTALLATION_TYPES List* of { overwrite pkgviews }
 PKG_JAVA_HOME          Readonly
 PKG_JVM                        Readonly
@@ -148,7 +148,7 @@
 PKG_JVM_DEFAULT                Userdefined
 PKG_LEGACY_OPTIONS     List* of Option
 PKG_OPTIONS            Readonly
-PKG_OPTIONS_DEPRECATED_WARNINGS        List*
+PKG_OPTIONS_DEPRECATED_WARNINGS        List* of ShellWord
 PKG_OPTIONS_GROUP      List*
 PKG_OPTIONS_LEGACY_OPTS        List*
 PKG_OPTIONS_LEGACY_VARS        List*
@@ -158,12 +158,12 @@
 PKG_OPTIONS_SET                List*
 PKG_OPTIONS_VAR                Varname
 PKG_PRESERVE           Yes
-PKG_SKIP_REASON                List
+PKG_SKIP_REASON                List of ShellWord
 PKG_SUFX               Userdefined
 PKG_SUGGESTED_OPTIONS  List* of Option
 PKG_SUPPORTED_OPTIONS  List* of Option
 PLIST_SRC              List* of Pathname
-PLIST_SUBST            List
+PLIST_SUBST            List of ShellWord
 PLIST_TYPE             { dynamic static }
 PTHREAD_AUTO_VARS      YesNo
 PTHREAD_OPTS           List of { native optional require }
diff -r 52d3c328093b -r e3a52932af7e pkgtools/pkglint/files/pkglint.pl
--- a/pkgtools/pkglint/files/pkglint.pl Wed Nov 23 04:49:51 2005 +0000
+++ b/pkgtools/pkglint/files/pkglint.pl Wed Nov 23 05:18:46 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.376 2005/11/21 22:06:30 rillig Exp $
+# $NetBSD: pkglint.pl,v 1.377 2005/11/23 05:18:46 rillig Exp $
 #
 # This version contains lots of changes necessary for NetBSD packages
 # done by:
@@ -1804,6 +1804,12 @@
                        $line->log_warning("\"${value}\" is not a valid relative package directory.");
                }
 
+       } elsif ($type eq "ShellWord") {
+               if ($value =~ qr"^[\w_]+=\"\$\{([\w_]+)\}\"$") {
+                       my ($vname) = ($1);
+                       $line->log_warning("Please use \${${vname}:Q} instead of \"\${${vname}}\".");
+               }
+
        } elsif ($type eq "Stage") {
                if ($value !~ qr"^(?:pre|do|post)-(?:extract|patch|configure|build|install)$") {
                        $line->log_warning("Invalid stage name. Use one of {pre,do,post}-{extract,patch,configure,build,install}.");