diff options
| author | lukem <lukem@pkgsrc.org> | 2002-06-27 23:09:01 +0000 |
|---|---|---|
| committer | lukem <lukem@pkgsrc.org> | 2002-06-27 23:09:01 +0000 |
| commit | 9e46e9da703995764fccbe3f1fc616141c906c4a (patch) | |
| tree | 814d95a1dfd4f9c28a6f12e10e89443f93b4b061 /pkgtools/pkgdiff | |
| parent | caffd74ead4f6f2acb55e72132922ae443d5914d (diff) | |
| download | pkgsrc-9e46e9da703995764fccbe3f1fc616141c906c4a.tar.gz | |
add -p to the diff arguments; it's useful to know which function a
patch applies to when updating a package
Diffstat (limited to 'pkgtools/pkgdiff')
| -rwxr-xr-x | pkgtools/pkgdiff/files/pkgdiff | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgtools/pkgdiff/files/pkgdiff b/pkgtools/pkgdiff/files/pkgdiff index c014ecc2afe..19d3df1bc79 100755 --- a/pkgtools/pkgdiff/files/pkgdiff +++ b/pkgtools/pkgdiff/files/pkgdiff @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: pkgdiff,v 1.7 2002/04/02 10:56:48 seb Exp $ +# $NetBSD: pkgdiff,v 1.8 2002/06/27 23:09:01 lukem Exp $ # # Usage: pkgdiff newfile # pkgdiff oldfile newfile @@ -38,7 +38,7 @@ dodiff() { } lines=3 -while [ `dodiff -u -$lines "$old" "$new" | egrep -c '\\$(NetBSD|Author|Date|Header|Id|Locker|Log|Name|RCSfile|Revision|Source|State)'` != 0 ] +while [ `dodiff -u -p -$lines "$old" "$new" | egrep -c '\\$(NetBSD|Author|Date|Header|Id|Locker|Log|Name|RCSfile|Revision|Source|State)'` != 0 ] do lines=`expr $lines - 1` if [ $lines = 0 ]; then @@ -47,7 +47,7 @@ do fi done -if dodiff -qu -$lines "$old" "$new" > /dev/null +if dodiff -q -u -p -$lines "$old" "$new" > /dev/null then : else @@ -55,5 +55,5 @@ else echo '' # Strip out the date on the +++ line to reduce needless # differences in regenerated patches - dodiff -u -$lines "$old" "$new" | sed -e 's:^\(+++ [^ ]*\) .*:\1:' + dodiff -u -p -$lines "$old" "$new" | sed -e 's:^\(+++ [^ ]*\) .*:\1:' fi |