[pkgsrc/trunk]: pkgsrc/pkgtools/pkgdiff In both mkpatches.pl and patchdiff.pl...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/81084a777603
branches:  trunk
changeset: 538697:81084a777603
user:      apb <apb%pkgsrc.org@localhost>
date:      Sat Feb 16 22:21:35 2008 +0000

description:
In both mkpatches.pl and patchdiff.pl, ignore a leading "./" when
parsing a file name from the "+++" line in an old patch file.  (New
patch files created by mkpatches do not have "./" in the file name in
the "+++" line, but some old patches currently in pkgsrc do have "./"
there.)

Bump version to 0.120.

diffstat:

 pkgtools/pkgdiff/Makefile           |  5 ++---
 pkgtools/pkgdiff/files/mkpatches.pl |  3 ++-
 pkgtools/pkgdiff/files/patchdiff.pl |  3 ++-
 3 files changed, 6 insertions(+), 5 deletions(-)

diffs (52 lines):

diff -r cb7d30cd0ee6 -r 81084a777603 pkgtools/pkgdiff/Makefile
--- a/pkgtools/pkgdiff/Makefile Sat Feb 16 22:06:12 2008 +0000
+++ b/pkgtools/pkgdiff/Makefile Sat Feb 16 22:21:35 2008 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.64 2007/10/01 09:54:32 rillig Exp $
+# $NetBSD: Makefile,v 1.65 2008/02/16 22:21:35 apb Exp $
 #
 
-DISTNAME=      pkgdiff-0.119
-PKGREVISION=   1
+DISTNAME=      pkgdiff-0.120
 CATEGORIES=    pkgtools devel
 MASTER_SITES=  # empty
 DISTFILES=     # empty
diff -r cb7d30cd0ee6 -r 81084a777603 pkgtools/pkgdiff/files/mkpatches.pl
--- a/pkgtools/pkgdiff/files/mkpatches.pl       Sat Feb 16 22:06:12 2008 +0000
+++ b/pkgtools/pkgdiff/files/mkpatches.pl       Sat Feb 16 22:21:35 2008 +0000
@@ -1,6 +1,6 @@
 #!@PERL5@
 #
-# $NetBSD: mkpatches.pl,v 1.12 2005/12/13 12:05:08 wiz Exp $
+# $NetBSD: mkpatches.pl,v 1.13 2008/02/16 22:21:35 apb Exp $
 #
 # mkpatches: creates a set of patches patch-aa, patch-ab, ...
 #   in work/.newpatches by looking for *.orig files in and below
@@ -138,6 +138,7 @@
            next;
        }
        $name = $1;
+       $name =~ s/^\.\///; # ignore leading "./", if any.
        $patch =~ s/\n--- .*/\n/s;
        $old_header{$name} = $patch;
        $filename =~ s!.*/!!;
diff -r cb7d30cd0ee6 -r 81084a777603 pkgtools/pkgdiff/files/patchdiff.pl
--- a/pkgtools/pkgdiff/files/patchdiff.pl       Sat Feb 16 22:06:12 2008 +0000
+++ b/pkgtools/pkgdiff/files/patchdiff.pl       Sat Feb 16 22:21:35 2008 +0000
@@ -1,6 +1,6 @@
 #!@PERL5@
 #
-# $NetBSD: patchdiff.pl,v 1.8 2007/07/12 15:35:43 joerg Exp $
+# $NetBSD: patchdiff.pl,v 1.9 2008/02/16 22:21:35 apb Exp $
 #
 # patchdiff: compares a set of patches patch-aa, patch-ab, ... in
 #   $WRKDIR/.newpatches in the with another set in patches.
@@ -27,6 +27,7 @@
        close(handle);
        $_ = $1;
        chomp();
+       s/^\.\///; # ignore leading "./", if any.
        return $_;
      }
      close(handle);