[pkgsrc/trunk]: pkgsrc Pkglint now checks that the file entries in PLIST file...

[rillig <rillig%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0a2c943694d3
branches:  trunk
changeset: 488940:0a2c943694d3
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Sat Feb 12 21:34:47 2005 +0000

description:
Pkglint now checks that the file entries in PLIST files are correctly
sorted. Welcome to 4.03.

diffstat:

 doc/CHANGES                       |   3 ++-
 doc/TODO                          |   4 +---
 pkgtools/pkglint/Makefile         |   4 ++--
 pkgtools/pkglint/files/pkglint.pl |  13 +++++++++++--
 4 files changed, 16 insertions(+), 8 deletions(-)

diffs (82 lines):

diff -r 713bf06394b1 -r 0a2c943694d3 doc/CHANGES
--- a/doc/CHANGES       Sat Feb 12 20:59:22 2005 +0000
+++ b/doc/CHANGES       Sat Feb 12 21:34:47 2005 +0000
@@ -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 @@
        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]
diff -r 713bf06394b1 -r 0a2c943694d3 doc/TODO
--- a/doc/TODO  Sat Feb 12 20:59:22 2005 +0000
+++ b/doc/TODO  Sat Feb 12 21:34:47 2005 +0000
@@ -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 @@
 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 -r 713bf06394b1 -r 0a2c943694d3 pkgtools/pkglint/Makefile
--- a/pkgtools/pkglint/Makefile Sat Feb 12 20:59:22 2005 +0000
+++ b/pkgtools/pkglint/Makefile Sat Feb 12 21:34:47 2005 +0000
@@ -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 -r 713bf06394b1 -r 0a2c943694d3 pkgtools/pkglint/files/pkglint.pl
--- a/pkgtools/pkglint/files/pkglint.pl Sat Feb 12 20:59:22 2005 +0000
+++ b/pkgtools/pkglint/files/pkglint.pl Sat Feb 12 21:34:47 2005 +0000
@@ -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@localhost>,
@@ -812,7 +812,7 @@
 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 @@
                        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.");
                }