Change is essentially as per the PRs but with an added necessary package
list tweak.
PR: 35177, 44834
Submitted by: Stijn Hoop <stijn@win.tue.nl>,
Aurélien Nephtali <aurelien.nephtali@wanadoo.fr>
Approved by: maintainer timeout
PLISTs.
Note: I know that this is going to break some symlinks and/or .so
includes, I will back some of these out as I run into these during
package building.