--Fix build on -CURRENT --Various cleanups and fixes to port and source distribution makefiles --Update maintainer email PR: 249980 Approved by: fernape