diff options
| -rw-r--r-- | doc/CHANGES | 3 | ||||
| -rw-r--r-- | doc/TODO | 4 | ||||
| -rw-r--r-- | pkgtools/pkglint/Makefile | 4 | ||||
| -rw-r--r-- | pkgtools/pkglint/files/pkglint.pl | 13 |
4 files changed, 16 insertions, 8 deletions
diff --git a/doc/CHANGES b/doc/CHANGES index 1db98613b16..46ab36e54bb 100644 --- a/doc/CHANGES +++ b/doc/CHANGES @@ -1,4 +1,4 @@ -$NetBSD: CHANGES,v 1.9122 2005/02/12 17:59:03 kim Exp $ +$NetBSD: CHANGES,v 1.9123 2005/02/12 21:34:47 rillig Exp $ Changes to the packages collection and infrastructure in 2005: @@ -857,3 +857,4 @@ Changes to the packages collection and infrastructure in 2005: Updated pkglint to 4.02 [rillig 2005-02-12] Updated roundup to 0.7.11 [recht 2005-02-12] Added cisco-mibs-20050210 [kim 2005-02-12] + Updated pkglint to 4.03 [rillig 2005-02-12] @@ -1,4 +1,4 @@ -$NetBSD: TODO,v 1.3018 2005/02/12 16:52:07 taca Exp $ +$NetBSD: TODO,v 1.3019 2005/02/12 21:34:47 rillig Exp $ Suggested new packages ====================== @@ -1199,8 +1199,6 @@ Infrastructure problems which need addressing Suggested pkgsrc enhancements ============================= - o Add a sort check to pkglint for PLISTs. - o Allow tokens in Makefiles, etc to silence pkglint WARNS. e.g. # ABS_PATH could silence an absolute path warning such as diff --git a/pkgtools/pkglint/Makefile b/pkgtools/pkglint/Makefile index 5a1433f83cf..0fdf66c5fa2 100644 --- a/pkgtools/pkglint/Makefile +++ b/pkgtools/pkglint/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.216 2005/02/12 10:59:20 rillig Exp $ +# $NetBSD: Makefile,v 1.217 2005/02/12 21:34:47 rillig Exp $ # -DISTNAME= pkglint-4.02 +DISTNAME= pkglint-4.03 CATEGORIES= pkgtools devel MASTER_SITES= # empty DISTFILES= # empty diff --git a/pkgtools/pkglint/files/pkglint.pl b/pkgtools/pkglint/files/pkglint.pl index b9cd22c35fb..ab59ce172b0 100644 --- a/pkgtools/pkglint/files/pkglint.pl +++ b/pkgtools/pkglint/files/pkglint.pl @@ -11,7 +11,7 @@ # Freely redistributable. Absolutely no warranty. # # From Id: portlint.pl,v 1.64 1998/02/28 02:34:05 itojun Exp -# $NetBSD: pkglint.pl,v 1.128 2005/02/12 10:59:21 rillig Exp $ +# $NetBSD: pkglint.pl,v 1.129 2005/02/12 21:34:47 rillig Exp $ # # This version contains lots of changes necessary for NetBSD packages # done by Hubert Feyrer <hubertf@netbsd.org>, @@ -812,7 +812,7 @@ sub checkfile_MESSAGE($) { sub checkfile_PLIST($) { my ($file) = @_; my ($fname) = ("$opt_packagedir/$file"); - my ($plist, $curdir, $rcsid_seen); + my ($plist, $curdir, $rcsid_seen, $last_file_seen); checkperms($fname); if (!defined($plist = load_file($fname))) { @@ -859,6 +859,15 @@ sub checkfile_PLIST($) { log_error($line->file, $line->lineno, "use of full pathname disallowed."); } + if ($line->text =~ qr"^[\w\d]") { + if (defined($last_file_seen)) { + if ($last_file_seen gt $line->text) { + log_error($line->file, $line->lineno, $line->text." must be sorted before ${last_file_seen}."); + } + } + $last_file_seen = $line->text; + } + if ($line->text =~ /^doc/) { log_error($line->file, $line->lineno, "documentation must be installed under share/doc, not doc."); } |