diff options
| author | wiz <wiz> | 2015-06-14 18:18:34 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2015-06-14 18:18:34 +0000 |
| commit | cd63a363f283c54a5932bf096b46d06b6365dc12 (patch) | |
| tree | d44731250a67f5fda1663f729380881d70176dff | |
| parent | edf2cf2240330e2bc9329d0d4c16b2f5dba3d5db (diff) | |
| download | pkgsrc-cd63a363f283c54a5932bf096b46d06b6365dc12.tar.gz | |
Fix some perl-5.22 warnings.
Bump version.
| -rw-r--r-- | pkgtools/pkglint/Makefile | 5 | ||||
| -rw-r--r-- | pkgtools/pkglint/files/pkglint.pl | 8 |
2 files changed, 6 insertions, 7 deletions
diff --git a/pkgtools/pkglint/Makefile b/pkgtools/pkglint/Makefile index 5d2e95584bb..515e8ae24b6 100644 --- a/pkgtools/pkglint/Makefile +++ b/pkgtools/pkglint/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.462 2015/06/12 10:50:56 wiz Exp $ +# $NetBSD: Makefile,v 1.463 2015/06/14 18:18:34 wiz Exp $ -PKGNAME= pkglint-4.154 -PKGREVISION= 1 +PKGNAME= pkglint-4.155 CATEGORIES= pkgtools OWNER= wiz@NetBSD.org diff --git a/pkgtools/pkglint/files/pkglint.pl b/pkgtools/pkglint/files/pkglint.pl index efb6967ee85..7850de1ffa2 100644 --- a/pkgtools/pkglint/files/pkglint.pl +++ b/pkgtools/pkglint/files/pkglint.pl @@ -1,5 +1,5 @@ #! @PERL@ -# $NetBSD: pkglint.pl,v 1.877 2015/03/11 19:05:58 rillig Exp $ +# $NetBSD: pkglint.pl,v 1.878 2015/06/14 18:18:34 wiz Exp $ # # pkglint - static analyzer and checker for pkgsrc packages @@ -2116,7 +2116,7 @@ sub parse_mk_cond($$) { sub parse_licenses($) { my ($licenses) = @_; - $licenses =~ s,\${PERL5_LICENSE},gnu-gpl-v2 OR artistic,g; + $licenses =~ s,\$\{PERL5_LICENSE},gnu-gpl-v2 OR artistic,g; $licenses =~ s,[()]|AND|OR,,g; # XXX: treats OR like AND my @licenses = split(/\s+/, $licenses); return \@licenses; @@ -3578,7 +3578,7 @@ sub checkline_mk_shelltext($$) { "\${PREFIX}."); } - if (($state == SCST_INSTALL_DIR || $state == SCST_INSTALL_DIR2) && $shellword !~ regex_mk_shellvaruse && $shellword =~ m"^(?:\${DESTDIR\})?\$\{PREFIX(?:|:Q)\}/(.*)") { + if (($state == SCST_INSTALL_DIR || $state == SCST_INSTALL_DIR2) && $shellword !~ regex_mk_shellvaruse && $shellword =~ m"^(?:\$\{DESTDIR\})?\$\{PREFIX(?:|:Q)\}/(.*)") { my ($dirname) = ($1); $line->log_note("You can use AUTO_MKDIRS=yes or INSTALLATION_DIRS+= ${dirname} instead of this command."); @@ -7011,7 +7011,7 @@ sub checkfile_PLIST($) { $opt_debug_unchecked and $line->log_debug("Unchecked pathname \"${text}\"."); } - if ($text =~ /\${PKGLOCALEDIR}/ && defined($pkgctx_vardef) && !exists($pkgctx_vardef->{"USE_PKGLOCALEDIR"})) { + if ($text =~ /\$\{PKGLOCALEDIR}/ && defined($pkgctx_vardef) && !exists($pkgctx_vardef->{"USE_PKGLOCALEDIR"})) { $line->log_warning("PLIST contains \${PKGLOCALEDIR}, but USE_PKGLOCALEDIR was not found."); } |