[pkgsrc/trunk]: pkgsrc/pkgtools/pkglint/files Generally allow $Id$ instead of...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a701f0af808f
branches:  trunk
changeset: 501607:a701f0af808f
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Mon Oct 24 18:20:40 2005 +0000

description:
Generally allow $Id$ instead of $NetBSD$ in files from pkgsrc-wip.

diffstat:

 pkgtools/pkglint/files/pkglint.pl |  9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diffs (26 lines):

diff -r 923f4383bb2f -r a701f0af808f pkgtools/pkglint/files/pkglint.pl
--- a/pkgtools/pkglint/files/pkglint.pl Mon Oct 24 17:36:42 2005 +0000
+++ b/pkgtools/pkglint/files/pkglint.pl Mon Oct 24 18:20:40 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.302 2005/10/23 23:14:57 rillig Exp $
+# $NetBSD: pkglint.pl,v 1.303 2005/10/24 18:20:40 rillig Exp $
 #
 # This version contains lots of changes necessary for NetBSD packages
 # done by:
@@ -746,7 +746,12 @@
 
 sub checkline_rcsid_regex($$$) {
        my ($line, $prefix_regex, $prefix) = @_;
-       if ($line->text !~ qr"^${prefix_regex}\$($opt_rcsidstring)(?::[^\$]*|)\$$") {
+       my ($id) = ($opt_rcsidstring);
+
+       if (Cwd::abs_path($line->file) =~ qr"/wip/") {
+               $id .= "|Id";
+       }
+       if ($line->text !~ qr"^${prefix_regex}\$(${id})(?::[^\$]*|)\$$") {
                $line->log_error("\"${prefix}\$${opt_rcsidstring}\$\" expected.");
                return false;
        }