It took me twenty minutes, this time. No manual work needed. :-) sysupgrade - reboot- sysmerge and pkg_add -u, done.