summaryrefslogtreecommitdiff
path: root/pkgtools
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2002-11-04 23:07:37 +0000
committerwiz <wiz@pkgsrc.org>2002-11-04 23:07:37 +0000
commitd4a9442bd3e9a1cd08baeef523d96b36c23b12b1 (patch)
tree6d0a3c87ca668246fda95932b3bd9c7a1e3cf8ed /pkgtools
parent6ff50914d7abfbd5bd94d4b6232cc6e4724bb9fe (diff)
downloadpkgsrc-d4a9442bd3e9a1cd08baeef523d96b36c23b12b1.tar.gz
Update to 0.107: Do not exit when pkgdiff fails on one file, just report
an error.
Diffstat (limited to 'pkgtools')
-rw-r--r--pkgtools/pkgdiff/Makefile4
-rwxr-xr-xpkgtools/pkgdiff/files/mkpatches.pl5
2 files changed, 4 insertions, 5 deletions
diff --git a/pkgtools/pkgdiff/Makefile b/pkgtools/pkgdiff/Makefile
index a512cc259f5..96601c40e3e 100644
--- a/pkgtools/pkgdiff/Makefile
+++ b/pkgtools/pkgdiff/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.28 2002/08/25 19:43:33 jlam Exp $
+# $NetBSD: Makefile,v 1.29 2002/11/04 23:07:37 wiz Exp $
#
-DISTNAME= pkgdiff-0.106
+DISTNAME= pkgdiff-0.107
CATEGORIES= pkgtools devel
MASTER_SITES= # empty
DISTFILES= # empty
diff --git a/pkgtools/pkgdiff/files/mkpatches.pl b/pkgtools/pkgdiff/files/mkpatches.pl
index d56025c863f..400ccf2491e 100755
--- a/pkgtools/pkgdiff/files/mkpatches.pl
+++ b/pkgtools/pkgdiff/files/mkpatches.pl
@@ -1,6 +1,6 @@
#!@PREFIX@/bin/perl
#
-# $NetBSD: mkpatches.pl,v 1.7 2002/07/21 16:34:10 wiz Exp $
+# $NetBSD: mkpatches.pl,v 1.8 2002/11/04 23:07:37 wiz Exp $
#
# mkpatches: creates a set of patches patch-aa, patch-ab, ...
# in work/.newpatches by looking for *.orig files in and below
@@ -93,8 +93,7 @@ foreach (sort <handle>) {
}
$diff=`pkgdiff $old $new`;
if ( $? ) {
- print "$old\n$diff\n";
- exit 1;
+ print "$old: $diff";
}
if ( "$diff" eq "" ) {
print ("$new and $old don't differ\n");