diff options
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/pkgdiff/Makefile | 5 | ||||
| -rwxr-xr-x | pkgtools/pkgdiff/files/mkpatches.pl | 3 | ||||
| -rwxr-xr-x | pkgtools/pkgdiff/files/patchdiff.pl | 3 |
3 files changed, 6 insertions, 5 deletions
diff --git a/pkgtools/pkgdiff/Makefile b/pkgtools/pkgdiff/Makefile index 18ebbb58642..3d9ce4cbea6 100644 --- a/pkgtools/pkgdiff/Makefile +++ b/pkgtools/pkgdiff/Makefile @@ -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 --git a/pkgtools/pkgdiff/files/mkpatches.pl b/pkgtools/pkgdiff/files/mkpatches.pl index 4a4fd9a1d8f..6a62d5d09e2 100755 --- a/pkgtools/pkgdiff/files/mkpatches.pl +++ b/pkgtools/pkgdiff/files/mkpatches.pl @@ -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 @@ sub analyze_old_patches next; } $name = $1; + $name =~ s/^\.\///; # ignore leading "./", if any. $patch =~ s/\n--- .*/\n/s; $old_header{$name} = $patch; $filename =~ s!.*/!!; diff --git a/pkgtools/pkgdiff/files/patchdiff.pl b/pkgtools/pkgdiff/files/patchdiff.pl index 31f6c2654f2..2aab500c4fa 100755 --- a/pkgtools/pkgdiff/files/patchdiff.pl +++ b/pkgtools/pkgdiff/files/patchdiff.pl @@ -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 @@ sub getfilename { close(handle); $_ = $1; chomp(); + s/^\.\///; # ignore leading "./", if any. return $_; } close(handle); |