summaryrefslogtreecommitdiff
path: root/pkgtools
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2014-09-08 12:03:32 +0000
committerwiz <wiz@pkgsrc.org>2014-09-08 12:03:32 +0000
commit52a122d1d119d9d0a60bb08e8aa52a870e410280 (patch)
treee6821ecf69512ac306ef683775f90634976e1804 /pkgtools
parent34d6a51599fad68e09937dbec6c1e4f646755739 (diff)
downloadpkgsrc-52a122d1d119d9d0a60bb08e8aa52a870e410280.tar.gz
Allow '+' in another place checking for package names. Needed e.g. for gtk2+.
Bump version.
Diffstat (limited to 'pkgtools')
-rw-r--r--pkgtools/pkglint/Makefile4
-rw-r--r--pkgtools/pkglint/files/pkglint.pl6
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgtools/pkglint/Makefile b/pkgtools/pkglint/Makefile
index 6ef3d4194d0..9af827556aa 100644
--- a/pkgtools/pkglint/Makefile
+++ b/pkgtools/pkglint/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.450 2014/08/07 20:35:34 wiz Exp $
+# $NetBSD: Makefile,v 1.451 2014/09/08 12:03:32 wiz 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.
-PKGNAME= pkglint-4.145
+PKGNAME= pkglint-4.146
CATEGORIES= pkgtools
OWNER= wiz@NetBSD.org
diff --git a/pkgtools/pkglint/files/pkglint.pl b/pkgtools/pkglint/files/pkglint.pl
index ec027ef77a4..3855ee03d76 100644
--- a/pkgtools/pkglint/files/pkglint.pl
+++ b/pkgtools/pkglint/files/pkglint.pl
@@ -1,5 +1,5 @@
#! @PERL@
-# $NetBSD: pkglint.pl,v 1.868 2014/06/01 13:12:38 obache Exp $
+# $NetBSD: pkglint.pl,v 1.869 2014/09/08 12:03:32 wiz Exp $
#
# pkglint - static analyzer and checker for pkgsrc packages
@@ -291,9 +291,9 @@ our $program = $0;
# Commonly used regular expressions.
#
-use constant regex_dependency_lge => qr"^((?:\$\{[\w_]+\}|[\w_\.]|-[^\d])+)[<>]=?(\d[^-*?\[\]]*)$";
+use constant regex_dependency_lge => qr"^((?:\$\{[\w_]+\}|[\w_\.+]|-[^\d])+)[<>]=?(\d[^-*?\[\]]*)$";
use constant regex_dependency_wildcard
- => qr"^((?:\$\{[\w_]+\}|[\w_\.]|-[^\d\[])+)-(?:\[0-9\]\*|\d[^-]*)$";
+ => qr"^((?:\$\{[\w_]+\}|[\w_\.+]|-[^\d\[])+)-(?:\[0-9\]\*|\d[^-]*)$";
use constant regex_gnu_configure_volatile_vars
=> qr"^(?:.*_)?(?:CFLAGS||CPPFLAGS|CXXFLAGS|FFLAGS|LDFLAGS|LIBS)$";
use constant regex_mk_comment => qr"^ *\s*#(.*)$";