Eirik Nygaard has suggested using Eivind Eklund’s etcmerge (available in ports/sysutils/etcmerge) to handle the upgrade process. Here’s etcmerge itself and the man page, for the curious.