[PATCH TO TEST] VESA [1024x768] mode support for FreeBSD-CURRENT

[Jay O'Brien]

Michal Mertl wrote:
> 
> You haven't read the thread in the archives carefully enough, have you?

Yes, but unfortunately I didn't comprehend. 

> Here is what I wrote (privately to the original poster but I explained
> the error to the mailing list too):
> 
> 
>>What? I don't know how the patching of vidcontrol ended but you'd
>>better redo it with fresh files from current. Go download vidcontrol.c
>>v 1.48 and vidcontrol.1 from
>>http://www.freebsd.org/cgi/cvsweb.cgi/src/usr.sbin/vidcontrol/
>>
>>Then run the patch on it again and recompile/reinstall vidcontrol
>>binary.
> 

I did that. The files are vidcontrol.1 Rev 1.55 and Vidcontrol.c Rev 1.48. 
Now all hunks failed. The results are below. 

What did I screw up this time?

Jay 


|Index: vidcontrol.1
|===================================================================
|RCS file: /home/ncvs/src/usr.sbin/vidcontrol/vidcontrol.1,v
|retrieving revision 1.55
|diff -u -r1.55 vidcontrol.1
|--- vidcontrol.1	2 Mar 2003 21:04:21 -0000	1.55
|+++ vidcontrol.1	17 Jan 2005 05:27:25 -0000
--------------------------
Patching file vidcontrol.1 using Plan A...
Hunk #1 failed at 11.
Hunk #2 failed at 88.
Hunk #3 failed at 297.
Hunk #4 failed at 532.
4 out of 4 hunks failed--saving rejects to vidcontrol.1.rej
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: vidcontrol.c
|===================================================================
|RCS file: /home/ncvs/src/usr.sbin/vidcontrol/vidcontrol.c,v
|retrieving revision 1.48
|diff -u -r1.48 vidcontrol.c
|--- vidcontrol.c	13 Jan 2005 03:59:44 -0000	1.48
|+++ vidcontrol.c	17 Jan 2005 05:27:25 -0000
--------------------------
Patching file vidcontrol.c using Plan A...
Hunk #1 failed at 24.
Hunk #2 failed at 48.
Hunk #3 failed at 66.
Hunk #4 failed at 187.
Hunk #5 failed at 223.
Hunk #6 failed at 239.
Hunk #7 failed at 257.
Hunk #8 failed at 297.
Hunk #9 failed at 332.
Hunk #10 failed at 348.
Hunk #11 failed at 377.
Hunk #12 failed at 419.
Hunk #13 failed at 507.
Hunk #14 failed at 572.
Hunk #15 failed at 669.
Hunk #16 failed at 722.
Hunk #17 failed at 743.
Hunk #18 failed at 806.
Hunk #19 failed at 891.
Hunk #20 failed at 900.
Hunk #21 failed at 933.
Hunk #22 failed at 950.
Hunk #23 failed at 962.
Hunk #24 failed at 985.
Hunk #25 failed at 1035.
Hunk #26 failed at 1050.
Hunk #27 failed at 1148.
Hunk #28 failed at 1173.
Hunk #29 failed at 1217.
Hunk #30 failed at 1234.
30 out of 30 hunks failed--saving rejects to vidcontrol.c.rej
done