Add a work-around to the bug in pkg where some files are getting
nuked during the upgrade because of breaking our ports into sub-modules