diff options
| author | wiz <wiz> | 2000-08-17 03:09:24 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2000-08-17 03:09:24 +0000 |
| commit | 0a12a20d2d4a6ead889a42f4d45b29cdaaf37f1b (patch) | |
| tree | 29eef2329d3d3def28c91053390a34998a244292 /pkgtools/pkgdiff | |
| parent | d25e91f6957a4c24d4f6a49f9d42e52a83d1e372 (diff) | |
| download | pkgsrc-0a12a20d2d4a6ead889a42f4d45b29cdaaf37f1b.tar.gz | |
Make patchdiff work again after the last changes. Bump to 0.94.
Diffstat (limited to 'pkgtools/pkgdiff')
| -rw-r--r-- | pkgtools/pkgdiff/Makefile | 4 | ||||
| -rwxr-xr-x | pkgtools/pkgdiff/files/patchdiff.pl | 10 |
2 files changed, 8 insertions, 6 deletions
diff --git a/pkgtools/pkgdiff/Makefile b/pkgtools/pkgdiff/Makefile index a32e555bde5..374a7d7fcbb 100644 --- a/pkgtools/pkgdiff/Makefile +++ b/pkgtools/pkgdiff/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.4 2000/08/15 14:43:41 abs Exp $ +# $NetBSD: Makefile,v 1.5 2000/08/17 03:09:24 wiz Exp $ # -DISTNAME= pkgdiff-0.93 +DISTNAME= pkgdiff-0.94 CATEGORIES= pkgtools devel MASTER_SITES= # empty DISTFILES= # empty diff --git a/pkgtools/pkgdiff/files/patchdiff.pl b/pkgtools/pkgdiff/files/patchdiff.pl index 21e39b996a4..f71b6eb4cea 100755 --- a/pkgtools/pkgdiff/files/patchdiff.pl +++ b/pkgtools/pkgdiff/files/patchdiff.pl @@ -1,6 +1,6 @@ #!@PREFIX@/bin/perl # -# $NetBSD: patchdiff.pl,v 1.1.1.1 2000/06/28 01:42:42 wiz Exp $ +# $NetBSD: patchdiff.pl,v 1.2 2000/08/17 03:09:26 wiz Exp $ # # patchdiff: compares a set of patches patch-aa, patch-ab, ... in # $WRKDIR/.newpatches in the with another set in patches. @@ -28,9 +28,11 @@ sub getfilename { local *handle; open(handle, $fname); while (<handle>) { - next unless m/^\+\+\+ ([^ ]*)/; + next unless m/^\+\+\+[ ]([^ ]*)/; close(handle); - return $1; + $_ = $1; + chomp(); + return $_; } close(handle); return undef; @@ -46,7 +48,7 @@ sub putinhash { chomp; $temp=getfilename($_); $$hash{$temp}=$_; -# print "put in hash: $temp // $_"; +# print "put in hash: $temp // $_\n"; } close(handle); } |