summaryrefslogtreecommitdiff
path: root/pkgtools
diff options
context:
space:
mode:
authorwiz <wiz>2000-08-17 03:09:24 +0000
committerwiz <wiz>2000-08-17 03:09:24 +0000
commit8e81a13f62dc5b52c4210420ad867606edb1130d (patch)
tree29eef2329d3d3def28c91053390a34998a244292 /pkgtools
parent8fecddf404904ab9dda603fceba1378d7c2563b4 (diff)
downloadpkgsrc-8e81a13f62dc5b52c4210420ad867606edb1130d.tar.gz
Make patchdiff work again after the last changes. Bump to 0.94.
Diffstat (limited to 'pkgtools')
-rw-r--r--pkgtools/pkgdiff/Makefile4
-rwxr-xr-xpkgtools/pkgdiff/files/patchdiff.pl10
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);
}