I think both are still active, but almost every major distro has moved or signalled they're moving to xorg -
from
www.x.org:
About the X11R6.7.0 Release
The X.Org repository is based on XFree86 4.4 RC2. Just before its 4.4 release, XFree86 adopted a new license possibly incompatible with the GPL. For this reason, we have recreated its tree as closely as possible without importing files affected by the new license. The monolithic tree is being referred to as simply "XOrg".
X11R6.7.0 contains substantial updates beyond XFree86 4.4RC2, as mentioned in the X11R6.7.0 release notes, including updated versions of Render, Xft, and fontconfig, and a greatly improved Cygwin/X port.
