Rebased from the ports branch to staging. I think the style of the .port and .patch files should be up to date.
Closing the earlier MR against the porttix repo.