Update the pattern used for checking option name to allow the plus (+)

character (e.g. as in "c++")
Bump version number.

2 files changed, 5 insertions, 5 deletions

diff --git a/pkgtools/pkglint/Makefile b/pkgtools/pkglint/Makefile
index a965ff17eab..7934790d3da 100644
--- a/pkgtools/pkglint/Makefile
+++ b/pkgtools/pkglint/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.399 2012/03/10 11:00:24 cheusov Exp $
+# $NetBSD: Makefile,v 1.400 2012/04/08 04:42:39 sbd 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 --git a/pkgtools/pkglint/files/pkglint.pl b/pkgtools/pkglint/files/pkglint.pl
index 8920a8caa31..1bff7ac0628 100644
--- a/pkgtools/pkglint/files/pkglint.pl
+++ b/pkgtools/pkglint/files/pkglint.pl
@@ -1,5 +1,5 @@
 #! @PERL@
-# $NetBSD: pkglint.pl,v 1.831 2011/09/09 15:18:28 wiz Exp $
+# $NetBSD: pkglint.pl,v 1.832 2012/04/08 04:42:39 sbd Exp $
 #
 
 # pkglint - static analyzer and checker for pkgsrc packages
@@ -5164,7 +5164,7 @@ sub checkline_mk_vartype_basic($$$$$$$$) {
 		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 @@ sub checkline_mk_vartype_basic($$$$$$$$) {
 "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.");