X.org vs. XFree86 ports

[vladimir at math.uic.edu]

does anyone know the situation with these ports?  I am trying
to understand which one of two X branches (or both?) is going
to be supported in FreeBSD.

Many thanks,
	Vladimir