"Fixed" font not found after upgrade to 7.2

[Krzysztof Jurewicz]

I've upgraded to xorg-7.2, trying to do it as described in
/usr/ports/UPDATING, though not everything went well and not
everything was done exactly accordingly. Then, after reboot, Xorg told
me something about not found pcidata module. After deleting
/etc/X11/xorg.conf it wasn't a problem, but Xorg "could not open
default font 'fixed'".

xorg-fonts-miscbitmaps is installed (and reinstalled), so I suppose
the problem is in deleting some files from /usr/X11R6 to make merging
script work.

There is Xorg.0.log and console output of upgrade process available at
http://jurewicz.org.pl/xorg/Xorg.0.log.bz2 and
http://jurewicz.org.pl/xorg/xorg-upgrade.bz2