*/*: restore removed aports
These were prematurely removed. We assumed that the upstream would relicense all their software but they seem to have not yet gone that route for these.
This reverts commit ea918b36 and part of 234ade56 and address #15531 (closed).
Edited by omni