Restore lost MacPorts path
Merge from origin/master