Tue Aug 16 23:13:34 2011 UTC ()
Avoid use of qw as parentheses. Silences a warning with perl-5.14.
Bump version to 4.103.


(wiz)
diff -r1.393 -r1.394 pkgsrc/pkgtools/pkglint/Makefile
diff -r1.828 -r1.829 pkgsrc/pkgtools/pkglint/files/pkglint.pl
cvs diff -r1.393 -r1.394 pkgsrc/pkgtools/pkglint/Makefile (expand / switch to unified diff)

--- pkgsrc/pkgtools/pkglint/Makefile 2011/08/01 11:58:14 1.393
+++ pkgsrc/pkgtools/pkglint/Makefile 2011/08/16 23:13:34 1.394
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1# $NetBSD: Makefile,v 1.393 2011/08/01 11:58:14 tron Exp $ 1# $NetBSD: Makefile,v 1.394 2011/08/16 23:13:34 wiz Exp $
2# 2#
3 3
4# Note: if you update the version number, please have a look at the 4# Note: if you update the version number, please have a look at the
5# changes between the CVS tag "pkglint_current" and HEAD. 5# changes between the CVS tag "pkglint_current" and HEAD.
6# After updating, please re-set the CVS tag to HEAD. 6# After updating, please re-set the CVS tag to HEAD.
7DISTNAME= pkglint-4.102 7DISTNAME= pkglint-4.103
8CATEGORIES= pkgtools 8CATEGORIES= pkgtools
9MASTER_SITES= # none 9MASTER_SITES= # none
10DISTFILES= # none 10DISTFILES= # none
11 11
12MAINTAINER= rillig@NetBSD.org 12MAINTAINER= rillig@NetBSD.org
13HOMEPAGE= http://www.NetBSD.org/docs/pkgsrc/ 13HOMEPAGE= http://www.NetBSD.org/docs/pkgsrc/
14COMMENT= Verifier for NetBSD packages 14COMMENT= Verifier for NetBSD packages
15 15
16DEPENDS+= p5-Digest-SHA1-[0-9]*:../../security/p5-Digest-SHA1 16DEPENDS+= p5-Digest-SHA1-[0-9]*:../../security/p5-Digest-SHA1
17DEPENDS+= p5-enum>=1.016:../../devel/p5-enum 17DEPENDS+= p5-enum>=1.016:../../devel/p5-enum
18DEPENDS+= p5-pkgsrc-Dewey>=1.0:../../pkgtools/p5-pkgsrc-Dewey 18DEPENDS+= p5-pkgsrc-Dewey>=1.0:../../pkgtools/p5-pkgsrc-Dewey
19 19
20PKG_INSTALLATION_TYPES= overwrite pkgviews 20PKG_INSTALLATION_TYPES= overwrite pkgviews
cvs diff -r1.828 -r1.829 pkgsrc/pkgtools/pkglint/files/Attic/pkglint.pl (expand / switch to unified diff)

--- pkgsrc/pkgtools/pkglint/files/Attic/pkglint.pl 2011/08/01 11:58:14 1.828
+++ pkgsrc/pkgtools/pkglint/files/Attic/pkglint.pl 2011/08/16 23:13:34 1.829
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1#! @PERL@ 1#! @PERL@
2# $NetBSD: pkglint.pl,v 1.828 2011/08/01 11:58:14 tron Exp $ 2# $NetBSD: pkglint.pl,v 1.829 2011/08/16 23:13:34 wiz Exp $
3# 3#
4 4
5# pkglint - static analyzer and checker for pkgsrc packages 5# pkglint - static analyzer and checker for pkgsrc packages
6# 6#
7# Written by: 7# Written by:
8# Roland Illig <rillig@NetBSD.org> 8# Roland Illig <rillig@NetBSD.org>
9# 9#
10# Based on work by: 10# Based on work by:
11# Hubert Feyrer <hubertf@NetBSD.org> 11# Hubert Feyrer <hubertf@NetBSD.org>
12# Thorsten Frueauf <frueauf@NetBSD.org> 12# Thorsten Frueauf <frueauf@NetBSD.org>
13# Thomas Klausner <wiz@NetBSD.org> 13# Thomas Klausner <wiz@NetBSD.org>
14# and others. 14# and others.
15# 15#
@@ -2289,31 +2289,31 @@ sub match_all($$); # needed by load_shar @@ -2289,31 +2289,31 @@ sub match_all($$); # needed by load_shar
2289 2289
2290my $load_shared_dirs_dir_to_varname = undef; 2290my $load_shared_dirs_dir_to_varname = undef;
2291my $load_shared_dirs_varname_to_dirs = undef; 2291my $load_shared_dirs_varname_to_dirs = undef;
2292my $load_shared_dirs_dir_to_id = undef; 2292my $load_shared_dirs_dir_to_id = undef;
2293sub load_shared_dirs() { 2293sub load_shared_dirs() {
2294 return if defined($load_shared_dirs_dir_to_varname); 2294 return if defined($load_shared_dirs_dir_to_varname);
2295 2295
2296 $opt_debug_trace and log_debug(NO_FILE, NO_LINES, "load_shared_dirs()"); 2296 $opt_debug_trace and log_debug(NO_FILE, NO_LINES, "load_shared_dirs()");
2297 2297
2298 my $dir_to_varname = {}; 2298 my $dir_to_varname = {};
2299 my $varname_to_dirs = {}; 2299 my $varname_to_dirs = {};
2300 my $dir_to_id = {}; 2300 my $dir_to_id = {};
2301 2301
2302 foreach my $pkg qw( 2302 foreach my $pkg (qw(
2303 misc/gnome-dirs misc/gnome1-dirs misc/gnome2-dirs 2303 misc/gnome-dirs misc/gnome1-dirs misc/gnome2-dirs
2304 misc/theme-dirs 2304 misc/theme-dirs
2305 misc/xdg-dirs misc/xdg-x11-dirs 2305 misc/xdg-dirs misc/xdg-x11-dirs
2306 print/texmf-dirs) { 2306 print/texmf-dirs)) {
2307 2307
2308 $opt_debug_trace and log_debug(NO_FILE, NO_LINES, "pkg=$pkg"); 2308 $opt_debug_trace and log_debug(NO_FILE, NO_LINES, "pkg=$pkg");
2309 my $dirs_mk = load_lines("$cwd_pkgsrcdir/$pkg/dirs.mk", true); 2309 my $dirs_mk = load_lines("$cwd_pkgsrcdir/$pkg/dirs.mk", true);
2310 assert($dirs_mk, "$pkg/dirs.mk is not readable."); 2310 assert($dirs_mk, "$pkg/dirs.mk is not readable.");
2311 2311
2312 foreach my $line (@$dirs_mk) { 2312 foreach my $line (@$dirs_mk) {
2313 parseline_mk($line); 2313 parseline_mk($line);
2314 if ($line->has("is_varassign")) { 2314 if ($line->has("is_varassign")) {
2315 my $varname = $line->get("varname"); 2315 my $varname = $line->get("varname");
2316 my $value = $line->get("value"); 2316 my $value = $line->get("value");
2317 2317
2318 if ($varname =~ m"^[A-Z]\w*_DIRS$" && $value ne "") { 2318 if ($varname =~ m"^[A-Z]\w*_DIRS$" && $value ne "") {
2319 if (exists($dir_to_varname->{$value})) { 2319 if (exists($dir_to_varname->{$value})) {