[pkgsrc/pkgsrc-2012Q1]: pkgsrc/pkgtools/pkglint Pullup ticket #3724 - request...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/bf05f596c1e1
branches:  pkgsrc-2012Q1
changeset: 602008:bf05f596c1e1
user:      spz <spz%pkgsrc.org@localhost>
date:      Mon Apr 09 15:02:07 2012 +0000

description:
Pullup ticket #3724 - requested by sbd
pkgtools/pkglint: option syntax fix

Revisions pulled up:
- pkgtools/pkglint/Makefile                                     1.400
- pkgtools/pkglint/files/pkglint.pl                             1.832

-------------------------------------------------------------------
   Module Name: pkgsrc
   Committed By:        sbd
   Date:                Sun Apr  8 04:42:39 UTC 2012

   Modified Files:
        pkgsrc/pkgtools/pkglint: Makefile
        pkgsrc/pkgtools/pkglint/files: pkglint.pl

   Log Message:
   Update the pattern used for checking option name to allow the plus (+)
   character (e.g. as in "c++")
   Bump version number.


   To generate a diff of this commit:
   cvs rdiff -u -r1.399 -r1.400 pkgsrc/pkgtools/pkglint/Makefile
   cvs rdiff -u -r1.831 -r1.832 pkgsrc/pkgtools/pkglint/files/pkglint.pl

diffstat:

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

diffs (44 lines):

diff -r 39312cb45e78 -r bf05f596c1e1 pkgtools/pkglint/Makefile
--- a/pkgtools/pkglint/Makefile Mon Apr 09 14:34:59 2012 +0000
+++ b/pkgtools/pkglint/Makefile Mon Apr 09 15:02:07 2012 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.399 2012/03/10 11:00:24 cheusov Exp $
+# $NetBSD: Makefile,v 1.399.2.1 2012/04/09 15:02:07 spz Exp $
 #
 
 # Note: if you update the version number, please have a look at the
 # changes between the CVS tag "pkglint_current" and HEAD.
 # After updating, please re-set the CVS tag to HEAD.
-DISTNAME=      pkglint-4.107
+DISTNAME=      pkglint-4.108
 CATEGORIES=    pkgtools
 MASTER_SITES=  # none
 DISTFILES=     # none
diff -r 39312cb45e78 -r bf05f596c1e1 pkgtools/pkglint/files/pkglint.pl
--- a/pkgtools/pkglint/files/pkglint.pl Mon Apr 09 14:34:59 2012 +0000
+++ b/pkgtools/pkglint/files/pkglint.pl Mon Apr 09 15:02:07 2012 +0000
@@ -1,5 +1,5 @@
 #! @PERL@
-# $NetBSD: pkglint.pl,v 1.831 2011/09/09 15:18:28 wiz Exp $
+# $NetBSD: pkglint.pl,v 1.831.6.1 2012/04/09 15:02:07 spz Exp $
 #
 
 # pkglint - static analyzer and checker for pkgsrc packages
@@ -5164,7 +5164,7 @@
                if ($value ne $value_novar) {
                        $opt_debug_unchecked and $line->log_debug("Unchecked option name \"${value}\".");
 
-               } elsif ($value_novar =~ m"^-?([a-z][-0-9a-z]*)$") {
+               } elsif ($value_novar =~ m"^-?([a-z][-0-9a-z\+]*)$") {
                        my ($optname) = ($1);
 
                        if (!exists(get_pkg_options()->{$optname})) {
@@ -5176,7 +5176,7 @@
 "tech-pkg\@NetBSD.org mailing list.");
                        }
 
-               } elsif ($value_novar =~ m"^-?([a-z][-0-9a-z_]*)$") {
+               } elsif ($value_novar =~ m"^-?([a-z][-0-9a-z_\+]*)$") {
                        my ($optname) = ($1);
 
                        $line->log_warning("Use of the underscore character in option names is deprecated.");