Using xorg instead of XFree86

[Axel S. Gruner]

Hi,

i have written a howto for people willing to switch from XFree86 to 
xorg. Ok, at this time it is only available in german:

http://www.bsdforen.de/showthread.php?p=39983#post39983

But i also have some questions about switching to xorg. 

(1) Will xorg be the default X in future FreeBSD Releases?

(2) I have xorg running, without a problem, but if i install a new 
application with a XFree86 dependency i have to run "pkgdb -F" to fix 
the dependency to xorg stuff (and imake-6).
If i change /usr/ports/Mk/bsd.port.mk and the entries about XFree86 and 
imake-4 to xorg and imake-6, the change will not be permanent (cvsup 
will overwrite the change):

[...]
LIB_DEPENDS+=   X11.6:${PORTSDIR}/x11/xorg-libraries
[...]
.if defined(USE_IMAKE)
BUILD_DEPENDS+= ${X11BASE}/lib/X11/config/date.def:
${PORTSDIR}/devel/imake-6
RUN_DEPENDS+= mkhtmlindex:${PORTSDIR}/devel/imake-6
[...]

So, is there another way to fix that permanently or a work-around?

asg