The merge into /etc (back it up first) is often ignored or not done carefully enough. Be sure to add the new group; if you need to ask what it is, you haven't read the docs in /usr/src. You may want to read Nik Clayton's discussion of this topic in his tutorial on upgrading on the FreeBSD web page (or on his own page). As Nik points out, part of this "merge" is putting the new MAKEDEV in /dev. Note that other "files" in /usr/src/etc are directories with subdirectories. It's especially important to install the new make.conf.
My thanks to Dag-Erling Smørgrav (des@freebsd.org) for helpful suggestions that improved this document greatly; remaining errors are my own.
Annelise Anderson
andrsn@andrsn.stanford.edu