I'll let others speak to that. Xorg has been imported into the base
system in -current, though, so it will happen at some point.
--Steve Bellovin, http://www.cs.columbia.edu/~smb
OK, since -current is at least 4.0.1, and I'm on 4.0, I'll be patient.