[pkgsrc/trunk]: pkgsrc/pkgtools/pkgdiff/files Workaround too aggressive RCS I...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/fddc02a58c2c
branches:  trunk
changeset: 530860:fddc02a58c2c
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Thu Jul 12 15:35:43 2007 +0000

description:
Workaround too aggressive RCS ID find, so that +BUILD_VERSION and
ident agree.

diffstat:

 pkgtools/pkgdiff/files/patchdiff.pl |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (20 lines):

diff -r 75dcc10f0422 -r fddc02a58c2c pkgtools/pkgdiff/files/patchdiff.pl
--- a/pkgtools/pkgdiff/files/patchdiff.pl       Thu Jul 12 15:12:25 2007 +0000
+++ b/pkgtools/pkgdiff/files/patchdiff.pl       Thu Jul 12 15:35:43 2007 +0000
@@ -1,6 +1,6 @@
 #!@PERL5@
 #
-# $NetBSD: patchdiff.pl,v 1.7 2005/12/13 12:05:08 wiz Exp $
+# $NetBSD: patchdiff.pl,v 1.8 2007/07/12 15:35:43 joerg Exp $
 #
 # patchdiff: compares a set of patches patch-aa, patch-ab, ... in
 #   $WRKDIR/.newpatches in the with another set in patches.
@@ -95,7 +95,7 @@
     if (defined($orig{$patch})) {
 #      system("diff",$orig{$patch},$new{$patch});
        $diff=`diff $orig{$patch} $new{$patch}`;
-       $diff=~s/^\dc\d\n..\$NetBSD.*\$\n---\n..\$NetBSD.*\$\n//m;
+       $diff=~s/^\dc\d\n..\$[N]etBSD.*\$\n---\n..\$[N]etBSD.*\$\n//m;
        $diff=~s/^\dc\d\n..\+\+\+.*\n---\n..\+\+\+.*\n//m;
        if ($diff) {
             print "Comparing $orig{$patch} to $new{$patch}\n$diff";