From bf8e6722cbce30ad094d8746628b0ead837ba452 Mon Sep 17 00:00:00 2001
From: rh <rh@pkgsrc.org>
Date: Sat, 21 May 2005 01:24:34 +0000
Subject: Use -U $lines instead of -$lines to avoid conflicts with the threeway
 diff option.

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

(limited to 'pkgtools')

diff --git a/pkgtools/pkgdiff/Makefile b/pkgtools/pkgdiff/Makefile
index 20de5d93c14..b082b30d7cb 100644
--- a/pkgtools/pkgdiff/Makefile
+++ b/pkgtools/pkgdiff/Makefile
@@ -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 --git a/pkgtools/pkgdiff/files/pkgdiff b/pkgtools/pkgdiff/files/pkgdiff
index af2a7ffe183..c0f96399584 100755
--- a/pkgtools/pkgdiff/files/pkgdiff
+++ b/pkgtools/pkgdiff/files/pkgdiff
@@ -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 @@ dodiff() {
 }
 
 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 @@ do
 	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 @@ else
     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
-- 
cgit v1.2.3