diff options
| author | wiz <wiz> | 2003-06-10 12:47:32 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2003-06-10 12:47:32 +0000 |
| commit | 2564b78f8d3557e1ea2c5d3bae2eb71b6a435687 (patch) | |
| tree | 21617e3476d7605841da6e9f2f3d2377840be90c /pkgtools/pkgdiff | |
| parent | 538867e966403cb096edd692f5f86ab79714a2a1 (diff) | |
| download | pkgsrc-2564b78f8d3557e1ea2c5d3bae2eb71b6a435687.tar.gz | |
Update to 1.110: make grep only match closed CVS tags (including the
second $).
Diffstat (limited to 'pkgtools/pkgdiff')
| -rw-r--r-- | pkgtools/pkgdiff/Makefile | 4 | ||||
| -rwxr-xr-x | pkgtools/pkgdiff/files/pkgdiff | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgtools/pkgdiff/Makefile b/pkgtools/pkgdiff/Makefile index c5b57ab6db4..6b3d39581fb 100644 --- a/pkgtools/pkgdiff/Makefile +++ b/pkgtools/pkgdiff/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.34 2003/05/28 14:53:51 seb Exp $ +# $NetBSD: Makefile,v 1.35 2003/06/10 12:47:32 wiz Exp $ # -DISTNAME= pkgdiff-0.109 +DISTNAME= pkgdiff-0.110 WRKSRC= ${WRKDIR} CATEGORIES= pkgtools devel MASTER_SITES= # empty diff --git a/pkgtools/pkgdiff/files/pkgdiff b/pkgtools/pkgdiff/files/pkgdiff index 848a1d19dc0..75e59fcb6bd 100755 --- a/pkgtools/pkgdiff/files/pkgdiff +++ b/pkgtools/pkgdiff/files/pkgdiff @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: pkgdiff,v 1.10 2003/04/09 15:01:18 seb Exp $ +# $NetBSD: pkgdiff,v 1.11 2003/06/10 12:47:32 wiz Exp $ # # Usage: pkgdiff newfile # pkgdiff oldfile newfile @@ -38,7 +38,7 @@ dodiff() { } lines=3 -while [ `dodiff -u -p -$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 |