On Thu, Jul 30, 2015 at 03:09:30PM -0500, Larry Rosenman wrote:
> $ sudo -s
> Password:
> # cd /usr/src
> # patch -p0 < ~ler/pmspcv.diff
> Hmm...  Looks like a unified diff to me...
> The text leading up to this was:
> --------------------------
> |Index: sys/dev/pms/freebsd/driver/common/lxutil.c
> |===================================================================
> |--- sys/dev/pms/freebsd/driver/common/lxutil.c       (revision 286083)
> |+++ sys/dev/pms/freebsd/driver/common/lxutil.c       (working copy)
> --------------------------
> Patching file sys/dev/pms/freebsd/driver/common/lxutil.c using Plan A...
> Hunk #1 failed at 758.
> Hunk #2 failed at 767.
> 2 out of 2 hunks failed--saving rejects to
> sys/dev/pms/freebsd/driver/common/lxutil.c.rej
> done
> # vi sys/dev/pms/freebsd/driver/common/lxutil.c.rej
> @@ -758,6 +758,7 @@
>    int idx;^M
>    static U32 cardMap[4] = { 0, 0, 0, 0 };^M

Hmm.  Somehow you ended up with MS DOS EOL...

I'm able to apply the patch without issues.  Try this:

 vi pmspcv.diff
 :%s:[ctrl-m]::g

It should apply afterward.

Glen

Attachment: pgpNAsx5wWYdP.pgp
Description: PGP signature

Reply via email to