Changes to BSD.x11-4.dist mtree affecting x11-fonts/libXft and x11/xfree86_xkb_xml

[Dejan Lesjak]

Hi,
 
I'm cleaning XPREFIX mtree a bit and will be commiting some changes along with  
XFree86 ports upgrade soon. A bit more about this is explained here:
http://lists.freebsd.org/pipermail/freebsd-x11/2005-February/001619.html
So they don't break I'll need to touch a few ports, including
x11-fonts/libXft and x11/xfree86_xkb_xml.
Changes in form of patch can be seen here:
http://www.ijs.si/~lesi/xfree/fixes/libXft.diff
http://www.ijs.si/~lesi/xfree/fixes/xfree86_xkb_xml.diff
Change for x11/xfree86_xkb_xml removes previous workaround for when mtree
used by Xorg and one used by XFree86-4 were out of sync and leaves removal
of empty dirs in both cases.
Change for x11-fonts/libXft introduces similar workaround which should go
away in next (last) roud of these cleanups, presumably along with next Xorg
ports upgrade, when both X_WINDOW_SYSTEMs will be using same mtree file
again.
I'll commit these as soon as we're done with pointyhat test run. Let me know   
if you feel this is wrong fix or if you need me to explain changes further.
 
 
Dejan