diff options
| author | wiz <wiz> | 2012-07-10 10:53:05 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2012-07-10 10:53:05 +0000 |
| commit | a3dba1ab6bcc82e5e8e1d531f383cdc0984fa013 (patch) | |
| tree | 2d70c382f1d6a4a02c303e2b68edb3c6b5df4d8b /pkgtools/pkglint | |
| parent | ddb11b8db35d84839a826cade5caf1d7c67b83f5 (diff) | |
| download | pkgsrc-a3dba1ab6bcc82e5e8e1d531f383cdc0984fa013.tar.gz | |
Fix regex_dependency_wildcard and recognize PERL5_LICENSE.
Diffstat (limited to 'pkgtools/pkglint')
| -rw-r--r-- | pkgtools/pkglint/files/pkglint.pl | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgtools/pkglint/files/pkglint.pl b/pkgtools/pkglint/files/pkglint.pl index 3f233b675f5..01f3832f8c3 100644 --- a/pkgtools/pkglint/files/pkglint.pl +++ b/pkgtools/pkglint/files/pkglint.pl @@ -1,5 +1,5 @@ #! @PERL@ -# $NetBSD: pkglint.pl,v 1.839 2012/07/10 10:27:23 wiz Exp $ +# $NetBSD: pkglint.pl,v 1.840 2012/07/10 10:53:05 wiz Exp $ # # pkglint - static analyzer and checker for pkgsrc packages @@ -1332,7 +1332,7 @@ my (@options) = ( use constant regex_dependency_gt => 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*#(.*)$"; @@ -3150,6 +3150,7 @@ sub parse_licenses($) { my ($licenses) = @_; # XXX: this is clearly cheating + $licenses =~ s,\${PERL5_LICENSE},gnu-gpl-v2 OR artistic,g; $licenses =~ s,[()]|AND|OR,,g; my @licenses = split(/\s+/, $licenses); return \@licenses; |