Fix couple of small bugs, don't need to try and re-install
ports-mgmt/pkg and misc/{pcbsd|trueos}-base, those are implicit
at the start of the upgrade code