Problem with qemu update on 6.2-STABLE

[Scott Robbins]

As no one else has mentioned this problem, it's probably something odd
with my system, but I figured I'd post here and see.

In trying to update qemu from 0.8.2s.20070111 to 20070203, the build
fails when patching vl.c. 

I have the results of the failed build at

http://www.scottro.net/qemu.out

The rejected hunks of the patch are at

http://www.scottro.net/vl.c.rej

The port upgraded with no problem on FreeBSD-7.0-CURRENT.

I'd be grateful for any pointers.  

uname -a

FreeBSD uws1.starlofashions.com 6.2-STABLE FreeBSD 6.2-STABLE #0: Mon Jan 29 14:32:19 EST 2007     scottro at uws1.starlofashions.com:/usr/obj/usr/src/sys/UWS1  i386
-- 

Scott

GPG KeyID EB3467D6
( 1B848 077D 66F6 9DB0 FDC2  A409 FA54 D575 EB34 67D6)
gpg --keyserver pgp.mit.edu --recv-keys EB3467D6

Angel: She murdered a man right in front of me, and I can't
even testify to that fact in a court of law.
Cordelia: Well, maybe in night court you could...