summaryrefslogtreecommitdiff
path: root/pkgtools/pkgdiff
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2007-07-12 15:35:43 +0000
committerjoerg <joerg@pkgsrc.org>2007-07-12 15:35:43 +0000
commit18bfea6740b97fb0ca37688c0d7832b57c282fe4 (patch)
tree6972b6a215502ff828a7daab590f627f2418b175 /pkgtools/pkgdiff
parentccf8cf5a8d9c24842ba893bf6a2a3f922f4875d3 (diff)
downloadpkgsrc-18bfea6740b97fb0ca37688c0d7832b57c282fe4.tar.gz
Workaround too aggressive RCS ID find, so that +BUILD_VERSION and
ident agree.
Diffstat (limited to 'pkgtools/pkgdiff')
-rwxr-xr-xpkgtools/pkgdiff/files/patchdiff.pl4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgtools/pkgdiff/files/patchdiff.pl b/pkgtools/pkgdiff/files/patchdiff.pl
index 873c93d1748..31f6c2654f2 100755
--- a/pkgtools/pkgdiff/files/patchdiff.pl
+++ b/pkgtools/pkgdiff/files/patchdiff.pl
@@ -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 @@ foreach $patch (keys%new) {
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";