[pkgsrc/trunk]: pkgsrc/pkgtools/pkgdiff Use -U $lines instead of -$lines to a...

[rh <rh%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f68d887144b7
branches:  trunk
changeset: 494210:f68d887144b7
user:      rh <rh%pkgsrc.org@localhost>
date:      Sat May 21 01:24:34 2005 +0000

description:
Use -U $lines instead of -$lines to avoid conflicts with the threeway diff
option.

diffstat:

 pkgtools/pkgdiff/Makefile      |   4 ++--
 pkgtools/pkgdiff/files/pkgdiff |  10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diffs (51 lines):

diff -r 77cbb6f5a331 -r f68d887144b7 pkgtools/pkgdiff/Makefile
--- a/pkgtools/pkgdiff/Makefile Fri May 20 22:40:36 2005 +0000
+++ b/pkgtools/pkgdiff/Makefile Sat May 21 01:24:34 2005 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.54 2005/05/07 22:24:04 wiz Exp $
+# $NetBSD: Makefile,v 1.55 2005/05/21 01:24:34 rh Exp $
 #
 
-DISTNAME=      pkgdiff-0.116
+DISTNAME=      pkgdiff-0.117
 CATEGORIES=    pkgtools devel
 MASTER_SITES=  # empty
 DISTFILES=     # empty
diff -r 77cbb6f5a331 -r f68d887144b7 pkgtools/pkgdiff/files/pkgdiff
--- a/pkgtools/pkgdiff/files/pkgdiff    Fri May 20 22:40:36 2005 +0000
+++ b/pkgtools/pkgdiff/files/pkgdiff    Sat May 21 01:24:34 2005 +0000
@@ -1,6 +1,6 @@
 #!@SH@
 #
-# $NetBSD: pkgdiff,v 1.14 2004/05/23 21:55:47 danw Exp $
+# $NetBSD: pkgdiff,v 1.15 2005/05/21 01:24:34 rh Exp $
 #
 # Usage: pkgdiff newfile
 #        pkgdiff oldfile newfile
@@ -38,8 +38,8 @@
 }
 
 lines=3
-: ${PKGDIFF_FMT:=-u -p}
-while [ `dodiff "$PKGDIFF_FMT" -$lines "$old" "$new" | egrep -c '\\$(NetBSD|Author|Date|Header|Id|Locker|Log|Name|RCSfile|Revision|Source|State)(:.*)?\\$'`  !=  0 ]
+: ${PKGDIFF_FMT:=-u -p -U $lines}
+while [ `dodiff "$PKGDIFF_FMT" "$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
@@ -48,7 +48,7 @@
        fi
 done
 
-if dodiff -q "$PKGDIFF_FMT" -$lines "$old" "$new" > /dev/null
+if dodiff -q "$PKGDIFF_FMT" "$old" "$new" > /dev/null
 then
        :
 else
@@ -56,5 +56,5 @@
     echo ''
     # Strip out the date on the +++ line to reduce needless
     # differences in regenerated patches
-    dodiff "$PKGDIFF_FMT" -$lines "$old" "$new" | sed -e 's:^\(+++ [^  ]*\)    .*:\1:'
+    dodiff "$PKGDIFF_FMT" "$old" "$new" | sed -e 's:^\(+++ [^  ]*\)    .*:\1:'
 fi