On Tue, 6 Mar 2001, Frederick Bruckman wrote:

> Still not quite right: "patch-aa" contains a NetBSD tag, which is
> expanded after a second invocation of "cvs update -A", subsequently
> causing the patch to fail! Plus, no "patch-sum" file.

Reducing the context works for me. I think it's pointless to insist on
three lines of context when the file is only five lines long...


Frederick

? files/patch-sum
Index: patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/pkg_install/patches/patch-aa,v
retrieving revision 1.1
diff -c -r1.1 patch-aa
*** patches/patch-aa	2001/03/07 00:17:29	1.1
--- patches/patch-aa	2001/03/07 00:41:45
***************
*** 7,14 ****
  diff -u -r1.5 Makefile
  --- Makefile	2001/01/09 03:13:43	1.5
  +++ Makefile	2001/03/06 23:54:39
! @@ -1,6 +1,7 @@
!  # $NetBSD: patch-aa,v 1.1 2001/03/07 00:17:29 hubertf Exp $
   # Original from FreeBSD, no rcs id.

  -SUBDIR=lib .WAIT add admin create delete info
--- 7,13 ----
  diff -u -r1.5 Makefile
  --- Makefile	2001/01/09 03:13:43	1.5
  +++ Makefile	2001/03/06 23:54:39
! @@ -2,5 +2,6 @@
   # Original from FreeBSD, no rcs id.

  -SUBDIR=lib .WAIT add admin create delete info