--- pkgsrc/pkgtools/pkgdiff/files/patchdiff.pl 2000/06/28 01:42:42 1.1 +++ pkgsrc/pkgtools/pkgdiff/files/patchdiff.pl 2000/08/17 03:09:26 1.2 @@ -1,6 +1,6 @@ #!@PREFIX@/bin/perl # -# $NetBSD: patchdiff.pl,v 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 () { - 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); }