Subject: How to apply patches in RCSDIFF format?
To: None <port-i386@netbsd.org>
From: Alicia da Conceicao <alicia@cyberstation.ca>
List: port-i386
Date: 10/13/1999 11:27:53
Greetings:

I am trying to apply a patch to support 3COM 3CCFEM556B 10/100
Ether + Modem PCMICA cards, from r-katoh@mxp.mesh.ne.jp in problem
report #8331, to my ix86 NetBSD 1.4.1 kernel:

    http://www.NetBSD.org/cgi-bin/query-pr-single.pl?number=8331

Unfortunately the patch does not appear to be in the usual diff
format.  (It looks like it was generated from rcsdiff.)  So applying
the patch in the "/usr/src/sys/" directory using "patch < PATCHFILE"
does not work.  Below is a sample of the patch format.

    Index: dev/ic/elink3.c
    =================================================================
    RCS file: /usr/src/CVSROOT/netbsd.sys/dev/ic/elink3.c,v
    retrieving revision 1.1.1.1
    diff -c -r1.1.1.1 elink3.c
    *** elink3.c    1999/08/27 10:14:17     1.1.1.1
    --- elink3.c    1999/08/31 09:06:33
    ***************
    *** 232,237 ****
    --- 232,239 ----
      void  ep_mii_sync __P((struct ep_softc *));
      void  ep_mii_sendbits __P((struct ep_softc *, u_int32_t, int));

Is there any option to the patch program to use this type of patch?
Is there a way to convert the patch file into a format that can be
used by the patch program?  (If I was to edit the patch file by hand
with vi, what changes should I make?)

Thanks in advance.  Sincerely, Alicia.